From 920f30ef7732e87045ae6652c464b58267991b8f Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Wed, 18 Apr 2018 16:36:31 -0700
Subject: [PATCH 001/277] Add forwardRef DEV warning for prop-types on render
 function (#12644)

---
 .../src/__tests__/forwardRef-test.internal.js | 21 +++++++++++++++++++
 packages/react/src/forwardRef.js              |  8 +++++++
 2 files changed, 29 insertions(+)

diff --git a/packages/react/src/__tests__/forwardRef-test.internal.js b/packages/react/src/__tests__/forwardRef-test.internal.js
index 068448c437..5780dbd054 100644
--- a/packages/react/src/__tests__/forwardRef-test.internal.js
+++ b/packages/react/src/__tests__/forwardRef-test.internal.js
@@ -249,4 +249,25 @@ describe('forwardRef', () => {
       'forwardRef requires a render function but was given undefined.',
     );
   });
+
+  it('should warn if the render function provided has propTypes or defaultProps attributes', () => {
+    function renderWithPropTypes() {
+      return null;
+    }
+    renderWithPropTypes.propTypes = {};
+
+    function renderWithDefaultProps() {
+      return null;
+    }
+    renderWithDefaultProps.defaultProps = {};
+
+    expect(() => React.forwardRef(renderWithPropTypes)).toWarnDev(
+      'forwardRef render functions do not support propTypes or defaultProps. ' +
+        'Did you accidentally pass a React component?',
+    );
+    expect(() => React.forwardRef(renderWithDefaultProps)).toWarnDev(
+      'forwardRef render functions do not support propTypes or defaultProps. ' +
+        'Did you accidentally pass a React component?',
+    );
+  });
 });
diff --git a/packages/react/src/forwardRef.js b/packages/react/src/forwardRef.js
index 6a923be127..6c3c1a4343 100644
--- a/packages/react/src/forwardRef.js
+++ b/packages/react/src/forwardRef.js
@@ -18,6 +18,14 @@ export default function forwardRef<Props, ElementType: React$ElementType>(
       'forwardRef requires a render function but was given %s.',
       render === null ? 'null' : typeof render,
     );
+
+    if (render != null) {
+      warning(
+        render.defaultProps == null && render.propTypes == null,
+        'forwardRef render functions do not support propTypes or defaultProps. ' +
+          'Did you accidentally pass a React component?',
+      );
+    }
   }
 
   return {

From f80bbf88e5278cab9aca7206a1f241e33f3f674b Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Thu, 19 Apr 2018 09:08:44 -0700
Subject: [PATCH 002/277] StrictMode should not warn about polyfilled
 getSnapshotBeforeUpdate (#12647)

* Installed 3.x release of react-lifecycles-compat
* Updated ReactComponentLifeCycle-test and ReactDOMServerLifecycles-test to cover both polyfilled lifecycles in StrictMode
* Updated StrictMode warnings to not warn about polyfilled getSnapshotBeforeUpdate
---
 package.json                                  |  2 +-
 .../ReactComponentLifeCycle-test.internal.js  | 49 ++++++++++---------
 .../ReactDOMServerLifecycles-test.internal.js | 34 +++++++++++--
 .../src/ReactStrictModeWarnings.js            | 20 +++-----
 yarn.lock                                     |  6 +--
 5 files changed, 68 insertions(+), 43 deletions(-)

diff --git a/package.json b/package.json
index 86cff63303..01f0a2781f 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "prettier": "1.11.1",
     "prop-types": "^15.6.0",
     "random-seed": "^0.3.0",
-    "react-lifecycles-compat": "^1.0.2",
+    "react-lifecycles-compat": "^3.0.2",
     "rimraf": "^2.6.1",
     "rollup": "^0.52.1",
     "rollup-plugin-babel": "^3.0.1",
diff --git a/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.internal.js b/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.internal.js
index 5b1b1732a1..651463bf1c 100644
--- a/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.internal.js
+++ b/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.internal.js
@@ -63,28 +63,9 @@ describe('ReactComponentLifeCycle', () => {
   });
 
   describe('react-lifecycles-compat', () => {
-    const polyfill = require('react-lifecycles-compat');
-
-    it('should not warn about deprecated cWM/cWRP for polyfilled components', () => {
-      class PolyfilledComponent extends React.Component {
-        state = {};
-        static getDerivedStateFromProps() {
-          return null;
-        }
-        render() {
-          return null;
-        }
-      }
-
-      polyfill(PolyfilledComponent);
-
-      const container = document.createElement('div');
-      ReactDOM.render(<PolyfilledComponent />, container);
-    });
-
-    it('should not warn about unsafe lifecycles within "strict" tree for polyfilled components', () => {
-      const {StrictMode} = React;
+    const {polyfill} = require('react-lifecycles-compat');
 
+    it('should not warn for components with polyfilled getDerivedStateFromProps', () => {
       class PolyfilledComponent extends React.Component {
         state = {};
         static getDerivedStateFromProps() {
@@ -99,9 +80,31 @@ describe('ReactComponentLifeCycle', () => {
 
       const container = document.createElement('div');
       ReactDOM.render(
-        <StrictMode>
+        <React.StrictMode>
           <PolyfilledComponent />
-        </StrictMode>,
+        </React.StrictMode>,
+        container,
+      );
+    });
+
+    it('should not warn for components with polyfilled getSnapshotBeforeUpdate', () => {
+      class PolyfilledComponent extends React.Component {
+        getSnapshotBeforeUpdate() {
+          return null;
+        }
+        componentDidUpdate() {}
+        render() {
+          return null;
+        }
+      }
+
+      polyfill(PolyfilledComponent);
+
+      const container = document.createElement('div');
+      ReactDOM.render(
+        <React.StrictMode>
+          <PolyfilledComponent />
+        </React.StrictMode>,
         container,
       );
     });
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.internal.js b/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.internal.js
index 69bedb3de1..bbd502e2ab 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.internal.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.internal.js
@@ -69,9 +69,9 @@ describe('ReactDOMServerLifecycles', () => {
   });
 
   describe('react-lifecycles-compat', () => {
-    const polyfill = require('react-lifecycles-compat');
+    const {polyfill} = require('react-lifecycles-compat');
 
-    it('should not warn about deprecated cWM/cWRP for polyfilled components', () => {
+    it('should not warn for components with polyfilled getDerivedStateFromProps', () => {
       class PolyfilledComponent extends React.Component {
         state = {};
         static getDerivedStateFromProps() {
@@ -84,7 +84,35 @@ describe('ReactDOMServerLifecycles', () => {
 
       polyfill(PolyfilledComponent);
 
-      ReactDOMServer.renderToString(<PolyfilledComponent />);
+      const container = document.createElement('div');
+      ReactDOMServer.renderToString(
+        <React.StrictMode>
+          <PolyfilledComponent />
+        </React.StrictMode>,
+        container,
+      );
+    });
+
+    it('should not warn for components with polyfilled getSnapshotBeforeUpdate', () => {
+      class PolyfilledComponent extends React.Component {
+        getSnapshotBeforeUpdate() {
+          return null;
+        }
+        componentDidUpdate() {}
+        render() {
+          return null;
+        }
+      }
+
+      polyfill(PolyfilledComponent);
+
+      const container = document.createElement('div');
+      ReactDOMServer.renderToString(
+        <React.StrictMode>
+          <PolyfilledComponent />
+        </React.StrictMode>,
+        container,
+      );
     });
   });
 });
diff --git a/packages/react-reconciler/src/ReactStrictModeWarnings.js b/packages/react-reconciler/src/ReactStrictModeWarnings.js
index 9b7b6c1dd2..0f39b09371 100644
--- a/packages/react-reconciler/src/ReactStrictModeWarnings.js
+++ b/packages/react-reconciler/src/ReactStrictModeWarnings.js
@@ -236,16 +236,6 @@ if (__DEV__) {
       return;
     }
 
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    // Note that it is sufficient to check for the presence of a
-    // single lifecycle, componentWillMount, with the polyfill flag.
-    if (
-      typeof instance.componentWillMount === 'function' &&
-      instance.componentWillMount.__suppressDeprecationWarning === true
-    ) {
-      return;
-    }
-
     let warningsForRoot;
     if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
       warningsForRoot = {
@@ -261,19 +251,23 @@ if (__DEV__) {
 
     const unsafeLifecycles = [];
     if (
-      typeof instance.componentWillMount === 'function' ||
+      (typeof instance.componentWillMount === 'function' &&
+        instance.componentWillMount.__suppressDeprecationWarning !== true) ||
       typeof instance.UNSAFE_componentWillMount === 'function'
     ) {
       unsafeLifecycles.push('UNSAFE_componentWillMount');
     }
     if (
-      typeof instance.componentWillReceiveProps === 'function' ||
+      (typeof instance.componentWillReceiveProps === 'function' &&
+        instance.componentWillReceiveProps.__suppressDeprecationWarning !==
+          true) ||
       typeof instance.UNSAFE_componentWillReceiveProps === 'function'
     ) {
       unsafeLifecycles.push('UNSAFE_componentWillReceiveProps');
     }
     if (
-      typeof instance.componentWillUpdate === 'function' ||
+      (typeof instance.componentWillUpdate === 'function' &&
+        instance.componentWillUpdate.__suppressDeprecationWarning !== true) ||
       typeof instance.UNSAFE_componentWillUpdate === 'function'
     ) {
       unsafeLifecycles.push('UNSAFE_componentWillUpdate');
diff --git a/yarn.lock b/yarn.lock
index 495fa024f6..0c9feb48b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4434,9 +4434,9 @@ react-dom@15.5.4:
     object-assign "^4.1.0"
     prop-types "~15.5.7"
 
-react-lifecycles-compat@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-1.0.2.tgz#551d8b1d156346e5fcf30ffac9b32ce3f78b8850"
+react-lifecycles-compat@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.2.tgz#7279047275bd727a912e25f734c0559527e84eff"
 
 react@15.5.4:
   version "15.5.4"

From 999b656ed1c94b00fcfd043f54e18ade7553dee0 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Thu, 19 Apr 2018 09:29:08 -0700
Subject: [PATCH 003/277] Initial commit (#12624)

This is the first step - pulling the ReactDOMFrameScheduling module out
into a separate package.

Co-authored-by: Brandon Dail <aweary@users.noreply.github.com>
---
 packages/react-art/src/ReactART.js            |  6 ++--
 .../react-dom/src/__tests__/ReactDOM-test.js  | 35 +++++++++++++++++++
 packages/react-dom/src/client/ReactDOM.js     |  8 ++---
 packages/react-scheduler/README.md            |  4 +++
 packages/react-scheduler/index.js             | 12 +++++++
 packages/react-scheduler/npm/index.js         |  7 ++++
 packages/react-scheduler/package.json         | 23 ++++++++++++
 .../src/ReactScheduler.js}                    | 15 ++++++++
 scripts/rollup/bundles.js                     | 10 ++++++
 9 files changed, 113 insertions(+), 7 deletions(-)
 create mode 100644 packages/react-scheduler/README.md
 create mode 100644 packages/react-scheduler/index.js
 create mode 100644 packages/react-scheduler/npm/index.js
 create mode 100644 packages/react-scheduler/package.json
 rename packages/{shared/ReactDOMFrameScheduling.js => react-scheduler/src/ReactScheduler.js} (94%)

diff --git a/packages/react-art/src/ReactART.js b/packages/react-art/src/ReactART.js
index 670e2a349b..04478434e8 100644
--- a/packages/react-art/src/ReactART.js
+++ b/packages/react-art/src/ReactART.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import ReactFiberReconciler from 'react-reconciler';
-import * as ReactDOMFrameScheduling from 'shared/ReactDOMFrameScheduling';
+import * as ReactScheduler from 'react-scheduler';
 import Mode from 'art/modes/current';
 import FastNoSideEffects from 'art/modes/fast-noSideEffects';
 import Transform from 'art/core/transform';
@@ -468,7 +468,7 @@ const ARTRenderer = ReactFiberReconciler({
     return emptyObject;
   },
 
-  scheduleDeferredCallback: ReactDOMFrameScheduling.rIC,
+  scheduleDeferredCallback: ReactScheduler.rIC,
 
   shouldSetTextContent(type, props) {
     return (
@@ -476,7 +476,7 @@ const ARTRenderer = ReactFiberReconciler({
     );
   },
 
-  now: ReactDOMFrameScheduling.now,
+  now: ReactScheduler.now,
 
   mutation: {
     appendChild(parentInstance, child) {
diff --git a/packages/react-dom/src/__tests__/ReactDOM-test.js b/packages/react-dom/src/__tests__/ReactDOM-test.js
index 46b9f5cabe..5e7d2772e3 100644
--- a/packages/react-dom/src/__tests__/ReactDOM-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOM-test.js
@@ -439,4 +439,39 @@ describe('ReactDOM', () => {
       Object.defineProperty(global, 'document', documentDescriptor);
     }
   });
+
+  it('warns when requestAnimationFrame is not polyfilled in the browser', () => {
+    const previousRAF = global.requestAnimationFrame;
+    try {
+      global.requestAnimationFrame = undefined;
+      jest.resetModules();
+      expect(() => require('react-dom')).toWarnDev(
+        'React depends on requestAnimationFrame.',
+      );
+    } finally {
+      global.requestAnimationFrame = previousRAF;
+    }
+  });
+
+  // We're just testing importing, not using it.
+  // It is important because even isomorphic components may import it.
+  it('can import findDOMNode in Node environment', () => {
+    const previousRAF = global.requestAnimationFrame;
+    const previousRIC = global.requestIdleCallback;
+    const prevWindow = global.window;
+    try {
+      global.requestAnimationFrame = undefined;
+      global.requestIdleCallback = undefined;
+      // Simulate the Node environment:
+      delete global.window;
+      jest.resetModules();
+      expect(() => {
+        require('react-dom');
+      }).not.toThrow();
+    } finally {
+      global.requestAnimationFrame = previousRAF;
+      global.requestIdleCallback = previousRIC;
+      global.window = prevWindow;
+    }
+  });
 });
diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js
index 1bb0c86ed2..82032f1d1d 100644
--- a/packages/react-dom/src/client/ReactDOM.js
+++ b/packages/react-dom/src/client/ReactDOM.js
@@ -29,7 +29,7 @@ import * as EventPluginRegistry from 'events/EventPluginRegistry';
 import * as EventPropagators from 'events/EventPropagators';
 import * as ReactInstanceMap from 'shared/ReactInstanceMap';
 import ReactVersion from 'shared/ReactVersion';
-import * as ReactDOMFrameScheduling from 'shared/ReactDOMFrameScheduling';
+import * as ReactScheduler from 'react-scheduler';
 import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'fbjs/lib/invariant';
@@ -688,7 +688,7 @@ const DOMRenderer = ReactFiberReconciler({
     return textNode;
   },
 
-  now: ReactDOMFrameScheduling.now,
+  now: ReactScheduler.now,
 
   mutation: {
     commitMount(
@@ -984,8 +984,8 @@ const DOMRenderer = ReactFiberReconciler({
     },
   },
 
-  scheduleDeferredCallback: ReactDOMFrameScheduling.rIC,
-  cancelDeferredCallback: ReactDOMFrameScheduling.cIC,
+  scheduleDeferredCallback: ReactScheduler.rIC,
+  cancelDeferredCallback: ReactScheduler.cIC,
 });
 
 ReactGenericBatching.injection.injectRenderer(DOMRenderer);
diff --git a/packages/react-scheduler/README.md b/packages/react-scheduler/README.md
new file mode 100644
index 0000000000..481b6f8f1a
--- /dev/null
+++ b/packages/react-scheduler/README.md
@@ -0,0 +1,4 @@
+# React Scheduler
+
+This is a work in progress - we are building a utility to better coordinate
+React and other JavaScript work.
diff --git a/packages/react-scheduler/index.js b/packages/react-scheduler/index.js
new file mode 100644
index 0000000000..9eceea5966
--- /dev/null
+++ b/packages/react-scheduler/index.js
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+'use strict';
+
+export * from './src/ReactScheduler';
diff --git a/packages/react-scheduler/npm/index.js b/packages/react-scheduler/npm/index.js
new file mode 100644
index 0000000000..777fe2f80d
--- /dev/null
+++ b/packages/react-scheduler/npm/index.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-scheduler.production.min.js');
+} else {
+  module.exports = require('./cjs/react-scheduler.development.js');
+}
diff --git a/packages/react-scheduler/package.json b/packages/react-scheduler/package.json
new file mode 100644
index 0000000000..b16a07e99b
--- /dev/null
+++ b/packages/react-scheduler/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "react-scheduler",
+  "version": "0.1.0-alpha-1",
+  "private": true,
+  "description": "unstable scheduling helper for coordinating React and other JS libraries",
+  "main": "index.js",
+  "repository": "facebook/react",
+  "license": "MIT",
+  "keywords": [
+    "react"
+  ],
+  "bugs": {
+    "url": "https://github.com/facebook/react/issues"
+  },
+  "homepage": "https://reactjs.org/",
+  "files": [
+    "LICENSE",
+    "README.md",
+    "index.js",
+    "cjs/",
+    "umd/"
+  ]
+}
diff --git a/packages/shared/ReactDOMFrameScheduling.js b/packages/react-scheduler/src/ReactScheduler.js
similarity index 94%
rename from packages/shared/ReactDOMFrameScheduling.js
rename to packages/react-scheduler/src/ReactScheduler.js
index 514ca07c22..a7983dfeaf 100644
--- a/packages/shared/ReactDOMFrameScheduling.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -7,6 +7,21 @@
  * @flow
  */
 
+'use strict';
+
+/**
+ * A scheduling library to allow scheduling work with more granular priority and
+ * control than requestAnimationFrame and requestIdleCallback.
+ * Current TODO items:
+ * X- Pull out the rIC polyfill built into React
+ * - Initial test coverage
+ * - Support for multiple callbacks
+ * - Support for two priorities; serial and deferred
+ * - Better test coverage
+ * - Better docblock
+ * - Polish documentation, API
+ */
+
 // This is a built-in polyfill for requestIdleCallback. It works by scheduling
 // a requestAnimationFrame, storing the time for the start of the frame, then
 // scheduling a postMessage which gets scheduled after paint. Within the
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index e22aca11b5..f6681c6467 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -351,6 +351,16 @@ const bundles = [
     global: 'createSubscription',
     externals: ['react'],
   },
+
+  /******* React Scheduler (experimental) *******/
+  {
+    label: 'react-scheduler',
+    bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
+    moduleType: ISOMORPHIC,
+    entry: 'react-scheduler',
+    global: 'ReactScheduler',
+    externals: [],
+  },
 ];
 
 // Based on deep-freeze by substack (public domain)

From c040bcbea8e4393fbab549cc195162ac183625ed Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Sat, 21 Apr 2018 21:21:05 +0100
Subject: [PATCH 004/277] Add server integration tests for new context (#12654)

* Add server integration tests for new context

* Pretty please

* Remove unused
---
 ...DOMServerIntegrationLegacyContext-test.js} |   2 +-
 ...eactDOMServerIntegrationNewContext-test.js | 195 ++++++++++++++++++
 2 files changed, 196 insertions(+), 1 deletion(-)
 rename packages/react-dom/src/__tests__/{ReactDOMServerIntegrationContext-test.js => ReactDOMServerIntegrationLegacyContext-test.js} (99%)
 create mode 100644 packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js

diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationContext-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationLegacyContext-test.js
similarity index 99%
rename from packages/react-dom/src/__tests__/ReactDOMServerIntegrationContext-test.js
rename to packages/react-dom/src/__tests__/ReactDOMServerIntegrationLegacyContext-test.js
index 4ccf8a303c..32b38b3e0f 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationContext-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationLegacyContext-test.js
@@ -42,7 +42,7 @@ describe('ReactDOMServerIntegration', () => {
     resetModules();
   });
 
-  describe('context', function() {
+  describe('legacy context', function() {
     let PurpleContext, RedContext;
     beforeEach(() => {
       class Parent extends React.Component {
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js
new file mode 100644
index 0000000000..c3c08eb6bf
--- /dev/null
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js
@@ -0,0 +1,195 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react-core
+ */
+
+'use strict';
+
+const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
+
+let React;
+let ReactDOM;
+let ReactDOMServer;
+
+function initModules() {
+  // Reset warning cache.
+  jest.resetModuleRegistry();
+  React = require('react');
+  ReactDOM = require('react-dom');
+  ReactDOMServer = require('react-dom/server');
+
+  // Make them available to the helpers.
+  return {
+    ReactDOM,
+    ReactDOMServer,
+  };
+}
+
+const {resetModules, itRenders} = ReactDOMServerIntegrationUtils(initModules);
+
+describe('ReactDOMServerIntegration', () => {
+  beforeEach(() => {
+    resetModules();
+  });
+
+  describe('context', function() {
+    let PurpleContext, RedContext, Consumer;
+    beforeEach(() => {
+      let Context = React.createContext('none');
+
+      class Parent extends React.Component {
+        render() {
+          return (
+            <Context.Provider value={this.props.text}>
+              {this.props.children}
+            </Context.Provider>
+          );
+        }
+      }
+      Consumer = Context.Consumer;
+      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>
+              <Consumer>{text => text}</Consumer>
+            </div>
+          );
+        }
+      }
+
+      const e = await render(
+        <PurpleContext>
+          <ClassChildWithContext />
+        </PurpleContext>,
+      );
+      expect(e.textContent).toBe('purple');
+    });
+
+    itRenders('stateless child with context', async render => {
+      function StatelessChildWithContext(props) {
+        return <Consumer>{text => text}</Consumer>;
+      }
+
+      const e = await render(
+        <PurpleContext>
+          <StatelessChildWithContext />
+        </PurpleContext>,
+      );
+      expect(e.textContent).toBe('purple');
+    });
+
+    itRenders('class child with default context', async render => {
+      class ClassChildWithWrongContext extends React.Component {
+        render() {
+          return (
+            <div id="classWrongChild">
+              <Consumer>{text => text}</Consumer>
+            </div>
+          );
+        }
+      }
+
+      const e = await render(<ClassChildWithWrongContext />);
+      expect(e.textContent).toBe('none');
+    });
+
+    itRenders('stateless child with wrong context', async render => {
+      function StatelessChildWithWrongContext(props) {
+        return (
+          <div id="statelessWrongChild">
+            <Consumer>{text => text}</Consumer>
+          </div>
+        );
+      }
+
+      const e = await render(<StatelessChildWithWrongContext />);
+      expect(e.textContent).toBe('none');
+    });
+
+    itRenders('with context passed through to a grandchild', async render => {
+      function Grandchild(props) {
+        return (
+          <div>
+            <Consumer>{text => text}</Consumer>
+          </div>
+        );
+      }
+
+      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 => {
+        return (
+          <div>
+            <Consumer>{text => text}</Consumer>
+          </div>
+        );
+      };
+
+      const e = await render(
+        <PurpleContext>
+          <RedContext>
+            <Grandchild />
+          </RedContext>
+        </PurpleContext>,
+      );
+      expect(e.textContent).toBe('red');
+    });
+
+    itRenders('multiple contexts', async render => {
+      const Theme = React.createContext('dark');
+      const Language = React.createContext('french');
+      class Parent extends React.Component {
+        render() {
+          return (
+            <Theme.Provider value="light">
+              <Child />
+            </Theme.Provider>
+          );
+        }
+      }
+
+      function Child() {
+        return (
+          <Language.Provider value="english">
+            <Grandchild />
+          </Language.Provider>
+        );
+      }
+
+      const Grandchild = props => {
+        return (
+          <div>
+            <Theme.Consumer>
+              {theme => <div id="theme">{theme}</div>}
+            </Theme.Consumer>
+            <Language.Consumer>
+              {language => <div id="language">{language}</div>}
+            </Language.Consumer>
+          </div>
+        );
+      };
+
+      const e = await render(<Parent />);
+      expect(e.querySelector('#theme').textContent).toBe('light');
+      expect(e.querySelector('#language').textContent).toBe('english');
+    });
+  });
+});

From 5dcf93d146ccde90af2c442d6cb32b29efddb46b Mon Sep 17 00:00:00 2001
From: Nicole Levy <seriff@protonmail.com>
Date: Sun, 22 Apr 2018 08:39:38 -0400
Subject: [PATCH 005/277] Validate props on context providers (#12658)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* checkPropTypes in updateContextProvider

* invalid “prop”

* `type not `types` .. :l

* test

* don’t need extra check with no spelling mistake (:

* change error message to specifically address provider

* don’t need class, add extra render to make sure good props go through

* nitpicky rename

* prettier

* switch to `Context.Provider`

* add stack to warning, add extra undefined check

* separate dev check

* add stack to test

* more efficient

* remove unused function

* prettier

* const to top
---
 .../src/ReactFiberBeginWork.js                | 17 ++++++++++++++
 .../__tests__/ReactContextValidator-test.js   | 22 +++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 6de5e54877..f2d93b0962 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -16,6 +16,7 @@ import type {NewContext} from './ReactFiberNewContext';
 import type {HydrationContext} from './ReactFiberHydrationContext';
 import type {FiberRoot} from './ReactFiberRoot';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
+import checkPropTypes from 'prop-types/checkPropTypes';
 
 import {
   IndeterminateComponent,
@@ -63,6 +64,8 @@ import {NoWork, Never} from './ReactFiberExpirationTime';
 import {AsyncMode, StrictMode} from './ReactTypeOfMode';
 import MAX_SIGNED_31_BIT_INT from './maxSigned31BitInt';
 
+const {getCurrentFiberStackAddendum} = ReactDebugCurrentFiber;
+
 let didWarnAboutBadClass;
 let didWarnAboutGetDerivedStateOnFunctionalComponent;
 let didWarnAboutStatelessRefs;
@@ -885,6 +888,20 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     const newValue = newProps.value;
     workInProgress.memoizedProps = newProps;
 
+    if (__DEV__) {
+      const providerPropTypes = workInProgress.type.propTypes;
+
+      if (providerPropTypes) {
+        checkPropTypes(
+          providerPropTypes,
+          newProps,
+          'prop',
+          'Context.Provider',
+          getCurrentFiberStackAddendum,
+        );
+      }
+    }
+
     let changedBits: number;
     if (oldProps === null) {
       // Initial render
diff --git a/packages/react/src/__tests__/ReactContextValidator-test.js b/packages/react/src/__tests__/ReactContextValidator-test.js
index d3b9e5b240..b4f500d930 100644
--- a/packages/react/src/__tests__/ReactContextValidator-test.js
+++ b/packages/react/src/__tests__/ReactContextValidator-test.js
@@ -225,6 +225,28 @@ describe('ReactContextValidator', () => {
     ReactTestUtils.renderIntoDocument(<Component testContext={{foo: 'foo'}} />);
   });
 
+  it('warns of incorrect prop types on context provider', () => {
+    const TestContext = React.createContext();
+
+    TestContext.Provider.propTypes = {
+      value: PropTypes.string.isRequired,
+    };
+
+    ReactTestUtils.renderIntoDocument(<TestContext.Provider value="val" />);
+
+    class Component extends React.Component {
+      render() {
+        return <TestContext.Provider />;
+      }
+    }
+
+    expect(() => ReactTestUtils.renderIntoDocument(<Component />)).toWarnDev(
+      'Warning: Failed prop type: The prop `value` is marked as required in ' +
+        '`Context.Provider`, but its value is `undefined`.\n' +
+        '    in Component (at **)',
+    );
+  });
+
   // TODO (bvaughn) Remove this test and the associated behavior in the future.
   // It has only been added in Fiber to match the (unintentional) behavior in Stack.
   it('should warn (but not error) if getChildContext method is missing', () => {

From b548b3cd640dbd515f5d67dafc0216bb7ee0d796 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Sun, 22 Apr 2018 23:05:28 -0700
Subject: [PATCH 006/277] Decouple update queue from Fiber type (#12600)

* Decouple update queue from Fiber type

The update queue is in need of a refactor. Recent bugfixes (#12528) have
exposed some flaws in how it's modeled. Upcoming features like Suspense
and [redacted] also rely on the update queue in ways that weren't
anticipated in the original design.

Major changes:

- Instead of boolean flags for `isReplace` and `isForceUpdate`, updates
have a `tag` field (like Fiber). This lowers the cost for adding new
types of updates.
- Render phase updates are special cased. Updates scheduled during
the render phase are dropped if the work-in-progress does not commit.
This is used for `getDerivedStateFrom{Props,Catch}`.
- `callbackList` has been replaced with a generic effect list. Aside
from callbacks, this is also used for `componentDidCatch`.

* Remove first class UpdateQueue types and use closures instead

I tried to avoid this at first, since we avoid it everywhere else in the Fiber
codebase, but since updates are not in a hot path, the trade off with file size
seems worth it.

* Store captured errors on a separate part of the update queue

This way they can be reused independently of updates like
getDerivedStateFromProps. This will be important for resuming.

* Revert back to storing hasForceUpdate on the update queue

Instead of using the effect tag. Ideally, this would be part of the
return type of processUpdateQueue.

* Rename UpdateQueue effect type back to Callback

I don't love this name either, but it's less confusing than UpdateQueue
I suppose. Conceptually, this is usually a callback: setState callbacks,
componentDidCatch. The only case that feels a bit weird is Timeouts,
which use this effect to attach a promise listener. I guess that kinda
fits, too.

* Call getDerivedStateFromProps every render, even if props did not change

Rather than enqueue a new setState updater for every props change, we
can skip the update queue entirely and merge the result into state at
the end. This makes more sense, since "receiving props" is not an event
that should be observed. It's still a bit weird, since eventually we do
persist the derived state (in other words, it accumulates).

* Store captured effects on separate list from "own" effects (callbacks)

For resuming, we need the ability to discard the "own" effects while
reusing the captured effects.

* Optimize for class components

Change `process` and `callback` to match the expected payload types
for class components. I had intended for the update queue to be reusable
for both class components and a future React API, but we'll likely have
to fork anyway.

* Only double-invoke render phase lifecycles functions in DEV

* Use global state to track currently processing queue in DEV
---
 .../createSubscription-test.internal.js       |  14 +-
 packages/react-noop-renderer/src/ReactNoop.js |  16 +-
 packages/react-reconciler/src/ReactFiber.js   |   2 +-
 .../src/ReactFiberBeginWork.js                |  78 +--
 .../src/ReactFiberClassComponent.js           | 505 +++++---------
 .../src/ReactFiberCommitWork.js               |  91 +--
 .../src/ReactFiberCompleteWork.js             |  27 +-
 .../src/ReactFiberReconciler.js               |  22 +-
 .../src/ReactFiberScheduler.js                |  89 ++-
 .../src/ReactFiberUnwindWork.js               | 105 ++-
 .../src/ReactFiberUpdateQueue.js              | 394 -----------
 .../react-reconciler/src/ReactUpdateQueue.js  | 640 ++++++++++++++++++
 .../ReactIncremental-test.internal.js         |  11 +-
 .../ReactIncrementalTriangle-test.internal.js |   2 +
 ...ReactIncrementalPerf-test.internal.js.snap |   8 +-
 .../ReactStrictMode-test.internal.js          |  82 ++-
 packages/shared/ReactTypeOfSideEffect.js      |  29 +-
 17 files changed, 1111 insertions(+), 1004 deletions(-)
 delete mode 100644 packages/react-reconciler/src/ReactFiberUpdateQueue.js
 create mode 100644 packages/react-reconciler/src/ReactUpdateQueue.js

diff --git a/packages/create-subscription/src/__tests__/createSubscription-test.internal.js b/packages/create-subscription/src/__tests__/createSubscription-test.internal.js
index 2cc81b696d..d96f57ba51 100644
--- a/packages/create-subscription/src/__tests__/createSubscription-test.internal.js
+++ b/packages/create-subscription/src/__tests__/createSubscription-test.internal.js
@@ -264,7 +264,6 @@ describe('createSubscription', () => {
 
   it('should ignore values emitted by a new subscribable until the commit phase', () => {
     const log = [];
-    let parentInstance;
 
     function Child({value}) {
       ReactNoop.yield('Child: ' + value);
@@ -301,8 +300,6 @@ describe('createSubscription', () => {
       }
 
       render() {
-        parentInstance = this;
-
         return (
           <Subscription source={this.state.observed}>
             {(value = 'default') => {
@@ -331,8 +328,8 @@ describe('createSubscription', () => {
     observableB.next('b-2');
     observableB.next('b-3');
 
-    // Mimic a higher-priority interruption
-    parentInstance.setState({observed: observableA});
+    // Update again
+    ReactNoop.render(<Parent observed={observableA} />);
 
     // Flush everything and ensure that the correct subscribable is used
     // We expect the last emitted update to be rendered (because of the commit phase value check)
@@ -354,7 +351,6 @@ describe('createSubscription', () => {
 
   it('should not drop values emitted between updates', () => {
     const log = [];
-    let parentInstance;
 
     function Child({value}) {
       ReactNoop.yield('Child: ' + value);
@@ -391,8 +387,6 @@ describe('createSubscription', () => {
       }
 
       render() {
-        parentInstance = this;
-
         return (
           <Subscription source={this.state.observed}>
             {(value = 'default') => {
@@ -420,8 +414,8 @@ describe('createSubscription', () => {
     observableA.next('a-1');
     observableA.next('a-2');
 
-    // Mimic a higher-priority interruption
-    parentInstance.setState({observed: observableA});
+    // Update again
+    ReactNoop.render(<Parent observed={observableA} />);
 
     // Flush everything and ensure that the correct subscribable is used
     // We expect the new subscribable to finish rendering,
diff --git a/packages/react-noop-renderer/src/ReactNoop.js b/packages/react-noop-renderer/src/ReactNoop.js
index 7b7bb61d0d..5cd6df0fbd 100644
--- a/packages/react-noop-renderer/src/ReactNoop.js
+++ b/packages/react-noop-renderer/src/ReactNoop.js
@@ -15,7 +15,7 @@
  */
 
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
-import type {UpdateQueue} from 'react-reconciler/src/ReactFiberUpdateQueue';
+import type {UpdateQueue} from 'react-reconciler/src/ReactUpdateQueue';
 import type {ReactNodeList} from 'shared/ReactTypes';
 import ReactFiberReconciler from 'react-reconciler';
 import {enablePersistentReconciler} from 'shared/ReactFeatureFlags';
@@ -526,23 +526,15 @@ const ReactNoop = {
 
     function logUpdateQueue(updateQueue: UpdateQueue<mixed>, depth) {
       log('  '.repeat(depth + 1) + 'QUEUED UPDATES');
-      const firstUpdate = updateQueue.first;
+      const firstUpdate = updateQueue.firstUpdate;
       if (!firstUpdate) {
         return;
       }
 
-      log(
-        '  '.repeat(depth + 1) + '~',
-        firstUpdate && firstUpdate.partialState,
-        firstUpdate.callback ? 'with callback' : '',
-        '[' + firstUpdate.expirationTime + ']',
-      );
-      let next;
-      while ((next = firstUpdate.next)) {
+      log('  '.repeat(depth + 1) + '~', '[' + firstUpdate.expirationTime + ']');
+      while (firstUpdate.next) {
         log(
           '  '.repeat(depth + 1) + '~',
-          next.partialState,
-          next.callback ? 'with callback' : '',
           '[' + firstUpdate.expirationTime + ']',
         );
       }
diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js
index 1ffa168b11..393cecb527 100644
--- a/packages/react-reconciler/src/ReactFiber.js
+++ b/packages/react-reconciler/src/ReactFiber.js
@@ -12,7 +12,7 @@ import type {TypeOfWork} from 'shared/ReactTypeOfWork';
 import type {TypeOfMode} from './ReactTypeOfMode';
 import type {TypeOfSideEffect} from 'shared/ReactTypeOfSideEffect';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
-import type {UpdateQueue} from './ReactFiberUpdateQueue';
+import type {UpdateQueue} from './ReactUpdateQueue';
 
 import invariant from 'fbjs/lib/invariant';
 import {NoEffect} from 'shared/ReactTypeOfSideEffect';
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index f2d93b0962..f2a8ad1f2f 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -36,10 +36,12 @@ import {
   ContextConsumer,
 } from 'shared/ReactTypeOfWork';
 import {
+  NoEffect,
   PerformedWork,
   Placement,
   ContentReset,
   Ref,
+  DidCapture,
 } from 'shared/ReactTypeOfSideEffect';
 import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
 import {
@@ -53,13 +55,15 @@ import warning from 'fbjs/lib/warning';
 import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
 import {cancelWorkTimer} from './ReactDebugFiberPerf';
 
-import ReactFiberClassComponent from './ReactFiberClassComponent';
+import ReactFiberClassComponent, {
+  applyDerivedStateFromProps,
+} from './ReactFiberClassComponent';
 import {
   mountChildFibers,
   reconcileChildFibers,
   cloneChildFibers,
 } from './ReactChildFiber';
-import {processUpdateQueue} from './ReactFiberUpdateQueue';
+import {processUpdateQueue} from './ReactUpdateQueue';
 import {NoWork, Never} from './ReactFiberExpirationTime';
 import {AsyncMode, StrictMode} from './ReactTypeOfMode';
 import MAX_SIGNED_31_BIT_INT from './maxSigned31BitInt';
@@ -108,7 +112,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
 
   const {
     adoptClassInstance,
-    callGetDerivedStateFromProps,
     constructClassInstance,
     mountClassInstance,
     resumeMountClassInstance,
@@ -263,7 +266,11 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     if (current === null) {
       if (workInProgress.stateNode === null) {
         // In the initial pass we might need to construct the instance.
-        constructClassInstance(workInProgress, workInProgress.pendingProps);
+        constructClassInstance(
+          workInProgress,
+          workInProgress.pendingProps,
+          renderExpirationTime,
+        );
         mountClassInstance(workInProgress, renderExpirationTime);
 
         shouldUpdate = true;
@@ -281,22 +288,11 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         renderExpirationTime,
       );
     }
-
-    // We processed the update queue inside updateClassInstance. It may have
-    // included some errors that were dispatched during the commit phase.
-    // TODO: Refactor class components so this is less awkward.
-    let didCaptureError = false;
-    const updateQueue = workInProgress.updateQueue;
-    if (updateQueue !== null && updateQueue.capturedValues !== null) {
-      shouldUpdate = true;
-      didCaptureError = true;
-    }
     return finishClassComponent(
       current,
       workInProgress,
       shouldUpdate,
       hasContext,
-      didCaptureError,
       renderExpirationTime,
     );
   }
@@ -306,12 +302,14 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     workInProgress: Fiber,
     shouldUpdate: boolean,
     hasContext: boolean,
-    didCaptureError: boolean,
     renderExpirationTime: ExpirationTime,
   ) {
     // Refs should update even if shouldComponentUpdate returns false
     markRef(current, workInProgress);
 
+    const didCaptureError =
+      (workInProgress.effectTag & DidCapture) !== NoEffect;
+
     if (!shouldUpdate && !didCaptureError) {
       // Context providers should defer to sCU for rendering
       if (hasContext) {
@@ -351,13 +349,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         }
         ReactDebugCurrentFiber.setCurrentPhase(null);
       } else {
-        if (
-          debugRenderPhaseSideEffects ||
-          (debugRenderPhaseSideEffectsForStrictMode &&
-            workInProgress.mode & StrictMode)
-        ) {
-          instance.render();
-        }
         nextChildren = instance.render();
       }
     }
@@ -416,29 +407,24 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     pushHostRootContext(workInProgress);
     let updateQueue = workInProgress.updateQueue;
     if (updateQueue !== null) {
+      const nextProps = workInProgress.pendingProps;
       const prevState = workInProgress.memoizedState;
-      const state = processUpdateQueue(
-        current,
+      const prevChildren = prevState !== null ? prevState.children : null;
+      processUpdateQueue(
         workInProgress,
         updateQueue,
-        null,
+        nextProps,
         null,
         renderExpirationTime,
       );
-      memoizeState(workInProgress, state);
-      updateQueue = workInProgress.updateQueue;
+      const nextState = workInProgress.memoizedState;
+      const nextChildren = nextState.children;
 
-      let element;
-      if (updateQueue !== null && updateQueue.capturedValues !== null) {
-        // There's an uncaught error. Unmount the whole root.
-        element = null;
-      } else if (prevState === state) {
+      if (nextChildren === prevChildren) {
         // If the state is the same as before, that's a bailout because we had
         // no work that expires at this time.
         resetHydrationState();
         return bailoutOnAlreadyFinishedWork(current, workInProgress);
-      } else {
-        element = state.element;
       }
       const root: FiberRoot = workInProgress.stateNode;
       if (
@@ -463,16 +449,15 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         workInProgress.child = mountChildFibers(
           workInProgress,
           null,
-          element,
+          nextChildren,
           renderExpirationTime,
         );
       } else {
         // Otherwise reset hydration state in case we aborted and resumed another
         // root.
         resetHydrationState();
-        reconcileChildren(current, workInProgress, element);
+        reconcileChildren(current, workInProgress, nextChildren);
       }
-      memoizeState(workInProgress, state);
       return workInProgress.child;
     }
     resetHydrationState();
@@ -610,21 +595,13 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       workInProgress.memoizedState =
         value.state !== null && value.state !== undefined ? value.state : null;
 
-      if (typeof Component.getDerivedStateFromProps === 'function') {
-        const partialState = callGetDerivedStateFromProps(
+      const getDerivedStateFromProps = Component.getDerivedStateFromProps;
+      if (typeof getDerivedStateFromProps === 'function') {
+        applyDerivedStateFromProps(
           workInProgress,
-          value,
+          getDerivedStateFromProps,
           props,
-          workInProgress.memoizedState,
         );
-
-        if (partialState !== null && partialState !== undefined) {
-          workInProgress.memoizedState = Object.assign(
-            {},
-            workInProgress.memoizedState,
-            partialState,
-          );
-        }
       }
 
       // Push context providers early to prevent context stack mismatches.
@@ -638,7 +615,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         workInProgress,
         true,
         hasContext,
-        false,
         renderExpirationTime,
       );
     } else {
diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js
index 3f811c1108..444d1070e6 100644
--- a/packages/react-reconciler/src/ReactFiberClassComponent.js
+++ b/packages/react-reconciler/src/ReactFiberClassComponent.js
@@ -10,11 +10,9 @@
 import type {Fiber} from './ReactFiber';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 import type {LegacyContext} from './ReactFiberContext';
-import type {CapturedValue} from './ReactCapturedValue';
 
 import {Update, Snapshot} from 'shared/ReactTypeOfSideEffect';
 import {
-  enableGetDerivedStateFromCatch,
   debugRenderPhaseSideEffects,
   debugRenderPhaseSideEffectsForStrictMode,
   warnAboutDeprecatedLifecycles,
@@ -31,26 +29,31 @@ import warning from 'fbjs/lib/warning';
 import {startPhaseTimer, stopPhaseTimer} from './ReactDebugFiberPerf';
 import {StrictMode} from './ReactTypeOfMode';
 import {
-  insertUpdateIntoFiber,
+  enqueueUpdate,
   processUpdateQueue,
-} from './ReactFiberUpdateQueue';
+  createUpdate,
+  ReplaceState,
+  ForceUpdate,
+} from './ReactUpdateQueue';
+import {NoWork} from './ReactFiberExpirationTime';
 
 const fakeInternalInstance = {};
 const isArray = Array.isArray;
 
 let didWarnAboutStateAssignmentForComponent;
-let didWarnAboutUndefinedDerivedState;
 let didWarnAboutUninitializedState;
 let didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate;
 let didWarnAboutLegacyLifecyclesAndDerivedState;
+let didWarnAboutUndefinedDerivedState;
+let warnOnUndefinedDerivedState;
 let warnOnInvalidCallback;
 
 if (__DEV__) {
   didWarnAboutStateAssignmentForComponent = new Set();
-  didWarnAboutUndefinedDerivedState = new Set();
   didWarnAboutUninitializedState = new Set();
   didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = new Set();
   didWarnAboutLegacyLifecyclesAndDerivedState = new Set();
+  didWarnAboutUndefinedDerivedState = new Set();
 
   const didWarnOnInvalidCallback = new Set();
 
@@ -71,6 +74,21 @@ if (__DEV__) {
     }
   };
 
+  warnOnUndefinedDerivedState = function(workInProgress, partialState) {
+    if (partialState === undefined) {
+      const componentName = getComponentName(workInProgress) || 'Component';
+      if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
+        didWarnAboutUndefinedDerivedState.add(componentName);
+        warning(
+          false,
+          '%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. ' +
+            'You have returned undefined.',
+          componentName,
+        );
+      }
+    }
+  };
+
   // This is so gross but it's at least non-critical and can be removed if
   // it causes problems. This is meant to give a nicer error message for
   // ReactDOM15.unstable_renderSubtreeIntoContainer(reactDOM16Component,
@@ -92,17 +110,43 @@ if (__DEV__) {
   });
   Object.freeze(fakeInternalInstance);
 }
-function callGetDerivedStateFromCatch(ctor: any, capturedValues: Array<mixed>) {
-  const resultState = {};
-  for (let i = 0; i < capturedValues.length; i++) {
-    const capturedValue: CapturedValue<mixed> = (capturedValues[i]: any);
-    const error = capturedValue.value;
-    const partialState = ctor.getDerivedStateFromCatch.call(null, error);
-    if (partialState !== null && partialState !== undefined) {
-      Object.assign(resultState, partialState);
+
+export function applyDerivedStateFromProps(
+  workInProgress: Fiber,
+  getDerivedStateFromProps: (props: any, state: any) => any,
+  nextProps: any,
+) {
+  const prevState = workInProgress.memoizedState;
+
+  if (__DEV__) {
+    if (
+      debugRenderPhaseSideEffects ||
+      (debugRenderPhaseSideEffectsForStrictMode &&
+        workInProgress.mode & StrictMode)
+    ) {
+      // Invoke the function an extra time to help detect side-effects.
+      getDerivedStateFromProps(nextProps, prevState);
     }
   }
-  return resultState;
+
+  const partialState = getDerivedStateFromProps(nextProps, prevState);
+
+  if (__DEV__) {
+    warnOnUndefinedDerivedState(workInProgress, partialState);
+  }
+  // Merge the partial state and the previous state.
+  const memoizedState =
+    partialState === null || partialState === undefined
+      ? prevState
+      : Object.assign({}, prevState, partialState);
+  workInProgress.memoizedState = memoizedState;
+
+  // Once the update queue is empty, persist the derived state onto the
+  // base state.
+  const updateQueue = workInProgress.updateQueue;
+  if (updateQueue !== null && updateQueue.expirationTime === NoWork) {
+    updateQueue.baseState = memoizedState;
+  }
 }
 
 export default function(
@@ -120,64 +164,57 @@ export default function(
     hasContextChanged,
   } = legacyContext;
 
-  // Class component state updater
-  const updater = {
+  const classComponentUpdater = {
     isMounted,
-    enqueueSetState(instance, partialState, callback) {
-      const fiber = ReactInstanceMap.get(instance);
-      callback = callback === undefined ? null : callback;
-      if (__DEV__) {
-        warnOnInvalidCallback(callback, 'setState');
-      }
+    enqueueSetState(inst, payload, callback) {
+      const fiber = ReactInstanceMap.get(inst);
       const expirationTime = computeExpirationForFiber(fiber);
-      const update = {
-        expirationTime,
-        partialState,
-        callback,
-        isReplace: false,
-        isForced: false,
-        capturedValue: null,
-        next: null,
-      };
-      insertUpdateIntoFiber(fiber, update);
+
+      const update = createUpdate(expirationTime);
+      update.payload = payload;
+      if (callback !== undefined && callback !== null) {
+        if (__DEV__) {
+          warnOnInvalidCallback(callback, 'setState');
+        }
+        update.callback = callback;
+      }
+
+      enqueueUpdate(fiber, update, expirationTime);
       scheduleWork(fiber, expirationTime);
     },
-    enqueueReplaceState(instance, state, callback) {
-      const fiber = ReactInstanceMap.get(instance);
-      callback = callback === undefined ? null : callback;
-      if (__DEV__) {
-        warnOnInvalidCallback(callback, 'replaceState');
-      }
+    enqueueReplaceState(inst, payload, callback) {
+      const fiber = ReactInstanceMap.get(inst);
       const expirationTime = computeExpirationForFiber(fiber);
-      const update = {
-        expirationTime,
-        partialState: state,
-        callback,
-        isReplace: true,
-        isForced: false,
-        capturedValue: null,
-        next: null,
-      };
-      insertUpdateIntoFiber(fiber, update);
+
+      const update = createUpdate(expirationTime);
+      update.tag = ReplaceState;
+      update.payload = payload;
+
+      if (callback !== undefined && callback !== null) {
+        if (__DEV__) {
+          warnOnInvalidCallback(callback, 'replaceState');
+        }
+        update.callback = callback;
+      }
+
+      enqueueUpdate(fiber, update, expirationTime);
       scheduleWork(fiber, expirationTime);
     },
-    enqueueForceUpdate(instance, callback) {
-      const fiber = ReactInstanceMap.get(instance);
-      callback = callback === undefined ? null : callback;
-      if (__DEV__) {
-        warnOnInvalidCallback(callback, 'forceUpdate');
-      }
+    enqueueForceUpdate(inst, callback) {
+      const fiber = ReactInstanceMap.get(inst);
       const expirationTime = computeExpirationForFiber(fiber);
-      const update = {
-        expirationTime,
-        partialState: null,
-        callback,
-        isReplace: false,
-        isForced: true,
-        capturedValue: null,
-        next: null,
-      };
-      insertUpdateIntoFiber(fiber, update);
+
+      const update = createUpdate(expirationTime);
+      update.tag = ForceUpdate;
+
+      if (callback !== undefined && callback !== null) {
+        if (__DEV__) {
+          warnOnInvalidCallback(callback, 'forceUpdate');
+        }
+        update.callback = callback;
+      }
+
+      enqueueUpdate(fiber, update, expirationTime);
       scheduleWork(fiber, expirationTime);
     },
   };
@@ -191,11 +228,10 @@ export default function(
     newContext,
   ) {
     if (
-      oldProps === null ||
-      (workInProgress.updateQueue !== null &&
-        workInProgress.updateQueue.hasForceUpdate)
+      workInProgress.updateQueue !== null &&
+      workInProgress.updateQueue.hasForceUpdate
     ) {
-      // If the workInProgress already has an Update effect, return true
+      // If forceUpdate was called, disregard sCU.
       return true;
     }
 
@@ -420,13 +456,8 @@ export default function(
     }
   }
 
-  function resetInputPointers(workInProgress: Fiber, instance: any) {
-    instance.props = workInProgress.memoizedProps;
-    instance.state = workInProgress.memoizedState;
-  }
-
   function adoptClassInstance(workInProgress: Fiber, instance: any): void {
-    instance.updater = updater;
+    instance.updater = classComponentUpdater;
     workInProgress.stateNode = instance;
     // The instance needs access to the fiber so that it can schedule updates
     ReactInstanceMap.set(instance, workInProgress);
@@ -435,7 +466,11 @@ export default function(
     }
   }
 
-  function constructClassInstance(workInProgress: Fiber, props: any): any {
+  function constructClassInstance(
+    workInProgress: Fiber,
+    props: any,
+    renderExpirationTime: ExpirationTime,
+  ): any {
     const ctor = workInProgress.type;
     const unmaskedContext = getUnmaskedContext(workInProgress);
     const needsContext = isContextConsumer(workInProgress);
@@ -444,19 +479,21 @@ export default function(
       : emptyObject;
 
     // Instantiate twice to help detect side-effects.
-    if (
-      debugRenderPhaseSideEffects ||
-      (debugRenderPhaseSideEffectsForStrictMode &&
-        workInProgress.mode & StrictMode)
-    ) {
-      new ctor(props, context); // eslint-disable-line no-new
+    if (__DEV__) {
+      if (
+        debugRenderPhaseSideEffects ||
+        (debugRenderPhaseSideEffectsForStrictMode &&
+          workInProgress.mode & StrictMode)
+      ) {
+        new ctor(props, context); // eslint-disable-line no-new
+      }
     }
 
     const instance = new ctor(props, context);
-    const state =
+    const state = (workInProgress.memoizedState =
       instance.state !== null && instance.state !== undefined
         ? instance.state
-        : null;
+        : null);
     adoptClassInstance(workInProgress, instance);
 
     if (__DEV__) {
@@ -545,26 +582,6 @@ export default function(
       }
     }
 
-    workInProgress.memoizedState = state;
-
-    const partialState = callGetDerivedStateFromProps(
-      workInProgress,
-      instance,
-      props,
-      state,
-    );
-
-    if (partialState !== null && partialState !== undefined) {
-      // Render-phase updates (like this) should not be added to the update queue,
-      // So that multiple render passes do not enqueue multiple updates.
-      // Instead, just synchronously merge the returned state into the instance.
-      workInProgress.memoizedState = Object.assign(
-        {},
-        workInProgress.memoizedState,
-        partialState,
-      );
-    }
-
     // Cache unmasked context so we can avoid recreating masked context unless necessary.
     // ReactFiberContext usually updates this cache but can't for newly-created instances.
     if (needsContext) {
@@ -597,7 +614,7 @@ export default function(
           getComponentName(workInProgress) || 'Component',
         );
       }
-      updater.enqueueReplaceState(instance, instance.state, null);
+      classComponentUpdater.enqueueReplaceState(instance, instance.state, null);
     }
   }
 
@@ -631,50 +648,7 @@ export default function(
           );
         }
       }
-      updater.enqueueReplaceState(instance, instance.state, null);
-    }
-  }
-
-  function callGetDerivedStateFromProps(
-    workInProgress: Fiber,
-    instance: any,
-    nextProps: any,
-    prevState: any,
-  ) {
-    const {type} = workInProgress;
-
-    if (typeof type.getDerivedStateFromProps === 'function') {
-      if (
-        debugRenderPhaseSideEffects ||
-        (debugRenderPhaseSideEffectsForStrictMode &&
-          workInProgress.mode & StrictMode)
-      ) {
-        // Invoke method an extra time to help detect side-effects.
-        type.getDerivedStateFromProps.call(null, nextProps, prevState);
-      }
-
-      const partialState = type.getDerivedStateFromProps.call(
-        null,
-        nextProps,
-        prevState,
-      );
-
-      if (__DEV__) {
-        if (partialState === undefined) {
-          const componentName = getComponentName(workInProgress) || 'Component';
-          if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
-            didWarnAboutUndefinedDerivedState.add(componentName);
-            warning(
-              false,
-              '%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. ' +
-                'You have returned undefined.',
-              componentName,
-            );
-          }
-        }
-      }
-
-      return partialState;
+      classComponentUpdater.enqueueReplaceState(instance, instance.state, null);
     }
   }
 
@@ -684,7 +658,6 @@ export default function(
     renderExpirationTime: ExpirationTime,
   ): void {
     const ctor = workInProgress.type;
-    const current = workInProgress.alternate;
 
     if (__DEV__) {
       checkClassInstance(workInProgress);
@@ -715,6 +688,29 @@ export default function(
       }
     }
 
+    let updateQueue = workInProgress.updateQueue;
+    if (updateQueue !== null) {
+      processUpdateQueue(
+        workInProgress,
+        updateQueue,
+        props,
+        instance,
+        renderExpirationTime,
+      );
+      instance.state = workInProgress.memoizedState;
+    }
+
+    const getDerivedStateFromProps =
+      workInProgress.type.getDerivedStateFromProps;
+    if (typeof getDerivedStateFromProps === 'function') {
+      applyDerivedStateFromProps(
+        workInProgress,
+        getDerivedStateFromProps,
+        props,
+      );
+      instance.state = workInProgress.memoizedState;
+    }
+
     // In order to support react-lifecycles-compat polyfilled components,
     // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
@@ -726,18 +722,19 @@ export default function(
       callComponentWillMount(workInProgress, instance);
       // If we had additional state updates during this life-cycle, let's
       // process them now.
-      const updateQueue = workInProgress.updateQueue;
+      updateQueue = workInProgress.updateQueue;
       if (updateQueue !== null) {
-        instance.state = processUpdateQueue(
-          current,
+        processUpdateQueue(
           workInProgress,
           updateQueue,
-          instance,
           props,
+          instance,
           renderExpirationTime,
         );
+        instance.state = workInProgress.memoizedState;
       }
     }
+
     if (typeof instance.componentDidMount === 'function') {
       workInProgress.effectTag |= Update;
     }
@@ -749,16 +746,18 @@ export default function(
   ): boolean {
     const ctor = workInProgress.type;
     const instance = workInProgress.stateNode;
-    resetInputPointers(workInProgress, instance);
 
     const oldProps = workInProgress.memoizedProps;
     const newProps = workInProgress.pendingProps;
+    instance.props = oldProps;
+
     const oldContext = instance.context;
     const newUnmaskedContext = getUnmaskedContext(workInProgress);
     const newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
+    const getDerivedStateFromProps = ctor.getDerivedStateFromProps;
     const hasNewLifecycles =
-      typeof ctor.getDerivedStateFromProps === 'function' ||
+      typeof getDerivedStateFromProps === 'function' ||
       typeof instance.getSnapshotBeforeUpdate === 'function';
 
     // Note: During these life-cycles, instance.props/instance.state are what
@@ -782,93 +781,27 @@ export default function(
       }
     }
 
-    // Compute the next state using the memoized state and the update queue.
     const oldState = workInProgress.memoizedState;
-    // TODO: Previous state can be null.
-    let newState;
-    let derivedStateFromCatch;
-    if (workInProgress.updateQueue !== null) {
-      newState = processUpdateQueue(
-        null,
+    let newState = (instance.state = oldState);
+    let updateQueue = workInProgress.updateQueue;
+    if (updateQueue !== null) {
+      processUpdateQueue(
         workInProgress,
-        workInProgress.updateQueue,
-        instance,
+        updateQueue,
         newProps,
+        instance,
         renderExpirationTime,
       );
-
-      let updateQueue = workInProgress.updateQueue;
-      if (
-        updateQueue !== null &&
-        updateQueue.capturedValues !== null &&
-        (enableGetDerivedStateFromCatch &&
-          typeof ctor.getDerivedStateFromCatch === 'function')
-      ) {
-        const capturedValues = updateQueue.capturedValues;
-        // Don't remove these from the update queue yet. We need them in
-        // finishClassComponent. Do the reset there.
-        // TODO: This is awkward. Refactor class components.
-        // updateQueue.capturedValues = null;
-        derivedStateFromCatch = callGetDerivedStateFromCatch(
-          ctor,
-          capturedValues,
-        );
-      }
-    } else {
-      newState = oldState;
+      newState = workInProgress.memoizedState;
     }
 
-    let derivedStateFromProps;
-    if (oldProps !== newProps) {
-      // The prevState parameter should be the partially updated state.
-      // Otherwise, spreading state in return values could override updates.
-      derivedStateFromProps = callGetDerivedStateFromProps(
+    if (typeof getDerivedStateFromProps === 'function') {
+      applyDerivedStateFromProps(
         workInProgress,
-        instance,
+        getDerivedStateFromProps,
         newProps,
-        newState,
       );
-    }
-
-    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
-      // Render-phase updates (like this) should not be added to the update queue,
-      // So that multiple render passes do not enqueue multiple updates.
-      // Instead, just synchronously merge the returned state into the instance.
-      newState =
-        newState === null || newState === undefined
-          ? derivedStateFromProps
-          : Object.assign({}, newState, derivedStateFromProps);
-
-      // Update the base state of the update queue.
-      // FIXME: This is getting ridiculous. Refactor plz!
-      const updateQueue = workInProgress.updateQueue;
-      if (updateQueue !== null) {
-        updateQueue.baseState = Object.assign(
-          {},
-          updateQueue.baseState,
-          derivedStateFromProps,
-        );
-      }
-    }
-    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
-      // Render-phase updates (like this) should not be added to the update queue,
-      // So that multiple render passes do not enqueue multiple updates.
-      // Instead, just synchronously merge the returned state into the instance.
-      newState =
-        newState === null || newState === undefined
-          ? derivedStateFromCatch
-          : Object.assign({}, newState, derivedStateFromCatch);
-
-      // Update the base state of the update queue.
-      // FIXME: This is getting ridiculous. Refactor plz!
-      const updateQueue = workInProgress.updateQueue;
-      if (updateQueue !== null) {
-        updateQueue.baseState = Object.assign(
-          {},
-          updateQueue.baseState,
-          derivedStateFromCatch,
-        );
-      }
+      newState = workInProgress.memoizedState;
     }
 
     if (
@@ -925,9 +858,9 @@ export default function(
       }
 
       // If shouldComponentUpdate returned false, we should still update the
-      // memoized props/state to indicate that this work can be reused.
-      memoizeProps(workInProgress, newProps);
-      memoizeState(workInProgress, newState);
+      // memoized state to indicate that this work can be reused.
+      workInProgress.memoizedProps = newProps;
+      workInProgress.memoizedState = newState;
     }
 
     // Update the existing instance's state, props, and context pointers even
@@ -947,16 +880,18 @@ export default function(
   ): boolean {
     const ctor = workInProgress.type;
     const instance = workInProgress.stateNode;
-    resetInputPointers(workInProgress, instance);
 
     const oldProps = workInProgress.memoizedProps;
     const newProps = workInProgress.pendingProps;
+    instance.props = oldProps;
+
     const oldContext = instance.context;
     const newUnmaskedContext = getUnmaskedContext(workInProgress);
     const newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
+    const getDerivedStateFromProps = ctor.getDerivedStateFromProps;
     const hasNewLifecycles =
-      typeof ctor.getDerivedStateFromProps === 'function' ||
+      typeof getDerivedStateFromProps === 'function' ||
       typeof instance.getSnapshotBeforeUpdate === 'function';
 
     // Note: During these life-cycles, instance.props/instance.state are what
@@ -980,94 +915,27 @@ export default function(
       }
     }
 
-    // Compute the next state using the memoized state and the update queue.
     const oldState = workInProgress.memoizedState;
-    // TODO: Previous state can be null.
-    let newState;
-    let derivedStateFromCatch;
-
-    if (workInProgress.updateQueue !== null) {
-      newState = processUpdateQueue(
-        current,
+    let newState = (instance.state = oldState);
+    let updateQueue = workInProgress.updateQueue;
+    if (updateQueue !== null) {
+      processUpdateQueue(
         workInProgress,
-        workInProgress.updateQueue,
-        instance,
+        updateQueue,
         newProps,
+        instance,
         renderExpirationTime,
       );
-
-      let updateQueue = workInProgress.updateQueue;
-      if (
-        updateQueue !== null &&
-        updateQueue.capturedValues !== null &&
-        (enableGetDerivedStateFromCatch &&
-          typeof ctor.getDerivedStateFromCatch === 'function')
-      ) {
-        const capturedValues = updateQueue.capturedValues;
-        // Don't remove these from the update queue yet. We need them in
-        // finishClassComponent. Do the reset there.
-        // TODO: This is awkward. Refactor class components.
-        // updateQueue.capturedValues = null;
-        derivedStateFromCatch = callGetDerivedStateFromCatch(
-          ctor,
-          capturedValues,
-        );
-      }
-    } else {
-      newState = oldState;
+      newState = workInProgress.memoizedState;
     }
 
-    let derivedStateFromProps;
-    if (oldProps !== newProps) {
-      // The prevState parameter should be the partially updated state.
-      // Otherwise, spreading state in return values could override updates.
-      derivedStateFromProps = callGetDerivedStateFromProps(
+    if (typeof getDerivedStateFromProps === 'function') {
+      applyDerivedStateFromProps(
         workInProgress,
-        instance,
+        getDerivedStateFromProps,
         newProps,
-        newState,
       );
-    }
-
-    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
-      // Render-phase updates (like this) should not be added to the update queue,
-      // So that multiple render passes do not enqueue multiple updates.
-      // Instead, just synchronously merge the returned state into the instance.
-      newState =
-        newState === null || newState === undefined
-          ? derivedStateFromProps
-          : Object.assign({}, newState, derivedStateFromProps);
-
-      // Update the base state of the update queue.
-      // FIXME: This is getting ridiculous. Refactor plz!
-      const updateQueue = workInProgress.updateQueue;
-      if (updateQueue !== null) {
-        updateQueue.baseState = Object.assign(
-          {},
-          updateQueue.baseState,
-          derivedStateFromProps,
-        );
-      }
-    }
-    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
-      // Render-phase updates (like this) should not be added to the update queue,
-      // So that multiple render passes do not enqueue multiple updates.
-      // Instead, just synchronously merge the returned state into the instance.
-      newState =
-        newState === null || newState === undefined
-          ? derivedStateFromCatch
-          : Object.assign({}, newState, derivedStateFromCatch);
-
-      // Update the base state of the update queue.
-      // FIXME: This is getting ridiculous. Refactor plz!
-      const updateQueue = workInProgress.updateQueue;
-      if (updateQueue !== null) {
-        updateQueue.baseState = Object.assign(
-          {},
-          updateQueue.baseState,
-          derivedStateFromCatch,
-        );
-      }
+      newState = workInProgress.memoizedState;
     }
 
     if (
@@ -1154,8 +1022,8 @@ export default function(
 
       // If shouldComponentUpdate returned false, we should still update the
       // memoized props/state to indicate that this work can be reused.
-      memoizeProps(workInProgress, newProps);
-      memoizeState(workInProgress, newState);
+      workInProgress.memoizedProps = newProps;
+      workInProgress.memoizedState = newState;
     }
 
     // Update the existing instance's state, props, and context pointers even
@@ -1169,7 +1037,6 @@ export default function(
 
   return {
     adoptClassInstance,
-    callGetDerivedStateFromProps,
     constructClassInstance,
     mountClassInstance,
     resumeMountClassInstance,
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index afa5b46d0b..a375490297 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -33,15 +33,15 @@ import {
   ContentReset,
   Snapshot,
 } from 'shared/ReactTypeOfSideEffect';
+import {commitUpdateQueue} from './ReactUpdateQueue';
 import invariant from 'fbjs/lib/invariant';
 import warning from 'fbjs/lib/warning';
 
-import {commitCallbacks} from './ReactFiberUpdateQueue';
 import {onCommitUnmount} from './ReactFiberDevToolsHook';
 import {startPhaseTimer, stopPhaseTimer} from './ReactDebugFiberPerf';
-import {logCapturedError} from './ReactFiberErrorLogger';
 import getComponentName from 'shared/getComponentName';
 import {getStackAddendumByWorkInProgressFiber} from 'shared/ReactFiberComponentTreeHook';
+import {logCapturedError} from './ReactFiberErrorLogger';
 
 const {
   invokeGuardedCallback,
@@ -54,7 +54,7 @@ if (__DEV__) {
   didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
 }
 
-function logError(boundary: Fiber, errorInfo: CapturedValue<mixed>) {
+export function logError(boundary: Fiber, errorInfo: CapturedValue<mixed>) {
   const source = errorInfo.source;
   let stack = errorInfo.stack;
   if (stack === null) {
@@ -251,7 +251,14 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         }
         const updateQueue = finishedWork.updateQueue;
         if (updateQueue !== null) {
-          commitCallbacks(updateQueue, instance);
+          instance.props = finishedWork.memoizedProps;
+          instance.state = finishedWork.memoizedState;
+          commitUpdateQueue(
+            finishedWork,
+            updateQueue,
+            instance,
+            committedExpirationTime,
+          );
         }
         return;
       }
@@ -269,7 +276,12 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
                 break;
             }
           }
-          commitCallbacks(updateQueue, instance);
+          commitUpdateQueue(
+            finishedWork,
+            updateQueue,
+            instance,
+            committedExpirationTime,
+          );
         }
         return;
       }
@@ -306,73 +318,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     }
   }
 
-  function commitErrorLogging(
-    finishedWork: Fiber,
-    onUncaughtError: (error: Error) => void,
-  ) {
-    switch (finishedWork.tag) {
-      case ClassComponent:
-        {
-          const ctor = finishedWork.type;
-          const instance = finishedWork.stateNode;
-          const updateQueue = finishedWork.updateQueue;
-          invariant(
-            updateQueue !== null && updateQueue.capturedValues !== null,
-            'An error logging effect should not have been scheduled if no errors ' +
-              'were captured. This error is likely caused by a bug in React. ' +
-              'Please file an issue.',
-          );
-          const capturedErrors = updateQueue.capturedValues;
-          updateQueue.capturedValues = null;
-
-          if (typeof ctor.getDerivedStateFromCatch !== 'function') {
-            // To preserve the preexisting retry behavior of error boundaries,
-            // we keep track of which ones already failed during this batch.
-            // This gets reset before we yield back to the browser.
-            // TODO: Warn in strict mode if getDerivedStateFromCatch is
-            // not defined.
-            markLegacyErrorBoundaryAsFailed(instance);
-          }
-
-          instance.props = finishedWork.memoizedProps;
-          instance.state = finishedWork.memoizedState;
-          for (let i = 0; i < capturedErrors.length; i++) {
-            const errorInfo = capturedErrors[i];
-            const error = errorInfo.value;
-            const stack = errorInfo.stack;
-            logError(finishedWork, errorInfo);
-            instance.componentDidCatch(error, {
-              componentStack: stack !== null ? stack : '',
-            });
-          }
-        }
-        break;
-      case HostRoot: {
-        const updateQueue = finishedWork.updateQueue;
-        invariant(
-          updateQueue !== null && updateQueue.capturedValues !== null,
-          'An error logging effect should not have been scheduled if no errors ' +
-            'were captured. This error is likely caused by a bug in React. ' +
-            'Please file an issue.',
-        );
-        const capturedErrors = updateQueue.capturedValues;
-        updateQueue.capturedValues = null;
-        for (let i = 0; i < capturedErrors.length; i++) {
-          const errorInfo = capturedErrors[i];
-          logError(finishedWork, errorInfo);
-          onUncaughtError(errorInfo.value);
-        }
-        break;
-      }
-      default:
-        invariant(
-          false,
-          'This unit of work tag cannot capture errors.  This error is ' +
-            'likely caused by a bug in React. Please file an issue.',
-        );
-    }
-  }
-
   function commitAttachRef(finishedWork: Fiber) {
     const ref = finishedWork.ref;
     if (ref !== null) {
@@ -564,7 +509,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         },
         commitLifeCycles,
         commitBeforeMutationLifeCycles,
-        commitErrorLogging,
         commitAttachRef,
         commitDetachRef,
       };
@@ -892,7 +836,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       commitDeletion,
       commitWork,
       commitLifeCycles,
-      commitErrorLogging,
       commitAttachRef,
       commitDetachRef,
     };
diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js
index 02779db8b6..aec3bc17c6 100644
--- a/packages/react-reconciler/src/ReactFiberCompleteWork.js
+++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js
@@ -38,13 +38,7 @@ import {
   Fragment,
   Mode,
 } from 'shared/ReactTypeOfWork';
-import {
-  Placement,
-  Ref,
-  Update,
-  ErrLog,
-  DidCapture,
-} from 'shared/ReactTypeOfSideEffect';
+import {Placement, Ref, Update} from 'shared/ReactTypeOfSideEffect';
 import invariant from 'fbjs/lib/invariant';
 
 import {reconcileChildFibers} from './ReactChildFiber';
@@ -416,20 +410,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       case ClassComponent: {
         // We are leaving this subtree, so pop context if any.
         popLegacyContextProvider(workInProgress);
-
-        // If this component caught an error, schedule an error log effect.
-        const instance = workInProgress.stateNode;
-        const updateQueue = workInProgress.updateQueue;
-        if (updateQueue !== null && updateQueue.capturedValues !== null) {
-          workInProgress.effectTag &= ~DidCapture;
-          if (typeof instance.componentDidCatch === 'function') {
-            workInProgress.effectTag |= ErrLog;
-          } else {
-            // Normally we clear this in the commit phase, but since we did not
-            // schedule an effect, we need to reset it here.
-            updateQueue.capturedValues = null;
-          }
-        }
         return null;
       }
       case HostRoot: {
@@ -449,11 +429,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
           workInProgress.effectTag &= ~Placement;
         }
         updateHostContainer(workInProgress);
-
-        const updateQueue = workInProgress.updateQueue;
-        if (updateQueue !== null && updateQueue.capturedValues !== null) {
-          workInProgress.effectTag |= ErrLog;
-        }
         return null;
       }
       case HostComponent: {
diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js
index 8118675232..519003f177 100644
--- a/packages/react-reconciler/src/ReactFiberReconciler.js
+++ b/packages/react-reconciler/src/ReactFiberReconciler.js
@@ -26,7 +26,7 @@ import warning from 'fbjs/lib/warning';
 import {createFiberRoot} from './ReactFiberRoot';
 import * as ReactFiberDevToolsHook from './ReactFiberDevToolsHook';
 import ReactFiberScheduler from './ReactFiberScheduler';
-import {insertUpdateIntoFiber} from './ReactFiberUpdateQueue';
+import {createUpdate, enqueueUpdate} from './ReactUpdateQueue';
 import ReactFiberInstrumentation from './ReactFiberInstrumentation';
 import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
 
@@ -339,28 +339,22 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       }
     }
 
+    const update = createUpdate(expirationTime);
+    update.payload = {children: element};
+
     callback = callback === undefined ? null : callback;
-    if (__DEV__) {
+    if (callback !== null) {
       warning(
-        callback === null || typeof callback === 'function',
+        typeof callback === 'function',
         'render(...): Expected the last optional `callback` argument to be a ' +
           'function. Instead received: %s.',
         callback,
       );
+      update.callback = callback;
     }
+    enqueueUpdate(current, update, expirationTime);
 
-    const update = {
-      expirationTime,
-      partialState: {element},
-      callback,
-      isReplace: false,
-      isForced: false,
-      capturedValue: null,
-      next: null,
-    };
-    insertUpdateIntoFiber(current, update);
     scheduleWork(current, expirationTime);
-
     return expirationTime;
   }
 
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 46cef6cec6..1a9846b0bd 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -31,7 +31,6 @@ import {
   Ref,
   Incomplete,
   HostEffectMask,
-  ErrLog,
 } from 'shared/ReactTypeOfSideEffect';
 import {
   HostRoot,
@@ -89,10 +88,7 @@ import {
 import {AsyncMode} from './ReactTypeOfMode';
 import ReactFiberLegacyContext from './ReactFiberContext';
 import ReactFiberNewContext from './ReactFiberNewContext';
-import {
-  getUpdateExpirationTime,
-  insertUpdateIntoFiber,
-} from './ReactFiberUpdateQueue';
+import {enqueueUpdate, resetCurrentlyProcessingQueue} from './ReactUpdateQueue';
 import {createCapturedValue} from './ReactCapturedValue';
 import ReactFiberStack from './ReactFiberStack';
 
@@ -195,12 +191,16 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     throwException,
     unwindWork,
     unwindInterruptedWork,
+    createRootErrorUpdate,
+    createClassErrorUpdate,
   } = ReactFiberUnwindWork(
     hostContext,
     legacyContext,
     newContext,
     scheduleWork,
+    markLegacyErrorBoundaryAsFailed,
     isAlreadyFailedLegacyErrorBoundary,
+    onUncaughtError,
   );
   const {
     commitBeforeMutationLifeCycles,
@@ -209,7 +209,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     commitDeletion,
     commitWork,
     commitLifeCycles,
-    commitErrorLogging,
     commitAttachRef,
     commitDetachRef,
   } = ReactFiberCommitWork(
@@ -447,10 +446,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         );
       }
 
-      if (effectTag & ErrLog) {
-        commitErrorLogging(nextEffect, onUncaughtError);
-      }
-
       if (effectTag & Ref) {
         recordEffect();
         commitAttachRef(nextEffect);
@@ -681,7 +676,16 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     }
 
     // Check for pending updates.
-    let newExpirationTime = getUpdateExpirationTime(workInProgress);
+    let newExpirationTime = NoWork;
+    switch (workInProgress.tag) {
+      case HostRoot:
+      case ClassComponent: {
+        const updateQueue = workInProgress.updateQueue;
+        if (updateQueue !== null) {
+          newExpirationTime = updateQueue.expirationTime;
+        }
+      }
+    }
 
     // TODO: Calls need to visit stateNode
 
@@ -956,6 +960,12 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
           break;
         }
 
+        if (__DEV__) {
+          // Reset global debug state
+          // We assume this is defined in DEV
+          (resetCurrentlyProcessingQueue: any)();
+        }
+
         if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
           const failedUnitOfWork = nextUnitOfWork;
           replayUnitOfWork(failedUnitOfWork, thrownValue, isAsync);
@@ -974,7 +984,12 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
           onUncaughtError(thrownValue);
           break;
         }
-        throwException(returnFiber, sourceFiber, thrownValue);
+        throwException(
+          returnFiber,
+          sourceFiber,
+          thrownValue,
+          nextRenderExpirationTime,
+        );
         nextUnitOfWork = completeUnitOfWork(sourceFiber);
       }
       break;
@@ -1022,22 +1037,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     }
   }
 
-  function scheduleCapture(sourceFiber, boundaryFiber, value, expirationTime) {
-    // TODO: We only support dispatching errors.
-    const capturedValue = createCapturedValue(value, sourceFiber);
-    const update = {
-      expirationTime,
-      partialState: null,
-      callback: null,
-      isReplace: false,
-      isForced: false,
-      capturedValue,
-      next: null,
-    };
-    insertUpdateIntoFiber(boundaryFiber, update);
-    scheduleWork(boundaryFiber, expirationTime);
-  }
-
   function dispatch(
     sourceFiber: Fiber,
     value: mixed,
@@ -1048,8 +1047,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       'dispatch: Cannot dispatch during the render phase.',
     );
 
-    // TODO: Handle arrays
-
     let fiber = sourceFiber.return;
     while (fiber !== null) {
       switch (fiber.tag) {
@@ -1061,14 +1058,28 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
             (typeof instance.componentDidCatch === 'function' &&
               !isAlreadyFailedLegacyErrorBoundary(instance))
           ) {
-            scheduleCapture(sourceFiber, fiber, value, expirationTime);
+            const errorInfo = createCapturedValue(value, sourceFiber);
+            const update = createClassErrorUpdate(
+              fiber,
+              errorInfo,
+              expirationTime,
+            );
+            enqueueUpdate(fiber, update, expirationTime);
+            scheduleWork(fiber, expirationTime);
             return;
           }
           break;
-        // TODO: Handle async boundaries
-        case HostRoot:
-          scheduleCapture(sourceFiber, fiber, value, expirationTime);
+        case HostRoot: {
+          const errorInfo = createCapturedValue(value, sourceFiber);
+          const update = createRootErrorUpdate(
+            fiber,
+            errorInfo,
+            expirationTime,
+          );
+          enqueueUpdate(fiber, update, expirationTime);
+          scheduleWork(fiber, expirationTime);
           return;
+        }
       }
       fiber = fiber.return;
     }
@@ -1076,7 +1087,15 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     if (sourceFiber.tag === HostRoot) {
       // Error was thrown at the root. There is no parent, so the root
       // itself should capture it.
-      scheduleCapture(sourceFiber, sourceFiber, value, expirationTime);
+      const rootFiber = sourceFiber;
+      const errorInfo = createCapturedValue(value, rootFiber);
+      const update = createRootErrorUpdate(
+        rootFiber,
+        errorInfo,
+        expirationTime,
+      );
+      enqueueUpdate(rootFiber, update, expirationTime);
+      scheduleWork(rootFiber, expirationTime);
     }
   }
 
diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index 6565e4888d..e59324c3c4 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -12,10 +12,16 @@ import type {ExpirationTime} from './ReactFiberExpirationTime';
 import type {HostContext} from './ReactFiberHostContext';
 import type {LegacyContext} from './ReactFiberContext';
 import type {NewContext} from './ReactFiberNewContext';
-import type {UpdateQueue} from './ReactFiberUpdateQueue';
+import type {CapturedValue} from './ReactCapturedValue';
+import type {Update} from './ReactUpdateQueue';
 
 import {createCapturedValue} from './ReactCapturedValue';
-import {ensureUpdateQueues} from './ReactFiberUpdateQueue';
+import {
+  enqueueCapturedUpdate,
+  createUpdate,
+  CaptureUpdate,
+} from './ReactUpdateQueue';
+import {logError} from './ReactFiberCommitWork';
 
 import {
   ClassComponent,
@@ -42,7 +48,9 @@ export default function<C, CX>(
     startTime: ExpirationTime,
     expirationTime: ExpirationTime,
   ) => void,
+  markLegacyErrorBoundaryAsFailed: (instance: mixed) => void,
   isAlreadyFailedLegacyErrorBoundary: (instance: mixed) => boolean,
+  onUncaughtError: (error: mixed) => void,
 ) {
   const {popHostContainer, popHostContext} = hostContext;
   const {
@@ -51,10 +59,71 @@ export default function<C, CX>(
   } = legacyContext;
   const {popProvider} = newContext;
 
+  function createRootErrorUpdate(
+    fiber: Fiber,
+    errorInfo: CapturedValue<mixed>,
+    expirationTime: ExpirationTime,
+  ): Update<null> {
+    const update = createUpdate(expirationTime);
+    // Unmount the root by rendering null.
+    update.tag = CaptureUpdate;
+    update.payload = {children: null};
+    const error = errorInfo.value;
+    update.callback = () => {
+      onUncaughtError(error);
+      logError(fiber, errorInfo);
+    };
+    return update;
+  }
+
+  function createClassErrorUpdate(
+    fiber: Fiber,
+    errorInfo: CapturedValue<mixed>,
+    expirationTime: ExpirationTime,
+  ): Update<mixed> {
+    const update = createUpdate(expirationTime);
+    update.tag = CaptureUpdate;
+    const getDerivedStateFromCatch = fiber.type.getDerivedStateFromCatch;
+    if (
+      enableGetDerivedStateFromCatch &&
+      typeof getDerivedStateFromCatch === 'function'
+    ) {
+      const error = errorInfo.value;
+      update.payload = () => {
+        return getDerivedStateFromCatch(error);
+      };
+    }
+
+    const inst = fiber.stateNode;
+    if (inst !== null && typeof inst.componentDidCatch === 'function') {
+      update.callback = function callback() {
+        if (
+          !enableGetDerivedStateFromCatch ||
+          getDerivedStateFromCatch !== 'function'
+        ) {
+          // To preserve the preexisting retry behavior of error boundaries,
+          // we keep track of which ones already failed during this batch.
+          // This gets reset before we yield back to the browser.
+          // TODO: Warn in strict mode if getDerivedStateFromCatch is
+          // not defined.
+          markLegacyErrorBoundaryAsFailed(this);
+        }
+        const error = errorInfo.value;
+        const stack = errorInfo.stack;
+        logError(fiber, errorInfo);
+        this.componentDidCatch(error, {
+          componentStack: stack !== null ? stack : '',
+        });
+      };
+    }
+    return update;
+  }
+
   function throwException(
     returnFiber: Fiber,
     sourceFiber: Fiber,
     rawValue: mixed,
+    renderExpirationTime: ExpirationTime,
   ) {
     // The source fiber did not complete.
     sourceFiber.effectTag |= Incomplete;
@@ -67,18 +136,19 @@ export default function<C, CX>(
     do {
       switch (workInProgress.tag) {
         case HostRoot: {
-          // Uncaught error
           const errorInfo = value;
-          ensureUpdateQueues(workInProgress);
-          const updateQueue: UpdateQueue<
-            any,
-          > = (workInProgress.updateQueue: any);
-          updateQueue.capturedValues = [errorInfo];
           workInProgress.effectTag |= ShouldCapture;
+          const update = createRootErrorUpdate(
+            workInProgress,
+            errorInfo,
+            renderExpirationTime,
+          );
+          enqueueCapturedUpdate(workInProgress, update, renderExpirationTime);
           return;
         }
         case ClassComponent:
           // Capture and retry
+          const errorInfo = value;
           const ctor = workInProgress.type;
           const instance = workInProgress.stateNode;
           if (
@@ -89,17 +159,14 @@ export default function<C, CX>(
                 typeof instance.componentDidCatch === 'function' &&
                 !isAlreadyFailedLegacyErrorBoundary(instance)))
           ) {
-            ensureUpdateQueues(workInProgress);
-            const updateQueue: UpdateQueue<
-              any,
-            > = (workInProgress.updateQueue: any);
-            const capturedValues = updateQueue.capturedValues;
-            if (capturedValues === null) {
-              updateQueue.capturedValues = [value];
-            } else {
-              capturedValues.push(value);
-            }
             workInProgress.effectTag |= ShouldCapture;
+            // Schedule the error boundary to re-render using updated state
+            const update = createClassErrorUpdate(
+              workInProgress,
+              errorInfo,
+              renderExpirationTime,
+            );
+            enqueueCapturedUpdate(workInProgress, update, renderExpirationTime);
             return;
           }
           break;
@@ -176,5 +243,7 @@ export default function<C, CX>(
     throwException,
     unwindWork,
     unwindInterruptedWork,
+    createRootErrorUpdate,
+    createClassErrorUpdate,
   };
 }
diff --git a/packages/react-reconciler/src/ReactFiberUpdateQueue.js b/packages/react-reconciler/src/ReactFiberUpdateQueue.js
deleted file mode 100644
index df66807dce..0000000000
--- a/packages/react-reconciler/src/ReactFiberUpdateQueue.js
+++ /dev/null
@@ -1,394 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow
- */
-
-import type {Fiber} from './ReactFiber';
-import type {ExpirationTime} from './ReactFiberExpirationTime';
-import type {CapturedValue} from './ReactCapturedValue';
-
-import {
-  debugRenderPhaseSideEffects,
-  debugRenderPhaseSideEffectsForStrictMode,
-} from 'shared/ReactFeatureFlags';
-import {Callback as CallbackEffect} from 'shared/ReactTypeOfSideEffect';
-import {ClassComponent, HostRoot} from 'shared/ReactTypeOfWork';
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
-import {StrictMode} from './ReactTypeOfMode';
-
-import {NoWork} from './ReactFiberExpirationTime';
-
-let didWarnUpdateInsideUpdate;
-
-if (__DEV__) {
-  didWarnUpdateInsideUpdate = false;
-}
-
-type PartialState<State, Props> =
-  | $Subtype<State>
-  | ((prevState: State, props: Props) => $Subtype<State>);
-
-// Callbacks are not validated until invocation
-type Callback = mixed;
-
-export type Update<State> = {
-  expirationTime: ExpirationTime,
-  partialState: PartialState<any, any>,
-  callback: Callback | null,
-  isReplace: boolean,
-  isForced: boolean,
-  capturedValue: CapturedValue<mixed> | null,
-  next: Update<State> | null,
-};
-
-// Singly linked-list of updates. When an update is scheduled, it is added to
-// the queue of the current fiber and the work-in-progress fiber. The two queues
-// are separate but they share a persistent structure.
-//
-// During reconciliation, updates are removed from the work-in-progress fiber,
-// but they remain on the current fiber. That ensures that if a work-in-progress
-// is aborted, the aborted updates are recovered by cloning from current.
-//
-// The work-in-progress queue is always a subset of the current queue.
-//
-// When the tree is committed, the work-in-progress becomes the current.
-export type UpdateQueue<State> = {
-  // A processed update is not removed from the queue if there are any
-  // unprocessed updates that came before it. In that case, we need to keep
-  // track of the base state, which represents the base state of the first
-  // unprocessed update, which is the same as the first update in the list.
-  baseState: State,
-  // For the same reason, we keep track of the remaining expiration time.
-  expirationTime: ExpirationTime,
-  first: Update<State> | null,
-  last: Update<State> | null,
-  callbackList: Array<Update<State>> | null,
-  hasForceUpdate: boolean,
-  isInitialized: boolean,
-  capturedValues: Array<CapturedValue<mixed>> | null,
-
-  // Dev only
-  isProcessing?: boolean,
-};
-
-function createUpdateQueue<State>(baseState: State): UpdateQueue<State> {
-  const queue: UpdateQueue<State> = {
-    baseState,
-    expirationTime: NoWork,
-    first: null,
-    last: null,
-    callbackList: null,
-    hasForceUpdate: false,
-    isInitialized: false,
-    capturedValues: null,
-  };
-  if (__DEV__) {
-    queue.isProcessing = false;
-  }
-  return queue;
-}
-
-export function insertUpdateIntoQueue<State>(
-  queue: UpdateQueue<State>,
-  update: Update<State>,
-): void {
-  // Append the update to the end of the list.
-  if (queue.last === null) {
-    // Queue is empty
-    queue.first = queue.last = update;
-  } else {
-    queue.last.next = update;
-    queue.last = update;
-  }
-  if (
-    queue.expirationTime === NoWork ||
-    queue.expirationTime > update.expirationTime
-  ) {
-    queue.expirationTime = update.expirationTime;
-  }
-}
-
-let q1;
-let q2;
-export function ensureUpdateQueues(fiber: Fiber) {
-  q1 = q2 = null;
-  // We'll have at least one and at most two distinct update queues.
-  const alternateFiber = fiber.alternate;
-  let queue1 = fiber.updateQueue;
-  if (queue1 === null) {
-    // TODO: We don't know what the base state will be until we begin work.
-    // It depends on which fiber is the next current. Initialize with an empty
-    // base state, then set to the memoizedState when rendering. Not super
-    // happy with this approach.
-    queue1 = fiber.updateQueue = createUpdateQueue((null: any));
-  }
-
-  let queue2;
-  if (alternateFiber !== null) {
-    queue2 = alternateFiber.updateQueue;
-    if (queue2 === null) {
-      queue2 = alternateFiber.updateQueue = createUpdateQueue((null: any));
-    }
-  } else {
-    queue2 = null;
-  }
-  queue2 = queue2 !== queue1 ? queue2 : null;
-
-  // Use module variables instead of returning a tuple
-  q1 = queue1;
-  q2 = queue2;
-}
-
-export function insertUpdateIntoFiber<State>(
-  fiber: Fiber,
-  update: Update<State>,
-): void {
-  ensureUpdateQueues(fiber);
-  const queue1: Fiber = (q1: any);
-  const queue2: Fiber | null = (q2: any);
-
-  // Warn if an update is scheduled from inside an updater function.
-  if (__DEV__) {
-    if (
-      (queue1.isProcessing || (queue2 !== null && queue2.isProcessing)) &&
-      !didWarnUpdateInsideUpdate
-    ) {
-      warning(
-        false,
-        'An update (setState, replaceState, or forceUpdate) was scheduled ' +
-          'from inside an update function. Update functions should be pure, ' +
-          'with zero side-effects. Consider using componentDidUpdate or a ' +
-          'callback.',
-      );
-      didWarnUpdateInsideUpdate = true;
-    }
-  }
-
-  // If there's only one queue, add the update to that queue and exit.
-  if (queue2 === null) {
-    insertUpdateIntoQueue(queue1, update);
-    return;
-  }
-
-  // If either queue is empty, we need to add to both queues.
-  if (queue1.last === null || queue2.last === null) {
-    insertUpdateIntoQueue(queue1, update);
-    insertUpdateIntoQueue(queue2, update);
-    return;
-  }
-
-  // If both lists are not empty, the last update is the same for both lists
-  // because of structural sharing. So, we should only append to one of
-  // the lists.
-  insertUpdateIntoQueue(queue1, update);
-  // But we still need to update the `last` pointer of queue2.
-  queue2.last = update;
-}
-
-export function getUpdateExpirationTime(fiber: Fiber): ExpirationTime {
-  switch (fiber.tag) {
-    case HostRoot:
-    case ClassComponent:
-      const updateQueue = fiber.updateQueue;
-      if (updateQueue === null) {
-        return NoWork;
-      }
-      return updateQueue.expirationTime;
-    default:
-      return NoWork;
-  }
-}
-
-function getStateFromUpdate(update, instance, prevState, props) {
-  const partialState = update.partialState;
-  if (typeof partialState === 'function') {
-    return partialState.call(instance, prevState, props);
-  } else {
-    return partialState;
-  }
-}
-
-export function processUpdateQueue<State>(
-  current: Fiber | null,
-  workInProgress: Fiber,
-  queue: UpdateQueue<State>,
-  instance: any,
-  props: any,
-  renderExpirationTime: ExpirationTime,
-): State {
-  if (current !== null && current.updateQueue === queue) {
-    // We need to create a work-in-progress queue, by cloning the current queue.
-    const currentQueue = queue;
-    queue = workInProgress.updateQueue = {
-      baseState: currentQueue.baseState,
-      expirationTime: currentQueue.expirationTime,
-      first: currentQueue.first,
-      last: currentQueue.last,
-      isInitialized: currentQueue.isInitialized,
-      capturedValues: currentQueue.capturedValues,
-      // These fields are no longer valid because they were already committed.
-      // Reset them.
-      callbackList: null,
-      hasForceUpdate: false,
-    };
-  }
-
-  if (__DEV__) {
-    // Set this flag so we can warn if setState is called inside the update
-    // function of another setState.
-    queue.isProcessing = true;
-  }
-
-  // Reset the remaining expiration time. If we skip over any updates, we'll
-  // increase this accordingly.
-  queue.expirationTime = NoWork;
-
-  // TODO: We don't know what the base state will be until we begin work.
-  // It depends on which fiber is the next current. Initialize with an empty
-  // base state, then set to the memoizedState when rendering. Not super
-  // happy with this approach.
-  let state;
-  if (queue.isInitialized) {
-    state = queue.baseState;
-  } else {
-    state = queue.baseState = workInProgress.memoizedState;
-    queue.isInitialized = true;
-  }
-  let dontMutatePrevState = true;
-  let update = queue.first;
-  let didSkip = false;
-  while (update !== null) {
-    const updateExpirationTime = update.expirationTime;
-    if (updateExpirationTime > renderExpirationTime) {
-      // This update does not have sufficient priority. Skip it.
-      const remainingExpirationTime = queue.expirationTime;
-      if (
-        remainingExpirationTime === NoWork ||
-        remainingExpirationTime > updateExpirationTime
-      ) {
-        // Update the remaining expiration time.
-        queue.expirationTime = updateExpirationTime;
-      }
-      if (!didSkip) {
-        didSkip = true;
-        queue.baseState = state;
-      }
-      // Continue to the next update.
-      update = update.next;
-      continue;
-    }
-
-    // This update does have sufficient priority.
-
-    // If no previous updates were skipped, drop this update from the queue by
-    // advancing the head of the list.
-    if (!didSkip) {
-      queue.first = update.next;
-      if (queue.first === null) {
-        queue.last = null;
-      }
-    }
-
-    // Invoke setState callback an extra time to help detect side-effects.
-    // Ignore the return value in this case.
-    if (
-      debugRenderPhaseSideEffects ||
-      (debugRenderPhaseSideEffectsForStrictMode &&
-        workInProgress.mode & StrictMode)
-    ) {
-      getStateFromUpdate(update, instance, state, props);
-    }
-
-    // Process the update
-    let partialState;
-    if (update.isReplace) {
-      state = getStateFromUpdate(update, instance, state, props);
-      dontMutatePrevState = true;
-    } else {
-      partialState = getStateFromUpdate(update, instance, state, props);
-      if (partialState) {
-        if (dontMutatePrevState) {
-          // $FlowFixMe: Idk how to type this properly.
-          state = Object.assign({}, state, partialState);
-        } else {
-          state = Object.assign(state, partialState);
-        }
-        dontMutatePrevState = false;
-      }
-    }
-    if (update.isForced) {
-      queue.hasForceUpdate = true;
-    }
-    if (update.callback !== null) {
-      // Append to list of callbacks.
-      let callbackList = queue.callbackList;
-      if (callbackList === null) {
-        callbackList = queue.callbackList = [];
-      }
-      callbackList.push(update);
-    }
-    if (update.capturedValue !== null) {
-      let capturedValues = queue.capturedValues;
-      if (capturedValues === null) {
-        queue.capturedValues = [update.capturedValue];
-      } else {
-        capturedValues.push(update.capturedValue);
-      }
-    }
-    update = update.next;
-  }
-
-  if (queue.callbackList !== null) {
-    workInProgress.effectTag |= CallbackEffect;
-  } else if (
-    queue.first === null &&
-    !queue.hasForceUpdate &&
-    queue.capturedValues === null
-  ) {
-    // The queue is empty. We can reset it.
-    workInProgress.updateQueue = null;
-  }
-
-  if (!didSkip) {
-    didSkip = true;
-    queue.baseState = state;
-  }
-
-  if (__DEV__) {
-    // No longer processing.
-    queue.isProcessing = false;
-  }
-
-  return state;
-}
-
-export function commitCallbacks<State>(
-  queue: UpdateQueue<State>,
-  context: any,
-) {
-  const callbackList = queue.callbackList;
-  if (callbackList === null) {
-    return;
-  }
-  // Set the list to null to make sure they don't get called more than once.
-  queue.callbackList = null;
-  for (let i = 0; i < callbackList.length; i++) {
-    const update = callbackList[i];
-    const callback = update.callback;
-    // This update might be processed again. Clear the callback so it's only
-    // called once.
-    update.callback = null;
-    invariant(
-      typeof callback === 'function',
-      'Invalid argument passed as callback. Expected a function. Instead ' +
-        'received: %s',
-      callback,
-    );
-    callback.call(context);
-  }
-}
diff --git a/packages/react-reconciler/src/ReactUpdateQueue.js b/packages/react-reconciler/src/ReactUpdateQueue.js
new file mode 100644
index 0000000000..574a3c0740
--- /dev/null
+++ b/packages/react-reconciler/src/ReactUpdateQueue.js
@@ -0,0 +1,640 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+// UpdateQueue is a linked list of prioritized updates.
+//
+// Like fibers, update queues come in pairs: a current queue, which represents
+// the visible state of the screen, and a work-in-progress queue, which is
+// can be mutated and processed asynchronously before it is committed — a form
+// of double buffering. If a work-in-progress render is discarded before
+// finishing, we create a new work-in-progress by cloning the current queue.
+//
+// Both queues share a persistent, singly-linked list structure. To schedule an
+// update, we append it to the end of both queues. Each queue maintains a
+// pointer to first update in the persistent list that hasn't been processed.
+// The work-in-progress pointer always has a position equal to or greater than
+// the current queue, since we always work on that one. The current queue's
+// pointer is only updated during the commit phase, when we swap in the
+// work-in-progress.
+//
+// For example:
+//
+//   Current pointer:           A - B - C - D - E - F
+//   Work-in-progress pointer:              D - E - F
+//                                          ^
+//                                          The work-in-progress queue has
+//                                          processed more updates than current.
+//
+// The reason we append to both queues is because otherwise we might drop
+// updates without ever processing them. For example, if we only add updates to
+// the work-in-progress queue, some updates could be lost whenever a work-in
+// -progress render restarts by cloning from current. Similarly, if we only add
+// updates to the current queue, the updates will be lost whenever an already
+// in-progress queue commits and swaps with the current queue. However, by
+// adding to both queues, we guarantee that the update will be part of the next
+// work-in-progress. (And because the work-in-progress queue becomes the
+// current queue once it commits, there's no danger of applying the same
+// update twice.)
+//
+// Prioritization
+// --------------
+//
+// Updates are not sorted by priority, but by insertion; new updates are always
+// appended to the end of the list.
+//
+// The priority is still important, though. When processing the update queue
+// during the render phase, only the updates with sufficient priority are
+// included in the result. If we skip an update because it has insufficient
+// priority, it remains in the queue to be processed later, during a lower
+// priority render. Crucially, all updates subsequent to a skipped update also
+// remain in the queue *regardless of their priority*. That means high priority
+// updates are sometimes processed twice, at two separate priorities. We also
+// keep track of a base state, that represents the state before the first
+// update in the queue is applied.
+//
+// For example:
+//
+//   Given a base state of '', and the following queue of updates
+//
+//     A1 - B2 - C1 - D2
+//
+//   where the number indicates the priority, and the update is applied to the
+//   previous state by appending a letter, React will process these updates as
+//   two separate renders, one per distinct priority level:
+//
+//   First render, at priority 1:
+//     Base state: ''
+//     Updates: [A1, C1]
+//     Result state: 'AC'
+//
+//   Second render, at priority 2:
+//     Base state: 'A'            <-  The base state does not include C1,
+//                                    because B2 was skipped.
+//     Updates: [B2, C1, D2]      <-  C1 was rebased on top of B2
+//     Result state: 'ABCD'
+//
+// Because we process updates in insertion order, and rebase high priority
+// updates when preceding updates are skipped, the final result is deterministic
+// regardless of priority. Intermediate state may vary according to system
+// resources, but the final state is always the same.
+
+import type {Fiber} from './ReactFiber';
+import type {ExpirationTime} from './ReactFiberExpirationTime';
+
+import {NoWork} from './ReactFiberExpirationTime';
+import {
+  Callback,
+  ShouldCapture,
+  DidCapture,
+} from 'shared/ReactTypeOfSideEffect';
+import {ClassComponent} from 'shared/ReactTypeOfWork';
+
+import {
+  debugRenderPhaseSideEffects,
+  debugRenderPhaseSideEffectsForStrictMode,
+} from 'shared/ReactFeatureFlags';
+
+import {StrictMode} from './ReactTypeOfMode';
+
+import invariant from 'fbjs/lib/invariant';
+import warning from 'fbjs/lib/warning';
+
+export type Update<State> = {
+  expirationTime: ExpirationTime,
+
+  tag: 0 | 1 | 2 | 3,
+  payload: any,
+  callback: (() => mixed) | null,
+
+  next: Update<State> | null,
+  nextEffect: Update<State> | null,
+};
+
+export type UpdateQueue<State> = {
+  expirationTime: ExpirationTime,
+  baseState: State,
+
+  firstUpdate: Update<State> | null,
+  lastUpdate: Update<State> | null,
+
+  firstCapturedUpdate: Update<State> | null,
+  lastCapturedUpdate: Update<State> | null,
+
+  firstEffect: Update<State> | null,
+  lastEffect: Update<State> | null,
+
+  firstCapturedEffect: Update<State> | null,
+  lastCapturedEffect: Update<State> | null,
+
+  // TODO: Workaround for lack of tuples. Could use global state instead.
+  hasForceUpdate: boolean,
+};
+
+export const UpdateState = 0;
+export const ReplaceState = 1;
+export const ForceUpdate = 2;
+export const CaptureUpdate = 3;
+
+let didWarnUpdateInsideUpdate;
+let currentlyProcessingQueue;
+export let resetCurrentlyProcessingQueue;
+if (__DEV__) {
+  didWarnUpdateInsideUpdate = false;
+  currentlyProcessingQueue = null;
+  resetCurrentlyProcessingQueue = () => {
+    currentlyProcessingQueue = null;
+  };
+}
+
+export function createUpdateQueue<State>(baseState: State): UpdateQueue<State> {
+  const queue: UpdateQueue<State> = {
+    expirationTime: NoWork,
+    baseState,
+    firstUpdate: null,
+    lastUpdate: null,
+    firstCapturedUpdate: null,
+    lastCapturedUpdate: null,
+    firstEffect: null,
+    lastEffect: null,
+    firstCapturedEffect: null,
+    lastCapturedEffect: null,
+    hasForceUpdate: false,
+  };
+  return queue;
+}
+
+function cloneUpdateQueue<State>(
+  currentQueue: UpdateQueue<State>,
+): UpdateQueue<State> {
+  const queue: UpdateQueue<State> = {
+    expirationTime: currentQueue.expirationTime,
+    baseState: currentQueue.baseState,
+    firstUpdate: currentQueue.firstUpdate,
+    lastUpdate: currentQueue.lastUpdate,
+
+    // TODO: With resuming, if we bail out and resuse the child tree, we should
+    // keep these effects.
+    firstCapturedUpdate: null,
+    lastCapturedUpdate: null,
+
+    hasForceUpdate: false,
+
+    firstEffect: null,
+    lastEffect: null,
+
+    firstCapturedEffect: null,
+    lastCapturedEffect: null,
+  };
+  return queue;
+}
+
+export function createUpdate(expirationTime: ExpirationTime): Update<*> {
+  return {
+    expirationTime: expirationTime,
+
+    tag: UpdateState,
+    payload: null,
+    callback: null,
+
+    next: null,
+    nextEffect: null,
+  };
+}
+
+function appendUpdateToQueue<State>(
+  queue: UpdateQueue<State>,
+  update: Update<State>,
+  expirationTime: ExpirationTime,
+) {
+  // Append the update to the end of the list.
+  if (queue.lastUpdate === null) {
+    // Queue is empty
+    queue.firstUpdate = queue.lastUpdate = update;
+  } else {
+    queue.lastUpdate.next = update;
+    queue.lastUpdate = update;
+  }
+  if (
+    queue.expirationTime === NoWork ||
+    queue.expirationTime > expirationTime
+  ) {
+    // The incoming update has the earliest expiration of any update in the
+    // queue. Update the queue's expiration time.
+    queue.expirationTime = expirationTime;
+  }
+}
+
+export function enqueueUpdate<State>(
+  fiber: Fiber,
+  update: Update<State>,
+  expirationTime: ExpirationTime,
+) {
+  // Update queues are created lazily.
+  const alternate = fiber.alternate;
+  let queue1;
+  let queue2;
+  if (alternate === null) {
+    // There's only one fiber.
+    queue1 = fiber.updateQueue;
+    queue2 = null;
+    if (queue1 === null) {
+      queue1 = fiber.updateQueue = createUpdateQueue(fiber.memoizedState);
+    }
+  } else {
+    // There are two owners.
+    queue1 = fiber.updateQueue;
+    queue2 = alternate.updateQueue;
+    if (queue1 === null) {
+      if (queue2 === null) {
+        // Neither fiber has an update queue. Create new ones.
+        queue1 = fiber.updateQueue = createUpdateQueue(fiber.memoizedState);
+        queue2 = alternate.updateQueue = createUpdateQueue(
+          alternate.memoizedState,
+        );
+      } else {
+        // Only one fiber has an update queue. Clone to create a new one.
+        queue1 = fiber.updateQueue = cloneUpdateQueue(queue2);
+      }
+    } else {
+      if (queue2 === null) {
+        // Only one fiber has an update queue. Clone to create a new one.
+        queue2 = alternate.updateQueue = cloneUpdateQueue(queue1);
+      } else {
+        // Both owners have an update queue.
+      }
+    }
+  }
+  if (queue2 === null || queue1 === queue2) {
+    // There's only a single queue.
+    appendUpdateToQueue(queue1, update, expirationTime);
+  } else {
+    // There are two queues. We need to append the update to both queues,
+    // while accounting for the persistent structure of the list — we don't
+    // want the same update to be added multiple times.
+    if (queue1.lastUpdate === null || queue2.lastUpdate === null) {
+      // One of the queues is not empty. We must add the update to both queues.
+      appendUpdateToQueue(queue1, update, expirationTime);
+      appendUpdateToQueue(queue2, update, expirationTime);
+    } else {
+      // Both queues are non-empty. The last update is the same in both lists,
+      // because of structural sharing. So, only append to one of the lists.
+      appendUpdateToQueue(queue1, update, expirationTime);
+      // But we still need to update the `lastUpdate` pointer of queue2.
+      queue2.lastUpdate = update;
+    }
+  }
+
+  if (__DEV__) {
+    if (
+      fiber.tag === ClassComponent &&
+      (currentlyProcessingQueue === queue1 ||
+        (queue2 !== null && currentlyProcessingQueue === queue2)) &&
+      !didWarnUpdateInsideUpdate
+    ) {
+      warning(
+        false,
+        'An update (setState, replaceState, or forceUpdate) was scheduled ' +
+          'from inside an update function. Update functions should be pure, ' +
+          'with zero side-effects. Consider using componentDidUpdate or a ' +
+          'callback.',
+      );
+      didWarnUpdateInsideUpdate = true;
+    }
+  }
+}
+
+export function enqueueCapturedUpdate<State>(
+  workInProgress: Fiber,
+  update: Update<State>,
+  renderExpirationTime: ExpirationTime,
+) {
+  // Captured updates go into a separate list, and only on the work-in-
+  // progress queue.
+  let workInProgressQueue = workInProgress.updateQueue;
+  if (workInProgressQueue === null) {
+    workInProgressQueue = workInProgress.updateQueue = createUpdateQueue(
+      workInProgress.memoizedState,
+    );
+  } else {
+    // TODO: I put this here rather than createWorkInProgress so that we don't
+    // clone the queue unnecessarily. There's probably a better way to
+    // structure this.
+    workInProgressQueue = ensureWorkInProgressQueueIsAClone(
+      workInProgress,
+      workInProgressQueue,
+    );
+  }
+
+  // Append the update to the end of the list.
+  if (workInProgressQueue.lastCapturedUpdate === null) {
+    // This is the first render phase update
+    workInProgressQueue.firstCapturedUpdate = workInProgressQueue.lastCapturedUpdate = update;
+  } else {
+    workInProgressQueue.lastCapturedUpdate.next = update;
+    workInProgressQueue.lastCapturedUpdate = update;
+  }
+  if (
+    workInProgressQueue.expirationTime === NoWork ||
+    workInProgressQueue.expirationTime > renderExpirationTime
+  ) {
+    // The incoming update has the earliest expiration of any update in the
+    // queue. Update the queue's expiration time.
+    workInProgressQueue.expirationTime = renderExpirationTime;
+  }
+}
+
+function ensureWorkInProgressQueueIsAClone<State>(
+  workInProgress: Fiber,
+  queue: UpdateQueue<State>,
+): UpdateQueue<State> {
+  const current = workInProgress.alternate;
+  if (current !== null) {
+    // If the work-in-progress queue is equal to the current queue,
+    // we need to clone it first.
+    if (queue === current.updateQueue) {
+      queue = workInProgress.updateQueue = cloneUpdateQueue(queue);
+    }
+  }
+  return queue;
+}
+
+function getStateFromUpdate<State>(
+  workInProgress: Fiber,
+  queue: UpdateQueue<State>,
+  update: Update<State>,
+  prevState: State,
+  nextProps: any,
+  instance: any,
+): any {
+  switch (update.tag) {
+    case ReplaceState: {
+      const payload = update.payload;
+      if (typeof payload === 'function') {
+        // Updater function
+        if (__DEV__) {
+          if (
+            debugRenderPhaseSideEffects ||
+            (debugRenderPhaseSideEffectsForStrictMode &&
+              workInProgress.mode & StrictMode)
+          ) {
+            payload.call(instance, prevState, nextProps);
+          }
+        }
+        return payload.call(instance, prevState, nextProps);
+      }
+      // State object
+      return payload;
+    }
+    case CaptureUpdate: {
+      workInProgress.effectTag =
+        (workInProgress.effectTag & ~ShouldCapture) | DidCapture;
+    }
+    // Intentional fallthrough
+    case UpdateState: {
+      const payload = update.payload;
+      let partialState;
+      if (typeof payload === 'function') {
+        // Updater function
+        if (__DEV__) {
+          if (
+            debugRenderPhaseSideEffects ||
+            (debugRenderPhaseSideEffectsForStrictMode &&
+              workInProgress.mode & StrictMode)
+          ) {
+            payload.call(instance, prevState, nextProps);
+          }
+        }
+        partialState = payload.call(instance, prevState, nextProps);
+      } else {
+        // Partial state object
+        partialState = payload;
+      }
+      if (partialState === null || partialState === undefined) {
+        // Null and undefined are treated as no-ops.
+        return prevState;
+      }
+      // Merge the partial state and the previous state.
+      return Object.assign({}, prevState, partialState);
+    }
+    case ForceUpdate: {
+      queue.hasForceUpdate = true;
+      return prevState;
+    }
+  }
+  return prevState;
+}
+
+export function processUpdateQueue<State>(
+  workInProgress: Fiber,
+  queue: UpdateQueue<State>,
+  props: any,
+  instance: any,
+  renderExpirationTime: ExpirationTime,
+): void {
+  if (
+    queue.expirationTime === NoWork ||
+    queue.expirationTime > renderExpirationTime
+  ) {
+    // Insufficient priority. Bailout.
+    return;
+  }
+
+  queue = ensureWorkInProgressQueueIsAClone(workInProgress, queue);
+
+  if (__DEV__) {
+    currentlyProcessingQueue = queue;
+  }
+
+  // These values may change as we process the queue.
+  let newBaseState = queue.baseState;
+  let newFirstUpdate = null;
+  let newExpirationTime = NoWork;
+
+  // Iterate through the list of updates to compute the result.
+  let update = queue.firstUpdate;
+  let resultState = newBaseState;
+  while (update !== null) {
+    const updateExpirationTime = update.expirationTime;
+    if (updateExpirationTime > renderExpirationTime) {
+      // This update does not have sufficient priority. Skip it.
+      if (newFirstUpdate === null) {
+        // This is the first skipped update. It will be the first update in
+        // the new list.
+        newFirstUpdate = update;
+        // Since this is the first update that was skipped, the current result
+        // is the new base state.
+        newBaseState = resultState;
+      }
+      // Since this update will remain in the list, update the remaining
+      // expiration time.
+      if (
+        newExpirationTime === NoWork ||
+        newExpirationTime > updateExpirationTime
+      ) {
+        newExpirationTime = updateExpirationTime;
+      }
+    } else {
+      // This update does have sufficient priority. Process it and compute
+      // a new result.
+      resultState = getStateFromUpdate(
+        workInProgress,
+        queue,
+        update,
+        resultState,
+        props,
+        instance,
+      );
+      const callback = update.callback;
+      if (callback !== null) {
+        workInProgress.effectTag |= Callback;
+        // Set this to null, in case it was mutated during an aborted render.
+        update.nextEffect = null;
+        if (queue.lastEffect === null) {
+          queue.firstEffect = queue.lastEffect = update;
+        } else {
+          queue.lastEffect.nextEffect = update;
+          queue.lastEffect = update;
+        }
+      }
+    }
+    // Continue to the next update.
+    update = update.next;
+  }
+
+  // Separately, iterate though the list of captured updates.
+  let newFirstCapturedUpdate = null;
+  update = queue.firstCapturedUpdate;
+  while (update !== null) {
+    const updateExpirationTime = update.expirationTime;
+    if (updateExpirationTime > renderExpirationTime) {
+      // This update does not have sufficient priority. Skip it.
+      if (newFirstCapturedUpdate === null) {
+        // This is the first skipped captured update. It will be the first
+        // update in the new list.
+        newFirstCapturedUpdate = update;
+        // If this is the first update that was skipped, the current result is
+        // the new base state.
+        if (newFirstUpdate === null) {
+          newBaseState = resultState;
+        }
+      }
+      // Since this update will remain in the list, update the remaining
+      // expiration time.
+      if (
+        newExpirationTime === NoWork ||
+        newExpirationTime > updateExpirationTime
+      ) {
+        newExpirationTime = updateExpirationTime;
+      }
+    } else {
+      // This update does have sufficient priority. Process it and compute
+      // a new result.
+      resultState = getStateFromUpdate(
+        workInProgress,
+        queue,
+        update,
+        resultState,
+        props,
+        instance,
+      );
+      const callback = update.callback;
+      if (callback !== null) {
+        workInProgress.effectTag |= Callback;
+        // Set this to null, in case it was mutated during an aborted render.
+        update.nextEffect = null;
+        if (queue.lastCapturedEffect === null) {
+          queue.firstCapturedEffect = queue.lastCapturedEffect = update;
+        } else {
+          queue.lastCapturedEffect.nextEffect = update;
+          queue.lastCapturedEffect = update;
+        }
+      }
+    }
+    update = update.next;
+  }
+
+  if (newFirstUpdate === null) {
+    queue.lastUpdate = null;
+  }
+  if (newFirstCapturedUpdate === null) {
+    queue.lastCapturedUpdate = null;
+  } else {
+    workInProgress.effectTag |= Callback;
+  }
+  if (newFirstUpdate === null && newFirstCapturedUpdate === null) {
+    // We processed every update, without skipping. That means the new base
+    // state is the same as the result state.
+    newBaseState = resultState;
+  }
+
+  queue.baseState = newBaseState;
+  queue.firstUpdate = newFirstUpdate;
+  queue.firstCapturedUpdate = newFirstCapturedUpdate;
+  queue.expirationTime = newExpirationTime;
+
+  workInProgress.memoizedState = resultState;
+
+  if (__DEV__) {
+    currentlyProcessingQueue = null;
+  }
+}
+
+function callCallback(callback, context) {
+  invariant(
+    typeof callback === 'function',
+    'Invalid argument passed as callback. Expected a function. Instead ' +
+      'received: %s',
+    callback,
+  );
+  callback.call(context);
+}
+
+export function commitUpdateQueue<State>(
+  finishedWork: Fiber,
+  finishedQueue: UpdateQueue<State>,
+  instance: any,
+  renderExpirationTime: ExpirationTime,
+): void {
+  // If the finished render included captured updates, and there are still
+  // lower priority updates left over, we need to keep the captured updates
+  // in the queue so that they are rebased and not dropped once we process the
+  // queue again at the lower priority.
+  if (finishedQueue.firstCapturedUpdate !== null) {
+    // Join the captured update list to the end of the normal list.
+    if (finishedQueue.lastUpdate !== null) {
+      finishedQueue.lastUpdate.next = finishedQueue.firstCapturedUpdate;
+      finishedQueue.lastUpdate = finishedQueue.lastCapturedUpdate;
+    }
+    // Clear the list of captured updates.
+    finishedQueue.firstCapturedUpdate = finishedQueue.lastCapturedUpdate = null;
+  }
+
+  // Commit the effects
+  let effect = finishedQueue.firstEffect;
+  finishedQueue.firstEffect = finishedQueue.lastEffect = null;
+  while (effect !== null) {
+    const callback = effect.callback;
+    if (callback !== null) {
+      effect.callback = null;
+      callCallback(callback, instance);
+    }
+    effect = effect.nextEffect;
+  }
+
+  effect = finishedQueue.firstCapturedEffect;
+  finishedQueue.firstCapturedEffect = finishedQueue.lastCapturedEffect = null;
+  while (effect !== null) {
+    const callback = effect.callback;
+    if (callback !== null) {
+      effect.callback = null;
+      callCallback(callback, instance);
+    }
+    effect = effect.nextEffect;
+  }
+}
diff --git a/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
index 91de8d285d..a8b66373d8 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
@@ -1003,6 +1003,7 @@ describe('ReactIncremental', () => {
     instance.setState(updater);
     ReactNoop.flush();
     expect(instance.state.num).toEqual(2);
+
     instance.setState(updater);
     ReactNoop.render(<Foo multiplier={3} />);
     ReactNoop.flush();
@@ -1421,7 +1422,7 @@ describe('ReactIncremental', () => {
     ]);
   });
 
-  it('does not call static getDerivedStateFromProps for state-only updates', () => {
+  it('calls getDerivedStateFromProps even for state-only updates', () => {
     let ops = [];
     let instance;
 
@@ -1455,8 +1456,12 @@ describe('ReactIncremental', () => {
     instance.changeState();
     ReactNoop.flush();
 
-    expect(ops).toEqual(['render', 'componentDidUpdate']);
-    expect(instance.state).toEqual({foo: 'bar'});
+    expect(ops).toEqual([
+      'getDerivedStateFromProps',
+      'render',
+      'componentDidUpdate',
+    ]);
+    expect(instance.state).toEqual({foo: 'foo'});
   });
 
   xit('does not call componentWillReceiveProps for state-only updates', () => {
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalTriangle-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalTriangle-test.internal.js
index 628e1c3880..731865da65 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalTriangle-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalTriangle-test.internal.js
@@ -427,6 +427,8 @@ describe('ReactIncrementalTriangle', () => {
 
     function simulate(...actions) {
       const gen = simulateAndYield();
+      // Call this once to prepare the generator
+      gen.next();
       // eslint-disable-next-line no-for-of-loops/no-for-of-loops
       for (let action of actions) {
         gen.next(action);
diff --git a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
index 40e37fe439..ffe5706d1c 100644
--- a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
+++ b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
@@ -298,7 +298,7 @@ exports[`ReactDebugFiberPerf recovers from caught errors 1`] = `
 ⛔ (Committing Changes) Warning: Lifecycle hook scheduled a cascading update
   ⚛ (Committing Snapshot Effects: 0 Total)
   ⚛ (Committing Host Effects: 2 Total)
-  ⚛ (Calling Lifecycle Methods: 0 Total)
+  ⚛ (Calling Lifecycle Methods: 1 Total)
 
 ⚛ (React Tree Reconciliation: Completed Root)
   ⚛ Boundary [update]
@@ -324,7 +324,7 @@ exports[`ReactDebugFiberPerf recovers from fatal errors 1`] = `
 ⚛ (Committing Changes)
   ⚛ (Committing Snapshot Effects: 0 Total)
   ⚛ (Committing Host Effects: 1 Total)
-  ⚛ (Calling Lifecycle Methods: 0 Total)
+  ⚛ (Calling Lifecycle Methods: 1 Total)
 
 ⚛ (Waiting for async callback... will force flush in 5230 ms)
 
@@ -406,8 +406,8 @@ exports[`ReactDebugFiberPerf warns if an in-progress update is interrupted 1`] =
 
 ⚛ (Committing Changes)
   ⚛ (Committing Snapshot Effects: 0 Total)
-  ⚛ (Committing Host Effects: 1 Total)
-  ⚛ (Calling Lifecycle Methods: 1 Total)
+  ⚛ (Committing Host Effects: 0 Total)
+  ⚛ (Calling Lifecycle Methods: 0 Total)
 "
 `;
 
diff --git a/packages/react/src/__tests__/ReactStrictMode-test.internal.js b/packages/react/src/__tests__/ReactStrictMode-test.internal.js
index 5a5a799bf8..9236ae7754 100644
--- a/packages/react/src/__tests__/ReactStrictMode-test.internal.js
+++ b/packages/react/src/__tests__/ReactStrictMode-test.internal.js
@@ -57,38 +57,64 @@ describe('ReactStrictMode', () => {
 
       const component = ReactTestRenderer.create(<ClassComponent />);
 
-      expect(log).toEqual([
-        'constructor',
-        'constructor',
-        'getDerivedStateFromProps',
-        'getDerivedStateFromProps',
-        'render',
-        'render',
-        'componentDidMount',
-      ]);
+      if (__DEV__) {
+        expect(log).toEqual([
+          'constructor',
+          'constructor',
+          'getDerivedStateFromProps',
+          'getDerivedStateFromProps',
+          'render',
+          'render',
+          'componentDidMount',
+        ]);
+      } else {
+        expect(log).toEqual([
+          'constructor',
+          'getDerivedStateFromProps',
+          'render',
+          'componentDidMount',
+        ]);
+      }
 
       log = [];
       shouldComponentUpdate = true;
 
       component.update(<ClassComponent />);
-      expect(log).toEqual([
-        'getDerivedStateFromProps',
-        'getDerivedStateFromProps',
-        'shouldComponentUpdate',
-        'render',
-        'render',
-        'componentDidUpdate',
-      ]);
+      if (__DEV__) {
+        expect(log).toEqual([
+          'getDerivedStateFromProps',
+          'getDerivedStateFromProps',
+          'shouldComponentUpdate',
+          'render',
+          'render',
+          'componentDidUpdate',
+        ]);
+      } else {
+        expect(log).toEqual([
+          'getDerivedStateFromProps',
+          'shouldComponentUpdate',
+          'render',
+          'componentDidUpdate',
+        ]);
+      }
 
       log = [];
       shouldComponentUpdate = false;
 
       component.update(<ClassComponent />);
-      expect(log).toEqual([
-        'getDerivedStateFromProps',
-        'getDerivedStateFromProps',
-        'shouldComponentUpdate',
-      ]);
+
+      if (__DEV__) {
+        expect(log).toEqual([
+          'getDerivedStateFromProps',
+          'getDerivedStateFromProps',
+          'shouldComponentUpdate',
+        ]);
+      } else {
+        expect(log).toEqual([
+          'getDerivedStateFromProps',
+          'shouldComponentUpdate',
+        ]);
+      }
     });
 
     it('should invoke setState callbacks twice', () => {
@@ -112,8 +138,8 @@ describe('ReactStrictMode', () => {
         };
       });
 
-      // Callback should be invoked twice
-      expect(setStateCount).toBe(2);
+      // Callback should be invoked twice in DEV
+      expect(setStateCount).toBe(__DEV__ ? 2 : 1);
       // But each time `state` should be the previous value
       expect(instance.state.count).toBe(2);
     });
@@ -174,7 +200,7 @@ describe('ReactStrictMode', () => {
 
         const component = ReactTestRenderer.create(<Root />);
 
-        if (debugRenderPhaseSideEffectsForStrictMode) {
+        if (__DEV__ && debugRenderPhaseSideEffectsForStrictMode) {
           expect(log).toEqual([
             'constructor',
             'constructor',
@@ -197,7 +223,7 @@ describe('ReactStrictMode', () => {
         shouldComponentUpdate = true;
 
         component.update(<Root />);
-        if (debugRenderPhaseSideEffectsForStrictMode) {
+        if (__DEV__ && debugRenderPhaseSideEffectsForStrictMode) {
           expect(log).toEqual([
             'getDerivedStateFromProps',
             'getDerivedStateFromProps',
@@ -219,7 +245,7 @@ describe('ReactStrictMode', () => {
         shouldComponentUpdate = false;
 
         component.update(<Root />);
-        if (debugRenderPhaseSideEffectsForStrictMode) {
+        if (__DEV__ && debugRenderPhaseSideEffectsForStrictMode) {
           expect(log).toEqual([
             'getDerivedStateFromProps',
             'getDerivedStateFromProps',
@@ -263,7 +289,7 @@ describe('ReactStrictMode', () => {
 
         // Callback should be invoked twice (in DEV)
         expect(setStateCount).toBe(
-          debugRenderPhaseSideEffectsForStrictMode ? 2 : 1,
+          __DEV__ && debugRenderPhaseSideEffectsForStrictMode ? 2 : 1,
         );
         // But each time `state` should be the previous value
         expect(instance.state.count).toBe(2);
diff --git a/packages/shared/ReactTypeOfSideEffect.js b/packages/shared/ReactTypeOfSideEffect.js
index 82e8c3342f..27d6aa6090 100644
--- a/packages/shared/ReactTypeOfSideEffect.js
+++ b/packages/shared/ReactTypeOfSideEffect.js
@@ -10,23 +10,22 @@
 export type TypeOfSideEffect = number;
 
 // Don't change these two values. They're used by React Dev Tools.
-export const NoEffect = /*              */ 0b000000000000;
-export const PerformedWork = /*         */ 0b000000000001;
+export const NoEffect = /*              */ 0b00000000000;
+export const PerformedWork = /*         */ 0b00000000001;
 
 // You can change the rest (and add more).
-export const Placement = /*             */ 0b000000000010;
-export const Update = /*                */ 0b000000000100;
-export const PlacementAndUpdate = /*    */ 0b000000000110;
-export const Deletion = /*              */ 0b000000001000;
-export const ContentReset = /*          */ 0b000000010000;
-export const Callback = /*              */ 0b000000100000;
-export const DidCapture = /*            */ 0b000001000000;
-export const Ref = /*                   */ 0b000010000000;
-export const ErrLog = /*                */ 0b000100000000;
-export const Snapshot = /*              */ 0b100000000000;
+export const Placement = /*             */ 0b00000000010;
+export const Update = /*                */ 0b00000000100;
+export const PlacementAndUpdate = /*    */ 0b00000000110;
+export const Deletion = /*              */ 0b00000001000;
+export const ContentReset = /*          */ 0b00000010000;
+export const Callback = /*              */ 0b00000100000;
+export const DidCapture = /*            */ 0b00001000000;
+export const Ref = /*                   */ 0b00010000000;
+export const Snapshot = /*              */ 0b00100000000;
 
 // Union of all host effects
-export const HostEffectMask = /*        */ 0b100111111111;
+export const HostEffectMask = /*        */ 0b00111111111;
 
-export const Incomplete = /*            */ 0b001000000000;
-export const ShouldCapture = /*         */ 0b010000000000;
+export const Incomplete = /*            */ 0b01000000000;
+export const ShouldCapture = /*         */ 0b10000000000;

From 149a34f735b47f225e3d26ce2478b3181e4ff8fe Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Mon, 23 Apr 2018 10:27:39 -0700
Subject: [PATCH 007/277] Exposed flushSync on the test renderer (#12672)

---
 .../src/ReactTestRenderer.js                  |  1 +
 .../__tests__/ReactTestRendererAsync-test.js  | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js
index aa58411a7d..977a1f5c68 100644
--- a/packages/react-test-renderer/src/ReactTestRenderer.js
+++ b/packages/react-test-renderer/src/ReactTestRenderer.js
@@ -736,6 +736,7 @@ const ReactTestRendererFiber = {
         }
         return TestRenderer.getPublicRootInstance(root);
       },
+      unstable_flushSync: TestRenderer.flushSync,
     };
 
     Object.defineProperty(
diff --git a/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js b/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js
index b9574012bd..26a3de6746 100644
--- a/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js
@@ -94,4 +94,44 @@ describe('ReactTestRendererAsync', () => {
     expect(renderer.unstable_flushAll()).toEqual(['C:1']);
     expect(renderer.toJSON()).toEqual(['A:1', 'B:1', 'C:1']);
   });
+
+  it('supports high priority interruptions', () => {
+    function Child(props) {
+      renderer.unstable_yield(props.children);
+      return props.children;
+    }
+
+    class Example extends React.Component {
+      componentDidMount() {
+        expect(this.props.step).toEqual(2);
+      }
+      componentDidUpdate() {
+        throw Error('Unexpected update');
+      }
+      render() {
+        return (
+          <React.Fragment>
+            <Child>{'A:' + this.props.step}</Child>
+            <Child>{'B:' + this.props.step}</Child>
+          </React.Fragment>
+        );
+      }
+    }
+
+    const renderer = ReactTestRenderer.create(<Example step={1} />, {
+      unstable_isAsync: true,
+    });
+
+    // Flush the some of the changes, but don't commit
+    expect(renderer.unstable_flushThrough(['A:1'])).toEqual(['A:1']);
+    expect(renderer.toJSON()).toEqual(null);
+
+    // Interrupt with higher priority properties
+    renderer.unstable_flushSync(() => {
+      renderer.update(<Example step={2} />);
+    });
+
+    // Only the higher priority properties have been committed
+    expect(renderer.toJSON()).toEqual(['A:2', 'B:2']);
+  });
 });

From 1e3cd332a015e312149efa36eb81c7523411cc2d Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Mon, 23 Apr 2018 15:25:46 -0700
Subject: [PATCH 008/277] Remove the 'alwaysUseRequestIdleCallbackPolyfill'
 feature flag (#12648)

* Remove the 'alwaysUseRequestIdleCallbackPolyfill' feature flag

**what is the change?:**
Removes the feature flag 'alwaysUseRequestIdleCallbackPolyfill', such
that we **always** use the polyfill for requestIdleCallback.

**why make this change?:**
We have been testing this feature flag at 100% for some time internally,
and determined it works better for React than the native implementation.
Looks like RN was overriding the flag to use the native when possible,
but since no RN products are using 'async' mode it should be safe to
switch this flag over for RN as well.

**test plan:**
We have already been testing this internally for some time.

**issue:**
internal task t28128480

* fix mistaken conditional

* Add mocking of rAF, postMessage, and initial test for ReactScheduler

**what is the change?:**
- In all tests where we previously mocked rIC or relied on native
mocking which no longer works, we are now mocking rAF and postMessage.
- Also adds a basic initial test for ReactScheduler.
NOTE -> we do plan to write headless browser tests for ReactScheduler!
This is just an initial test, to verify that it works with the mocked
out browser APIs as expected.

**why make this change?:**
We need to mock out the browser APIs more completely for the new
'ReactScheduler' to work in our tests. Many tests are depending on it,
since it's used at a low level.

By mocking the browser APIs rather than the 'react-scheduler' module, we
enable testing the production bundles. This approach is trading
isolation for accuracy. These tests will be closer to a real use.

**test plan:**
run the tests :)

**issue:**
internal task T28128480
---
 .../ReactDOMFiberAsync-test.internal.js       |  25 +++++
 .../src/__tests__/ReactDOMRoot-test.js        | 105 +++++++++---------
 .../ChangeEventPlugin-test.internal.js        |  25 +++++
 .../SimpleEventPlugin-test.internal.js        |  25 +++++
 .../react-scheduler/src/ReactScheduler.js     |  13 +--
 .../src/__tests__/ReactScheduler-test.js      |  56 ++++++++++
 .../src/__tests__/test_page.html              |  10 ++
 packages/shared/ReactFeatureFlags.js          |   2 -
 .../ReactFeatureFlags.native-fabric-fb.js     |   1 -
 .../ReactFeatureFlags.native-fabric-oss.js    |   1 -
 .../forks/ReactFeatureFlags.native-fb.js      |   1 -
 .../forks/ReactFeatureFlags.native-oss.js     |   1 -
 .../forks/ReactFeatureFlags.persistent.js     |   1 -
 .../forks/ReactFeatureFlags.test-renderer.js  |   1 -
 .../shared/forks/ReactFeatureFlags.www.js     |   1 -
 15 files changed, 196 insertions(+), 72 deletions(-)
 create mode 100644 packages/react-scheduler/src/__tests__/ReactScheduler-test.js
 create mode 100644 packages/react-scheduler/src/__tests__/test_page.html

diff --git a/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.internal.js b/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.internal.js
index e0c256d4a3..51b901f1dd 100644
--- a/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.internal.js
+++ b/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.internal.js
@@ -20,6 +20,31 @@ describe('ReactDOMFiberAsync', () => {
   let container;
 
   beforeEach(() => {
+    // TODO pull this into helper method, reduce repetition.
+    // mock the browser APIs which are used in react-scheduler:
+    // - requestAnimationFrame should pass the DOMHighResTimeStamp argument
+    // - calling 'window.postMessage' should actually fire postmessage handlers
+    global.requestAnimationFrame = function(cb) {
+      return setTimeout(() => {
+        cb(Date.now());
+      });
+    };
+    const originalAddEventListener = global.addEventListener;
+    let postMessageCallback;
+    global.addEventListener = function(eventName, callback, useCapture) {
+      if (eventName === 'message') {
+        postMessageCallback = callback;
+      } else {
+        originalAddEventListener(eventName, callback, useCapture);
+      }
+    };
+    global.postMessage = function(messageKey, targetOrigin) {
+      const postMessageEvent = {source: window, data: messageKey};
+      if (postMessageCallback) {
+        postMessageCallback(postMessageEvent);
+      }
+    };
+    jest.resetModules();
     container = document.createElement('div');
     ReactDOM = require('react-dom');
   });
diff --git a/packages/react-dom/src/__tests__/ReactDOMRoot-test.js b/packages/react-dom/src/__tests__/ReactDOMRoot-test.js
index f86d3b0e06..2255d1cb04 100644
--- a/packages/react-dom/src/__tests__/ReactDOMRoot-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMRoot-test.js
@@ -17,47 +17,46 @@ let AsyncMode = React.unstable_AsyncMode;
 describe('ReactDOMRoot', () => {
   let container;
 
-  let scheduledCallback;
-  let flush;
-  let now;
-  let expire;
+  let advanceCurrentTime;
 
   beforeEach(() => {
     container = document.createElement('div');
-
-    // Override requestIdleCallback
-    scheduledCallback = null;
-    flush = function(units = Infinity) {
-      if (scheduledCallback !== null) {
-        let didStop = false;
-        while (scheduledCallback !== null && !didStop) {
-          const cb = scheduledCallback;
-          scheduledCallback = null;
-          cb({
-            timeRemaining() {
-              if (units > 0) {
-                return 999;
-              }
-              didStop = true;
-              return 0;
-            },
-          });
-          units--;
-        }
+    // TODO pull this into helper method, reduce repetition.
+    // mock the browser APIs which are used in react-scheduler:
+    // - requestAnimationFrame should pass the DOMHighResTimeStamp argument
+    // - calling 'window.postMessage' should actually fire postmessage handlers
+    // - must allow artificially changing time returned by Date.now
+    // Performance.now is not supported in the test environment
+    const originalDateNow = Date.now;
+    let advancedTime = null;
+    global.Date.now = function() {
+      if (advancedTime) {
+        return originalDateNow() + advancedTime;
+      }
+      return originalDateNow();
+    };
+    advanceCurrentTime = function(amount) {
+      advancedTime = amount;
+    };
+    global.requestAnimationFrame = function(cb) {
+      return setTimeout(() => {
+        cb(Date.now());
+      });
+    };
+    const originalAddEventListener = global.addEventListener;
+    let postMessageCallback;
+    global.addEventListener = function(eventName, callback, useCapture) {
+      if (eventName === 'message') {
+        postMessageCallback = callback;
+      } else {
+        originalAddEventListener(eventName, callback, useCapture);
       }
     };
-    global.performance = {
-      now() {
-        return now;
-      },
-    };
-    global.requestIdleCallback = function(cb) {
-      scheduledCallback = cb;
-    };
-
-    now = 0;
-    expire = function(ms) {
-      now += ms;
+    global.postMessage = function(messageKey, targetOrigin) {
+      const postMessageEvent = {source: window, data: messageKey};
+      if (postMessageCallback) {
+        postMessageCallback(postMessageEvent);
+      }
     };
 
     jest.resetModules();
@@ -70,17 +69,17 @@ describe('ReactDOMRoot', () => {
   it('renders children', () => {
     const root = ReactDOM.unstable_createRoot(container);
     root.render(<div>Hi</div>);
-    flush();
+    jest.runAllTimers();
     expect(container.textContent).toEqual('Hi');
   });
 
   it('unmounts children', () => {
     const root = ReactDOM.unstable_createRoot(container);
     root.render(<div>Hi</div>);
-    flush();
+    jest.runAllTimers();
     expect(container.textContent).toEqual('Hi');
     root.unmount();
-    flush();
+    jest.runAllTimers();
     expect(container.textContent).toEqual('');
   });
 
@@ -92,7 +91,7 @@ describe('ReactDOMRoot', () => {
       ops.push('inside callback: ' + container.textContent);
     });
     ops.push('before committing: ' + container.textContent);
-    flush();
+    jest.runAllTimers();
     ops.push('after committing: ' + container.textContent);
     expect(ops).toEqual([
       'before committing: ',
@@ -105,7 +104,7 @@ describe('ReactDOMRoot', () => {
   it('resolves `work.then` callback synchronously if the work already committed', () => {
     const root = ReactDOM.unstable_createRoot(container);
     const work = root.render(<AsyncMode>Hi</AsyncMode>);
-    flush();
+    jest.runAllTimers();
     let ops = [];
     work.then(() => {
       ops.push('inside callback');
@@ -133,7 +132,7 @@ describe('ReactDOMRoot', () => {
         <span />
       </div>,
     );
-    flush();
+    jest.runAllTimers();
 
     // Accepts `hydrate` option
     const container2 = document.createElement('div');
@@ -144,7 +143,7 @@ describe('ReactDOMRoot', () => {
         <span />
       </div>,
     );
-    expect(flush).toWarnDev('Extra attributes');
+    expect(jest.runAllTimers).toWarnDev('Extra attributes');
   });
 
   it('does not clear existing children', async () => {
@@ -156,7 +155,7 @@ describe('ReactDOMRoot', () => {
         <span>d</span>
       </div>,
     );
-    flush();
+    jest.runAllTimers();
     expect(container.textContent).toEqual('abcd');
     root.render(
       <div>
@@ -164,7 +163,7 @@ describe('ReactDOMRoot', () => {
         <span>c</span>
       </div>,
     );
-    flush();
+    jest.runAllTimers();
     expect(container.textContent).toEqual('abdc');
   });
 
@@ -200,7 +199,7 @@ describe('ReactDOMRoot', () => {
       </AsyncMode>,
     );
 
-    flush();
+    jest.runAllTimers();
 
     // Hasn't updated yet
     expect(container.textContent).toEqual('');
@@ -229,7 +228,7 @@ describe('ReactDOMRoot', () => {
     const batch = root.createBatch();
     batch.render(<Foo>Hi</Foo>);
     // Flush all async work.
-    flush();
+    jest.runAllTimers();
     // Root should complete without committing.
     expect(ops).toEqual(['Foo']);
     expect(container.textContent).toEqual('');
@@ -247,7 +246,7 @@ describe('ReactDOMRoot', () => {
     const batch = root.createBatch();
     batch.render(<AsyncMode>Foo</AsyncMode>);
 
-    flush();
+    jest.runAllTimers();
 
     // Hasn't updated yet
     expect(container.textContent).toEqual('');
@@ -287,7 +286,7 @@ describe('ReactDOMRoot', () => {
     const root = ReactDOM.unstable_createRoot(container);
     root.render(<AsyncMode>1</AsyncMode>);
 
-    expire(2000);
+    advanceCurrentTime(2000);
     // This batch has a later expiration time than the earlier update.
     const batch = root.createBatch();
 
@@ -295,7 +294,7 @@ describe('ReactDOMRoot', () => {
     batch.commit();
     expect(container.textContent).toEqual('');
 
-    flush();
+    jest.runAllTimers();
     expect(container.textContent).toEqual('1');
   });
 
@@ -322,7 +321,7 @@ describe('ReactDOMRoot', () => {
     batch1.render(1);
 
     // This batch has a later expiration time
-    expire(2000);
+    advanceCurrentTime(2000);
     const batch2 = root.createBatch();
     batch2.render(2);
 
@@ -341,7 +340,7 @@ describe('ReactDOMRoot', () => {
     batch1.render(1);
 
     // This batch has a later expiration time
-    expire(2000);
+    advanceCurrentTime(2000);
     const batch2 = root.createBatch();
     batch2.render(2);
 
@@ -351,7 +350,7 @@ describe('ReactDOMRoot', () => {
     expect(container.textContent).toEqual('2');
 
     batch1.commit();
-    flush();
+    jest.runAllTimers();
     expect(container.textContent).toEqual('1');
   });
 
diff --git a/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.internal.js b/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.internal.js
index e5f8969ba1..570ecf3238 100644
--- a/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.internal.js
+++ b/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.internal.js
@@ -32,6 +32,31 @@ describe('ChangeEventPlugin', () => {
   let container;
 
   beforeEach(() => {
+    // TODO pull this into helper method, reduce repetition.
+    // mock the browser APIs which are used in react-scheduler:
+    // - requestAnimationFrame should pass the DOMHighResTimeStamp argument
+    // - calling 'window.postMessage' should actually fire postmessage handlers
+    global.requestAnimationFrame = function(cb) {
+      return setTimeout(() => {
+        cb(Date.now());
+      });
+    };
+    const originalAddEventListener = global.addEventListener;
+    let postMessageCallback;
+    global.addEventListener = function(eventName, callback, useCapture) {
+      if (eventName === 'message') {
+        postMessageCallback = callback;
+      } else {
+        originalAddEventListener(eventName, callback, useCapture);
+      }
+    };
+    global.postMessage = function(messageKey, targetOrigin) {
+      const postMessageEvent = {source: window, data: messageKey};
+      if (postMessageCallback) {
+        postMessageCallback(postMessageEvent);
+      }
+    };
+    jest.resetModules();
     container = document.createElement('div');
     document.body.appendChild(container);
   });
diff --git a/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js b/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js
index ad90110818..1b39dd1e47 100644
--- a/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js
+++ b/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js
@@ -33,6 +33,31 @@ describe('SimpleEventPlugin', function() {
   }
 
   beforeEach(function() {
+    // TODO pull this into helper method, reduce repetition.
+    // mock the browser APIs which are used in react-scheduler:
+    // - requestAnimationFrame should pass the DOMHighResTimeStamp argument
+    // - calling 'window.postMessage' should actually fire postmessage handlers
+    global.requestAnimationFrame = function(cb) {
+      return setTimeout(() => {
+        cb(Date.now());
+      });
+    };
+    const originalAddEventListener = global.addEventListener;
+    let postMessageCallback;
+    global.addEventListener = function(eventName, callback, useCapture) {
+      if (eventName === 'message') {
+        postMessageCallback = callback;
+      } else {
+        originalAddEventListener(eventName, callback, useCapture);
+      }
+    };
+    global.postMessage = function(messageKey, targetOrigin) {
+      const postMessageEvent = {source: window, data: messageKey};
+      if (postMessageCallback) {
+        postMessageCallback(postMessageEvent);
+      }
+    };
+    jest.resetModules();
     React = require('react');
     ReactDOM = require('react-dom');
     ReactTestUtils = require('react-dom/test-utils');
diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index a7983dfeaf..49169c6396 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -32,7 +32,6 @@
 
 import type {Deadline} from 'react-reconciler';
 
-import {alwaysUseRequestIdleCallbackPolyfill} from 'shared/ReactFeatureFlags';
 import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
 import warning from 'fbjs/lib/warning';
 
@@ -85,12 +84,8 @@ if (!ExecutionEnvironment.canUseDOM) {
   cIC = function(timeoutID: number) {
     clearTimeout(timeoutID);
   };
-} else if (
-  alwaysUseRequestIdleCallbackPolyfill ||
-  typeof requestIdleCallback !== 'function' ||
-  typeof cancelIdleCallback !== 'function'
-) {
-  // Polyfill requestIdleCallback and cancelIdleCallback
+} else {
+  // Always polyfill requestIdleCallback and cancelIdleCallback
 
   let scheduledRICCallback = null;
   let isIdleScheduled = false;
@@ -175,6 +170,7 @@ if (!ExecutionEnvironment.canUseDOM) {
   window.addEventListener('message', idleTick, false);
 
   const animationTick = function(rafTime) {
+    console.log('animationTick called and rafTime is ', rafTime);
     isAnimationFrameScheduled = false;
     let nextFrameTime = rafTime - frameDeadline + activeFrameTime;
     if (
@@ -231,9 +227,6 @@ if (!ExecutionEnvironment.canUseDOM) {
     isIdleScheduled = false;
     timeoutTime = -1;
   };
-} else {
-  rIC = window.requestIdleCallback;
-  cIC = window.cancelIdleCallback;
 }
 
 export {now, rIC, cIC};
diff --git a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
new file mode 100644
index 0000000000..1ed60b0fb3
--- /dev/null
+++ b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react-core
+ */
+
+'use strict';
+
+let ReactScheduler;
+
+describe('ReactScheduler', () => {
+  beforeEach(() => {
+    // TODO pull this into helper method, reduce repetition.
+    // mock the browser APIs which are used in react-scheduler:
+    // - requestAnimationFrame should pass the DOMHighResTimeStamp argument
+    // - calling 'window.postMessage' should actually fire postmessage handlers
+    global.requestAnimationFrame = function(cb) {
+      return setTimeout(() => {
+        cb(Date.now());
+      });
+    };
+    const originalAddEventListener = global.addEventListener;
+    let postMessageCallback;
+    global.addEventListener = function(eventName, callback, useCapture) {
+      if (eventName === 'message') {
+        postMessageCallback = callback;
+      } else {
+        originalAddEventListener(eventName, callback, useCapture);
+      }
+    };
+    global.postMessage = function(messageKey, targetOrigin) {
+      const postMessageEvent = {source: window, data: messageKey};
+      if (postMessageCallback) {
+        postMessageCallback(postMessageEvent);
+      }
+    };
+    jest.resetModules();
+    ReactScheduler = require('react-scheduler');
+  });
+
+  it('rIC calls the callback within the frame when not blocked', () => {
+    const {rIC} = ReactScheduler;
+    const cb = jest.fn();
+    rIC(cb);
+    jest.runAllTimers();
+    expect(cb.mock.calls.length).toBe(1);
+    // should have ... TODO details on what we expect
+    expect(cb.mock.calls[0][0].didTimeout).toBe(false);
+    expect(typeof cb.mock.calls[0][0].timeRemaining()).toBe('number');
+  });
+
+  // TODO: test cIC and now
+});
diff --git a/packages/react-scheduler/src/__tests__/test_page.html b/packages/react-scheduler/src/__tests__/test_page.html
new file mode 100644
index 0000000000..3b5af08b39
--- /dev/null
+++ b/packages/react-scheduler/src/__tests__/test_page.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html style="width: 100%; height: 100%; overflow: hidden">
+  <head>
+    <meta charset="utf-8">
+    <title>React Scheduler test page</title>
+  </head>
+  <body>
+    <h1>Hello World</h1>
+  </body>
+</html>
diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
index fc0a50083d..955668d13e 100644
--- a/packages/shared/ReactFeatureFlags.js
+++ b/packages/shared/ReactFeatureFlags.js
@@ -37,8 +37,6 @@ export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 // Warn about deprecated, async-unsafe lifecycles; relates to RFC #6:
 export const warnAboutDeprecatedLifecycles = false;
 
-export const alwaysUseRequestIdleCallbackPolyfill = false;
-
 // Only used in www builds.
 export function addUserTimingListener() {
   invariant(false, 'Not implemented.');
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
index 4e61717d9c..e2fd437999 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
@@ -23,7 +23,6 @@ export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableMutatingReconciler = false;
 export const enableNoopReconciler = false;
 export const enablePersistentReconciler = true;
-export const alwaysUseRequestIdleCallbackPolyfill = false;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
index 0948deff81..c6a4862d85 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
@@ -23,7 +23,6 @@ export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableMutatingReconciler = false;
 export const enableNoopReconciler = false;
 export const enablePersistentReconciler = true;
-export const alwaysUseRequestIdleCallbackPolyfill = false;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js
index aeed05a9b3..3026a69fc6 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js
@@ -26,7 +26,6 @@ export const enableUserTimingAPI = __DEV__;
 export const enableMutatingReconciler = true;
 export const enableNoopReconciler = false;
 export const enablePersistentReconciler = false;
-export const alwaysUseRequestIdleCallbackPolyfill = false;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js
index 381fe7b39d..a238ca1688 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js
@@ -12,7 +12,6 @@ import invariant from 'fbjs/lib/invariant';
 import typeof * as FeatureFlagsType from 'shared/ReactFeatureFlags';
 import typeof * as FeatureFlagsShimType from './ReactFeatureFlags.native-oss';
 
-export const alwaysUseRequestIdleCallbackPolyfill = false;
 export const debugRenderPhaseSideEffects = false;
 export const debugRenderPhaseSideEffectsForStrictMode = false;
 export const enableGetDerivedStateFromCatch = false;
diff --git a/packages/shared/forks/ReactFeatureFlags.persistent.js b/packages/shared/forks/ReactFeatureFlags.persistent.js
index 6ae31a7ce5..57d7c6bf53 100644
--- a/packages/shared/forks/ReactFeatureFlags.persistent.js
+++ b/packages/shared/forks/ReactFeatureFlags.persistent.js
@@ -24,7 +24,6 @@ export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableMutatingReconciler = false;
 export const enableNoopReconciler = false;
 export const enablePersistentReconciler = true;
-export const alwaysUseRequestIdleCallbackPolyfill = false;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
index 03642454dd..000f950a4f 100644
--- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js
+++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
@@ -21,7 +21,6 @@ export const replayFailedUnitOfWorkWithInvokeGuardedCallback = false;
 export const enableMutatingReconciler = true;
 export const enableNoopReconciler = false;
 export const enablePersistentReconciler = false;
-export const alwaysUseRequestIdleCallbackPolyfill = false;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js
index 407a0a662c..9153819ce5 100644
--- a/packages/shared/forks/ReactFeatureFlags.www.js
+++ b/packages/shared/forks/ReactFeatureFlags.www.js
@@ -17,7 +17,6 @@ export const {
   debugRenderPhaseSideEffectsForStrictMode,
   warnAboutDeprecatedLifecycles,
   replayFailedUnitOfWorkWithInvokeGuardedCallback,
-  alwaysUseRequestIdleCallbackPolyfill,
 } = require('ReactFeatureFlags');
 
 // The rest of the flags are static for better dead code elimination.

From 1673485720d9ac172fcf1f8628a004a4990bf4f4 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Mon, 23 Apr 2018 18:44:14 -0700
Subject: [PATCH 009/277] Revert stray console.log

---
 packages/react-scheduler/src/ReactScheduler.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index 49169c6396..362a3f34b7 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -170,7 +170,6 @@ if (!ExecutionEnvironment.canUseDOM) {
   window.addEventListener('message', idleTick, false);
 
   const animationTick = function(rafTime) {
-    console.log('animationTick called and rafTime is ', rafTime);
     isAnimationFrameScheduled = false;
     let nextFrameTime = rafTime - frameDeadline + activeFrameTime;
     if (

From 09a14eacd45993cfc9fb623a9ee14a924f3ce483 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Mon, 23 Apr 2018 19:38:07 -0700
Subject: [PATCH 010/277] Update bundle sizes

---
 scripts/rollup/results.json | 289 +++++++++++++++++++++++++++++-------
 1 file changed, 239 insertions(+), 50 deletions(-)

diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index 0383f623b4..67107645c5 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -4,8 +4,8 @@
       "filename": "react.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react",
-      "size": 56545,
-      "gzip": 15535
+      "size": 56795,
+      "gzip": 15603
     },
     {
       "filename": "react.production.min.js",
@@ -18,8 +18,8 @@
       "filename": "react.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react",
-      "size": 46962,
-      "gzip": 13128
+      "size": 47210,
+      "gzip": 13192
     },
     {
       "filename": "react.production.min.js",
@@ -46,29 +46,29 @@
       "filename": "react-dom.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-dom",
-      "size": 623901,
-      "gzip": 143779
+      "size": 626353,
+      "gzip": 144739
     },
     {
       "filename": "react-dom.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-dom",
-      "size": 102609,
-      "gzip": 32741
+      "size": 102821,
+      "gzip": 32649
     },
     {
       "filename": "react-dom.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 607898,
-      "gzip": 139520
+      "size": 610354,
+      "gzip": 140504
     },
     {
       "filename": "react-dom.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
-      "size": 101020,
-      "gzip": 31842
+      "size": 101220,
+      "gzip": 31815
     },
     {
       "filename": "ReactDOM-dev.js",
@@ -88,7 +88,7 @@
       "filename": "react-dom-test-utils.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-dom",
-      "size": 41729,
+      "size": 41728,
       "gzip": 11969
     },
     {
@@ -102,8 +102,8 @@
       "filename": "react-dom-test-utils.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 36466,
-      "gzip": 10518
+      "size": 36465,
+      "gzip": 10517
     },
     {
       "filename": "react-dom-test-utils.production.min.js",
@@ -165,8 +165,8 @@
       "filename": "react-dom-server.browser.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-dom",
-      "size": 103764,
-      "gzip": 27110
+      "size": 103762,
+      "gzip": 27108
     },
     {
       "filename": "react-dom-server.browser.production.min.js",
@@ -179,8 +179,8 @@
       "filename": "react-dom-server.browser.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 92808,
-      "gzip": 24792
+      "size": 92806,
+      "gzip": 24789
     },
     {
       "filename": "react-dom-server.browser.production.min.js",
@@ -207,8 +207,8 @@
       "filename": "react-dom-server.node.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 94776,
-      "gzip": 25351
+      "size": 94774,
+      "gzip": 25349
     },
     {
       "filename": "react-dom-server.node.production.min.js",
@@ -221,29 +221,29 @@
       "filename": "react-art.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-art",
-      "size": 422274,
-      "gzip": 91610
+      "size": 424539,
+      "gzip": 92383
     },
     {
       "filename": "react-art.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-art",
-      "size": 92654,
-      "gzip": 28286
+      "size": 92908,
+      "gzip": 28133
     },
     {
       "filename": "react-art.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-art",
-      "size": 346329,
-      "gzip": 72375
+      "size": 348598,
+      "gzip": 73299
     },
     {
       "filename": "react-art.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-art",
-      "size": 56356,
-      "gzip": 17279
+      "size": 56579,
+      "gzip": 17175
     },
     {
       "filename": "ReactART-dev.js",
@@ -291,29 +291,29 @@
       "filename": "react-test-renderer.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-test-renderer",
-      "size": 354126,
-      "gzip": 74269
+      "size": 356387,
+      "gzip": 74965
     },
     {
       "filename": "react-test-renderer.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-test-renderer",
-      "size": 56085,
-      "gzip": 17115
+      "size": 56480,
+      "gzip": 17088
     },
     {
       "filename": "react-test-renderer.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-test-renderer",
-      "size": 344731,
-      "gzip": 71384
+      "size": 346996,
+      "gzip": 72227
     },
     {
       "filename": "react-test-renderer.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-test-renderer",
-      "size": 55313,
-      "gzip": 16741
+      "size": 55696,
+      "gzip": 16727
     },
     {
       "filename": "ReactTestRenderer-dev.js",
@@ -361,49 +361,49 @@
       "filename": "react-noop-renderer.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-noop-renderer",
-      "size": 18834,
-      "gzip": 5201
+      "size": 18663,
+      "gzip": 5148
     },
     {
       "filename": "react-noop-renderer.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-noop-renderer",
-      "size": 6618,
-      "gzip": 2600
+      "size": 6521,
+      "gzip": 2566
     },
     {
       "filename": "react-reconciler.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-reconciler",
-      "size": 324645,
-      "gzip": 66734
+      "size": 326858,
+      "gzip": 67568
     },
     {
       "filename": "react-reconciler.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-reconciler",
-      "size": 48036,
-      "gzip": 14640
+      "size": 48375,
+      "gzip": 14567
     },
     {
       "filename": "react-reconciler-persistent.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-reconciler",
-      "size": 323964,
-      "gzip": 66489
+      "size": 326178,
+      "gzip": 67326
     },
     {
       "filename": "react-reconciler-persistent.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-reconciler",
-      "size": 46925,
-      "gzip": 14421
+      "size": 47268,
+      "gzip": 14446
     },
     {
       "filename": "react-reconciler-reflection.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-reconciler",
-      "size": 11327,
+      "size": 11326,
       "gzip": 3505
     },
     {
@@ -496,6 +496,195 @@
       "packageName": "create-subscription",
       "size": 2599,
       "gzip": 1240
+    },
+    {
+      "filename": "React-dev.js",
+      "bundleType": "FB_WWW_DEV",
+      "packageName": "react",
+      "size": 47216,
+      "gzip": 12859
+    },
+    {
+      "filename": "React-prod.js",
+      "bundleType": "FB_WWW_PROD",
+      "packageName": "react",
+      "size": 13749,
+      "gzip": 3815
+    },
+    {
+      "filename": "ReactDOM-dev.js",
+      "bundleType": "FB_WWW_DEV",
+      "packageName": "react-dom",
+      "size": 635369,
+      "gzip": 143277
+    },
+    {
+      "filename": "ReactDOM-prod.js",
+      "bundleType": "FB_WWW_PROD",
+      "packageName": "react-dom",
+      "size": 291114,
+      "gzip": 53216
+    },
+    {
+      "filename": "ReactTestUtils-dev.js",
+      "bundleType": "FB_WWW_DEV",
+      "packageName": "react-dom",
+      "size": 37779,
+      "gzip": 10710
+    },
+    {
+      "filename": "ReactDOMUnstableNativeDependencies-dev.js",
+      "bundleType": "FB_WWW_DEV",
+      "packageName": "react-dom",
+      "size": 58465,
+      "gzip": 14911
+    },
+    {
+      "filename": "ReactDOMUnstableNativeDependencies-prod.js",
+      "bundleType": "FB_WWW_PROD",
+      "packageName": "react-dom",
+      "size": 26974,
+      "gzip": 5507
+    },
+    {
+      "filename": "ReactDOMServer-dev.js",
+      "bundleType": "FB_WWW_DEV",
+      "packageName": "react-dom",
+      "size": 96360,
+      "gzip": 24600
+    },
+    {
+      "filename": "ReactDOMServer-prod.js",
+      "bundleType": "FB_WWW_PROD",
+      "packageName": "react-dom",
+      "size": 32376,
+      "gzip": 7965
+    },
+    {
+      "filename": "ReactART-dev.js",
+      "bundleType": "FB_WWW_DEV",
+      "packageName": "react-art",
+      "size": 357056,
+      "gzip": 72841
+    },
+    {
+      "filename": "ReactART-prod.js",
+      "bundleType": "FB_WWW_PROD",
+      "packageName": "react-art",
+      "size": 171040,
+      "gzip": 28102
+    },
+    {
+      "filename": "ReactNativeRenderer-dev.js",
+      "bundleType": "RN_FB_DEV",
+      "packageName": "react-native-renderer",
+      "size": 470028,
+      "gzip": 100556
+    },
+    {
+      "filename": "ReactNativeRenderer-prod.js",
+      "bundleType": "RN_FB_PROD",
+      "packageName": "react-native-renderer",
+      "size": 222916,
+      "gzip": 37259
+    },
+    {
+      "filename": "ReactNativeRenderer-dev.js",
+      "bundleType": "RN_OSS_DEV",
+      "packageName": "react-native-renderer",
+      "size": 469772,
+      "gzip": 100493
+    },
+    {
+      "filename": "ReactNativeRenderer-prod.js",
+      "bundleType": "RN_OSS_PROD",
+      "packageName": "react-native-renderer",
+      "size": 222116,
+      "gzip": 37129
+    },
+    {
+      "filename": "ReactFabric-dev.js",
+      "bundleType": "RN_FB_DEV",
+      "packageName": "react-native-renderer",
+      "size": 452022,
+      "gzip": 96052
+    },
+    {
+      "filename": "ReactFabric-prod.js",
+      "bundleType": "RN_FB_PROD",
+      "packageName": "react-native-renderer",
+      "size": 207365,
+      "gzip": 34455
+    },
+    {
+      "filename": "ReactFabric-dev.js",
+      "bundleType": "RN_OSS_DEV",
+      "packageName": "react-native-renderer",
+      "size": 452057,
+      "gzip": 96067
+    },
+    {
+      "filename": "ReactFabric-prod.js",
+      "bundleType": "RN_OSS_PROD",
+      "packageName": "react-native-renderer",
+      "size": 207401,
+      "gzip": 34473
+    },
+    {
+      "filename": "ReactTestRenderer-dev.js",
+      "bundleType": "FB_WWW_DEV",
+      "packageName": "react-test-renderer",
+      "size": 355733,
+      "gzip": 71836
+    },
+    {
+      "filename": "ReactShallowRenderer-dev.js",
+      "bundleType": "FB_WWW_DEV",
+      "packageName": "react-test-renderer",
+      "size": 14759,
+      "gzip": 3631
+    },
+    {
+      "filename": "ReactIs-dev.js",
+      "bundleType": "FB_WWW_DEV",
+      "packageName": "react-is",
+      "size": 4263,
+      "gzip": 1220
+    },
+    {
+      "filename": "ReactIs-prod.js",
+      "bundleType": "FB_WWW_PROD",
+      "packageName": "react-is",
+      "size": 3414,
+      "gzip": 953
+    },
+    {
+      "filename": "react-scheduler.development.js",
+      "bundleType": "UMD_DEV",
+      "packageName": "react-scheduler",
+      "size": 10937,
+      "gzip": 3771
+    },
+    {
+      "filename": "react-scheduler.production.min.js",
+      "bundleType": "UMD_PROD",
+      "packageName": "react-scheduler",
+      "size": 1721,
+      "gzip": 873
+    },
+    {
+      "filename": "react-scheduler.development.js",
+      "bundleType": "NODE_DEV",
+      "packageName": "react-scheduler",
+      "size": 10741,
+      "gzip": 3720
+    },
+    {
+      "filename": "react-scheduler.production.min.js",
+      "bundleType": "NODE_PROD",
+      "packageName": "react-scheduler",
+      "size": 1792,
+      "gzip": 889
     }
   ]
 }
\ No newline at end of file

From 9c77ffb444598c32c8f92c8d79e406959a10445b Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Tue, 24 Apr 2018 08:54:31 -0700
Subject: [PATCH 011/277] Dedup conditional in ReactScheduler (#12680)

**what is the change?:**
We had a condition to set either 'performance.now' or 'Date.now' as the
'now' function.

Then later we had another conditional checking again if
'performance.now' was supported, and using it if so, otherwise falling
back to 'Date.now'.

More efficient to just use the 'now' shortcut defined above.

**why make this change?:**
Fewer lines, clearer code.

**test plan:**
Now that we have tests we can run them :)
---
 .../react-scheduler/src/ReactScheduler.js     | 28 +++++--------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index 362a3f34b7..b15e5f4428 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -100,27 +100,13 @@ if (!ExecutionEnvironment.canUseDOM) {
   let previousFrameTime = 33;
   let activeFrameTime = 33;
 
-  let frameDeadlineObject;
-  if (hasNativePerformanceNow) {
-    frameDeadlineObject = {
-      didTimeout: false,
-      timeRemaining() {
-        // We assume that if we have a performance timer that the rAF callback
-        // gets a performance timer value. Not sure if this is always true.
-        const remaining = frameDeadline - performance.now();
-        return remaining > 0 ? remaining : 0;
-      },
-    };
-  } else {
-    frameDeadlineObject = {
-      didTimeout: false,
-      timeRemaining() {
-        // Fallback to Date.now()
-        const remaining = frameDeadline - Date.now();
-        return remaining > 0 ? remaining : 0;
-      },
-    };
-  }
+  const frameDeadlineObject = {
+    didTimeout: false,
+    timeRemaining() {
+      const remaining = frameDeadline - now();
+      return remaining > 0 ? remaining : 0;
+    },
+  };
 
   // We use the postMessage trick to defer idle work until after the repaint.
   const messageKey =

From ec57d2994156ba5fcf794100968764bf25206629 Mon Sep 17 00:00:00 2001
From: Heaven <ne_smalltown@163.com>
Date: Fri, 27 Apr 2018 01:39:11 +0800
Subject: [PATCH 012/277] Remove redundant feature flag in the test due to
 https://github.com/facebook/react/pull/12117 (#12696)

---
 .../src/events/__tests__/ChangeEventPlugin-test.internal.js      | 1 -
 .../src/events/__tests__/SimpleEventPlugin-test.internal.js      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.internal.js b/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.internal.js
index 570ecf3238..51eb86eedb 100644
--- a/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.internal.js
+++ b/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.internal.js
@@ -475,7 +475,6 @@ describe('ChangeEventPlugin', () => {
     beforeEach(() => {
       jest.resetModules();
       ReactFeatureFlags = require('shared/ReactFeatureFlags');
-      ReactFeatureFlags.enableAsyncSubtreeAPI = true;
       ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
       ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
       ReactDOM = require('react-dom');
diff --git a/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js b/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js
index 1b39dd1e47..dc6087e1d3 100644
--- a/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js
+++ b/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js
@@ -246,7 +246,6 @@ describe('SimpleEventPlugin', function() {
     beforeEach(() => {
       jest.resetModules();
       ReactFeatureFlags = require('shared/ReactFeatureFlags');
-      ReactFeatureFlags.enableAsyncSubtreeAPI = true;
       ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
       ReactDOM = require('react-dom');
     });

From d883d59863483a1fb9f3dd0455022e4c6e1a41d5 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 26 Apr 2018 19:47:34 +0100
Subject: [PATCH 013/277] forwardRef() components should not re-render on deep
 setState() (#12690)

* Add a failing test for forwardRef memoization

* Memoize forwardRef props and bail out on strict equality

* Bail out only when ref matches the current ref
---
 .../src/ReactFiberBeginWork.js                | 18 +++++++---
 .../src/__tests__/forwardRef-test.internal.js | 33 +++++++++++++++++++
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index f2a8ad1f2f..3c20dceacf 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -169,12 +169,20 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
 
   function updateForwardRef(current, workInProgress) {
     const render = workInProgress.type.render;
-    const nextChildren = render(
-      workInProgress.pendingProps,
-      workInProgress.ref,
-    );
+    const nextProps = workInProgress.pendingProps;
+    const ref = workInProgress.ref;
+    if (hasLegacyContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (workInProgress.memoizedProps === nextProps) {
+      const currentRef = current !== null ? current.ref : null;
+      if (ref === currentRef) {
+        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      }
+    }
+    const nextChildren = render(nextProps, ref);
     reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextProps);
     return workInProgress.child;
   }
 
diff --git a/packages/react/src/__tests__/forwardRef-test.internal.js b/packages/react/src/__tests__/forwardRef-test.internal.js
index 5780dbd054..a578ae7368 100644
--- a/packages/react/src/__tests__/forwardRef-test.internal.js
+++ b/packages/react/src/__tests__/forwardRef-test.internal.js
@@ -232,6 +232,39 @@ describe('forwardRef', () => {
     expect(ref.current).toBe(null);
   });
 
+  it('should not re-run the render callback on a deep setState', () => {
+    let inst;
+
+    class Inner extends React.Component {
+      render() {
+        ReactNoop.yield('Inner');
+        inst = this;
+        return <div ref={this.props.forwardedRef} />;
+      }
+    }
+
+    function Middle(props) {
+      ReactNoop.yield('Middle');
+      return <Inner {...props} />;
+    }
+
+    const Forward = React.forwardRef((props, ref) => {
+      ReactNoop.yield('Forward');
+      return <Middle {...props} forwardedRef={ref} />;
+    });
+
+    function App() {
+      ReactNoop.yield('App');
+      return <Forward />;
+    }
+
+    ReactNoop.render(<App />);
+    expect(ReactNoop.flush()).toEqual(['App', 'Forward', 'Middle', 'Inner']);
+
+    inst.setState({});
+    expect(ReactNoop.flush()).toEqual(['Inner']);
+  });
+
   it('should warn if not provided a callback during creation', () => {
     expect(() => React.forwardRef(undefined)).toWarnDev(
       'forwardRef requires a render function but was given undefined.',

From 7c3932857195d0cfba2379875b65f1bd1fae39fd Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 26 Apr 2018 20:59:17 +0100
Subject: [PATCH 014/277] Don't bail on new context Provider if a legacy
 provider rendered above (#12586)

* Don't bail on new context Provider if a legacy provider rendered above

* Avoid an extra variable
---
 .../src/ReactFiberBeginWork.js                |  8 ++-
 .../ReactNewContext-test.internal.js          | 66 +++++++++++++++++++
 2 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 3c20dceacf..527e6787d1 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -859,8 +859,10 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
 
     const newProps = workInProgress.pendingProps;
     const oldProps = workInProgress.memoizedProps;
+    let canBailOnProps = true;
 
     if (hasLegacyContextChanged()) {
+      canBailOnProps = false;
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (oldProps === newProps) {
@@ -893,7 +895,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     } else {
       if (oldProps.value === newProps.value) {
         // No change. Bailout early if children are the same.
-        if (oldProps.children === newProps.children) {
+        if (oldProps.children === newProps.children && canBailOnProps) {
           workInProgress.stateNode = 0;
           pushProvider(workInProgress);
           return bailoutOnAlreadyFinishedWork(current, workInProgress);
@@ -910,7 +912,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
           (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
         ) {
           // No change. Bailout early if children are the same.
-          if (oldProps.children === newProps.children) {
+          if (oldProps.children === newProps.children && canBailOnProps) {
             workInProgress.stateNode = 0;
             pushProvider(workInProgress);
             return bailoutOnAlreadyFinishedWork(current, workInProgress);
@@ -933,7 +935,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
 
           if (changedBits === 0) {
             // No change. Bailout early if children are the same.
-            if (oldProps.children === newProps.children) {
+            if (oldProps.children === newProps.children && canBailOnProps) {
               workInProgress.stateNode = 0;
               pushProvider(workInProgress);
               return bailoutOnAlreadyFinishedWork(current, workInProgress);
diff --git a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
index 0a4763a4fe..db2703d3a7 100644
--- a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
@@ -847,6 +847,72 @@ describe('ReactNewContext', () => {
     expect(ReactNoop.getChildren()).toEqual([span('Child')]);
   });
 
+  it('provider does not bail out if legacy context changed above', () => {
+    const Context = React.createContext(0);
+
+    function Child() {
+      ReactNoop.yield('Child');
+      return <span prop="Child" />;
+    }
+
+    const children = <Child />;
+
+    class LegacyProvider extends React.Component {
+      static childContextTypes = {
+        legacyValue: () => {},
+      };
+      state = {legacyValue: 1};
+      getChildContext() {
+        return {legacyValue: this.state.legacyValue};
+      }
+      render() {
+        ReactNoop.yield('LegacyProvider');
+        return this.props.children;
+      }
+    }
+
+    class App extends React.Component {
+      state = {value: 1};
+      render() {
+        ReactNoop.yield('App');
+        return (
+          <Context.Provider value={this.state.value}>
+            {this.props.children}
+          </Context.Provider>
+        );
+      }
+    }
+
+    const legacyProviderRef = React.createRef();
+    const appRef = React.createRef();
+
+    // Initial mount
+    ReactNoop.render(
+      <LegacyProvider ref={legacyProviderRef}>
+        <App ref={appRef} value={1}>
+          {children}
+        </App>
+      </LegacyProvider>,
+    );
+    expect(ReactNoop.flush()).toEqual(['LegacyProvider', 'App', 'Child']);
+    expect(ReactNoop.getChildren()).toEqual([span('Child')]);
+
+    // Update App with same value (should bail out)
+    appRef.current.setState({value: 1});
+    expect(ReactNoop.flush()).toEqual(['App']);
+    expect(ReactNoop.getChildren()).toEqual([span('Child')]);
+
+    // Update LegacyProvider (should not bail out)
+    legacyProviderRef.current.setState({value: 1});
+    expect(ReactNoop.flush()).toEqual(['LegacyProvider', 'App', 'Child']);
+    expect(ReactNoop.getChildren()).toEqual([span('Child')]);
+
+    // Update App with same value (should bail out)
+    appRef.current.setState({value: 1});
+    expect(ReactNoop.flush()).toEqual(['App']);
+    expect(ReactNoop.getChildren()).toEqual([span('Child')]);
+  });
+
   it('consumer bails out if value is unchanged and something above bailed out', () => {
     const Context = React.createContext(0);
 

From 045d4f166db6023550b76da6a83fe595a6cdf2f2 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Sat, 28 Apr 2018 01:52:48 +0100
Subject: [PATCH 015/277] Fix a context propagation bug (#12708)

* Fix a context propagation bug

* Add a regression test
---
 .../src/ReactFiberBeginWork.js                |  2 +
 .../ReactNewContext-test.internal.js          | 76 +++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 527e6787d1..76f93beac0 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -838,6 +838,8 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
           }
           let sibling = nextFiber.sibling;
           if (sibling !== null) {
+            // Set the return pointer of the sibling to the work-in-progress fiber.
+            sibling.return = nextFiber.return;
             nextFiber = sibling;
             break;
           }
diff --git a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
index db2703d3a7..480b4b0021 100644
--- a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
@@ -1055,6 +1055,82 @@ describe('ReactNewContext', () => {
     ReactNoop.flush();
   });
 
+  // This is a regression case for https://github.com/facebook/react/issues/12686
+  it('does not skip some siblings', () => {
+    const Context = React.createContext(0);
+
+    class App extends React.Component {
+      state = {
+        step: 0,
+      };
+
+      render() {
+        ReactNoop.yield('App');
+        return (
+          <Context.Provider value={this.state.step}>
+            <StaticContent />
+            {this.state.step > 0 && <Indirection />}
+          </Context.Provider>
+        );
+      }
+    }
+
+    class StaticContent extends React.PureComponent {
+      render() {
+        return (
+          <React.Fragment>
+            <React.Fragment>
+              <span prop="static 1" />
+              <span prop="static 2" />
+            </React.Fragment>
+          </React.Fragment>
+        );
+      }
+    }
+
+    class Indirection extends React.PureComponent {
+      render() {
+        return <Consumer />;
+      }
+    }
+
+    function Consumer() {
+      return (
+        <Context.Consumer>
+          {value => {
+            ReactNoop.yield('Consumer');
+            return <span prop={value} />;
+          }}
+        </Context.Consumer>
+      );
+    }
+
+    // Initial mount
+    let inst;
+    ReactNoop.render(<App ref={ref => (inst = ref)} />);
+    expect(ReactNoop.flush()).toEqual(['App']);
+    expect(ReactNoop.getChildren()).toEqual([
+      span('static 1'),
+      span('static 2'),
+    ]);
+    // Update the first time
+    inst.setState({step: 1});
+    expect(ReactNoop.flush()).toEqual(['App', 'Consumer']);
+    expect(ReactNoop.getChildren()).toEqual([
+      span('static 1'),
+      span('static 2'),
+      span(1),
+    ]);
+    // Update the second time
+    inst.setState({step: 2});
+    expect(ReactNoop.flush()).toEqual(['App', 'Consumer']);
+    expect(ReactNoop.getChildren()).toEqual([
+      span('static 1'),
+      span('static 2'),
+      span(2),
+    ]);
+  });
+
   describe('fuzz test', () => {
     const Fragment = React.Fragment;
     const contextKeys = ['A', 'B', 'C', 'D', 'E', 'F', 'G'];

From dcc854bcc3c940ca583565ce25200ca618c05bf0 Mon Sep 17 00:00:00 2001
From: Airam <airamrguez@users.noreply.github.com>
Date: Sat, 28 Apr 2018 21:52:30 +0200
Subject: [PATCH 016/277] prevent removing attributes on custom component tags
 (#12702)

---
 .../react-dom/src/__tests__/DOMPropertyOperations-test.js   | 6 ++++++
 packages/react-dom/src/shared/DOMProperty.js                | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js b/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js
index aabb3e995f..08874222d5 100644
--- a/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js
+++ b/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js
@@ -155,5 +155,11 @@ describe('DOMPropertyOperations', () => {
       expect(container.firstChild.getAttribute('value')).toBe('foo');
       expect(container.firstChild.value).toBe('foo');
     });
+
+    it('should not remove attributes for custom component tag', () => {
+      const container = document.createElement('div');
+      ReactDOM.render(<my-icon size="5px" />, container);
+      expect(container.firstChild.getAttribute('size')).toBe('5px');
+    });
   });
 });
diff --git a/packages/react-dom/src/shared/DOMProperty.js b/packages/react-dom/src/shared/DOMProperty.js
index dd2c8f6e3a..b01c069dba 100644
--- a/packages/react-dom/src/shared/DOMProperty.js
+++ b/packages/react-dom/src/shared/DOMProperty.js
@@ -157,6 +157,9 @@ export function shouldRemoveAttribute(
   ) {
     return true;
   }
+  if (isCustomComponentTag) {
+    return false;
+  }
   if (propertyInfo !== null) {
     switch (propertyInfo.type) {
       case BOOLEAN:

From 9a9f54720fda4c69e35503b64a215e6235cfe07d Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 30 Apr 2018 14:30:37 +0100
Subject: [PATCH 017/277] Remove ES3-specific transforms (#12716)

---
 .babelrc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.babelrc b/.babelrc
index f2c5329116..3879b06aee 100644
--- a/.babelrc
+++ b/.babelrc
@@ -18,8 +18,6 @@
     ["transform-es2015-spread", { "loose": true }],
     "transform-es2015-parameters",
     ["transform-es2015-destructuring", { "loose": true }],
-    ["transform-es2015-block-scoping", { "throwIfClosureRequired": true }],
-    "transform-es3-member-expression-literals",
-    "transform-es3-property-literals"
+    ["transform-es2015-block-scoping", { "throwIfClosureRequired": true }]
   ]
 }

From 7dd4ca2911d742f9b5c457ce2d010432fa2d6578 Mon Sep 17 00:00:00 2001
From: Toru Kobayashi <koba0004@gmail.com>
Date: Tue, 1 May 2018 01:04:40 +0900
Subject: [PATCH 018/277] Call getDerivedStateFromProps even for setState of
 ShallowRenderer (#12676)

---
 packages/react-test-renderer/src/ReactShallowRenderer.js       | 3 +--
 .../src/__tests__/ReactShallowRenderer-test.js                 | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js
index 131db2d417..49be844e8b 100644
--- a/packages/react-test-renderer/src/ReactShallowRenderer.js
+++ b/packages/react-test-renderer/src/ReactShallowRenderer.js
@@ -186,9 +186,8 @@ class ReactShallowRenderer {
           this._instance.UNSAFE_componentWillReceiveProps(props, context);
         }
       }
-
-      this._updateStateFromStaticLifecycle(props);
     }
+    this._updateStateFromStaticLifecycle(props);
 
     // Read state after cWRP in case it calls setState
     const state = this._newState || oldState;
diff --git a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
index 7e60bde003..59ea0d9c69 100644
--- a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
@@ -94,7 +94,7 @@ describe('ReactShallowRenderer', () => {
     const instance = shallowRenderer.getMountedInstance();
     instance.setState({});
 
-    expect(logs).toEqual(['shouldComponentUpdate']);
+    expect(logs).toEqual(['getDerivedStateFromProps', 'shouldComponentUpdate']);
 
     logs.splice(0);
 

From e0ca51a85d7c5b01c1efa7edb40080770d508cad Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 1 May 2018 19:55:06 +0100
Subject: [PATCH 019/277] Make React.forwardRef() components discoverable by
 TestRenderer traversal (#12725)

---
 .../react-test-renderer/src/ReactTestRenderer.js  |  3 ++-
 .../__tests__/ReactTestRendererTraversal-test.js  | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js
index 977a1f5c68..d3ef7aff4f 100644
--- a/packages/react-test-renderer/src/ReactTestRenderer.js
+++ b/packages/react-test-renderer/src/ReactTestRenderer.js
@@ -411,6 +411,7 @@ const validWrapperTypes = new Set([
   FunctionalComponent,
   ClassComponent,
   HostComponent,
+  ForwardRef,
 ]);
 
 class ReactTestInstance {
@@ -475,6 +476,7 @@ class ReactTestInstance {
         case FunctionalComponent:
         case ClassComponent:
         case HostComponent:
+        case ForwardRef:
           children.push(wrapFiber(node));
           break;
         case HostText:
@@ -484,7 +486,6 @@ class ReactTestInstance {
         case ContextProvider:
         case ContextConsumer:
         case Mode:
-        case ForwardRef:
           descend = true;
           break;
         default:
diff --git a/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js b/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js
index 587a094f8a..e6f3909b0b 100644
--- a/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js
@@ -37,6 +37,7 @@ describe('ReactTestRendererTraversal', () => {
               <View void="void" />
               <View void="void" />
             </ExampleNull>
+            <ExampleForwardRef qux="qux" />
           </View>
         </View>
       );
@@ -48,13 +49,17 @@ describe('ReactTestRendererTraversal', () => {
   const ExampleFn = props => <View baz="baz" />;
   const ExampleNull = props => null;
 
+  const ExampleForwardRef = React.forwardRef((props, ref) => (
+    <View {...props} ref={ref} />
+  ));
+
   it('initializes', () => {
     const render = ReactTestRenderer.create(<Example />);
     const hasFooProp = node => node.props.hasOwnProperty('foo');
 
     // assert .props, .type and .parent attributes
     const foo = render.root.find(hasFooProp);
-    expect(foo.props.children).toHaveLength(7);
+    expect(foo.props.children).toHaveLength(8);
     expect(foo.type).toBe(View);
     expect(render.root.parent).toBe(null);
     expect(foo.children[0].parent).toBe(foo);
@@ -116,14 +121,16 @@ describe('ReactTestRendererTraversal', () => {
 
     expect(() => render.root.findByType(ExampleFn)).not.toThrow(); // 1 match
     expect(() => render.root.findByType(View)).not.toThrow(); // 1 match
+    expect(() => render.root.findByType(ExampleForwardRef)).not.toThrow(); // 1 match
     // note: there are clearly multiple <View /> in general, but there
     //       is only one being rendered at root node level
     expect(() => render.root.findByType(ExampleNull)).toThrow(); // 2 matches
 
     expect(render.root.findAllByType(ExampleFn)).toHaveLength(1);
     expect(render.root.findAllByType(View, {deep: false})).toHaveLength(1);
-    expect(render.root.findAllByType(View)).toHaveLength(7);
+    expect(render.root.findAllByType(View)).toHaveLength(8);
     expect(render.root.findAllByType(ExampleNull)).toHaveLength(2);
+    expect(render.root.findAllByType(ExampleForwardRef)).toHaveLength(1);
 
     const nulls = render.root.findAllByType(ExampleNull);
     expect(nulls[0].findAllByType(View)).toHaveLength(0);
@@ -138,17 +145,21 @@ describe('ReactTestRendererTraversal', () => {
     const foo = 'foo';
     const bar = 'bar';
     const baz = 'baz';
+    const qux = 'qux';
 
     expect(() => render.root.findByProps({foo})).not.toThrow(); // 1 match
     expect(() => render.root.findByProps({bar})).toThrow(); // >1 matches
     expect(() => render.root.findByProps({baz})).toThrow(); // >1 matches
+    expect(() => render.root.findByProps({qux})).not.toThrow(); // 1 match
 
     expect(render.root.findAllByProps({foo}, {deep: false})).toHaveLength(1);
     expect(render.root.findAllByProps({bar}, {deep: false})).toHaveLength(5);
     expect(render.root.findAllByProps({baz}, {deep: false})).toHaveLength(2);
+    expect(render.root.findAllByProps({qux}, {deep: false})).toHaveLength(1);
 
     expect(render.root.findAllByProps({foo})).toHaveLength(2);
     expect(render.root.findAllByProps({bar})).toHaveLength(9);
     expect(render.root.findAllByProps({baz})).toHaveLength(4);
+    expect(render.root.findAllByProps({qux})).toHaveLength(3);
   });
 });

From 200357596aed51d5a71cac0996e3a0510e507156 Mon Sep 17 00:00:00 2001
From: Sophie Alpert <git@sophiebits.com>
Date: Tue, 1 May 2018 12:46:17 -0700
Subject: [PATCH 020/277] Add error when running jest directly (#12726)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
$ jest
 FAIL  scripts/jest/dont-run-jest-directly.js
  ● Test suite failed to run

    Don't run `jest` directly. Run `yarn test` instead.

    > 1 | throw new Error("Don't run `jest` directly. Run `yarn test` instead.");
      2 |

      at Object.<anonymous> (scripts/jest/dont-run-jest-directly.js:1:96)

Test Suites: 1 failed, 1 total
Tests:       0 total
Snapshots:   0 total
Time:        0.866s
Ran all test suites.
```
---
 package.json                           | 3 +++
 scripts/jest/dont-run-jest-directly.js | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 scripts/jest/dont-run-jest-directly.js

diff --git a/package.json b/package.json
index 01f0a2781f..9b625ea397 100644
--- a/package.json
+++ b/package.json
@@ -103,6 +103,9 @@
   "devEngines": {
     "node": "8.x || 9.x"
   },
+  "jest": {
+    "testRegex": "/scripts/jest/dont-run-jest-directly\\.js$"
+  },
   "scripts": {
     "build": "npm run version-check && node ./scripts/rollup/build.js",
     "flow-coverage": "flow-coverage-report --config ./.flowcoverage",
diff --git a/scripts/jest/dont-run-jest-directly.js b/scripts/jest/dont-run-jest-directly.js
new file mode 100644
index 0000000000..672d07caec
--- /dev/null
+++ b/scripts/jest/dont-run-jest-directly.js
@@ -0,0 +1,3 @@
+'use strict';
+
+throw new Error("Don't run `jest` directly. Run `yarn test` instead.");

From ad7cd686670d8e519789fb226d8ff9175fb69370 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 1 May 2018 21:04:20 +0100
Subject: [PATCH 021/277] Rename internal property to fix React DevTools
 (#12727)

---
 packages/react-reconciler/src/ReactFiberBeginWork.js  | 6 ++++--
 packages/react-reconciler/src/ReactFiberReconciler.js | 4 +++-
 packages/react-reconciler/src/ReactFiberUnwindWork.js | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 76f93beac0..ce93bccfdd 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -417,7 +417,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     if (updateQueue !== null) {
       const nextProps = workInProgress.pendingProps;
       const prevState = workInProgress.memoizedState;
-      const prevChildren = prevState !== null ? prevState.children : null;
+      const prevChildren = prevState !== null ? prevState.element : null;
       processUpdateQueue(
         workInProgress,
         updateQueue,
@@ -426,7 +426,9 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         renderExpirationTime,
       );
       const nextState = workInProgress.memoizedState;
-      const nextChildren = nextState.children;
+      // Caution: React DevTools currently depends on this property
+      // being called "element".
+      const nextChildren = nextState.element;
 
       if (nextChildren === prevChildren) {
         // If the state is the same as before, that's a bailout because we had
diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js
index 519003f177..a3f38bc394 100644
--- a/packages/react-reconciler/src/ReactFiberReconciler.js
+++ b/packages/react-reconciler/src/ReactFiberReconciler.js
@@ -340,7 +340,9 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     }
 
     const update = createUpdate(expirationTime);
-    update.payload = {children: element};
+    // Caution: React DevTools currently depends on this property
+    // being called "element".
+    update.payload = {element};
 
     callback = callback === undefined ? null : callback;
     if (callback !== null) {
diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index e59324c3c4..05a8a1856d 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -67,7 +67,9 @@ export default function<C, CX>(
     const update = createUpdate(expirationTime);
     // Unmount the root by rendering null.
     update.tag = CaptureUpdate;
-    update.payload = {children: null};
+    // Caution: React DevTools currently depends on this property
+    // being called "element".
+    update.payload = {element: null};
     const error = errorInfo.value;
     update.callback = () => {
       onUncaughtError(error);

From 25dda90c1ecb0c662ab06e2c80c1ee31e0ae9d36 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 2 May 2018 16:35:16 +0100
Subject: [PATCH 022/277] Mark context consumers with PerformedWork effect on
 render (#12729)

* Mark new component types with PerformedWork effect

* Don't do it for ForwardRef

Since this has some overhead and ForwardRef is likely going to be used around context, let's skip it.
We don't highlight ForwardRef alone in DevTools anyway.
---
 packages/react-reconciler/src/ReactFiberBeginWork.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index ce93bccfdd..5aa7ffc446 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -1023,6 +1023,8 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     }
 
     const newChildren = render(newValue);
+    // React DevTools reads this flag.
+    workInProgress.effectTag |= PerformedWork;
     reconcileChildren(current, workInProgress, newChildren);
     return workInProgress.child;
   }

From 0bf24cc83eb8a899c73a96f00c2e63d2db680129 Mon Sep 17 00:00:00 2001
From: Toru Kobayashi <koba0004@gmail.com>
Date: Tue, 8 May 2018 09:31:33 +0900
Subject: [PATCH 023/277] setState returning null and undefined is no-op on the
 ShallowRenderer (#12756)

---
 .../src/ReactShallowRenderer.js               |  5 ++++
 .../__tests__/ReactShallowRenderer-test.js    | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js
index 49be844e8b..9cafeeb2f1 100644
--- a/packages/react-test-renderer/src/ReactShallowRenderer.js
+++ b/packages/react-test-renderer/src/ReactShallowRenderer.js
@@ -301,6 +301,11 @@ class Updater {
       partialState = partialState(currentState, publicInstance.props);
     }
 
+    // Null and undefined are treated as no-ops.
+    if (partialState === null || partialState === undefined) {
+      return;
+    }
+
     this._renderer._newState = {
       ...currentState,
       ...partialState,
diff --git a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
index 59ea0d9c69..b20f316d9e 100644
--- a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
@@ -1305,4 +1305,32 @@ describe('ReactShallowRenderer', () => {
       'UNSAFE_componentWillUpdate',
     ]);
   });
+
+  it('should stop the upade when setState returns null or undefined', () => {
+    const log = [];
+    let instance;
+    class Component extends React.Component {
+      constructor(props) {
+        super(props);
+        this.state = {
+          count: 0,
+        };
+      }
+      render() {
+        log.push('render');
+        instance = this;
+        return null;
+      }
+    }
+    const shallowRenderer = createRenderer();
+    shallowRenderer.render(<Component />);
+    log.length = 0;
+    instance.setState(() => null);
+    instance.setState(() => undefined);
+    instance.setState(null);
+    instance.setState(undefined);
+    expect(log).toEqual([]);
+    instance.setState(state => ({count: state.count + 1}));
+    expect(log).toEqual(['render']);
+  });
 });

From 3fb8be5c30d8f8ec01a4213eb621d5e7c1a6295c Mon Sep 17 00:00:00 2001
From: bee0060 <bee0060@126.com>
Date: Tue, 8 May 2018 08:46:42 +0800
Subject: [PATCH 024/277] Minor fix params description for addPercent function
 (#12669)

---
 dangerfile.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dangerfile.js b/dangerfile.js
index c3ac638d71..a892b10b05 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -53,7 +53,8 @@ function generateMDTable(headers, body) {
 
 /**
  * Generates a user-readable string from a percentage change
- * @param {string[]} headers
+ * @param {number} change
+ * @param {boolean} includeEmoji
  */
 function addPercent(change, includeEmoji) {
   if (!isFinite(change)) {

From a9abd27e4f5aa1e68bd6035be901299327279ee2 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Wed, 9 May 2018 15:28:13 -0700
Subject: [PATCH 025/277] [schedule] Support multiple callbacks in scheduler
 (#12746)

* Support using id to cancel scheduled callback

**what is the change?:**
see title

**why make this change?:**
Once we support multiple callbacks you will need to use the id to
specify which callback you mean.

**test plan:**
Added a test, ran all tests, lint, etc.

* ran prettier

* fix lint

* Use object for storing callback info in scheduler

* Wrap initial test in a describe block

* Support multiple callbacks in `ReactScheduler`

**what is the change?:**
We keep a queue of callbacks instead of just one at a time, and call
them in order first by their timeoutTime and then by the order which
they were scheduled in.

**why make this change?:**
We plan on using this module to coordinate JS outside of React, so we
will need to schedule more than one callback at a time.

**test plan:**
Added a boatload of shiny new tests. :)

Plus ran all the old ones.

NOTE: The tests do not yet cover the vital logic of callbacks timing
out, and later commits will add the missing test coverage.

* Heuristic to avoid looking for timed out callbacks when none timed out

**what is the change?:**
Tracks the current soonest timeOut time for all scheduled callbacks.

**why make this change?:**
We were checking every scheduled callback to see if it timed out on
every tick. It's more efficient to skip that O(n) check if we know that
none have timed out.

**test plan:**
Ran existing tests.

Will write new tests to cover timeout behavior in more detail soon.

* Put multiple callback support under a disabled feature flag

**what is the change?:**
See title

**why make this change?:**
We don't have error handling in place yet, so should maintain the old
behavior until that is in place.

But want to get this far to continue making incremental changes.

**test plan:**
Updated and ran tests.

* Hide support for multiple callbacks under a feature flag

**what is the change?:**
see title

**why make this change?:**
We haven't added error handling yet, so should not expose this feature.

**test plan:**
Ran all tests, temporarily split out the tests for multiple callbacks
into separate file. Will recombine once we remove the flag.

* Fix nits from code review

See comments on https://github.com/facebook/react/pull/12743

* update checklist in comments

* Remove nested loop which calls additional timed out callbacks

**what is the change?:**
We used to re-run any callbacks which time out whilst other callbacks
are running, but now we will only check once for timed out callbacks
then then run them.

**why make this change?:**
To simplify the code and the behavior of this module.

**test plan:**
Ran all existing tests.

* Remove feature flag

**what is the change?:**
see title

**why make this change?:**
Because only React is using this, and it sounds like async. rendering
won't hit any different behavior due to these changes.

**test plan:**
Existing tests pass, and this allowed us to recombine all tests to run
in both 'test' and 'test-build' modes.

* remove outdated file

* fix typo
---
 .../react-scheduler/src/ReactScheduler.js     | 172 +++++++++++++-----
 .../src/__tests__/ReactScheduler-test.js      | 171 ++++++++++++++++-
 .../shared/forks/ReactFeatureFlags.www.js     |   4 +-
 3 files changed, 293 insertions(+), 54 deletions(-)

diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index b15e5f4428..2b0fa9f171 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -14,8 +14,8 @@
  * control than requestAnimationFrame and requestIdleCallback.
  * Current TODO items:
  * X- Pull out the rIC polyfill built into React
- * - Initial test coverage
- * - Support for multiple callbacks
+ * X- Initial test coverage
+ * X- Support for multiple callbacks
  * - Support for two priorities; serial and deferred
  * - Better test coverage
  * - Better docblock
@@ -31,6 +31,11 @@
 // The frame rate is dynamically adjusted.
 
 import type {Deadline} from 'react-reconciler';
+type CallbackConfigType = {|
+  scheduledCallback: Deadline => void,
+  timeoutTime: number,
+  callbackId: number, // used for cancelling
+|};
 
 import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
 import warning from 'fbjs/lib/warning';
@@ -85,12 +90,31 @@ if (!ExecutionEnvironment.canUseDOM) {
     clearTimeout(timeoutID);
   };
 } else {
-  // Always polyfill requestIdleCallback and cancelIdleCallback
+  // We keep callbacks in a queue.
+  // Calling rIC will push in a new callback at the end of the queue.
+  // When we get idle time, callbacks are removed from the front of the queue
+  // and called.
+  const pendingCallbacks: Array<CallbackConfigType> = [];
+
+  let callbackIdCounter = 0;
+  const getCallbackId = function(): number {
+    callbackIdCounter++;
+    return callbackIdCounter;
+  };
+
+  // When a callback is scheduled, we register it by adding it's id to this
+  // object.
+  // If the user calls 'cIC' with the id of that callback, it will be
+  // unregistered by removing the id from this object.
+  // Then we skip calling any callback which is not registered.
+  // This means cancelling is an O(1) time complexity instead of O(n).
+  const registeredCallbackIds: {[number]: boolean} = {};
+
+  // We track what the next soonest timeoutTime is, to be able to quickly tell
+  // if none of the scheduled callbacks have timed out.
+  let nextSoonestTimeoutTime = -1;
 
-  let scheduledRICCallback = null;
   let isIdleScheduled = false;
-  let timeoutTime = -1;
-
   let isAnimationFrameScheduled = false;
 
   let frameDeadline = 0;
@@ -100,7 +124,7 @@ if (!ExecutionEnvironment.canUseDOM) {
   let previousFrameTime = 33;
   let activeFrameTime = 33;
 
-  const frameDeadlineObject = {
+  const frameDeadlineObject: Deadline = {
     didTimeout: false,
     timeRemaining() {
       const remaining = frameDeadline - now();
@@ -108,6 +132,67 @@ if (!ExecutionEnvironment.canUseDOM) {
     },
   };
 
+  const safelyCallScheduledCallback = function(callback, callbackId) {
+    if (!registeredCallbackIds[callbackId]) {
+      // ignore cancelled callbacks
+      return;
+    }
+    try {
+      callback(frameDeadlineObject);
+      // Avoid using 'catch' to keep errors easy to debug
+    } finally {
+      // always clean up the callbackId, even if the callback throws
+      delete registeredCallbackIds[callbackId];
+    }
+  };
+
+  /**
+   * Checks for timed out callbacks, runs them, and then checks again to see if
+   * any more have timed out.
+   * Keeps doing this until there are none which have currently timed out.
+   */
+  const callTimedOutCallbacks = function() {
+    if (pendingCallbacks.length === 0) {
+      return;
+    }
+
+    const currentTime = now();
+    // TODO: this would be more efficient if deferred callbacks are stored in
+    // min heap.
+    // Or in a linked list with links for both timeoutTime order and insertion
+    // order.
+    // For now an easy compromise is the current approach:
+    // Keep a pointer to the soonest timeoutTime, and check that first.
+    // If it has not expired, we can skip traversing the whole list.
+    // If it has expired, then we step through all the callbacks.
+    if (nextSoonestTimeoutTime === -1 || nextSoonestTimeoutTime > currentTime) {
+      // We know that none of them have timed out yet.
+      return;
+    }
+    nextSoonestTimeoutTime = -1; // we will reset it below
+
+    // keep checking until we don't find any more timed out callbacks
+    frameDeadlineObject.didTimeout = true;
+    for (let i = 0, len = pendingCallbacks.length; i < len; i++) {
+      const currentCallbackConfig = pendingCallbacks[i];
+      const timeoutTime = currentCallbackConfig.timeoutTime;
+      if (timeoutTime !== -1 && timeoutTime <= currentTime) {
+        // it has timed out!
+        // call it
+        const callback = currentCallbackConfig.scheduledCallback;
+        safelyCallScheduledCallback(callback, timeoutTime);
+      } else {
+        if (
+          timeoutTime !== -1 &&
+          (nextSoonestTimeoutTime === -1 ||
+            timeoutTime < nextSoonestTimeoutTime)
+        ) {
+          nextSoonestTimeoutTime = timeoutTime;
+        }
+      }
+    }
+  };
+
   // We use the postMessage trick to defer idle work until after the repaint.
   const messageKey =
     '__reactIdleCallback$' +
@@ -119,36 +204,30 @@ if (!ExecutionEnvironment.canUseDOM) {
       return;
     }
 
+    if (pendingCallbacks.length === 0) {
+      return;
+    }
     isIdleScheduled = false;
 
-    const currentTime = now();
-    if (frameDeadline - currentTime <= 0) {
-      // There's no time left in this idle period. Check if the callback has
-      // a timeout and whether it's been exceeded.
-      if (timeoutTime !== -1 && timeoutTime <= currentTime) {
-        // Exceeded the timeout. Invoke the callback even though there's no
-        // time left.
-        frameDeadlineObject.didTimeout = true;
-      } else {
-        // No timeout.
-        if (!isAnimationFrameScheduled) {
-          // Schedule another animation callback so we retry later.
-          isAnimationFrameScheduled = true;
-          requestAnimationFrame(animationTick);
-        }
-        // Exit without invoking the callback.
-        return;
-      }
-    } else {
-      // There's still time left in this idle period.
-      frameDeadlineObject.didTimeout = false;
-    }
+    // First call anything which has timed out, until we have caught up.
+    callTimedOutCallbacks();
 
-    timeoutTime = -1;
-    const callback = scheduledRICCallback;
-    scheduledRICCallback = null;
-    if (callback !== null) {
-      callback(frameDeadlineObject);
+    let currentTime = now();
+    // Next, as long as we have idle time, try calling more callbacks.
+    while (frameDeadline - currentTime > 0 && pendingCallbacks.length > 0) {
+      const latestCallbackConfig = pendingCallbacks.shift();
+      frameDeadlineObject.didTimeout = false;
+      const latestCallback = latestCallbackConfig.scheduledCallback;
+      const newCallbackId = latestCallbackConfig.callbackId;
+      safelyCallScheduledCallback(latestCallback, newCallbackId);
+      currentTime = now();
+    }
+    if (pendingCallbacks.length > 0) {
+      if (!isAnimationFrameScheduled) {
+        // Schedule another animation callback so we retry later.
+        isAnimationFrameScheduled = true;
+        requestAnimationFrame(animationTick);
+      }
     }
   };
   // Assumes that we have addEventListener in this environment. Might need
@@ -190,12 +269,23 @@ if (!ExecutionEnvironment.canUseDOM) {
     callback: (deadline: Deadline) => void,
     options?: {timeout: number},
   ): number {
-    // This assumes that we only schedule one callback at a time because that's
-    // how Fiber uses it.
-    scheduledRICCallback = callback;
+    let timeoutTime = -1;
     if (options != null && typeof options.timeout === 'number') {
       timeoutTime = now() + options.timeout;
     }
+    if (timeoutTime > nextSoonestTimeoutTime) {
+      nextSoonestTimeoutTime = timeoutTime;
+    }
+
+    const newCallbackId = getCallbackId();
+    const scheduledCallbackConfig = {
+      scheduledCallback: callback,
+      callbackId: newCallbackId,
+      timeoutTime,
+    };
+    pendingCallbacks.push(scheduledCallbackConfig);
+
+    registeredCallbackIds[newCallbackId] = true;
     if (!isAnimationFrameScheduled) {
       // If rAF didn't already schedule one, we need to schedule a frame.
       // TODO: If this rAF doesn't materialize because the browser throttles, we
@@ -204,13 +294,11 @@ if (!ExecutionEnvironment.canUseDOM) {
       isAnimationFrameScheduled = true;
       requestAnimationFrame(animationTick);
     }
-    return 0;
+    return newCallbackId;
   };
 
-  cIC = function() {
-    scheduledRICCallback = null;
-    isIdleScheduled = false;
-    timeoutTime = -1;
+  cIC = function(callbackId: number) {
+    delete registeredCallbackIds[callbackId];
   };
 }
 
diff --git a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
index 1ed60b0fb3..41bbd4d496 100644
--- a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
+++ b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
@@ -41,16 +41,167 @@ describe('ReactScheduler', () => {
     ReactScheduler = require('react-scheduler');
   });
 
-  it('rIC calls the callback within the frame when not blocked', () => {
-    const {rIC} = ReactScheduler;
-    const cb = jest.fn();
-    rIC(cb);
-    jest.runAllTimers();
-    expect(cb.mock.calls.length).toBe(1);
-    // should have ... TODO details on what we expect
-    expect(cb.mock.calls[0][0].didTimeout).toBe(false);
-    expect(typeof cb.mock.calls[0][0].timeRemaining()).toBe('number');
+  describe('rIC', () => {
+    it('calls the callback within the frame when not blocked', () => {
+      const {rIC} = ReactScheduler;
+      const cb = jest.fn();
+      rIC(cb);
+      jest.runAllTimers();
+      expect(cb.mock.calls.length).toBe(1);
+      // should not have timed out and should include a timeRemaining method
+      expect(cb.mock.calls[0][0].didTimeout).toBe(false);
+      expect(typeof cb.mock.calls[0][0].timeRemaining()).toBe('number');
+    });
+
+    describe('with multiple callbacks', () => {
+      it('accepts multiple callbacks and calls within frame when not blocked', () => {
+        const {rIC} = ReactScheduler;
+        const callbackLog = [];
+        const callbackA = jest.fn(() => callbackLog.push('A'));
+        const callbackB = jest.fn(() => callbackLog.push('B'));
+        rIC(callbackA);
+        // initially waits to call the callback
+        expect(callbackLog).toEqual([]);
+        // waits while second callback is passed
+        rIC(callbackB);
+        expect(callbackLog).toEqual([]);
+        // after a delay, calls as many callbacks as it has time for
+        jest.runAllTimers();
+        expect(callbackLog).toEqual(['A', 'B']);
+        // callbackA should not have timed out and should include a timeRemaining method
+        expect(callbackA.mock.calls[0][0].didTimeout).toBe(false);
+        expect(typeof callbackA.mock.calls[0][0].timeRemaining()).toBe(
+          'number',
+        );
+        // callbackA should not have timed out and should include a timeRemaining method
+        expect(callbackB.mock.calls[0][0].didTimeout).toBe(false);
+        expect(typeof callbackB.mock.calls[0][0].timeRemaining()).toBe(
+          'number',
+        );
+      });
+
+      it(
+        'schedules callbacks in correct order and' +
+          'keeps calling them if there is time',
+        () => {
+          const {rIC} = ReactScheduler;
+          const callbackLog = [];
+          const callbackA = jest.fn(() => {
+            callbackLog.push('A');
+            rIC(callbackC);
+          });
+          const callbackB = jest.fn(() => {
+            callbackLog.push('B');
+          });
+          const callbackC = jest.fn(() => {
+            callbackLog.push('C');
+          });
+
+          rIC(callbackA);
+          // initially waits to call the callback
+          expect(callbackLog).toEqual([]);
+          // continues waiting while B is scheduled
+          rIC(callbackB);
+          expect(callbackLog).toEqual([]);
+          // after a delay, calls the scheduled callbacks,
+          // and also calls new callbacks scheduled by current callbacks
+          jest.runAllTimers();
+          expect(callbackLog).toEqual(['A', 'B', 'C']);
+        },
+      );
+
+      it('schedules callbacks in correct order when callbacks have many nested rIC calls', () => {
+        const {rIC} = ReactScheduler;
+        const callbackLog = [];
+        const callbackA = jest.fn(() => {
+          callbackLog.push('A');
+          rIC(callbackC);
+          rIC(callbackD);
+        });
+        const callbackB = jest.fn(() => {
+          callbackLog.push('B');
+          rIC(callbackE);
+          rIC(callbackF);
+        });
+        const callbackC = jest.fn(() => {
+          callbackLog.push('C');
+        });
+        const callbackD = jest.fn(() => {
+          callbackLog.push('D');
+        });
+        const callbackE = jest.fn(() => {
+          callbackLog.push('E');
+        });
+        const callbackF = jest.fn(() => {
+          callbackLog.push('F');
+        });
+
+        rIC(callbackA);
+        rIC(callbackB);
+        // initially waits to call the callback
+        expect(callbackLog).toEqual([]);
+        // while flushing callbacks, calls as many as it has time for
+        jest.runAllTimers();
+        expect(callbackLog).toEqual(['A', 'B', 'C', 'D', 'E', 'F']);
+      });
+
+      it('schedules callbacks in correct order when they use rIC to schedule themselves', () => {
+        const {rIC} = ReactScheduler;
+        const callbackLog = [];
+        let callbackAIterations = 0;
+        const callbackA = jest.fn(() => {
+          if (callbackAIterations < 1) {
+            rIC(callbackA);
+          }
+          callbackLog.push('A' + callbackAIterations);
+          callbackAIterations++;
+        });
+        const callbackB = jest.fn(() => callbackLog.push('B'));
+
+        rIC(callbackA);
+        // initially waits to call the callback
+        expect(callbackLog).toEqual([]);
+        rIC(callbackB);
+        expect(callbackLog).toEqual([]);
+        // after a delay, calls the latest callback passed
+        jest.runAllTimers();
+        expect(callbackLog).toEqual(['A0', 'B', 'A1']);
+      });
+    });
   });
 
-  // TODO: test cIC and now
+  describe('cIC', () => {
+    it('cancels the scheduled callback', () => {
+      const {rIC, cIC} = ReactScheduler;
+      const cb = jest.fn();
+      const callbackId = rIC(cb);
+      expect(cb.mock.calls.length).toBe(0);
+      cIC(callbackId);
+      jest.runAllTimers();
+      expect(cb.mock.calls.length).toBe(0);
+    });
+
+    describe('with multiple callbacks', () => {
+      it('when one callback cancels the next one', () => {
+        const {rIC, cIC} = ReactScheduler;
+        const callbackLog = [];
+        let callbackBId;
+        const callbackA = jest.fn(() => {
+          callbackLog.push('A');
+          cIC(callbackBId);
+        });
+        const callbackB = jest.fn(() => callbackLog.push('B'));
+        rIC(callbackA);
+        callbackBId = rIC(callbackB);
+        // Initially doesn't call anything
+        expect(callbackLog).toEqual([]);
+        jest.runAllTimers();
+        // B should not get called because A cancelled B
+        expect(callbackLog).toEqual(['A']);
+        expect(callbackB.mock.calls.length).toBe(0);
+      });
+    });
+  });
+
+  // TODO: test 'now'
 });
diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js
index 9153819ce5..df3560c6fb 100644
--- a/packages/shared/forks/ReactFeatureFlags.www.js
+++ b/packages/shared/forks/ReactFeatureFlags.www.js
@@ -12,11 +12,11 @@ import typeof * as FeatureFlagsShimType from './ReactFeatureFlags.www';
 
 // Re-export dynamic flags from the www version.
 export const {
-  enableGetDerivedStateFromCatch,
   debugRenderPhaseSideEffects,
   debugRenderPhaseSideEffectsForStrictMode,
-  warnAboutDeprecatedLifecycles,
+  enableGetDerivedStateFromCatch,
   replayFailedUnitOfWorkWithInvokeGuardedCallback,
+  warnAboutDeprecatedLifecycles,
 } = require('ReactFeatureFlags');
 
 // The rest of the flags are static for better dead code elimination.

From fc3777b1fe295fd2661f1974f5587d214791f04b Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Thu, 10 May 2018 15:25:32 -0700
Subject: [PATCH 026/277] Add Profiler component for collecting new render
 timing info (#12745)

Add a new component type, Profiler, that can be used to collect new render time metrics. Since this is a new, experimental API, it will be exported as React.unstable_Profiler initially.

Most of the functionality for this component has been added behind a feature flag, enableProfileModeMetrics. When the feature flag is disabled, the component will just render its children with no additional behavior. When the flag is enabled, React will also collect timing information and pass it to the onRender function (as described below).
---
 .../src/server/ReactPartialRenderer.js        |   2 +
 packages/react-is/src/ReactIs.js              |   6 +
 .../react-is/src/__tests__/ReactIs-test.js    |  14 +
 packages/react-reconciler/src/ReactFiber.js   |  54 +-
 .../src/ReactFiberBeginWork.js                |  50 +
 .../src/ReactFiberCommitWork.js               |  26 +-
 .../src/ReactFiberCompleteWork.js             |  11 +
 .../src/ReactFiberScheduler.js                | 117 ++-
 .../src/ReactFiberUnwindWork.js               |  26 +-
 .../src/ReactProfilerTimer.js                 | 144 +++
 .../react-reconciler/src/ReactTypeOfMode.js   |   7 +-
 .../ReactIncrementalPerf-test.internal.js     |  18 +-
 ...ReactIncrementalPerf-test.internal.js.snap |   7 +-
 .../src/ReactTestRenderer.js                  |  21 +-
 .../__tests__/ReactShallowRenderer-test.js    |  26 +
 .../ReactTestRendererTraversal-test.js        |   4 +-
 packages/react/src/React.js                   |   6 +-
 .../__tests__/ReactProfiler-test.internal.js  | 862 ++++++++++++++++++
 .../ReactProfiler-test.internal.js.snap       |  65 ++
 packages/shared/ReactFeatureFlags.js          |   3 +
 packages/shared/ReactSymbols.js               |   3 +
 packages/shared/ReactTypeOfWork.js            |   4 +-
 .../ReactFeatureFlags.native-fabric-fb.js     |   1 +
 .../ReactFeatureFlags.native-fabric-oss.js    |   1 +
 .../forks/ReactFeatureFlags.native-fb.js      |   1 +
 .../forks/ReactFeatureFlags.native-oss.js     |   1 +
 .../forks/ReactFeatureFlags.persistent.js     |   1 +
 .../forks/ReactFeatureFlags.test-renderer.js  |   1 +
 .../shared/forks/ReactFeatureFlags.www.js     |   1 +
 packages/shared/getComponentName.js           |  15 +-
 packages/shared/isValidElementType.js         |   8 +-
 31 files changed, 1452 insertions(+), 54 deletions(-)
 create mode 100644 packages/react-reconciler/src/ReactProfilerTimer.js
 create mode 100644 packages/react/src/__tests__/ReactProfiler-test.internal.js
 create mode 100644 packages/react/src/__tests__/__snapshots__/ReactProfiler-test.internal.js.snap

diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index ec26eba2c1..d0cef9c60a 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -34,6 +34,7 @@ import {
   REACT_CALL_TYPE,
   REACT_RETURN_TYPE,
   REACT_PORTAL_TYPE,
+  REACT_PROFILER_TYPE,
   REACT_PROVIDER_TYPE,
   REACT_CONTEXT_TYPE,
 } from 'shared/ReactSymbols';
@@ -811,6 +812,7 @@ class ReactDOMServerRenderer {
       switch (elementType) {
         case REACT_STRICT_MODE_TYPE:
         case REACT_ASYNC_MODE_TYPE:
+        case REACT_PROFILER_TYPE:
         case REACT_FRAGMENT_TYPE: {
           const nextChildren = toArray(
             ((nextChild: any): ReactElement).props.children,
diff --git a/packages/react-is/src/ReactIs.js b/packages/react-is/src/ReactIs.js
index 4418759a9b..e94599474d 100644
--- a/packages/react-is/src/ReactIs.js
+++ b/packages/react-is/src/ReactIs.js
@@ -16,6 +16,7 @@ import {
   REACT_FORWARD_REF_TYPE,
   REACT_FRAGMENT_TYPE,
   REACT_PORTAL_TYPE,
+  REACT_PROFILER_TYPE,
   REACT_PROVIDER_TYPE,
   REACT_STRICT_MODE_TYPE,
 } from 'shared/ReactSymbols';
@@ -32,6 +33,7 @@ export function typeOf(object: any) {
         switch (type) {
           case REACT_ASYNC_MODE_TYPE:
           case REACT_FRAGMENT_TYPE:
+          case REACT_PROFILER_TYPE:
           case REACT_STRICT_MODE_TYPE:
             return type;
           default:
@@ -60,6 +62,7 @@ export const ContextProvider = REACT_PROVIDER_TYPE;
 export const Element = REACT_ELEMENT_TYPE;
 export const ForwardRef = REACT_FORWARD_REF_TYPE;
 export const Fragment = REACT_FRAGMENT_TYPE;
+export const Profiler = REACT_PROFILER_TYPE;
 export const Portal = REACT_PORTAL_TYPE;
 export const StrictMode = REACT_STRICT_MODE_TYPE;
 
@@ -87,6 +90,9 @@ export function isForwardRef(object: any) {
 export function isFragment(object: any) {
   return typeOf(object) === REACT_FRAGMENT_TYPE;
 }
+export function isProfiler(object: any) {
+  return typeOf(object) === REACT_PROFILER_TYPE;
+}
 export function isPortal(object: any) {
   return typeOf(object) === REACT_PORTAL_TYPE;
 }
diff --git a/packages/react-is/src/__tests__/ReactIs-test.js b/packages/react-is/src/__tests__/ReactIs-test.js
index e4ce5074b1..04c7cec745 100644
--- a/packages/react-is/src/__tests__/ReactIs-test.js
+++ b/packages/react-is/src/__tests__/ReactIs-test.js
@@ -145,4 +145,18 @@ describe('ReactIs', () => {
     expect(ReactIs.isStrictMode(<React.unstable_AsyncMode />)).toBe(false);
     expect(ReactIs.isStrictMode(<div />)).toBe(false);
   });
+
+  it('should identify profile root', () => {
+    expect(
+      ReactIs.typeOf(<React.unstable_Profiler id="foo" onRender={jest.fn()} />),
+    ).toBe(ReactIs.Profiler);
+    expect(
+      ReactIs.isProfiler(
+        <React.unstable_Profiler id="foo" onRender={jest.fn()} />,
+      ),
+    ).toBe(true);
+    expect(ReactIs.isProfiler({type: ReactIs.unstable_Profiler})).toBe(false);
+    expect(ReactIs.isProfiler(<React.unstable_AsyncMode />)).toBe(false);
+    expect(ReactIs.isProfiler(<div />)).toBe(false);
+  });
 });
diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js
index 393cecb527..51c4d52fe5 100644
--- a/packages/react-reconciler/src/ReactFiber.js
+++ b/packages/react-reconciler/src/ReactFiber.js
@@ -15,6 +15,7 @@ import type {ExpirationTime} from './ReactFiberExpirationTime';
 import type {UpdateQueue} from './ReactUpdateQueue';
 
 import invariant from 'fbjs/lib/invariant';
+import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
 import {NoEffect} from 'shared/ReactTypeOfSideEffect';
 import {
   IndeterminateComponent,
@@ -30,17 +31,19 @@ import {
   Mode,
   ContextProvider,
   ContextConsumer,
+  Profiler,
 } from 'shared/ReactTypeOfWork';
 import getComponentName from 'shared/getComponentName';
 
 import {NoWork} from './ReactFiberExpirationTime';
-import {NoContext, AsyncMode, StrictMode} from './ReactTypeOfMode';
+import {NoContext, AsyncMode, ProfileMode, StrictMode} from './ReactTypeOfMode';
 import {
   REACT_FORWARD_REF_TYPE,
   REACT_FRAGMENT_TYPE,
   REACT_RETURN_TYPE,
   REACT_CALL_TYPE,
   REACT_STRICT_MODE_TYPE,
+  REACT_PROFILER_TYPE,
   REACT_PROVIDER_TYPE,
   REACT_CONTEXT_TYPE,
   REACT_ASYNC_MODE_TYPE,
@@ -150,6 +153,10 @@ export type Fiber = {|
   // memory if we need to.
   alternate: Fiber | null,
 
+  // Profiling metrics
+  selfBaseTime?: number,
+  treeBaseTime?: number,
+
   // Conceptual aliases
   // workInProgress : Fiber ->  alternate The alternate used for reuse happens
   // to be the same as work in progress.
@@ -204,6 +211,11 @@ function FiberNode(
 
   this.alternate = null;
 
+  if (enableProfilerTimer) {
+    this.selfBaseTime = 0;
+    this.treeBaseTime = 0;
+  }
+
   if (__DEV__) {
     this._debugID = debugCounter++;
     this._debugSource = null;
@@ -298,6 +310,11 @@ export function createWorkInProgress(
   workInProgress.index = current.index;
   workInProgress.ref = current.ref;
 
+  if (enableProfilerTimer) {
+    workInProgress.selfBaseTime = current.selfBaseTime;
+    workInProgress.treeBaseTime = current.treeBaseTime;
+  }
+
   return workInProgress;
 }
 
@@ -343,6 +360,8 @@ export function createFiberFromElement(
         fiberTag = Mode;
         mode |= StrictMode;
         break;
+      case REACT_PROFILER_TYPE:
+        return createFiberFromProfiler(pendingProps, mode, expirationTime, key);
       case REACT_CALL_TYPE:
         fiberTag = CallComponent;
         break;
@@ -440,6 +459,35 @@ export function createFiberFromFragment(
   return fiber;
 }
 
+export function createFiberFromProfiler(
+  pendingProps: any,
+  mode: TypeOfMode,
+  expirationTime: ExpirationTime,
+  key: null | string,
+): Fiber {
+  if (__DEV__) {
+    if (
+      typeof pendingProps.id !== 'string' ||
+      typeof pendingProps.onRender !== 'function'
+    ) {
+      invariant(
+        false,
+        'Profiler must specify an "id" string and "onRender" function as props',
+      );
+    }
+  }
+
+  const fiber = createFiber(Profiler, pendingProps, key, mode | ProfileMode);
+  fiber.type = REACT_PROFILER_TYPE;
+  fiber.expirationTime = expirationTime;
+  fiber.stateNode = {
+    duration: 0,
+    startTime: 0,
+  };
+
+  return fiber;
+}
+
 export function createFiberFromText(
   content: string,
   mode: TypeOfMode,
@@ -509,6 +557,10 @@ export function assignFiberPropertiesInDEV(
   target.lastEffect = source.lastEffect;
   target.expirationTime = source.expirationTime;
   target.alternate = source.alternate;
+  if (enableProfilerTimer) {
+    target.selfBaseTime = source.selfBaseTime;
+    target.treeBaseTime = source.treeBaseTime;
+  }
   target._debugID = source._debugID;
   target._debugSource = source._debugSource;
   target._debugOwner = source._debugOwner;
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 5aa7ffc446..2c80e26ffb 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -16,6 +16,7 @@ import type {NewContext} from './ReactFiberNewContext';
 import type {HydrationContext} from './ReactFiberHydrationContext';
 import type {FiberRoot} from './ReactFiberRoot';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
+import type {ProfilerTimer} from './ReactProfilerTimer';
 import checkPropTypes from 'prop-types/checkPropTypes';
 
 import {
@@ -34,6 +35,7 @@ import {
   Mode,
   ContextProvider,
   ContextConsumer,
+  Profiler,
 } from 'shared/ReactTypeOfWork';
 import {
   NoEffect,
@@ -42,12 +44,14 @@ import {
   ContentReset,
   Ref,
   DidCapture,
+  Update,
 } from 'shared/ReactTypeOfSideEffect';
 import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
 import {
   enableGetDerivedStateFromCatch,
   debugRenderPhaseSideEffects,
   debugRenderPhaseSideEffectsForStrictMode,
+  enableProfilerTimer,
 } from 'shared/ReactFeatureFlags';
 import invariant from 'fbjs/lib/invariant';
 import getComponentName from 'shared/getComponentName';
@@ -88,6 +92,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
   hydrationContext: HydrationContext<C, CX>,
   scheduleWork: (fiber: Fiber, expirationTime: ExpirationTime) => void,
   computeExpirationForFiber: (fiber: Fiber) => ExpirationTime,
+  profilerTimer: ProfilerTimer,
 ) {
   const {shouldSetTextContent, shouldDeprioritizeSubtree} = config;
 
@@ -95,6 +100,11 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
 
   const {pushProvider} = newContext;
 
+  const {
+    markActualRenderTimeStarted,
+    stopBaseRenderTimerIfRunning,
+  } = profilerTimer;
+
   const {
     getMaskedContext,
     getUnmaskedContext,
@@ -215,6 +225,25 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     return workInProgress.child;
   }
 
+  function updateProfiler(current, workInProgress) {
+    const nextProps = workInProgress.pendingProps;
+    if (enableProfilerTimer) {
+      // Start render timer here and push start time onto queue
+      markActualRenderTimeStarted(workInProgress);
+
+      // Let the "complete" phase know to stop the timer,
+      // And the scheduler to record the measured time.
+      workInProgress.effectTag |= Update;
+    }
+    if (workInProgress.memoizedProps === nextProps) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+    const nextChildren = nextProps.children;
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextProps);
+    return workInProgress.child;
+  }
+
   function markRef(current: Fiber | null, workInProgress: Fiber) {
     const ref = workInProgress.ref;
     if (
@@ -344,6 +373,10 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       // the new API.
       // TODO: Warn in a future release.
       nextChildren = null;
+
+      if (enableProfilerTimer) {
+        stopBaseRenderTimerIfRunning();
+      }
     } else {
       if (__DEV__) {
         ReactDebugCurrentFiber.setCurrentPhase('render');
@@ -1054,6 +1087,11 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
   ): Fiber | null {
     cancelWorkTimer(workInProgress);
 
+    if (enableProfilerTimer) {
+      // Don't update "base" render times for bailouts.
+      stopBaseRenderTimerIfRunning();
+    }
+
     // TODO: We should ideally be able to bail out early if the children have no
     // more work to do. However, since we don't have a separation of this
     // Fiber's priority and its children yet - we don't know without doing lots
@@ -1075,6 +1113,11 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
   function bailoutOnLowPriority(current, workInProgress) {
     cancelWorkTimer(workInProgress);
 
+    if (enableProfilerTimer) {
+      // Don't update "base" render times for bailouts.
+      stopBaseRenderTimerIfRunning();
+    }
+
     // TODO: Handle HostComponent tags here as well and call pushHostContext()?
     // See PR 8590 discussion for context
     switch (workInProgress.tag) {
@@ -1093,6 +1136,11 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       case ContextProvider:
         pushProvider(workInProgress);
         break;
+      case Profiler:
+        if (enableProfilerTimer) {
+          markActualRenderTimeStarted(workInProgress);
+        }
+        break;
     }
     // TODO: What if this is currently in progress?
     // How can that happen? How is this not being cloned?
@@ -1173,6 +1221,8 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         return updateFragment(current, workInProgress);
       case Mode:
         return updateMode(current, workInProgress);
+      case Profiler:
+        return updateProfiler(current, workInProgress);
       case ContextProvider:
         return updateContextProvider(
           current,
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index a375490297..686a49219b 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -17,6 +17,7 @@ import {
   enableMutatingReconciler,
   enableNoopReconciler,
   enablePersistentReconciler,
+  enableProfilerTimer,
 } from 'shared/ReactFeatureFlags';
 import {
   ClassComponent,
@@ -25,13 +26,14 @@ import {
   HostText,
   HostPortal,
   CallComponent,
+  Profiler,
 } from 'shared/ReactTypeOfWork';
 import ReactErrorUtils from 'shared/ReactErrorUtils';
 import {
-  Placement,
-  Update,
   ContentReset,
+  Placement,
   Snapshot,
+  Update,
 } from 'shared/ReactTypeOfSideEffect';
 import {commitUpdateQueue} from './ReactUpdateQueue';
 import invariant from 'fbjs/lib/invariant';
@@ -308,6 +310,10 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         // We have no life-cycles associated with portals.
         return;
       }
+      case Profiler: {
+        // We have no life-cycles associated with Profiler.
+        return;
+      }
       default: {
         invariant(
           false,
@@ -814,6 +820,22 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       case HostRoot: {
         return;
       }
+      case Profiler: {
+        if (enableProfilerTimer) {
+          const onRender = finishedWork.memoizedProps.onRender;
+          onRender(
+            finishedWork.memoizedProps.id,
+            current === null ? 'mount' : 'update',
+            finishedWork.stateNode.duration,
+            finishedWork.treeBaseTime,
+          );
+
+          // Reset actualTime after successful commit.
+          // By default, we append to this time to account for errors and pauses.
+          finishedWork.stateNode.duration = 0;
+        }
+        return;
+      }
       default: {
         invariant(
           false,
diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js
index aec3bc17c6..e9752e38da 100644
--- a/packages/react-reconciler/src/ReactFiberCompleteWork.js
+++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js
@@ -15,11 +15,13 @@ import type {LegacyContext} from './ReactFiberContext';
 import type {NewContext} from './ReactFiberNewContext';
 import type {HydrationContext} from './ReactFiberHydrationContext';
 import type {FiberRoot} from './ReactFiberRoot';
+import type {ProfilerTimer} from './ReactProfilerTimer';
 
 import {
   enableMutatingReconciler,
   enablePersistentReconciler,
   enableNoopReconciler,
+  enableProfilerTimer,
 } from 'shared/ReactFeatureFlags';
 import {
   IndeterminateComponent,
@@ -37,6 +39,7 @@ import {
   ForwardRef,
   Fragment,
   Mode,
+  Profiler,
 } from 'shared/ReactTypeOfWork';
 import {Placement, Ref, Update} from 'shared/ReactTypeOfSideEffect';
 import invariant from 'fbjs/lib/invariant';
@@ -49,6 +52,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
   legacyContext: LegacyContext,
   newContext: NewContext,
   hydrationContext: HydrationContext<C, CX>,
+  profilerTimer: ProfilerTimer,
 ) {
   const {
     createInstance,
@@ -67,6 +71,8 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     popHostContainer,
   } = hostContext;
 
+  const {recordElapsedActualRenderTime} = profilerTimer;
+
   const {
     popContextProvider: popLegacyContextProvider,
     popTopLevelContextObject: popTopLevelLegacyContextObject,
@@ -591,6 +597,11 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         return null;
       case Mode:
         return null;
+      case Profiler:
+        if (enableProfilerTimer) {
+          recordElapsedActualRenderTime(workInProgress);
+        }
+        return null;
       case HostPortal:
         popHostContainer(workInProgress);
         updateHostContainer(workInProgress);
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 1a9846b0bd..fde57fd5a4 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -40,10 +40,12 @@ import {
   HostPortal,
 } from 'shared/ReactTypeOfWork';
 import {
+  enableProfilerTimer,
   enableUserTimingAPI,
-  warnAboutDeprecatedLifecycles,
   replayFailedUnitOfWorkWithInvokeGuardedCallback,
+  warnAboutDeprecatedLifecycles,
 } from 'shared/ReactFeatureFlags';
+import {createProfilerTimer} from './ReactProfilerTimer';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'fbjs/lib/invariant';
 import warning from 'fbjs/lib/warning';
@@ -85,7 +87,7 @@ import {
   expirationTimeToMs,
   computeExpirationBucket,
 } from './ReactFiberExpirationTime';
-import {AsyncMode} from './ReactTypeOfMode';
+import {AsyncMode, ProfileMode} from './ReactTypeOfMode';
 import ReactFiberLegacyContext from './ReactFiberContext';
 import ReactFiberNewContext from './ReactFiberNewContext';
 import {enqueueUpdate, resetCurrentlyProcessingQueue} from './ReactUpdateQueue';
@@ -158,10 +160,18 @@ if (__DEV__) {
 export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
   config: HostConfig<T, P, I, TI, HI, PI, C, CC, CX, PL>,
 ) {
+  const {
+    now,
+    scheduleDeferredCallback,
+    cancelDeferredCallback,
+    prepareForCommit,
+    resetAfterCommit,
+  } = config;
   const stack = ReactFiberStack();
   const hostContext = ReactFiberHostContext(config, stack);
   const legacyContext = ReactFiberLegacyContext(stack);
   const newContext = ReactFiberNewContext(stack);
+  const profilerTimer = createProfilerTimer(now);
   const {popHostContext, popHostContainer} = hostContext;
   const {
     popTopLevelContextObject: popTopLevelLegacyContextObject,
@@ -179,6 +189,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     hydrationContext,
     scheduleWork,
     computeExpirationForFiber,
+    profilerTimer,
   );
   const {completeWork} = ReactFiberCompleteWork(
     config,
@@ -186,6 +197,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     legacyContext,
     newContext,
     hydrationContext,
+    profilerTimer,
   );
   const {
     throwException,
@@ -194,6 +206,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     createRootErrorUpdate,
     createClassErrorUpdate,
   } = ReactFiberUnwindWork(
+    config,
     hostContext,
     legacyContext,
     newContext,
@@ -201,6 +214,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     markLegacyErrorBoundaryAsFailed,
     isAlreadyFailedLegacyErrorBoundary,
     onUncaughtError,
+    profilerTimer,
   );
   const {
     commitBeforeMutationLifeCycles,
@@ -219,13 +233,16 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     markLegacyErrorBoundaryAsFailed,
     recalculateCurrentTime,
   );
+
   const {
-    now,
-    scheduleDeferredCallback,
-    cancelDeferredCallback,
-    prepareForCommit,
-    resetAfterCommit,
-  } = config;
+    checkActualRenderTimeStackEmpty,
+    pauseActualRenderTimerIfRunning,
+    recordElapsedBaseRenderTimeIfRunning,
+    resetActualRenderTimer,
+    resumeActualRenderTimerIfPaused,
+    startBaseRenderTimer,
+    stopBaseRenderTimerIfRunning,
+  } = profilerTimer;
 
   // Represents the current time in ms.
   const originalStartTimeMs = now();
@@ -305,6 +322,11 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       originalReplayError = null;
       if (hasCaughtError()) {
         clearCaughtError();
+
+        if (enableProfilerTimer) {
+          // Stop "base" render timer again (after the re-thrown error).
+          stopBaseRenderTimerIfRunning();
+        }
       } else {
         // If the begin phase did not fail the second time, set this pointer
         // back to the original value.
@@ -645,6 +667,13 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       }
     }
 
+    if (enableProfilerTimer) {
+      if (__DEV__) {
+        checkActualRenderTimeStackEmpty();
+      }
+      resetActualRenderTimer();
+    }
+
     isCommitting = false;
     isWorking = false;
     stopCommitLifeCyclesTimer();
@@ -690,17 +719,36 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     // TODO: Calls need to visit stateNode
 
     // Bubble up the earliest expiration time.
-    let child = workInProgress.child;
-    while (child !== null) {
-      if (
-        child.expirationTime !== NoWork &&
-        (newExpirationTime === NoWork ||
-          newExpirationTime > child.expirationTime)
-      ) {
-        newExpirationTime = child.expirationTime;
+    // (And "base" render timers if that feature flag is enabled)
+    if (enableProfilerTimer && workInProgress.mode & ProfileMode) {
+      let treeBaseTime = workInProgress.selfBaseTime;
+      let child = workInProgress.child;
+      while (child !== null) {
+        treeBaseTime += child.treeBaseTime;
+        if (
+          child.expirationTime !== NoWork &&
+          (newExpirationTime === NoWork ||
+            newExpirationTime > child.expirationTime)
+        ) {
+          newExpirationTime = child.expirationTime;
+        }
+        child = child.sibling;
+      }
+      workInProgress.treeBaseTime = treeBaseTime;
+    } else {
+      let child = workInProgress.child;
+      while (child !== null) {
+        if (
+          child.expirationTime !== NoWork &&
+          (newExpirationTime === NoWork ||
+            newExpirationTime > child.expirationTime)
+        ) {
+          newExpirationTime = child.expirationTime;
+        }
+        child = child.sibling;
       }
-      child = child.sibling;
     }
+
     workInProgress.expirationTime = newExpirationTime;
   }
 
@@ -875,7 +923,19 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         workInProgress,
       );
     }
-    let next = beginWork(current, workInProgress, nextRenderExpirationTime);
+
+    let next;
+    if (enableProfilerTimer) {
+      startBaseRenderTimer();
+      next = beginWork(current, workInProgress, nextRenderExpirationTime);
+
+      // Update "base" time if the render wasn't bailed out on.
+      recordElapsedBaseRenderTimeIfRunning(workInProgress);
+      stopBaseRenderTimerIfRunning();
+    } else {
+      next = beginWork(current, workInProgress, nextRenderExpirationTime);
+    }
+
     if (__DEV__) {
       ReactDebugCurrentFiber.resetCurrentFiber();
       if (isReplayingFailedUnitOfWork) {
@@ -911,6 +971,12 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       while (nextUnitOfWork !== null && !shouldYield()) {
         nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
       }
+
+      if (enableProfilerTimer) {
+        // If we didn't finish, pause the "actual" render timer.
+        // We'll restart it when we resume work.
+        pauseActualRenderTimerIfRunning();
+      }
     }
   }
 
@@ -953,6 +1019,11 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       try {
         workLoop(isAsync);
       } catch (thrownValue) {
+        if (enableProfilerTimer) {
+          // Stop "base" render timer in the event of an error.
+          stopBaseRenderTimerIfRunning();
+        }
+
         if (nextUnitOfWork === null) {
           // This is a fatal error.
           didFatal = true;
@@ -1516,6 +1587,10 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     // the deadline.
     findHighestPriorityRoot();
 
+    if (enableProfilerTimer) {
+      resumeActualRenderTimerIfPaused();
+    }
+
     if (enableUserTimingAPI && deadline !== null) {
       const didExpire = nextFlushedExpirationTime < recalculateCurrentTime();
       const timeout = expirationTimeToMs(nextFlushedExpirationTime);
@@ -1661,6 +1736,12 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
             // There's no time left. Mark this root as complete. We'll come
             // back and commit it later.
             root.finishedWork = finishedWork;
+
+            if (enableProfilerTimer) {
+              // If we didn't finish, pause the "actual" render timer.
+              // We'll restart it when we resume work.
+              pauseActualRenderTimerIfRunning();
+            }
           }
         }
       }
diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index 05a8a1856d..3337f02fcd 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -7,12 +7,14 @@
  * @flow
  */
 
+import type {HostConfig} from 'react-reconciler';
 import type {Fiber} from './ReactFiber';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 import type {HostContext} from './ReactFiberHostContext';
 import type {LegacyContext} from './ReactFiberContext';
 import type {NewContext} from './ReactFiberNewContext';
 import type {CapturedValue} from './ReactCapturedValue';
+import type {ProfilerTimer} from './ReactProfilerTimer';
 import type {Update} from './ReactUpdateQueue';
 
 import {createCapturedValue} from './ReactCapturedValue';
@@ -29,17 +31,21 @@ import {
   HostComponent,
   HostPortal,
   ContextProvider,
+  Profiler,
 } from 'shared/ReactTypeOfWork';
 import {
-  NoEffect,
   DidCapture,
   Incomplete,
+  NoEffect,
   ShouldCapture,
 } from 'shared/ReactTypeOfSideEffect';
+import {
+  enableGetDerivedStateFromCatch,
+  enableProfilerTimer,
+} from 'shared/ReactFeatureFlags';
 
-import {enableGetDerivedStateFromCatch} from 'shared/ReactFeatureFlags';
-
-export default function<C, CX>(
+export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
+  config: HostConfig<T, P, I, TI, HI, PI, C, CC, CX, PL>,
   hostContext: HostContext<C, CX>,
   legacyContext: LegacyContext,
   newContext: NewContext,
@@ -51,6 +57,7 @@ export default function<C, CX>(
   markLegacyErrorBoundaryAsFailed: (instance: mixed) => void,
   isAlreadyFailedLegacyErrorBoundary: (instance: mixed) => boolean,
   onUncaughtError: (error: mixed) => void,
+  profilerTimer: ProfilerTimer,
 ) {
   const {popHostContainer, popHostContext} = hostContext;
   const {
@@ -58,6 +65,10 @@ export default function<C, CX>(
     popTopLevelContextObject: popTopLevelLegacyContextObject,
   } = legacyContext;
   const {popProvider} = newContext;
+  const {
+    resumeActualRenderTimerIfPaused,
+    recordElapsedActualRenderTime,
+  } = profilerTimer;
 
   function createRootErrorUpdate(
     fiber: Fiber,
@@ -236,6 +247,13 @@ export default function<C, CX>(
       case ContextProvider:
         popProvider(interruptedWork);
         break;
+      case Profiler:
+        if (enableProfilerTimer) {
+          // Resume in case we're picking up on work that was paused.
+          resumeActualRenderTimerIfPaused();
+          recordElapsedActualRenderTime(interruptedWork);
+        }
+        break;
       default:
         break;
     }
diff --git a/packages/react-reconciler/src/ReactProfilerTimer.js b/packages/react-reconciler/src/ReactProfilerTimer.js
new file mode 100644
index 0000000000..d192bc1e91
--- /dev/null
+++ b/packages/react-reconciler/src/ReactProfilerTimer.js
@@ -0,0 +1,144 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import type {Fiber} from './ReactFiber';
+
+import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
+
+import warning from 'fbjs/lib/warning';
+
+/**
+ * The "actual" render time is total time required to render the descendants of a Profiler component.
+ * This time is stored as a stack, since Profilers can be nested.
+ * This time is started during the "begin" phase and stopped during the "complete" phase.
+ * It is paused (and accumulated) in the event of an interruption or an aborted render.
+ */
+
+export type ProfilerTimer = {
+  checkActualRenderTimeStackEmpty(): void,
+  markActualRenderTimeStarted(fiber: Fiber): void,
+  pauseActualRenderTimerIfRunning(): void,
+  recordElapsedActualRenderTime(fiber: Fiber): void,
+  resetActualRenderTimer(): void,
+  resumeActualRenderTimerIfPaused(): void,
+  recordElapsedBaseRenderTimeIfRunning(fiber: Fiber): void,
+  startBaseRenderTimer(): void,
+  stopBaseRenderTimerIfRunning(): void,
+};
+
+export function createProfilerTimer(now: () => number): ProfilerTimer {
+  let fiberStack: Array<Fiber | null>;
+
+  if (__DEV__) {
+    fiberStack = [];
+  }
+
+  let timerPausedAt: number = 0;
+  let totalElapsedPauseTime: number = 0;
+
+  function checkActualRenderTimeStackEmpty(): void {
+    if (__DEV__) {
+      warning(
+        fiberStack.length === 0,
+        'Expected an empty stack. Something was not reset properly.',
+      );
+    }
+  }
+
+  function markActualRenderTimeStarted(fiber: Fiber): void {
+    if (__DEV__) {
+      fiberStack.push(fiber);
+    }
+    fiber.stateNode.startTime = now() - totalElapsedPauseTime;
+  }
+
+  function pauseActualRenderTimerIfRunning(): void {
+    if (timerPausedAt === 0) {
+      timerPausedAt = now();
+    }
+  }
+
+  function recordElapsedActualRenderTime(fiber: Fiber): void {
+    if (__DEV__) {
+      warning(fiber === fiberStack.pop(), 'Unexpected Fiber popped.');
+    }
+    fiber.stateNode.duration +=
+      now() - totalElapsedPauseTime - fiber.stateNode.startTime;
+  }
+
+  function resetActualRenderTimer(): void {
+    totalElapsedPauseTime = 0;
+  }
+
+  function resumeActualRenderTimerIfPaused(): void {
+    if (timerPausedAt > 0) {
+      totalElapsedPauseTime += now() - timerPausedAt;
+      timerPausedAt = 0;
+    }
+  }
+
+  /**
+   * The "base" render time is the duration of the “begin” phase of work for a particular fiber.
+   * This time is measured and stored on each fiber.
+   * The time for all sibling fibers are accumulated and stored on their parent during the "complete" phase.
+   * If a fiber bails out (sCU false) then its "base" timer is cancelled and the fiber is not updated.
+   */
+
+  let baseStartTime: number = -1;
+
+  function recordElapsedBaseRenderTimeIfRunning(fiber: Fiber): void {
+    if (baseStartTime !== -1) {
+      fiber.selfBaseTime = now() - baseStartTime;
+    }
+  }
+
+  function startBaseRenderTimer(): void {
+    if (__DEV__) {
+      if (baseStartTime !== -1) {
+        warning(
+          false,
+          'Cannot start base timer that is already running. ' +
+            'This error is likely caused by a bug in React. ' +
+            'Please file an issue.',
+        );
+      }
+    }
+    baseStartTime = now();
+  }
+
+  function stopBaseRenderTimerIfRunning(): void {
+    baseStartTime = -1;
+  }
+
+  if (enableProfilerTimer) {
+    return {
+      checkActualRenderTimeStackEmpty,
+      markActualRenderTimeStarted,
+      pauseActualRenderTimerIfRunning,
+      recordElapsedActualRenderTime,
+      resetActualRenderTimer,
+      resumeActualRenderTimerIfPaused,
+      recordElapsedBaseRenderTimeIfRunning,
+      startBaseRenderTimer,
+      stopBaseRenderTimerIfRunning,
+    };
+  } else {
+    return {
+      checkActualRenderTimeStackEmpty(): void {},
+      markActualRenderTimeStarted(fiber: Fiber): void {},
+      pauseActualRenderTimerIfRunning(): void {},
+      recordElapsedActualRenderTime(fiber: Fiber): void {},
+      resetActualRenderTimer(): void {},
+      resumeActualRenderTimerIfPaused(): void {},
+      recordElapsedBaseRenderTimeIfRunning(fiber: Fiber): void {},
+      startBaseRenderTimer(): void {},
+      stopBaseRenderTimerIfRunning(): void {},
+    };
+  }
+}
diff --git a/packages/react-reconciler/src/ReactTypeOfMode.js b/packages/react-reconciler/src/ReactTypeOfMode.js
index e93b4d984d..4bf9da2ec8 100644
--- a/packages/react-reconciler/src/ReactTypeOfMode.js
+++ b/packages/react-reconciler/src/ReactTypeOfMode.js
@@ -9,6 +9,7 @@
 
 export type TypeOfMode = number;
 
-export const NoContext = 0b00;
-export const AsyncMode = 0b01;
-export const StrictMode = 0b10;
+export const NoContext = 0b000;
+export const AsyncMode = 0b001;
+export const StrictMode = 0b010;
+export const ProfileMode = 0b100;
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
index d5dc2b6f6a..1e33804d12 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
@@ -187,15 +187,17 @@ describe('ReactDebugFiberPerf', () => {
     expect(getFlameChart()).toMatchSnapshot();
   });
 
-  it('does not include StrictMode or AsyncMode components in measurements', () => {
+  it('does not include AsyncMode, StrictMode, or Profiler components in measurements', () => {
     ReactNoop.render(
-      <React.StrictMode>
-        <Parent>
-          <React.unstable_AsyncMode>
-            <Child />
-          </React.unstable_AsyncMode>
-        </Parent>
-      </React.StrictMode>,
+      <React.unstable_Profiler id="test" onRender={jest.fn()}>
+        <React.StrictMode>
+          <Parent>
+            <React.unstable_AsyncMode>
+              <Child />
+            </React.unstable_AsyncMode>
+          </Parent>
+        </React.StrictMode>
+      </React.unstable_Profiler>,
     );
     addComment('Mount');
     ReactNoop.flush();
diff --git a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
index ffe5706d1c..119c55154e 100644
--- a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
+++ b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
@@ -91,13 +91,14 @@ exports[`ReactDebugFiberPerf deduplicates lifecycle names during commit to reduc
 "
 `;
 
-exports[`ReactDebugFiberPerf does not include StrictMode or AsyncMode components in measurements 1`] = `
+exports[`ReactDebugFiberPerf does not include AsyncMode, StrictMode, or Profiler components in measurements 1`] = `
 "⚛ (Waiting for async callback... will force flush in 5230 ms)
 
 // Mount
 ⚛ (React Tree Reconciliation: Completed Root)
-  ⚛ Parent [mount]
-    ⚛ Child [mount]
+  ⚛ Profiler(test) [mount]
+    ⚛ Parent [mount]
+      ⚛ Child [mount]
 
 ⚛ (Committing Changes)
   ⚛ (Committing Snapshot Effects: 0 Total)
diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js
index d3ef7aff4f..561aed6c58 100644
--- a/packages/react-test-renderer/src/ReactTestRenderer.js
+++ b/packages/react-test-renderer/src/ReactTestRenderer.js
@@ -27,6 +27,7 @@ import {
   ContextProvider,
   Mode,
   ForwardRef,
+  Profiler,
 } from 'shared/ReactTypeOfWork';
 import invariant from 'fbjs/lib/invariant';
 
@@ -119,7 +120,7 @@ function removeChild(
 }
 
 // Current virtual time
-let currentTime: number = 0;
+let nowImplementation = () => 0;
 let scheduledCallback: ((deadline: Deadline) => mixed) | null = null;
 let yieldedValues: Array<mixed> | null = null;
 
@@ -221,9 +222,9 @@ const TestRenderer = ReactFiberReconciler({
 
   getPublicInstance,
 
-  now(): number {
-    return currentTime;
-  },
+  // This approach enables `now` to be mocked by tests,
+  // Even after the reconciler has initialized and read host config values.
+  now: () => nowImplementation(),
 
   mutation: {
     commitUpdate(
@@ -383,6 +384,7 @@ function toTree(node: ?Fiber) {
     case ContextProvider:
     case ContextConsumer:
     case Mode:
+    case Profiler:
     case ForwardRef:
       return childrenToTree(node.child);
     default:
@@ -486,6 +488,7 @@ class ReactTestInstance {
         case ContextProvider:
         case ContextConsumer:
         case Mode:
+        case Profiler:
           descend = true;
           break;
         default:
@@ -737,7 +740,11 @@ const ReactTestRendererFiber = {
         }
         return TestRenderer.getPublicRootInstance(root);
       },
-      unstable_flushSync: TestRenderer.flushSync,
+      unstable_flushSync(fn: Function) {
+        yieldedValues = [];
+        TestRenderer.flushSync(fn);
+        return yieldedValues;
+      },
     };
 
     Object.defineProperty(
@@ -761,6 +768,10 @@ const ReactTestRendererFiber = {
   /* eslint-disable camelcase */
   unstable_batchedUpdates: batchedUpdates,
   /* eslint-enable camelcase */
+
+  unstable_setNowImplementation(implementation: () => number): void {
+    nowImplementation = implementation;
+  },
 };
 
 export default ReactTestRendererFiber;
diff --git a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
index b20f316d9e..ce62bba280 100644
--- a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
@@ -230,6 +230,32 @@ describe('ReactShallowRenderer', () => {
     ]);
   });
 
+  it('should handle Profiler', () => {
+    class SomeComponent extends React.Component {
+      render() {
+        return (
+          <React.unstable_Profiler id="test" onRender={jest.fn()}>
+            <div>
+              <span className="child1" />
+              <span className="child2" />
+            </div>
+          </React.unstable_Profiler>
+        );
+      }
+    }
+
+    const shallowRenderer = createRenderer();
+    const result = shallowRenderer.render(<SomeComponent />);
+
+    expect(result.type).toBe(React.unstable_Profiler);
+    expect(result.props.children).toEqual(
+      <div>
+        <span className="child1" />
+        <span className="child2" />
+      </div>,
+    );
+  });
+
   it('should enable shouldComponentUpdate to prevent a re-render', () => {
     let renderCounter = 0;
     class SimpleComponent extends React.Component {
diff --git a/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js b/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js
index e6f3909b0b..cefef5657c 100644
--- a/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js
@@ -37,7 +37,9 @@ describe('ReactTestRendererTraversal', () => {
               <View void="void" />
               <View void="void" />
             </ExampleNull>
-            <ExampleForwardRef qux="qux" />
+            <React.unstable_Profiler id="test" onRender={() => {}}>
+              <ExampleForwardRef qux="qux" />
+            </React.unstable_Profiler>
           </View>
         </View>
       );
diff --git a/packages/react/src/React.js b/packages/react/src/React.js
index d3a52cf61c..d474040611 100644
--- a/packages/react/src/React.js
+++ b/packages/react/src/React.js
@@ -8,9 +8,10 @@
 import assign from 'object-assign';
 import ReactVersion from 'shared/ReactVersion';
 import {
-  REACT_FRAGMENT_TYPE,
-  REACT_STRICT_MODE_TYPE,
   REACT_ASYNC_MODE_TYPE,
+  REACT_FRAGMENT_TYPE,
+  REACT_PROFILER_TYPE,
+  REACT_STRICT_MODE_TYPE,
 } from 'shared/ReactSymbols';
 
 import {Component, PureComponent} from './ReactBaseClasses';
@@ -51,6 +52,7 @@ const React = {
   Fragment: REACT_FRAGMENT_TYPE,
   StrictMode: REACT_STRICT_MODE_TYPE,
   unstable_AsyncMode: REACT_ASYNC_MODE_TYPE,
+  unstable_Profiler: REACT_PROFILER_TYPE,
 
   createElement: __DEV__ ? createElementWithValidation : createElement,
   cloneElement: __DEV__ ? cloneElementWithValidation : cloneElement,
diff --git a/packages/react/src/__tests__/ReactProfiler-test.internal.js b/packages/react/src/__tests__/ReactProfiler-test.internal.js
new file mode 100644
index 0000000000..e97d8eeef9
--- /dev/null
+++ b/packages/react/src/__tests__/ReactProfiler-test.internal.js
@@ -0,0 +1,862 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react-core
+ */
+
+'use strict';
+
+let React;
+let ReactFeatureFlags;
+let ReactTestRenderer;
+
+function loadModules({
+  enableProfilerTimer = true,
+  replayFailedUnitOfWorkWithInvokeGuardedCallback = false,
+} = {}) {
+  ReactFeatureFlags = require('shared/ReactFeatureFlags');
+  ReactFeatureFlags.debugRenderPhaseSideEffects = false;
+  ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
+  ReactFeatureFlags.enableProfilerTimer = enableProfilerTimer;
+  ReactFeatureFlags.enableGetDerivedStateFromCatch = true;
+  ReactFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback = replayFailedUnitOfWorkWithInvokeGuardedCallback;
+  React = require('react');
+  ReactTestRenderer = require('react-test-renderer');
+}
+
+describe('Profiler', () => {
+  describe('works in profiling and non-profiling bundles', () => {
+    [true, false].forEach(flagEnabled => {
+      describe(`enableProfilerTimer ${
+        flagEnabled ? 'enabled' : 'disabled'
+      }`, () => {
+        beforeEach(() => {
+          jest.resetModules();
+
+          loadModules({enableProfilerTimer: flagEnabled});
+        });
+
+        // This will throw in production too,
+        // But the test is only interested in verifying the DEV error message.
+        if (__DEV__) {
+          it('should warn if required params are missing', () => {
+            expect(() => {
+              ReactTestRenderer.create(<React.unstable_Profiler />);
+            }).toThrow(
+              'Profiler must specify an "id" string and "onRender" function as props',
+            );
+          });
+        }
+
+        it('should support an empty Profiler (with no children)', () => {
+          // As root
+          expect(
+            ReactTestRenderer.create(
+              <React.unstable_Profiler id="label" onRender={jest.fn()} />,
+            ).toJSON(),
+          ).toMatchSnapshot();
+
+          // As non-root
+          expect(
+            ReactTestRenderer.create(
+              <div>
+                <React.unstable_Profiler id="label" onRender={jest.fn()} />
+              </div>,
+            ).toJSON(),
+          ).toMatchSnapshot();
+        });
+
+        it('should render children', () => {
+          const FunctionalComponent = ({label}) => <span>{label}</span>;
+          const renderer = ReactTestRenderer.create(
+            <div>
+              <span>outside span</span>
+              <React.unstable_Profiler id="label" onRender={jest.fn()}>
+                <span>inside span</span>
+                <FunctionalComponent label="functional component" />
+              </React.unstable_Profiler>
+            </div>,
+          );
+          expect(renderer.toJSON()).toMatchSnapshot();
+        });
+
+        it('should support nested Profilers', () => {
+          const FunctionalComponent = ({label}) => <div>{label}</div>;
+          class ClassComponent extends React.Component {
+            render() {
+              return <block>{this.props.label}</block>;
+            }
+          }
+          const renderer = ReactTestRenderer.create(
+            <React.unstable_Profiler id="outer" onRender={jest.fn()}>
+              <FunctionalComponent label="outer functional component" />
+              <React.unstable_Profiler id="inner" onRender={jest.fn()}>
+                <ClassComponent label="inner class component" />
+                <span>inner span</span>
+              </React.unstable_Profiler>
+            </React.unstable_Profiler>,
+          );
+          expect(renderer.toJSON()).toMatchSnapshot();
+        });
+      });
+    });
+  });
+
+  describe('onRender callback', () => {
+    let AdvanceTime;
+    let advanceTimeBy;
+
+    const mockNowForTests = () => {
+      let currentTime = 0;
+      ReactTestRenderer.unstable_setNowImplementation(() => currentTime);
+      advanceTimeBy = amount => {
+        currentTime += amount;
+      };
+    };
+
+    beforeEach(() => {
+      jest.resetModules();
+
+      loadModules();
+      mockNowForTests();
+
+      AdvanceTime = class extends React.Component {
+        static defaultProps = {
+          byAmount: 10,
+          shouldComponentUpdate: true,
+        };
+        shouldComponentUpdate(nextProps) {
+          return nextProps.shouldComponentUpdate;
+        }
+        render() {
+          // Simulate time passing when this component is rendered
+          advanceTimeBy(this.props.byAmount);
+          return this.props.children || null;
+        }
+      };
+    });
+
+    it('is not invoked until the commit phase', () => {
+      const callback = jest.fn();
+
+      const Yield = ({value}) => {
+        renderer.unstable_yield(value);
+        return null;
+      };
+
+      const renderer = ReactTestRenderer.create(
+        <React.unstable_Profiler id="test" onRender={callback}>
+          <Yield value="first" />
+          <Yield value="last" />
+        </React.unstable_Profiler>,
+        {
+          unstable_isAsync: true,
+        },
+      );
+
+      // Times are logged until a render is committed.
+      renderer.unstable_flushThrough(['first']);
+      expect(callback).toHaveBeenCalledTimes(0);
+      expect(renderer.unstable_flushAll()).toEqual(['last']);
+      expect(callback).toHaveBeenCalledTimes(1);
+    });
+
+    it('logs render times for both mount and update', () => {
+      const callback = jest.fn();
+
+      const renderer = ReactTestRenderer.create(
+        <React.unstable_Profiler id="test" onRender={callback}>
+          <AdvanceTime />
+        </React.unstable_Profiler>,
+      );
+
+      expect(callback).toHaveBeenCalledTimes(1);
+
+      let [call] = callback.mock.calls;
+
+      expect(call).toHaveLength(4);
+      expect(call[0]).toBe('test');
+      expect(call[1]).toBe('mount');
+      expect(call[2]).toBe(10); // "actual" time
+      expect(call[3]).toBe(10); // "base" time
+
+      callback.mockReset();
+
+      renderer.update(
+        <React.unstable_Profiler id="test" onRender={callback}>
+          <AdvanceTime />
+        </React.unstable_Profiler>,
+      );
+
+      expect(callback).toHaveBeenCalledTimes(1);
+
+      [call] = callback.mock.calls;
+
+      expect(call).toHaveLength(4);
+      expect(call[0]).toBe('test');
+      expect(call[1]).toBe('update');
+      expect(call[2]).toBe(10); // "actual" time
+      expect(call[3]).toBe(10); // "base" time
+    });
+
+    it('includes render times of nested Profilers in their parent times', () => {
+      const callback = jest.fn();
+
+      ReactTestRenderer.create(
+        <React.Fragment>
+          <React.unstable_Profiler id="parent" onRender={callback}>
+            <AdvanceTime byAmount={10}>
+              <React.unstable_Profiler id="child" onRender={callback}>
+                <AdvanceTime byAmount={20} />
+              </React.unstable_Profiler>
+            </AdvanceTime>
+          </React.unstable_Profiler>
+        </React.Fragment>,
+      );
+
+      expect(callback).toHaveBeenCalledTimes(2);
+
+      // Callbacks bubble (reverse order).
+      const [childCall, parentCall] = callback.mock.calls;
+      expect(childCall[0]).toBe('child');
+      expect(parentCall[0]).toBe('parent');
+
+      // Parent times should include child times
+      expect(childCall[2]).toBe(20); // "actual" time
+      expect(childCall[3]).toBe(20); // "base" time
+      expect(parentCall[2]).toBe(30); // "actual" time
+      expect(parentCall[3]).toBe(30); // "base" time
+    });
+
+    it('tracks sibling Profilers separately', () => {
+      const callback = jest.fn();
+
+      ReactTestRenderer.create(
+        <React.Fragment>
+          <React.unstable_Profiler id="first" onRender={callback}>
+            <AdvanceTime byAmount={20} />
+          </React.unstable_Profiler>
+          <React.unstable_Profiler id="second" onRender={callback}>
+            <AdvanceTime byAmount={5} />
+          </React.unstable_Profiler>
+        </React.Fragment>,
+      );
+
+      expect(callback).toHaveBeenCalledTimes(2);
+
+      const [firstCall, secondCall] = callback.mock.calls;
+      expect(firstCall[0]).toBe('first');
+      expect(secondCall[0]).toBe('second');
+
+      // Parent times should include child times
+      expect(firstCall[2]).toBe(20); // "actual" time
+      expect(firstCall[3]).toBe(20); // "base" time
+      expect(secondCall[2]).toBe(5); // "actual" time
+      expect(secondCall[3]).toBe(5); // "base" time
+    });
+
+    it('does not include time spent outside of profile root', () => {
+      const callback = jest.fn();
+
+      ReactTestRenderer.create(
+        <React.Fragment>
+          <AdvanceTime byAmount={20} />
+          <React.unstable_Profiler id="test" onRender={callback}>
+            <AdvanceTime byAmount={5} />
+          </React.unstable_Profiler>
+          <AdvanceTime byAmount={20} />
+        </React.Fragment>,
+      );
+
+      expect(callback).toHaveBeenCalledTimes(1);
+
+      const [call] = callback.mock.calls;
+      expect(call[0]).toBe('test');
+      expect(call[2]).toBe(5); // "actual" time
+      expect(call[3]).toBe(5); // "base" time
+    });
+
+    it('is not called when blocked by sCU false', () => {
+      const callback = jest.fn();
+
+      let instance;
+      class Updater extends React.Component {
+        state = {};
+        render() {
+          instance = this;
+          return this.props.children;
+        }
+      }
+
+      class Pure extends React.PureComponent {
+        render() {
+          return this.props.children;
+        }
+      }
+
+      const renderer = ReactTestRenderer.create(
+        <React.unstable_Profiler id="outer" onRender={callback}>
+          <Updater>
+            <React.unstable_Profiler id="middle" onRender={callback}>
+              <Pure>
+                <React.unstable_Profiler id="inner" onRender={callback}>
+                  <div />
+                </React.unstable_Profiler>
+              </Pure>
+            </React.unstable_Profiler>
+          </Updater>
+        </React.unstable_Profiler>,
+      );
+
+      // All profile callbacks are called for initial render
+      expect(callback).toHaveBeenCalledTimes(3);
+
+      callback.mockReset();
+
+      renderer.unstable_flushSync(() => {
+        instance.setState({
+          count: 1,
+        });
+      });
+
+      // Only call profile updates for paths that have re-rendered
+      // Since "inner" is beneath a pure compoent, it isn't called
+      expect(callback).toHaveBeenCalledTimes(2);
+      expect(callback.mock.calls[0][0]).toBe('middle');
+      expect(callback.mock.calls[1][0]).toBe('outer');
+    });
+
+    it('decreases "actual" time but not "base" time when sCU prevents an update', () => {
+      const callback = jest.fn();
+
+      const renderer = ReactTestRenderer.create(
+        <React.unstable_Profiler id="test" onRender={callback}>
+          <AdvanceTime>
+            <AdvanceTime shouldComponentUpdate={false} />
+          </AdvanceTime>
+        </React.unstable_Profiler>,
+      );
+
+      expect(callback).toHaveBeenCalledTimes(1);
+
+      renderer.update(
+        <React.unstable_Profiler id="test" onRender={callback}>
+          <AdvanceTime>
+            <AdvanceTime shouldComponentUpdate={false} />
+          </AdvanceTime>
+        </React.unstable_Profiler>,
+      );
+
+      expect(callback).toHaveBeenCalledTimes(2);
+
+      const [mountCall, updateCall] = callback.mock.calls;
+
+      expect(mountCall[1]).toBe('mount');
+      expect(mountCall[2]).toBe(20); // "actual" time
+      expect(mountCall[3]).toBe(20); // "base" time
+
+      expect(updateCall[1]).toBe('update');
+      expect(updateCall[2]).toBe(10); // "actual" time
+      expect(updateCall[3]).toBe(20); // "base" time
+    });
+
+    it('includes time spent in render phase lifecycles', () => {
+      class WithLifecycles extends React.Component {
+        state = {};
+        static getDerivedStateFromProps() {
+          advanceTimeBy(3);
+          return null;
+        }
+        shouldComponentUpdate() {
+          advanceTimeBy(7);
+          return true;
+        }
+        render() {
+          advanceTimeBy(5);
+          return null;
+        }
+      }
+
+      const callback = jest.fn();
+
+      const renderer = ReactTestRenderer.create(
+        <React.unstable_Profiler id="test" onRender={callback}>
+          <WithLifecycles />
+        </React.unstable_Profiler>,
+      );
+
+      renderer.update(
+        <React.unstable_Profiler id="test" onRender={callback}>
+          <WithLifecycles />
+        </React.unstable_Profiler>,
+      );
+
+      expect(callback).toHaveBeenCalledTimes(2);
+
+      const [mountCall, updateCall] = callback.mock.calls;
+
+      expect(mountCall[1]).toBe('mount');
+      expect(mountCall[2]).toBe(8); // "actual" time
+      expect(mountCall[3]).toBe(8); // "base" time
+
+      expect(updateCall[1]).toBe('update');
+      expect(updateCall[2]).toBe(15); // "actual" time
+      expect(updateCall[3]).toBe(15); // "base" time
+    });
+
+    describe('with regard to interruptions', () => {
+      it('should accumulate "actual" time after a scheduling interruptions', () => {
+        const callback = jest.fn();
+
+        const Yield = ({renderTime}) => {
+          advanceTimeBy(renderTime);
+          renderer.unstable_yield('Yield:' + renderTime);
+          return null;
+        };
+
+        // Render partially, but run out of time before completing.
+        const renderer = ReactTestRenderer.create(
+          <React.unstable_Profiler id="test" onRender={callback}>
+            <Yield renderTime={2} />
+            <Yield renderTime={3} />
+          </React.unstable_Profiler>,
+          {unstable_isAsync: true},
+        );
+        expect(renderer.unstable_flushThrough(['Yield:2'])).toEqual([
+          'Yield:2',
+        ]);
+        expect(callback).toHaveBeenCalledTimes(0);
+
+        // Resume render for remaining children.
+        expect(renderer.unstable_flushAll()).toEqual(['Yield:3']);
+
+        // Verify that logged times include both durations above.
+        expect(callback).toHaveBeenCalledTimes(1);
+        expect(callback.mock.calls[0][2]).toBe(5); // "actual" time
+        expect(callback.mock.calls[0][3]).toBe(5); // "base" time
+      });
+
+      it('should not include time between frames', () => {
+        const callback = jest.fn();
+
+        const Yield = ({renderTime}) => {
+          advanceTimeBy(renderTime);
+          renderer.unstable_yield('Yield:' + renderTime);
+          return null;
+        };
+
+        // Render partially, but don't finish.
+        // This partial render should take 5ms of simulated time.
+        const renderer = ReactTestRenderer.create(
+          <React.unstable_Profiler id="outer" onRender={callback}>
+            <Yield renderTime={5} />
+            <Yield renderTime={10} />
+            <React.unstable_Profiler id="inner" onRender={callback}>
+              <Yield renderTime={17} />
+            </React.unstable_Profiler>
+          </React.unstable_Profiler>,
+          {unstable_isAsync: true},
+        );
+        expect(renderer.unstable_flushThrough(['Yield:5'])).toEqual([
+          'Yield:5',
+        ]);
+        expect(callback).toHaveBeenCalledTimes(0);
+
+        // Simulate time moving forward while frame is paused.
+        advanceTimeBy(50);
+
+        // Flush the remaninig work,
+        // Which should take an additional 10ms of simulated time.
+        expect(renderer.unstable_flushAll()).toEqual(['Yield:10', 'Yield:17']);
+        expect(callback).toHaveBeenCalledTimes(2);
+
+        const [innerCall, outerCall] = callback.mock.calls;
+
+        // Verify that the "actual" time includes all work times,
+        // But not the time that elapsed between frames.
+        expect(innerCall[0]).toBe('inner');
+        expect(innerCall[2]).toBe(17); // "actual" time
+        expect(innerCall[3]).toBe(17); // "base" time
+        expect(outerCall[0]).toBe('outer');
+        expect(outerCall[2]).toBe(32); // "actual" time
+        expect(outerCall[3]).toBe(32); // "base" time
+      });
+
+      it('should report the expected times when a high-priority update replaces an in-progress initial render', () => {
+        const callback = jest.fn();
+
+        const Yield = ({renderTime}) => {
+          advanceTimeBy(renderTime);
+          renderer.unstable_yield('Yield:' + renderTime);
+          return null;
+        };
+
+        // Render a partially update, but don't finish.
+        // This partial render should take 10ms of simulated time.
+        const renderer = ReactTestRenderer.create(
+          <React.unstable_Profiler id="test" onRender={callback}>
+            <Yield renderTime={10} />
+            <Yield renderTime={20} />
+          </React.unstable_Profiler>,
+          {unstable_isAsync: true},
+        );
+        expect(renderer.unstable_flushThrough(['first'])).toEqual(['Yield:10']);
+        expect(callback).toHaveBeenCalledTimes(0);
+
+        // Simulate time moving forward while frame is paused.
+        advanceTimeBy(100);
+
+        // Interrupt with higher priority work.
+        // The interrupted work simulates an additional 5ms of time.
+        expect(
+          renderer.unstable_flushSync(() => {
+            renderer.update(
+              <React.unstable_Profiler id="test" onRender={callback}>
+                <Yield renderTime={5} />
+              </React.unstable_Profiler>,
+            );
+          }),
+        ).toEqual(['Yield:5']);
+
+        // The initial work was thrown away in this case,
+        // So the "actual" and "base" times should only include the final rendered tree times.
+        expect(callback).toHaveBeenCalledTimes(1);
+        let call = callback.mock.calls[0];
+        expect(call[2]).toBe(5); // "actual" time
+        expect(call[3]).toBe(5); // "base" time
+
+        callback.mockReset();
+
+        // Verify no more unexpected callbacks from low priority work
+        expect(renderer.unstable_flushAll()).toEqual([]);
+        expect(callback).toHaveBeenCalledTimes(0);
+      });
+
+      it('should report the expected times when a high-priority update replaces a low-priority update', () => {
+        const callback = jest.fn();
+
+        const Yield = ({renderTime}) => {
+          advanceTimeBy(renderTime);
+          renderer.unstable_yield('Yield:' + renderTime);
+          return null;
+        };
+
+        const renderer = ReactTestRenderer.create(
+          <React.unstable_Profiler id="test" onRender={callback}>
+            <Yield renderTime={6} />
+            <Yield renderTime={15} />
+          </React.unstable_Profiler>,
+          {unstable_isAsync: true},
+        );
+
+        // Render everything initially.
+        // This should take 21 seconds of "actual" and "base" time.
+        expect(renderer.unstable_flushAll()).toEqual(['Yield:6', 'Yield:15']);
+        expect(callback).toHaveBeenCalledTimes(1);
+        let call = callback.mock.calls[0];
+        expect(call[2]).toBe(21); // "actual" time
+        expect(call[3]).toBe(21); // "base" time
+
+        callback.mockReset();
+
+        // Render a partially update, but don't finish.
+        // This partial render should take 3ms of simulated time.
+        renderer.update(
+          <React.unstable_Profiler id="test" onRender={callback}>
+            <Yield renderTime={3} />
+            <Yield renderTime={5} />
+            <Yield renderTime={9} />
+          </React.unstable_Profiler>,
+        );
+        expect(renderer.unstable_flushThrough(['Yield:3'])).toEqual([
+          'Yield:3',
+        ]);
+        expect(callback).toHaveBeenCalledTimes(0);
+
+        // Simulate time moving forward while frame is paused.
+        advanceTimeBy(100);
+
+        // Render another 5ms of simulated time.
+        expect(renderer.unstable_flushThrough(['Yield:5'])).toEqual([
+          'Yield:5',
+        ]);
+        expect(callback).toHaveBeenCalledTimes(0);
+
+        // Simulate time moving forward while frame is paused.
+        advanceTimeBy(100);
+
+        // Interrupt with higher priority work.
+        // The interrupted work simulates an additional 11ms of time.
+        expect(
+          renderer.unstable_flushSync(() => {
+            renderer.update(
+              <React.unstable_Profiler id="test" onRender={callback}>
+                <Yield renderTime={11} />
+              </React.unstable_Profiler>,
+            );
+          }),
+        ).toEqual(['Yield:11']);
+
+        // Verify that the "actual" time includes all three durations above.
+        // And the "base" time includes only the final rendered tree times.
+        expect(callback).toHaveBeenCalledTimes(1);
+        call = callback.mock.calls[0];
+        expect(call[2]).toBe(19); // "actual" time
+        expect(call[3]).toBe(11); // "base" time
+
+        // Verify no more unexpected callbacks from low priority work
+        expect(renderer.unstable_flushAll()).toEqual([]);
+        expect(callback).toHaveBeenCalledTimes(1);
+      });
+
+      it('should report the expected times when a high-priority update interrupts a low-priority update', () => {
+        const callback = jest.fn();
+
+        const Yield = ({renderTime}) => {
+          advanceTimeBy(renderTime);
+          renderer.unstable_yield('Yield:' + renderTime);
+          return null;
+        };
+
+        let first;
+        class FirstComponent extends React.Component {
+          state = {renderTime: 1};
+          render() {
+            first = this;
+            advanceTimeBy(this.state.renderTime);
+            renderer.unstable_yield('FirstComponent:' + this.state.renderTime);
+            return <Yield renderTime={4} />;
+          }
+        }
+        let second;
+        class SecondComponent extends React.Component {
+          state = {renderTime: 2};
+          render() {
+            second = this;
+            advanceTimeBy(this.state.renderTime);
+            renderer.unstable_yield('SecondComponent:' + this.state.renderTime);
+            return <Yield renderTime={7} />;
+          }
+        }
+
+        const renderer = ReactTestRenderer.create(
+          <React.unstable_Profiler id="test" onRender={callback} foo="1">
+            <FirstComponent />
+            <SecondComponent />
+          </React.unstable_Profiler>,
+          {unstable_isAsync: true},
+        );
+
+        // Render everything initially.
+        // This simulates a total of 14ms of "actual" render time.
+        // The "base" render time is also 14ms for the initial render.
+        expect(renderer.unstable_flushAll()).toEqual([
+          'FirstComponent:1',
+          'Yield:4',
+          'SecondComponent:2',
+          'Yield:7',
+        ]);
+        expect(callback).toHaveBeenCalledTimes(1);
+        let call = callback.mock.calls[0];
+        expect(call[2]).toBe(14); // "actual" time
+        expect(call[3]).toBe(14); // "base" time
+
+        callback.mockClear();
+
+        // Render a partially update, but don't finish.
+        // This partial render will take 10ms of "actual" render time.
+        first.setState({renderTime: 10});
+        expect(renderer.unstable_flushThrough(['FirstComponent:10'])).toEqual([
+          'FirstComponent:10',
+        ]);
+        expect(callback).toHaveBeenCalledTimes(0);
+
+        // Simulate time moving forward while frame is paused.
+        advanceTimeBy(100);
+
+        // Interrupt with higher priority work.
+        // This simulates a total of 37ms of "actual" render time.
+        expect(
+          renderer.unstable_flushSync(() => second.setState({renderTime: 30})),
+        ).toEqual(['SecondComponent:30', 'Yield:7']);
+
+        // Verify that the "actual" time includes time spent in the both renders so far (10ms and 37ms).
+        // The "base" time should include the more recent times for the SecondComponent subtree,
+        // As well as the original times for the FirstComponent subtree.
+        expect(callback).toHaveBeenCalledTimes(1);
+        call = callback.mock.calls[0];
+        expect(call[2]).toBe(47); // "actual" time
+        expect(call[3]).toBe(42); // "base" time
+
+        callback.mockClear();
+
+        // Resume the original low priority update, with rebased state.
+        // This simulates a total of 14ms of "actual" render time,
+        // And does not include the original (interrupted) 10ms.
+        // The tree contains 42ms of "base" render time at this point,
+        // Reflecting the most recent (longer) render durations.
+        // TODO: This "actual" time should decrease by 10ms once the scheduler supports resuming.
+        expect(renderer.unstable_flushAll()).toEqual([
+          'FirstComponent:10',
+          'Yield:4',
+        ]);
+        expect(callback).toHaveBeenCalledTimes(1);
+        call = callback.mock.calls[0];
+        expect(call[2]).toBe(14); // "actual" time
+        expect(call[3]).toBe(51); // "base" time
+      });
+
+      [true, false].forEach(flagEnabled => {
+        describe(`replayFailedUnitOfWorkWithInvokeGuardedCallback ${
+          flagEnabled ? 'enabled' : 'disabled'
+        }`, () => {
+          beforeEach(() => {
+            jest.resetModules();
+
+            loadModules({
+              replayFailedUnitOfWorkWithInvokeGuardedCallback: flagEnabled,
+            });
+            mockNowForTests();
+          });
+
+          it('should accumulate "actual" time after an error handled by componentDidCatch()', () => {
+            const callback = jest.fn();
+
+            const ThrowsError = () => {
+              advanceTimeBy(10);
+              throw Error('expected error');
+            };
+
+            class ErrorBoundary extends React.Component {
+              state = {error: null};
+              componentDidCatch(error) {
+                this.setState({error});
+              }
+              render() {
+                advanceTimeBy(2);
+                return this.state.error === null ? (
+                  this.props.children
+                ) : (
+                  <AdvanceTime byAmount={20} />
+                );
+              }
+            }
+
+            ReactTestRenderer.create(
+              <React.unstable_Profiler id="test" onRender={callback}>
+                <ErrorBoundary>
+                  <AdvanceTime byAmount={5} />
+                  <ThrowsError />
+                </ErrorBoundary>
+              </React.unstable_Profiler>,
+            );
+
+            expect(callback).toHaveBeenCalledTimes(2);
+
+            // Callbacks bubble (reverse order).
+            let [mountCall, updateCall] = callback.mock.calls;
+
+            // The initial mount only includes the ErrorBoundary (which takes 2ms)
+            // But it spends time rendering all of the failed subtree also.
+            expect(mountCall[1]).toBe('mount');
+            // "actual" time includes: 2 (ErrorBoundary) + 5 (AdvanceTime) + 10 (ThrowsError)
+            // If replayFailedUnitOfWorkWithInvokeGuardedCallback is enbaled, ThrowsError is replayed.
+            expect(mountCall[2]).toBe(flagEnabled && __DEV__ ? 27 : 17);
+            // "base" time includes: 2 (ErrorBoundary)
+            expect(mountCall[3]).toBe(2);
+
+            // The update includes the ErrorBoundary and its fallback child
+            expect(updateCall[1]).toBe('update');
+            // "actual" time includes: 2 (ErrorBoundary) + 20 (AdvanceTime)
+            expect(updateCall[2]).toBe(22);
+            // "base" time includes: 2 (ErrorBoundary) + 20 (AdvanceTime)
+            expect(updateCall[3]).toBe(22);
+          });
+
+          it('should accumulate "actual" time after an error handled by getDerivedStateFromCatch()', () => {
+            const callback = jest.fn();
+
+            const ThrowsError = () => {
+              advanceTimeBy(10);
+              throw Error('expected error');
+            };
+
+            class ErrorBoundary extends React.Component {
+              state = {error: null};
+              static getDerivedStateFromCatch(error) {
+                return {error};
+              }
+              render() {
+                advanceTimeBy(2);
+                return this.state.error === null ? (
+                  this.props.children
+                ) : (
+                  <AdvanceTime byAmount={20} />
+                );
+              }
+            }
+
+            ReactTestRenderer.create(
+              <React.unstable_Profiler id="test" onRender={callback}>
+                <ErrorBoundary>
+                  <AdvanceTime byAmount={5} />
+                  <ThrowsError />
+                </ErrorBoundary>
+              </React.unstable_Profiler>,
+            );
+
+            expect(callback).toHaveBeenCalledTimes(1);
+
+            // Callbacks bubble (reverse order).
+            let [mountCall] = callback.mock.calls;
+
+            // The initial mount includes the ErrorBoundary's error state,
+            // But i also spends "actual" time rendering UI that fails and isn't included.
+            expect(mountCall[1]).toBe('mount');
+            // "actual" time includes: 2 (ErrorBoundary) + 5 (AdvanceTime) + 10 (ThrowsError)
+            // Then the re-render: 2 (ErrorBoundary) + 20 (AdvanceTime)
+            // If replayFailedUnitOfWorkWithInvokeGuardedCallback is enbaled, ThrowsError is replayed.
+            expect(mountCall[2]).toBe(flagEnabled && __DEV__ ? 49 : 39);
+            // "base" time includes: 2 (ErrorBoundary) + 20 (AdvanceTime)
+            expect(mountCall[3]).toBe(22);
+          });
+        });
+      });
+    });
+
+    it('reflects the most recently rendered id value', () => {
+      const callback = jest.fn();
+
+      const renderer = ReactTestRenderer.create(
+        <React.unstable_Profiler id="one" onRender={callback}>
+          <AdvanceTime byAmount={2} />
+        </React.unstable_Profiler>,
+      );
+
+      expect(callback).toHaveBeenCalledTimes(1);
+
+      renderer.update(
+        <React.unstable_Profiler id="two" onRender={callback}>
+          <AdvanceTime byAmount={1} />
+        </React.unstable_Profiler>,
+      );
+
+      expect(callback).toHaveBeenCalledTimes(2);
+
+      const [mountCall, updateCall] = callback.mock.calls;
+
+      expect(mountCall[0]).toBe('one');
+      expect(mountCall[1]).toBe('mount');
+      expect(mountCall[2]).toBe(2); // "actual" time
+      expect(mountCall[3]).toBe(2); // "base" time
+
+      expect(updateCall[0]).toBe('two');
+      expect(updateCall[1]).toBe('update');
+      expect(updateCall[2]).toBe(1); // "actual" time
+      expect(updateCall[3]).toBe(1); // "base" time
+    });
+  });
+});
diff --git a/packages/react/src/__tests__/__snapshots__/ReactProfiler-test.internal.js.snap b/packages/react/src/__tests__/__snapshots__/ReactProfiler-test.internal.js.snap
new file mode 100644
index 0000000000..0022e5abd3
--- /dev/null
+++ b/packages/react/src/__tests__/__snapshots__/ReactProfiler-test.internal.js.snap
@@ -0,0 +1,65 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Profiler works in profiling and non-profiling bundles enableProfilerTimer disabled should render children 1`] = `
+<div>
+  <span>
+    outside span
+  </span>
+  <span>
+    inside span
+  </span>
+  <span>
+    functional component
+  </span>
+</div>
+`;
+
+exports[`Profiler works in profiling and non-profiling bundles enableProfilerTimer disabled should support an empty Profiler (with no children) 1`] = `null`;
+
+exports[`Profiler works in profiling and non-profiling bundles enableProfilerTimer disabled should support an empty Profiler (with no children) 2`] = `<div />`;
+
+exports[`Profiler works in profiling and non-profiling bundles enableProfilerTimer disabled should support nested Profilers 1`] = `
+Array [
+  <div>
+    outer functional component
+  </div>,
+  <block>
+    inner class component
+  </block>,
+  <span>
+    inner span
+  </span>,
+]
+`;
+
+exports[`Profiler works in profiling and non-profiling bundles enableProfilerTimer enabled should render children 1`] = `
+<div>
+  <span>
+    outside span
+  </span>
+  <span>
+    inside span
+  </span>
+  <span>
+    functional component
+  </span>
+</div>
+`;
+
+exports[`Profiler works in profiling and non-profiling bundles enableProfilerTimer enabled should support an empty Profiler (with no children) 1`] = `null`;
+
+exports[`Profiler works in profiling and non-profiling bundles enableProfilerTimer enabled should support an empty Profiler (with no children) 2`] = `<div />`;
+
+exports[`Profiler works in profiling and non-profiling bundles enableProfilerTimer enabled should support nested Profilers 1`] = `
+Array [
+  <div>
+    outer functional component
+  </div>,
+  <block>
+    inner class component
+  </block>,
+  <span>
+    inner span
+  </span>,
+]
+`;
diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
index 955668d13e..614a1b6cc7 100644
--- a/packages/shared/ReactFeatureFlags.js
+++ b/packages/shared/ReactFeatureFlags.js
@@ -37,6 +37,9 @@ export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 // Warn about deprecated, async-unsafe lifecycles; relates to RFC #6:
 export const warnAboutDeprecatedLifecycles = false;
 
+// Gather advanced timing metrics for Profiler subtrees.
+export const enableProfilerTimer = false;
+
 // Only used in www builds.
 export function addUserTimingListener() {
   invariant(false, 'Not implemented.');
diff --git a/packages/shared/ReactSymbols.js b/packages/shared/ReactSymbols.js
index 12e0fdddad..672e51de8e 100644
--- a/packages/shared/ReactSymbols.js
+++ b/packages/shared/ReactSymbols.js
@@ -27,6 +27,9 @@ export const REACT_FRAGMENT_TYPE = hasSymbol
 export const REACT_STRICT_MODE_TYPE = hasSymbol
   ? Symbol.for('react.strict_mode')
   : 0xeacc;
+export const REACT_PROFILER_TYPE = hasSymbol
+  ? Symbol.for('react.profile_root')
+  : 0xeacc;
 export const REACT_PROVIDER_TYPE = hasSymbol
   ? Symbol.for('react.provider')
   : 0xeacd;
diff --git a/packages/shared/ReactTypeOfWork.js b/packages/shared/ReactTypeOfWork.js
index 573b75aabc..1c672bb4b5 100644
--- a/packages/shared/ReactTypeOfWork.js
+++ b/packages/shared/ReactTypeOfWork.js
@@ -22,7 +22,8 @@ export type TypeOfWork =
   | 11
   | 12
   | 13
-  | 14;
+  | 14
+  | 15;
 
 export const IndeterminateComponent = 0; // Before we know whether it is functional or class
 export const FunctionalComponent = 1;
@@ -39,3 +40,4 @@ export const Mode = 11;
 export const ContextConsumer = 12;
 export const ContextProvider = 13;
 export const ForwardRef = 14;
+export const Profiler = 15;
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
index e2fd437999..7eb809c952 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
@@ -18,6 +18,7 @@ export const enableUserTimingAPI = __DEV__;
 export const enableGetDerivedStateFromCatch = false;
 export const warnAboutDeprecatedLifecycles = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
+export const enableProfilerTimer = __DEV__;
 
 // React Fabric uses persistent reconciler.
 export const enableMutatingReconciler = false;
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
index c6a4862d85..c6b30c6532 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
@@ -18,6 +18,7 @@ export const enableUserTimingAPI = __DEV__;
 export const enableGetDerivedStateFromCatch = false;
 export const warnAboutDeprecatedLifecycles = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
+export const enableProfilerTimer = false;
 
 // React Fabric uses persistent reconciler.
 export const enableMutatingReconciler = false;
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js
index 3026a69fc6..51e2133a67 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js
@@ -19,6 +19,7 @@ export const {
   debugRenderPhaseSideEffectsForStrictMode,
   warnAboutDeprecatedLifecycles,
   replayFailedUnitOfWorkWithInvokeGuardedCallback,
+  enableProfilerTimer,
 } = require('ReactFeatureFlags');
 
 // The rest of the flags are static for better dead code elimination.
diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js
index a238ca1688..5e03310dc0 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js
@@ -21,6 +21,7 @@ export const enablePersistentReconciler = false;
 export const enableUserTimingAPI = __DEV__;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const warnAboutDeprecatedLifecycles = false;
+export const enableProfilerTimer = false;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.persistent.js b/packages/shared/forks/ReactFeatureFlags.persistent.js
index 57d7c6bf53..780c62db4d 100644
--- a/packages/shared/forks/ReactFeatureFlags.persistent.js
+++ b/packages/shared/forks/ReactFeatureFlags.persistent.js
@@ -18,6 +18,7 @@ export const enableUserTimingAPI = __DEV__;
 export const enableGetDerivedStateFromCatch = false;
 export const warnAboutDeprecatedLifecycles = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
+export const enableProfilerTimer = false;
 
 // react-reconciler/persistent entry point
 // uses a persistent reconciler.
diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
index 000f950a4f..486aecfa68 100644
--- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js
+++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
@@ -21,6 +21,7 @@ export const replayFailedUnitOfWorkWithInvokeGuardedCallback = false;
 export const enableMutatingReconciler = true;
 export const enableNoopReconciler = false;
 export const enablePersistentReconciler = false;
+export const enableProfilerTimer = false;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js
index df3560c6fb..523e1604a6 100644
--- a/packages/shared/forks/ReactFeatureFlags.www.js
+++ b/packages/shared/forks/ReactFeatureFlags.www.js
@@ -17,6 +17,7 @@ export const {
   enableGetDerivedStateFromCatch,
   replayFailedUnitOfWorkWithInvokeGuardedCallback,
   warnAboutDeprecatedLifecycles,
+  enableProfilerTimer,
 } = require('ReactFeatureFlags');
 
 // The rest of the flags are static for better dead code elimination.
diff --git a/packages/shared/getComponentName.js b/packages/shared/getComponentName.js
index 23e10d1a73..ed448d8152 100644
--- a/packages/shared/getComponentName.js
+++ b/packages/shared/getComponentName.js
@@ -10,11 +10,14 @@
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
 
 import {
+  REACT_ASYNC_MODE_TYPE,
   REACT_CALL_TYPE,
+  REACT_FORWARD_REF_TYPE,
   REACT_FRAGMENT_TYPE,
   REACT_RETURN_TYPE,
   REACT_PORTAL_TYPE,
-  REACT_FORWARD_REF_TYPE,
+  REACT_PROFILER_TYPE,
+  REACT_STRICT_MODE_TYPE,
 } from 'shared/ReactSymbols';
 
 function getComponentName(fiber: Fiber): string | null {
@@ -26,14 +29,20 @@ function getComponentName(fiber: Fiber): string | null {
     return type;
   }
   switch (type) {
+    case REACT_ASYNC_MODE_TYPE:
+      return 'AsyncMode';
+    case REACT_CALL_TYPE:
+      return 'ReactCall';
     case REACT_FRAGMENT_TYPE:
       return 'ReactFragment';
     case REACT_PORTAL_TYPE:
       return 'ReactPortal';
-    case REACT_CALL_TYPE:
-      return 'ReactCall';
+    case REACT_PROFILER_TYPE:
+      return `Profiler(${fiber.pendingProps.id})`;
     case REACT_RETURN_TYPE:
       return 'ReactReturn';
+    case REACT_STRICT_MODE_TYPE:
+      return 'StrictMode';
   }
   if (typeof type === 'object' && type !== null) {
     switch (type.$$typeof) {
diff --git a/packages/shared/isValidElementType.js b/packages/shared/isValidElementType.js
index 7a333c8c11..c9a759d502 100644
--- a/packages/shared/isValidElementType.js
+++ b/packages/shared/isValidElementType.js
@@ -8,12 +8,13 @@
  */
 
 import {
-  REACT_FRAGMENT_TYPE,
   REACT_ASYNC_MODE_TYPE,
-  REACT_STRICT_MODE_TYPE,
-  REACT_PROVIDER_TYPE,
   REACT_CONTEXT_TYPE,
   REACT_FORWARD_REF_TYPE,
+  REACT_FRAGMENT_TYPE,
+  REACT_PROFILER_TYPE,
+  REACT_PROVIDER_TYPE,
+  REACT_STRICT_MODE_TYPE,
 } from 'shared/ReactSymbols';
 
 export default function isValidElementType(type: mixed) {
@@ -23,6 +24,7 @@ export default function isValidElementType(type: mixed) {
     // Note: its typeof might be other than 'symbol' or 'number' if it's a polyfill.
     type === REACT_FRAGMENT_TYPE ||
     type === REACT_ASYNC_MODE_TYPE ||
+    type === REACT_PROFILER_TYPE ||
     type === REACT_STRICT_MODE_TYPE ||
     (typeof type === 'object' &&
       type !== null &&

From 42a126237507a2038e9dbd7222a94b0debb9a69a Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Thu, 10 May 2018 18:08:11 -0700
Subject: [PATCH 027/277] Update sizes

---
 scripts/rollup/results.json | 300 ++++++++++++++++++------------------
 1 file changed, 150 insertions(+), 150 deletions(-)

diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index 67107645c5..f265beaf72 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -4,29 +4,29 @@
       "filename": "react.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react",
-      "size": 56795,
-      "gzip": 15603
+      "size": 57115,
+      "gzip": 15675
     },
     {
       "filename": "react.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react",
-      "size": 7164,
-      "gzip": 3039
+      "size": 7194,
+      "gzip": 3050
     },
     {
       "filename": "react.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react",
-      "size": 47210,
-      "gzip": 13192
+      "size": 47530,
+      "gzip": 13262
     },
     {
       "filename": "react.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react",
-      "size": 5668,
-      "gzip": 2468
+      "size": 5698,
+      "gzip": 2476
     },
     {
       "filename": "React-dev.js",
@@ -46,29 +46,29 @@
       "filename": "react-dom.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-dom",
-      "size": 626353,
-      "gzip": 144739
+      "size": 639980,
+      "gzip": 147756
     },
     {
       "filename": "react-dom.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-dom",
-      "size": 102821,
-      "gzip": 32649
+      "size": 103714,
+      "gzip": 33074
     },
     {
       "filename": "react-dom.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 610354,
-      "gzip": 140504
+      "size": 623973,
+      "gzip": 143563
     },
     {
       "filename": "react-dom.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
-      "size": 101220,
-      "gzip": 31815
+      "size": 102103,
+      "gzip": 32217
     },
     {
       "filename": "ReactDOM-dev.js",
@@ -88,29 +88,29 @@
       "filename": "react-dom-test-utils.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-dom",
-      "size": 41728,
-      "gzip": 11969
+      "size": 41683,
+      "gzip": 11959
     },
     {
       "filename": "react-dom-test-utils.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-dom",
-      "size": 10898,
-      "gzip": 4053
+      "size": 10852,
+      "gzip": 4037
     },
     {
       "filename": "react-dom-test-utils.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 36465,
-      "gzip": 10517
+      "size": 36420,
+      "gzip": 10508
     },
     {
       "filename": "react-dom-test-utils.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
-      "size": 10150,
-      "gzip": 3820
+      "size": 10105,
+      "gzip": 3815
     },
     {
       "filename": "ReactTestUtils-dev.js",
@@ -123,29 +123,29 @@
       "filename": "react-dom-unstable-native-dependencies.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-dom",
-      "size": 62648,
-      "gzip": 16409
+      "size": 62645,
+      "gzip": 16407
     },
     {
       "filename": "react-dom-unstable-native-dependencies.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-dom",
-      "size": 11595,
-      "gzip": 4012
+      "size": 11592,
+      "gzip": 4008
     },
     {
       "filename": "react-dom-unstable-native-dependencies.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 58210,
-      "gzip": 15123
+      "size": 58207,
+      "gzip": 15121
     },
     {
       "filename": "react-dom-unstable-native-dependencies.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
-      "size": 10918,
-      "gzip": 3765
+      "size": 10915,
+      "gzip": 3762
     },
     {
       "filename": "ReactDOMUnstableNativeDependencies-dev.js",
@@ -165,29 +165,29 @@
       "filename": "react-dom-server.browser.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-dom",
-      "size": 103762,
-      "gzip": 27108
+      "size": 103942,
+      "gzip": 27140
     },
     {
       "filename": "react-dom-server.browser.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-dom",
-      "size": 15564,
-      "gzip": 5951
+      "size": 15593,
+      "gzip": 5959
     },
     {
       "filename": "react-dom-server.browser.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 92806,
-      "gzip": 24789
+      "size": 92986,
+      "gzip": 24826
     },
     {
       "filename": "react-dom-server.browser.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
-      "size": 14909,
-      "gzip": 5679
+      "size": 14939,
+      "gzip": 5692
     },
     {
       "filename": "ReactDOMServer-dev.js",
@@ -207,43 +207,43 @@
       "filename": "react-dom-server.node.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 94774,
-      "gzip": 25349
+      "size": 94954,
+      "gzip": 25386
     },
     {
       "filename": "react-dom-server.node.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
-      "size": 15733,
-      "gzip": 5983
+      "size": 15763,
+      "gzip": 5997
     },
     {
       "filename": "react-art.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-art",
-      "size": 424539,
-      "gzip": 92383
+      "size": 438185,
+      "gzip": 95469
     },
     {
       "filename": "react-art.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-art",
-      "size": 92908,
-      "gzip": 28133
+      "size": 93805,
+      "gzip": 28540
     },
     {
       "filename": "react-art.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-art",
-      "size": 348598,
-      "gzip": 73299
+      "size": 362236,
+      "gzip": 76390
     },
     {
       "filename": "react-art.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-art",
-      "size": 56579,
-      "gzip": 17175
+      "size": 57462,
+      "gzip": 17574
     },
     {
       "filename": "ReactART-dev.js",
@@ -291,29 +291,29 @@
       "filename": "react-test-renderer.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-test-renderer",
-      "size": 356387,
-      "gzip": 74965
+      "size": 367787,
+      "gzip": 77332
     },
     {
       "filename": "react-test-renderer.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-test-renderer",
-      "size": 56480,
-      "gzip": 17088
+      "size": 57216,
+      "gzip": 17399
     },
     {
       "filename": "react-test-renderer.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-test-renderer",
-      "size": 346996,
-      "gzip": 72227
+      "size": 358388,
+      "gzip": 74592
     },
     {
       "filename": "react-test-renderer.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-test-renderer",
-      "size": 55696,
-      "gzip": 16727
+      "size": 56410,
+      "gzip": 16995
     },
     {
       "filename": "ReactTestRenderer-dev.js",
@@ -326,29 +326,29 @@
       "filename": "react-test-renderer-shallow.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-test-renderer",
-      "size": 24526,
-      "gzip": 6546
+      "size": 24939,
+      "gzip": 6654
     },
     {
       "filename": "react-test-renderer-shallow.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-test-renderer",
-      "size": 7344,
-      "gzip": 2396
+      "size": 7377,
+      "gzip": 2416
     },
     {
       "filename": "react-test-renderer-shallow.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-test-renderer",
-      "size": 14042,
-      "gzip": 3514
+      "size": 14595,
+      "gzip": 3660
     },
     {
       "filename": "react-test-renderer-shallow.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-test-renderer",
-      "size": 7087,
-      "gzip": 2315
+      "size": 7314,
+      "gzip": 2398
     },
     {
       "filename": "ReactShallowRenderer-dev.js",
@@ -361,99 +361,99 @@
       "filename": "react-noop-renderer.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-noop-renderer",
-      "size": 18663,
-      "gzip": 5148
+      "size": 18684,
+      "gzip": 5165
     },
     {
       "filename": "react-noop-renderer.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-noop-renderer",
-      "size": 6521,
-      "gzip": 2566
+      "size": 6479,
+      "gzip": 2549
     },
     {
       "filename": "react-reconciler.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-reconciler",
-      "size": 326858,
-      "gzip": 67568
+      "size": 337878,
+      "gzip": 69868
     },
     {
       "filename": "react-reconciler.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-reconciler",
-      "size": 48375,
-      "gzip": 14567
+      "size": 48996,
+      "gzip": 14768
     },
     {
       "filename": "react-reconciler-persistent.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-reconciler",
-      "size": 326178,
-      "gzip": 67326
+      "size": 337140,
+      "gzip": 69575
     },
     {
       "filename": "react-reconciler-persistent.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-reconciler",
-      "size": 47268,
-      "gzip": 14446
+      "size": 47919,
+      "gzip": 14583
     },
     {
       "filename": "react-reconciler-reflection.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-reconciler",
-      "size": 11326,
-      "gzip": 3505
+      "size": 11698,
+      "gzip": 3601
     },
     {
       "filename": "react-reconciler-reflection.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-reconciler",
-      "size": 2377,
-      "gzip": 1040
+      "size": 2320,
+      "gzip": 1034
     },
     {
       "filename": "react-call-return.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-call-return",
-      "size": 2683,
-      "gzip": 958
+      "size": 2671,
+      "gzip": 955
     },
     {
       "filename": "react-call-return.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-call-return",
-      "size": 971,
-      "gzip": 525
+      "size": 959,
+      "gzip": 522
     },
     {
       "filename": "react-is.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-is",
-      "size": 4384,
-      "gzip": 1252
+      "size": 4685,
+      "gzip": 1302
     },
     {
       "filename": "react-is.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-is",
-      "size": 1807,
-      "gzip": 748
+      "size": 1892,
+      "gzip": 773
     },
     {
       "filename": "react-is.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-is",
-      "size": 4195,
-      "gzip": 1201
+      "size": 4496,
+      "gzip": 1245
     },
     {
       "filename": "react-is.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-is",
-      "size": 1743,
-      "gzip": 685
+      "size": 1840,
+      "gzip": 707
     },
     {
       "filename": "ReactIs-dev.js",
@@ -501,190 +501,190 @@
       "filename": "React-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react",
-      "size": 47216,
-      "gzip": 12859
+      "size": 47536,
+      "gzip": 12932
     },
     {
       "filename": "React-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react",
-      "size": 13749,
-      "gzip": 3815
+      "size": 13822,
+      "gzip": 3825
     },
     {
       "filename": "ReactDOM-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-dom",
-      "size": 635369,
-      "gzip": 143277
+      "size": 649280,
+      "gzip": 146389
     },
     {
       "filename": "ReactDOM-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-dom",
-      "size": 291114,
-      "gzip": 53216
+      "size": 299975,
+      "gzip": 54678
     },
     {
       "filename": "ReactTestUtils-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-dom",
-      "size": 37779,
-      "gzip": 10710
+      "size": 37734,
+      "gzip": 10701
     },
     {
       "filename": "ReactDOMUnstableNativeDependencies-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-dom",
-      "size": 58465,
-      "gzip": 14911
+      "size": 58462,
+      "gzip": 14909
     },
     {
       "filename": "ReactDOMUnstableNativeDependencies-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-dom",
-      "size": 26974,
-      "gzip": 5507
+      "size": 26971,
+      "gzip": 5503
     },
     {
       "filename": "ReactDOMServer-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-dom",
-      "size": 96360,
-      "gzip": 24600
+      "size": 96543,
+      "gzip": 24639
     },
     {
       "filename": "ReactDOMServer-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-dom",
-      "size": 32376,
-      "gzip": 7965
+      "size": 32475,
+      "gzip": 7968
     },
     {
       "filename": "ReactART-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-art",
-      "size": 357056,
-      "gzip": 72841
+      "size": 370976,
+      "gzip": 75980
     },
     {
       "filename": "ReactART-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-art",
-      "size": 171040,
-      "gzip": 28102
+      "size": 179924,
+      "gzip": 29606
     },
     {
       "filename": "ReactNativeRenderer-dev.js",
       "bundleType": "RN_FB_DEV",
       "packageName": "react-native-renderer",
-      "size": 470028,
-      "gzip": 100556
+      "size": 481278,
+      "gzip": 102913
     },
     {
       "filename": "ReactNativeRenderer-prod.js",
       "bundleType": "RN_FB_PROD",
       "packageName": "react-native-renderer",
-      "size": 222916,
-      "gzip": 37259
+      "size": 230529,
+      "gzip": 38569
     },
     {
       "filename": "ReactNativeRenderer-dev.js",
       "bundleType": "RN_OSS_DEV",
       "packageName": "react-native-renderer",
-      "size": 469772,
-      "gzip": 100493
+      "size": 480999,
+      "gzip": 102846
     },
     {
       "filename": "ReactNativeRenderer-prod.js",
       "bundleType": "RN_OSS_PROD",
       "packageName": "react-native-renderer",
-      "size": 222116,
-      "gzip": 37129
+      "size": 224503,
+      "gzip": 37480
     },
     {
       "filename": "ReactFabric-dev.js",
       "bundleType": "RN_FB_DEV",
       "packageName": "react-native-renderer",
-      "size": 452022,
-      "gzip": 96052
+      "size": 463244,
+      "gzip": 98382
     },
     {
       "filename": "ReactFabric-prod.js",
       "bundleType": "RN_FB_PROD",
       "packageName": "react-native-renderer",
-      "size": 207365,
-      "gzip": 34455
+      "size": 209798,
+      "gzip": 34820
     },
     {
       "filename": "ReactFabric-dev.js",
       "bundleType": "RN_OSS_DEV",
       "packageName": "react-native-renderer",
-      "size": 452057,
-      "gzip": 96067
+      "size": 463280,
+      "gzip": 98398
     },
     {
       "filename": "ReactFabric-prod.js",
       "bundleType": "RN_OSS_PROD",
       "packageName": "react-native-renderer",
-      "size": 207401,
-      "gzip": 34473
+      "size": 209834,
+      "gzip": 34837
     },
     {
       "filename": "ReactTestRenderer-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-test-renderer",
-      "size": 355733,
-      "gzip": 71836
+      "size": 367404,
+      "gzip": 74293
     },
     {
       "filename": "ReactShallowRenderer-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-test-renderer",
-      "size": 14759,
-      "gzip": 3631
+      "size": 15318,
+      "gzip": 3781
     },
     {
       "filename": "ReactIs-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-is",
-      "size": 4263,
-      "gzip": 1220
+      "size": 4564,
+      "gzip": 1270
     },
     {
       "filename": "ReactIs-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-is",
-      "size": 3414,
-      "gzip": 953
+      "size": 3653,
+      "gzip": 977
     },
     {
       "filename": "react-scheduler.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-scheduler",
-      "size": 10937,
-      "gzip": 3771
+      "size": 13551,
+      "gzip": 4584
     },
     {
       "filename": "react-scheduler.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-scheduler",
-      "size": 1721,
-      "gzip": 873
+      "size": 1979,
+      "gzip": 1032
     },
     {
       "filename": "react-scheduler.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-scheduler",
-      "size": 10741,
-      "gzip": 3720
+      "size": 13355,
+      "gzip": 4534
     },
     {
       "filename": "react-scheduler.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-scheduler",
-      "size": 1792,
-      "gzip": 889
+      "size": 2068,
+      "gzip": 1051
     }
   ]
 }
\ No newline at end of file

From 6565795377d1d2c79a7708766f1af9e1a87517de Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Thu, 10 May 2018 18:09:10 -0700
Subject: [PATCH 028/277] Suspense (#12279)

* Timeout component

Adds Timeout component. If a promise is thrown from inside a Timeout component,
React will suspend the in-progress render from committing. When the promise
resolves, React will retry. If the render is suspended for longer than the
maximum threshold, the Timeout switches to a placeholder state.

The timeout threshold is defined as the minimum of:
- The expiration time of the current render
- The `ms` prop given to each Timeout component in the ancestor path of the
thrown promise.

* Add a test for nested fallbacks

Co-authored-by: Andrew Clark <acdlite@fb.com>

* Resume on promise rejection

React should resume rendering regardless of whether it resolves
or rejects.

* Wrap Suspense code in feature flag

* Children of a Timeout must be strict mode compatible

Async is not required for Suspense, but strict mode is.

* Simplify list of pending work

Some of this was added with "soft expiration" in mind, but now with our revised
model for how soft expiration will work, this isn't necessary.

It would be nice to remove more of this, but I think the list itself is inherent
because we need a way to track the start times, for <Timeout ms={ms} />.

* Only use the Timeout update queue to store promises, not for state

It already worked this way in practice.

* Wrap more Suspense-only paths in the feature flag

* Attach promise listener immediately on suspend

Instead of waiting for commit phase.

* Infer approximate start time using expiration time

* Remove list of pending priority levels

We can replicate almost all the functionality by tracking just five
separate levels: the highest/lowest priority pending levels, the
highest/lowest priority suspended levels, and the lowest pinged level.

We lose a bit of granularity, in that if there are multiple levels of
pending updates, only the first and last ones are known. But in practice
this likely isn't a big deal.

These heuristics are almost entirely isolated to a single module and
can be adjusted later, without API changes, if necessary.

Non-IO-bound work is not affected at all.

* ReactFiberPendingWork -> ReactFiberPendingPriority

* Renaming method names from "pending work" to "pending priority"

* Get rid of SuspenseThenable module

Idk why I thought this was neccessary

* Nits based on Sebastian's feedback

* More naming nits + comments

* Add test for hiding a suspended tree to unblock

* Revert change to expiration time rounding

This means you have to account for the start time approximation
heuristic when writing Suspense tests, but that's going to be
true regardless.

When updating the tests, I also made a fix related to offscreen
priority. We should never timeout inside a hidden tree.

* palceholder -> placeholder
---
 packages/react-reconciler/src/ReactFiber.js   |   8 +
 .../src/ReactFiberBeginWork.js                |  52 +-
 .../src/ReactFiberClassComponent.js           |  15 +-
 .../src/ReactFiberCommitWork.js               |   8 +
 .../src/ReactFiberCompleteWork.js             |   3 +
 .../src/ReactFiberExpirationTime.js           |   9 +-
 .../src/ReactFiberPendingPriority.js          | 196 ++++
 .../src/ReactFiberReconciler.js               |  15 +-
 .../react-reconciler/src/ReactFiberRoot.js    |  23 +
 .../src/ReactFiberScheduler.js                | 128 ++-
 .../src/ReactFiberUnwindWork.js               | 155 ++-
 .../__tests__/ReactSuspense-test.internal.js  | 946 ++++++++++++++++++
 ...ReactIncrementalPerf-test.internal.js.snap |  54 +-
 packages/react/src/React.js                   |   7 +
 packages/shared/ReactFeatureFlags.js          |   2 +
 packages/shared/ReactSymbols.js               |   3 +
 packages/shared/ReactTypeOfWork.js            |   4 +-
 .../ReactFeatureFlags.native-fabric-fb.js     |   1 +
 .../ReactFeatureFlags.native-fabric-oss.js    |   1 +
 .../forks/ReactFeatureFlags.native-fb.js      |   1 +
 .../forks/ReactFeatureFlags.native-oss.js     |   1 +
 .../forks/ReactFeatureFlags.persistent.js     |   1 +
 .../forks/ReactFeatureFlags.test-renderer.js  |   1 +
 .../shared/forks/ReactFeatureFlags.www.js     |   1 +
 packages/shared/isValidElementType.js         |   2 +
 25 files changed, 1561 insertions(+), 76 deletions(-)
 create mode 100644 packages/react-reconciler/src/ReactFiberPendingPriority.js
 create mode 100644 packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js

diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js
index 51c4d52fe5..720fb9ffe1 100644
--- a/packages/react-reconciler/src/ReactFiber.js
+++ b/packages/react-reconciler/src/ReactFiber.js
@@ -32,6 +32,7 @@ import {
   ContextProvider,
   ContextConsumer,
   Profiler,
+  TimeoutComponent,
 } from 'shared/ReactTypeOfWork';
 import getComponentName from 'shared/getComponentName';
 
@@ -47,6 +48,7 @@ import {
   REACT_PROVIDER_TYPE,
   REACT_CONTEXT_TYPE,
   REACT_ASYNC_MODE_TYPE,
+  REACT_TIMEOUT_TYPE,
 } from 'shared/ReactSymbols';
 
 let hasBadMapPolyfill;
@@ -368,6 +370,12 @@ export function createFiberFromElement(
       case REACT_RETURN_TYPE:
         fiberTag = ReturnComponent;
         break;
+      case REACT_TIMEOUT_TYPE:
+        fiberTag = TimeoutComponent;
+        // Suspense does not require async, but its children should be strict
+        // mode compatible.
+        mode |= StrictMode;
+        break;
       default: {
         if (typeof type === 'object' && type !== null) {
           switch (type.$$typeof) {
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 2c80e26ffb..489393bebb 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -36,19 +36,21 @@ import {
   ContextProvider,
   ContextConsumer,
   Profiler,
+  TimeoutComponent,
 } from 'shared/ReactTypeOfWork';
 import {
   NoEffect,
   PerformedWork,
   Placement,
   ContentReset,
-  Ref,
   DidCapture,
   Update,
+  Ref,
 } from 'shared/ReactTypeOfSideEffect';
 import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
 import {
   enableGetDerivedStateFromCatch,
+  enableSuspense,
   debugRenderPhaseSideEffects,
   debugRenderPhaseSideEffectsForStrictMode,
   enableProfilerTimer,
@@ -91,8 +93,12 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
   newContext: NewContext,
   hydrationContext: HydrationContext<C, CX>,
   scheduleWork: (fiber: Fiber, expirationTime: ExpirationTime) => void,
-  computeExpirationForFiber: (fiber: Fiber) => ExpirationTime,
+  computeExpirationForFiber: (
+    startTime: ExpirationTime,
+    fiber: Fiber,
+  ) => ExpirationTime,
   profilerTimer: ProfilerTimer,
+  recalculateCurrentTime: () => ExpirationTime,
 ) {
   const {shouldSetTextContent, shouldDeprioritizeSubtree} = config;
 
@@ -132,6 +138,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     computeExpirationForFiber,
     memoizeProps,
     memoizeState,
+    recalculateCurrentTime,
   );
 
   // TODO: Remove this and use reconcileChildrenAtExpirationTime directly.
@@ -758,6 +765,41 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     return workInProgress.stateNode;
   }
 
+  function updateTimeoutComponent(
+    current,
+    workInProgress,
+    renderExpirationTime,
+  ) {
+    if (enableSuspense) {
+      const nextProps = workInProgress.pendingProps;
+      const prevProps = workInProgress.memoizedProps;
+
+      const prevDidTimeout = workInProgress.memoizedState;
+
+      // Check if we already attempted to render the normal state. If we did,
+      // and we timed out, render the placeholder state.
+      const alreadyCaptured =
+        (workInProgress.effectTag & DidCapture) === NoEffect;
+      const nextDidTimeout = !alreadyCaptured;
+
+      if (hasLegacyContextChanged()) {
+        // Normally we can bail out on props equality but if context has changed
+        // we don't do the bailout and we have to reuse existing props instead.
+      } else if (nextProps === prevProps && nextDidTimeout === prevDidTimeout) {
+        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      }
+
+      const render = nextProps.children;
+      const nextChildren = render(nextDidTimeout);
+      workInProgress.memoizedProps = nextProps;
+      workInProgress.memoizedState = nextDidTimeout;
+      reconcileChildren(current, workInProgress, nextChildren);
+      return workInProgress.child;
+    } else {
+      return null;
+    }
+  }
+
   function updatePortalComponent(
     current,
     workInProgress,
@@ -1209,6 +1251,12 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         // A return component is just a placeholder, we can just run through the
         // next one immediately.
         return null;
+      case TimeoutComponent:
+        return updateTimeoutComponent(
+          current,
+          workInProgress,
+          renderExpirationTime,
+        );
       case HostPortal:
         return updatePortalComponent(
           current,
diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js
index 444d1070e6..36bb58ecc5 100644
--- a/packages/react-reconciler/src/ReactFiberClassComponent.js
+++ b/packages/react-reconciler/src/ReactFiberClassComponent.js
@@ -152,9 +152,13 @@ export function applyDerivedStateFromProps(
 export default function(
   legacyContext: LegacyContext,
   scheduleWork: (fiber: Fiber, expirationTime: ExpirationTime) => void,
-  computeExpirationForFiber: (fiber: Fiber) => ExpirationTime,
+  computeExpirationForFiber: (
+    currentTime: ExpirationTime,
+    fiber: Fiber,
+  ) => ExpirationTime,
   memoizeProps: (workInProgress: Fiber, props: any) => void,
   memoizeState: (workInProgress: Fiber, state: any) => void,
+  recalculateCurrentTime: () => ExpirationTime,
 ) {
   const {
     cacheContext,
@@ -168,7 +172,8 @@ export default function(
     isMounted,
     enqueueSetState(inst, payload, callback) {
       const fiber = ReactInstanceMap.get(inst);
-      const expirationTime = computeExpirationForFiber(fiber);
+      const currentTime = recalculateCurrentTime();
+      const expirationTime = computeExpirationForFiber(currentTime, fiber);
 
       const update = createUpdate(expirationTime);
       update.payload = payload;
@@ -184,7 +189,8 @@ export default function(
     },
     enqueueReplaceState(inst, payload, callback) {
       const fiber = ReactInstanceMap.get(inst);
-      const expirationTime = computeExpirationForFiber(fiber);
+      const currentTime = recalculateCurrentTime();
+      const expirationTime = computeExpirationForFiber(currentTime, fiber);
 
       const update = createUpdate(expirationTime);
       update.tag = ReplaceState;
@@ -202,7 +208,8 @@ export default function(
     },
     enqueueForceUpdate(inst, callback) {
       const fiber = ReactInstanceMap.get(inst);
-      const expirationTime = computeExpirationForFiber(fiber);
+      const currentTime = recalculateCurrentTime();
+      const expirationTime = computeExpirationForFiber(currentTime, fiber);
 
       const update = createUpdate(expirationTime);
       update.tag = ForceUpdate;
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index 686a49219b..f3184ced83 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -27,6 +27,7 @@ import {
   HostPortal,
   CallComponent,
   Profiler,
+  TimeoutComponent,
 } from 'shared/ReactTypeOfWork';
 import ReactErrorUtils from 'shared/ReactErrorUtils';
 import {
@@ -314,6 +315,10 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         // We have no life-cycles associated with Profiler.
         return;
       }
+      case TimeoutComponent: {
+        // We have no life-cycles associated with Timeouts.
+        return;
+      }
       default: {
         invariant(
           false,
@@ -836,6 +841,9 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         }
         return;
       }
+      case TimeoutComponent: {
+        return;
+      }
       default: {
         invariant(
           false,
diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js
index e9752e38da..ab55061b12 100644
--- a/packages/react-reconciler/src/ReactFiberCompleteWork.js
+++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js
@@ -40,6 +40,7 @@ import {
   Fragment,
   Mode,
   Profiler,
+  TimeoutComponent,
 } from 'shared/ReactTypeOfWork';
 import {Placement, Ref, Update} from 'shared/ReactTypeOfSideEffect';
 import invariant from 'fbjs/lib/invariant';
@@ -593,6 +594,8 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         return null;
       case ForwardRef:
         return null;
+      case TimeoutComponent:
+        return null;
       case Fragment:
         return null;
       case Mode:
diff --git a/packages/react-reconciler/src/ReactFiberExpirationTime.js b/packages/react-reconciler/src/ReactFiberExpirationTime.js
index dca42c4e3d..7143173c9c 100644
--- a/packages/react-reconciler/src/ReactFiberExpirationTime.js
+++ b/packages/react-reconciler/src/ReactFiberExpirationTime.js
@@ -38,8 +38,11 @@ export function computeExpirationBucket(
   expirationInMs: number,
   bucketSizeMs: number,
 ): ExpirationTime {
-  return ceiling(
-    currentTime + expirationInMs / UNIT_SIZE,
-    bucketSizeMs / UNIT_SIZE,
+  return (
+    MAGIC_NUMBER_OFFSET +
+    ceiling(
+      currentTime - MAGIC_NUMBER_OFFSET + expirationInMs / UNIT_SIZE,
+      bucketSizeMs / UNIT_SIZE,
+    )
   );
 }
diff --git a/packages/react-reconciler/src/ReactFiberPendingPriority.js b/packages/react-reconciler/src/ReactFiberPendingPriority.js
new file mode 100644
index 0000000000..b34b266713
--- /dev/null
+++ b/packages/react-reconciler/src/ReactFiberPendingPriority.js
@@ -0,0 +1,196 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import type {FiberRoot} from './ReactFiberRoot';
+import type {ExpirationTime} from './ReactFiberExpirationTime';
+
+import {NoWork} from './ReactFiberExpirationTime';
+
+import {enableSuspense} from 'shared/ReactFeatureFlags';
+
+// TODO: Offscreen updates
+
+export function markPendingPriorityLevel(
+  root: FiberRoot,
+  expirationTime: ExpirationTime,
+): void {
+  if (enableSuspense) {
+    // Update the latest and earliest pending times
+    const earliestPendingTime = root.earliestPendingTime;
+    if (earliestPendingTime === NoWork) {
+      // No other pending updates.
+      root.earliestPendingTime = root.latestPendingTime = expirationTime;
+    } else {
+      if (earliestPendingTime > expirationTime) {
+        // This is the earliest pending update.
+        root.earliestPendingTime = expirationTime;
+      } else {
+        const latestPendingTime = root.latestPendingTime;
+        if (latestPendingTime < expirationTime) {
+          // This is the latest pending update
+          root.latestPendingTime = expirationTime;
+        }
+      }
+    }
+  }
+}
+
+export function markCommittedPriorityLevels(
+  root: FiberRoot,
+  currentTime: ExpirationTime,
+  earliestRemainingTime: ExpirationTime,
+): void {
+  if (enableSuspense) {
+    if (earliestRemainingTime === NoWork) {
+      // Fast path. There's no remaining work. Clear everything.
+      root.earliestPendingTime = NoWork;
+      root.latestPendingTime = NoWork;
+      root.earliestSuspendedTime = NoWork;
+      root.latestSuspendedTime = NoWork;
+      root.latestPingedTime = NoWork;
+      return;
+    }
+
+    // Let's see if the previous latest known pending level was just flushed.
+    const latestPendingTime = root.latestPendingTime;
+    if (latestPendingTime !== NoWork) {
+      if (latestPendingTime < earliestRemainingTime) {
+        // We've flushed all the known pending levels.
+        root.earliestPendingTime = root.latestPendingTime = NoWork;
+      } else {
+        const earliestPendingTime = root.earliestPendingTime;
+        if (earliestPendingTime < earliestRemainingTime) {
+          // We've flushed the earliest known pending level. Set this to the
+          // latest pending time.
+          root.earliestPendingTime = root.latestPendingTime;
+        }
+      }
+    }
+
+    // Now let's handle the earliest remaining level in the whole tree. We need to
+    // decide whether to treat it as a pending level or as suspended. Check
+    // it falls within the range of known suspended levels.
+
+    const earliestSuspendedTime = root.earliestSuspendedTime;
+    if (earliestSuspendedTime === NoWork) {
+      // There's no suspended work. Treat the earliest remaining level as a
+      // pending level.
+      markPendingPriorityLevel(root, earliestRemainingTime);
+      return;
+    }
+
+    const latestSuspendedTime = root.latestSuspendedTime;
+    if (earliestRemainingTime > latestSuspendedTime) {
+      // The earliest remaining level is later than all the suspended work. That
+      // means we've flushed all the suspended work.
+      root.earliestSuspendedTime = NoWork;
+      root.latestSuspendedTime = NoWork;
+      root.latestPingedTime = NoWork;
+
+      // There's no suspended work. Treat the earliest remaining level as a
+      // pending level.
+      markPendingPriorityLevel(root, earliestRemainingTime);
+      return;
+    }
+
+    if (earliestRemainingTime < earliestSuspendedTime) {
+      // The earliest remaining time is earlier than all the suspended work.
+      // Treat it as a pending update.
+      markPendingPriorityLevel(root, earliestRemainingTime);
+      return;
+    }
+
+    // The earliest remaining time falls within the range of known suspended
+    // levels. We should treat this as suspended work.
+  }
+}
+
+export function markSuspendedPriorityLevel(
+  root: FiberRoot,
+  suspendedTime: ExpirationTime,
+): void {
+  if (enableSuspense) {
+    // First, check the known pending levels and update them if needed.
+    const earliestPendingTime = root.earliestPendingTime;
+    const latestPendingTime = root.latestPendingTime;
+    if (earliestPendingTime === suspendedTime) {
+      if (latestPendingTime === suspendedTime) {
+        // Both known pending levels were suspended. Clear them.
+        root.earliestPendingTime = root.latestPendingTime = NoWork;
+      } else {
+        // The earliest pending level was suspended. Clear by setting it to the
+        // latest pending level.
+        root.earliestPendingTime = latestPendingTime;
+      }
+    } else if (latestPendingTime === suspendedTime) {
+      // The latest pending level was suspended. Clear by setting it to the
+      // latest pending level.
+      root.latestPendingTime = earliestPendingTime;
+    }
+
+    // Next, if we're working on the lowest known suspended level, clear the ping.
+    // TODO: What if a promise suspends and pings before the root completes?
+    const latestSuspendedTime = root.latestSuspendedTime;
+    if (latestSuspendedTime === suspendedTime) {
+      root.latestPingedTime = NoWork;
+    }
+
+    // Finally, update the known suspended levels.
+    const earliestSuspendedTime = root.earliestSuspendedTime;
+    if (earliestSuspendedTime === NoWork) {
+      // No other suspended levels.
+      root.earliestSuspendedTime = root.latestSuspendedTime = suspendedTime;
+    } else {
+      if (earliestSuspendedTime > suspendedTime) {
+        // This is the earliest suspended level.
+        root.earliestSuspendedTime = suspendedTime;
+      } else if (latestSuspendedTime < suspendedTime) {
+        // This is the latest suspended level
+        root.latestSuspendedTime = suspendedTime;
+      }
+    }
+  }
+}
+
+export function markPingedPriorityLevel(
+  root: FiberRoot,
+  pingedTime: ExpirationTime,
+): void {
+  if (enableSuspense) {
+    const latestSuspendedTime = root.latestSuspendedTime;
+    if (latestSuspendedTime !== NoWork && latestSuspendedTime <= pingedTime) {
+      const latestPingedTime = root.latestPingedTime;
+      if (latestPingedTime === NoWork || latestPingedTime < pingedTime) {
+        root.latestPingedTime = pingedTime;
+      }
+    }
+  }
+}
+
+export function findNextPendingPriorityLevel(root: FiberRoot): ExpirationTime {
+  if (enableSuspense) {
+    const earliestSuspendedTime = root.earliestSuspendedTime;
+    const earliestPendingTime = root.earliestPendingTime;
+    if (earliestSuspendedTime === NoWork) {
+      // Fast path. There's no suspended work.
+      return earliestPendingTime;
+    }
+
+    // First, check if there's known pending work.
+    if (earliestPendingTime !== NoWork) {
+      return earliestPendingTime;
+    }
+
+    // Finally, if a suspended level was pinged, work on that. Otherwise there's
+    // nothing to work on.
+    return root.latestPingedTime;
+  } else {
+    return root.current.expirationTime;
+  }
+}
diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js
index a3f38bc394..dd395af753 100644
--- a/packages/react-reconciler/src/ReactFiberReconciler.js
+++ b/packages/react-reconciler/src/ReactFiberReconciler.js
@@ -317,7 +317,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
   function scheduleRootUpdate(
     current: Fiber,
     element: ReactNodeList,
-    currentTime: ExpirationTime,
     expirationTime: ExpirationTime,
     callback: ?Function,
   ) {
@@ -364,7 +363,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     element: ReactNodeList,
     container: OpaqueRoot,
     parentComponent: ?React$Component<any, any>,
-    currentTime: ExpirationTime,
     expirationTime: ExpirationTime,
     callback: ?Function,
   ) {
@@ -390,13 +388,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       container.pendingContext = context;
     }
 
-    return scheduleRootUpdate(
-      current,
-      element,
-      currentTime,
-      expirationTime,
-      callback,
-    );
+    return scheduleRootUpdate(current, element, expirationTime, callback);
   }
 
   function findHostInstance(component: Object): PI | null {
@@ -436,12 +428,11 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     ): ExpirationTime {
       const current = container.current;
       const currentTime = recalculateCurrentTime();
-      const expirationTime = computeExpirationForFiber(current);
+      const expirationTime = computeExpirationForFiber(currentTime, current);
       return updateContainerAtExpirationTime(
         element,
         container,
         parentComponent,
-        currentTime,
         expirationTime,
         callback,
       );
@@ -454,12 +445,10 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       expirationTime,
       callback,
     ) {
-      const currentTime = recalculateCurrentTime();
       return updateContainerAtExpirationTime(
         element,
         container,
         parentComponent,
-        currentTime,
         expirationTime,
         callback,
       );
diff --git a/packages/react-reconciler/src/ReactFiberRoot.js b/packages/react-reconciler/src/ReactFiberRoot.js
index 50bcafbd39..302675ad3c 100644
--- a/packages/react-reconciler/src/ReactFiberRoot.js
+++ b/packages/react-reconciler/src/ReactFiberRoot.js
@@ -28,6 +28,22 @@ export type FiberRoot = {
   pendingChildren: any,
   // The currently active root fiber. This is the mutable root of the tree.
   current: Fiber,
+
+  // The following priority levels are used to distinguish between 1)
+  // uncommitted work, 2) uncommitted work that is suspended, and 3) uncommitted
+  // work that may be unsuspended. We choose not to track each individual
+  // pending level, trading granularity for performance.
+  //
+  // The earliest and latest priority levels that are suspended from committing.
+  earliestSuspendedTime: ExpirationTime,
+  latestSuspendedTime: ExpirationTime,
+  // The earliest and latest priority levels that are not known to be suspended.
+  earliestPendingTime: ExpirationTime,
+  latestPendingTime: ExpirationTime,
+  // The latest priority level that was pinged by a resolved promise and can
+  // be retried.
+  latestPingedTime: ExpirationTime,
+
   pendingCommitExpirationTime: ExpirationTime,
   // A finished work-in-progress HostRoot that's ready to be committed.
   // TODO: The reason this is separate from isReadyForCommit is because the
@@ -62,6 +78,13 @@ export function createFiberRoot(
     current: uninitializedFiber,
     containerInfo: containerInfo,
     pendingChildren: null,
+
+    earliestPendingTime: NoWork,
+    latestPendingTime: NoWork,
+    earliestSuspendedTime: NoWork,
+    latestSuspendedTime: NoWork,
+    latestPingedTime: NoWork,
+
     pendingCommitExpirationTime: NoWork,
     finishedWork: null,
     context: null,
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index fde57fd5a4..5c9657876c 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -58,6 +58,13 @@ import ReactFiberHostContext from './ReactFiberHostContext';
 import ReactFiberHydrationContext from './ReactFiberHydrationContext';
 import ReactFiberInstrumentation from './ReactFiberInstrumentation';
 import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
+import {
+  markPendingPriorityLevel,
+  markCommittedPriorityLevels,
+  findNextPendingPriorityLevel,
+  markSuspendedPriorityLevel,
+  markPingedPriorityLevel,
+} from './ReactFiberPendingPriority';
 import {
   recordEffect,
   recordScheduleUpdate,
@@ -94,6 +101,10 @@ import {enqueueUpdate, resetCurrentlyProcessingQueue} from './ReactUpdateQueue';
 import {createCapturedValue} from './ReactCapturedValue';
 import ReactFiberStack from './ReactFiberStack';
 
+export type Thenable = {
+  then(resolve: () => mixed, reject?: () => mixed): mixed,
+};
+
 const {
   invokeGuardedCallback,
   hasCaughtError,
@@ -190,6 +201,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     scheduleWork,
     computeExpirationForFiber,
     profilerTimer,
+    recalculateCurrentTime,
   );
   const {completeWork} = ReactFiberCompleteWork(
     config,
@@ -211,10 +223,14 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     legacyContext,
     newContext,
     scheduleWork,
+    computeExpirationForFiber,
+    recalculateCurrentTime,
     markLegacyErrorBoundaryAsFailed,
     isAlreadyFailedLegacyErrorBoundary,
     onUncaughtError,
     profilerTimer,
+    suspendRoot,
+    retrySuspendedRoot,
   );
   const {
     commitBeforeMutationLifeCycles,
@@ -264,6 +280,8 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
   let nextRoot: FiberRoot | null = null;
   // The time at which we're currently rendering work.
   let nextRenderExpirationTime: ExpirationTime = NoWork;
+  let nextLatestTimeoutMs: number = -1;
+  let nextRenderIsExpired: boolean = false;
 
   // The next fiber with an effect that we're currently committing.
   let nextEffect: Fiber | null = null;
@@ -288,9 +306,20 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     originalReplayError = null;
     replayUnitOfWork = (
       failedUnitOfWork: Fiber,
-      error: mixed,
+      thrownValue: mixed,
       isAsync: boolean,
     ) => {
+      if (
+        thrownValue !== null &&
+        typeof thrownValue === 'object' &&
+        typeof thrownValue.then === 'function'
+      ) {
+        // Don't replay promises. Treat everything else like an error.
+        // TODO: Need to figure out a different strategy if/when we add
+        // support for catching other types.
+        return;
+      }
+
       // Restore the original state of the work-in-progress
       assignFiberPropertiesInDEV(
         failedUnitOfWork,
@@ -316,7 +345,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       }
       // Replay the begin phase.
       isReplayingFailedUnitOfWork = true;
-      originalReplayError = error;
+      originalReplayError = thrownValue;
       invokeGuardedCallback(null, workLoop, null, isAsync);
       isReplayingFailedUnitOfWork = false;
       originalReplayError = null;
@@ -354,6 +383,8 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
 
     nextRoot = null;
     nextRenderExpirationTime = NoWork;
+    nextLatestTimeoutMs = -1;
+    nextRenderIsExpired = false;
     nextUnitOfWork = null;
 
     isRootReadyForCommit = false;
@@ -685,7 +716,8 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       ReactFiberInstrumentation.debugTool.onCommitWork(finishedWork);
     }
 
-    const remainingTime = root.current.expirationTime;
+    markCommittedPriorityLevels(root, currentTime, root.current.expirationTime);
+    const remainingTime = findNextPendingPriorityLevel(root);
     if (remainingTime === NoWork) {
       // If there's no remaining work, we can clear the set of already failed
       // error boundaries.
@@ -849,7 +881,11 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         // This fiber did not complete because something threw. Pop values off
         // the stack without entering the complete phase. If this is a boundary,
         // capture values if possible.
-        const next = unwindWork(workInProgress);
+        const next = unwindWork(
+          workInProgress,
+          nextRenderIsExpired,
+          nextRenderExpirationTime,
+        );
         // Because this fiber did not complete, don't reset its expiration time.
         if (workInProgress.effectTag & DidCapture) {
           // Restarting an error boundary
@@ -1003,6 +1039,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       resetStack();
       nextRoot = root;
       nextRenderExpirationTime = expirationTime;
+      nextLatestTimeoutMs = -1;
       nextUnitOfWork = createWorkInProgress(
         nextRoot.current,
         null,
@@ -1013,6 +1050,9 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
 
     let didFatal = false;
 
+    nextRenderIsExpired =
+      !isAsync || nextRenderExpirationTime <= mostRecentCurrentTime;
+
     startWorkLoopTimer(nextUnitOfWork);
 
     do {
@@ -1056,10 +1096,13 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
           break;
         }
         throwException(
+          root,
           returnFiber,
           sourceFiber,
           thrownValue,
+          nextRenderIsExpired,
           nextRenderExpirationTime,
+          mostRecentCurrentTimeMs,
         );
         nextUnitOfWork = completeUnitOfWork(sourceFiber);
       }
@@ -1094,10 +1137,19 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         stopWorkLoopTimer(interruptedBy, didCompleteRoot);
         interruptedBy = null;
         invariant(
-          false,
+          !nextRenderIsExpired,
           'Expired work should have completed. This error is likely caused ' +
             'by a bug in React. Please file an issue.',
         );
+        markSuspendedPriorityLevel(root, expirationTime);
+        if (nextLatestTimeoutMs >= 0) {
+          setTimeout(() => {
+            retrySuspendedRoot(root, expirationTime);
+          }, nextLatestTimeoutMs);
+        }
+        const firstUnblockedExpirationTime = findNextPendingPriorityLevel(root);
+        onBlock(firstUnblockedExpirationTime);
+        return null;
       }
     } else {
       stopWorkLoopTimer(interruptedBy, didCompleteRoot);
@@ -1218,7 +1270,10 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     return lastUniqueAsyncExpiration;
   }
 
-  function computeExpirationForFiber(fiber: Fiber) {
+  function computeExpirationForFiber(
+    currentTime: ExpirationTime,
+    fiber: Fiber,
+  ) {
     let expirationTime;
     if (expirationContext !== NoWork) {
       // An explicit expiration context was set;
@@ -1239,11 +1294,9 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       if (fiber.mode & AsyncMode) {
         if (isBatchingInteractiveUpdates) {
           // This is an interactive update
-          const currentTime = recalculateCurrentTime();
           expirationTime = computeInteractiveExpiration(currentTime);
         } else {
           // This is an async update
-          const currentTime = recalculateCurrentTime();
           expirationTime = computeAsyncExpiration(currentTime);
         }
       } else {
@@ -1265,19 +1318,32 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     return expirationTime;
   }
 
-  function scheduleWork(fiber: Fiber, expirationTime: ExpirationTime) {
-    return scheduleWorkImpl(fiber, expirationTime, false);
+  // TODO: Rename this to scheduleTimeout or something
+  function suspendRoot(
+    root: FiberRoot,
+    thenable: Thenable,
+    timeoutMs: number,
+    suspendedTime: ExpirationTime,
+  ) {
+    // Schedule the timeout.
+    if (timeoutMs >= 0 && nextLatestTimeoutMs < timeoutMs) {
+      nextLatestTimeoutMs = timeoutMs;
+    }
   }
 
-  function scheduleWorkImpl(
-    fiber: Fiber,
-    expirationTime: ExpirationTime,
-    isErrorRecovery: boolean,
-  ) {
+  function retrySuspendedRoot(root, suspendedTime) {
+    markPingedPriorityLevel(root, suspendedTime);
+    const retryTime = findNextPendingPriorityLevel(root);
+    if (retryTime !== NoWork) {
+      requestRetry(root, retryTime);
+    }
+  }
+
+  function scheduleWork(fiber: Fiber, expirationTime: ExpirationTime) {
     recordScheduleUpdate();
 
     if (__DEV__) {
-      if (!isErrorRecovery && fiber.tag === ClassComponent) {
+      if (fiber.tag === ClassComponent) {
         const instance = fiber.stateNode;
         warnAboutInvalidUpdates(instance);
       }
@@ -1313,6 +1379,8 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
             interruptedBy = fiber;
             resetStack();
           }
+          markPendingPriorityLevel(root, expirationTime);
+          const nextExpirationTimeToWorkOn = findNextPendingPriorityLevel(root);
           if (
             // If we're in the render phase, we don't need to schedule this root
             // for an update, because we'll do it before we exit...
@@ -1321,8 +1389,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
             // ...unless this is a different root than the one we're rendering.
             nextRoot !== root
           ) {
-            // Add this root to the root schedule.
-            requestWork(root, expirationTime);
+            requestWork(root, nextExpirationTimeToWorkOn);
           }
           if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
             invariant(
@@ -1335,7 +1402,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
           }
         } else {
           if (__DEV__) {
-            if (!isErrorRecovery && fiber.tag === ClassComponent) {
+            if (fiber.tag === ClassComponent) {
               warnAboutUpdateOnUnmounted(fiber);
             }
           }
@@ -1434,6 +1501,18 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     callbackID = scheduleDeferredCallback(performAsyncWork, {timeout});
   }
 
+  function requestRetry(root: FiberRoot, expirationTime: ExpirationTime) {
+    if (
+      root.remainingExpirationTime === NoWork ||
+      root.remainingExpirationTime < expirationTime
+    ) {
+      // For a retry, only update the remaining expiration time if it has a
+      // *lower priority* than the existing value. This is because, on a retry,
+      // we should attempt to coalesce as much as possible.
+      requestWork(root, expirationTime);
+    }
+  }
+
   // requestWork is called by the scheduler whenever a root receives an update.
   // It's up to the renderer to call renderRoot at some point in the future.
   function requestWork(root: FiberRoot, expirationTime: ExpirationTime) {
@@ -1606,6 +1685,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         (!deadlineDidExpire ||
           recalculateCurrentTime() >= nextFlushedExpirationTime)
       ) {
+        recalculateCurrentTime();
         performWorkOnRoot(
           nextFlushedRoot,
           nextFlushedExpirationTime,
@@ -1807,6 +1887,16 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     }
   }
 
+  function onBlock(remainingExpirationTime: ExpirationTime) {
+    invariant(
+      nextFlushedRoot !== null,
+      'Should be working on a root. This error is likely caused by a bug in ' +
+        'React. Please file an issue.',
+    );
+    // This root was blocked. Unschedule it until there's another update.
+    nextFlushedRoot.remainingExpirationTime = remainingExpirationTime;
+  }
+
   // TODO: Batching should be implemented at the renderer level, not inside
   // the reconciler.
   function batchedUpdates<A, R>(fn: (a: A) => R, a: A): R {
diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index 3337f02fcd..31bb8a258b 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -9,6 +9,7 @@
 
 import type {HostConfig} from 'react-reconciler';
 import type {Fiber} from './ReactFiber';
+import type {FiberRoot} from './ReactFiberRoot';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 import type {HostContext} from './ReactFiberHostContext';
 import type {LegacyContext} from './ReactFiberContext';
@@ -16,11 +17,13 @@ import type {NewContext} from './ReactFiberNewContext';
 import type {CapturedValue} from './ReactCapturedValue';
 import type {ProfilerTimer} from './ReactProfilerTimer';
 import type {Update} from './ReactUpdateQueue';
+import type {Thenable} from './ReactFiberScheduler';
 
 import {createCapturedValue} from './ReactCapturedValue';
 import {
   enqueueCapturedUpdate,
   createUpdate,
+  enqueueUpdate,
   CaptureUpdate,
 } from './ReactUpdateQueue';
 import {logError} from './ReactFiberCommitWork';
@@ -32,6 +35,7 @@ import {
   HostPortal,
   ContextProvider,
   Profiler,
+  TimeoutComponent,
 } from 'shared/ReactTypeOfWork';
 import {
   DidCapture,
@@ -42,22 +46,33 @@ import {
 import {
   enableGetDerivedStateFromCatch,
   enableProfilerTimer,
+  enableSuspense,
 } from 'shared/ReactFeatureFlags';
 
+import {Never, Sync, expirationTimeToMs} from './ReactFiberExpirationTime';
+
 export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
   config: HostConfig<T, P, I, TI, HI, PI, C, CC, CX, PL>,
   hostContext: HostContext<C, CX>,
   legacyContext: LegacyContext,
   newContext: NewContext,
-  scheduleWork: (
-    fiber: Fiber,
+  scheduleWork: (fiber: Fiber, expirationTime: ExpirationTime) => void,
+  computeExpirationForFiber: (
     startTime: ExpirationTime,
-    expirationTime: ExpirationTime,
-  ) => void,
+    fiber: Fiber,
+  ) => ExpirationTime,
+  recalculateCurrentTime: () => ExpirationTime,
   markLegacyErrorBoundaryAsFailed: (instance: mixed) => void,
   isAlreadyFailedLegacyErrorBoundary: (instance: mixed) => boolean,
   onUncaughtError: (error: mixed) => void,
   profilerTimer: ProfilerTimer,
+  suspendRoot: (
+    root: FiberRoot,
+    thenable: Thenable,
+    timeoutMs: number,
+    suspendedTime: ExpirationTime,
+  ) => void,
+  retrySuspendedRoot: (root: FiberRoot, suspendedTime: ExpirationTime) => void,
 ) {
   const {popHostContainer, popHostContext} = hostContext;
   const {
@@ -132,19 +147,133 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     return update;
   }
 
+  function schedulePing(finishedWork) {
+    // Once the promise resolves, we should try rendering the non-
+    // placeholder state again.
+    const currentTime = recalculateCurrentTime();
+    const expirationTime = computeExpirationForFiber(currentTime, finishedWork);
+    const recoveryUpdate = createUpdate(expirationTime);
+    enqueueUpdate(finishedWork, recoveryUpdate, expirationTime);
+    scheduleWork(finishedWork, expirationTime);
+  }
+
   function throwException(
+    root: FiberRoot,
     returnFiber: Fiber,
     sourceFiber: Fiber,
-    rawValue: mixed,
+    value: mixed,
+    renderIsExpired: boolean,
     renderExpirationTime: ExpirationTime,
+    currentTimeMs: number,
   ) {
     // The source fiber did not complete.
     sourceFiber.effectTag |= Incomplete;
     // Its effect list is no longer valid.
     sourceFiber.firstEffect = sourceFiber.lastEffect = null;
 
-    const value = createCapturedValue(rawValue, sourceFiber);
+    if (
+      enableSuspense &&
+      value !== null &&
+      typeof value === 'object' &&
+      typeof value.then === 'function'
+    ) {
+      // This is a thenable.
+      const thenable: Thenable = (value: any);
 
+      const expirationTimeMs = expirationTimeToMs(renderExpirationTime);
+      const startTimeMs = expirationTimeMs - 5000;
+      let elapsedMs = currentTimeMs - startTimeMs;
+      if (elapsedMs < 0) {
+        elapsedMs = 0;
+      }
+      const remainingTimeMs = expirationTimeMs - currentTimeMs;
+
+      // Find the earliest timeout of all the timeouts in the ancestor path.
+      // TODO: Alternatively, we could store the earliest timeout on the context
+      // stack, rather than searching on every suspend.
+      let workInProgress = returnFiber;
+      let earliestTimeoutMs = -1;
+      searchForEarliestTimeout: do {
+        if (workInProgress.tag === TimeoutComponent) {
+          const current = workInProgress.alternate;
+          if (current !== null && current.memoizedState === true) {
+            // A parent Timeout already committed in a placeholder state. We
+            // need to handle this promise immediately. In other words, we
+            // should never suspend inside a tree that already expired.
+            earliestTimeoutMs = 0;
+            break searchForEarliestTimeout;
+          }
+          let timeoutPropMs = workInProgress.pendingProps.ms;
+          if (typeof timeoutPropMs === 'number') {
+            if (timeoutPropMs <= 0) {
+              earliestTimeoutMs = 0;
+              break searchForEarliestTimeout;
+            } else if (
+              earliestTimeoutMs === -1 ||
+              timeoutPropMs < earliestTimeoutMs
+            ) {
+              earliestTimeoutMs = timeoutPropMs;
+            }
+          } else if (earliestTimeoutMs === -1) {
+            earliestTimeoutMs = remainingTimeMs;
+          }
+        }
+        workInProgress = workInProgress.return;
+      } while (workInProgress !== null);
+
+      // Compute the remaining time until the timeout.
+      const msUntilTimeout = earliestTimeoutMs - elapsedMs;
+
+      if (renderExpirationTime === Never || msUntilTimeout > 0) {
+        // There's still time remaining.
+        suspendRoot(root, thenable, msUntilTimeout, renderExpirationTime);
+        const onResolveOrReject = () => {
+          retrySuspendedRoot(root, renderExpirationTime);
+        };
+        thenable.then(onResolveOrReject, onResolveOrReject);
+        return;
+      } else {
+        // No time remaining. Need to fallback to placeholder.
+        // Find the nearest timeout that can be retried.
+        workInProgress = returnFiber;
+        do {
+          switch (workInProgress.tag) {
+            case HostRoot: {
+              // The root expired, but no fallback was provided. Throw a
+              // helpful error.
+              const message =
+                renderExpirationTime === Sync
+                  ? 'A synchronous update was suspended, but no fallback UI ' +
+                    'was provided.'
+                  : 'An update was suspended for longer than the timeout, ' +
+                    'but no fallback UI was provided.';
+              value = new Error(message);
+              break;
+            }
+            case TimeoutComponent: {
+              if ((workInProgress.effectTag & DidCapture) === NoEffect) {
+                workInProgress.effectTag |= ShouldCapture;
+                const onResolveOrReject = schedulePing.bind(
+                  null,
+                  workInProgress,
+                );
+                thenable.then(onResolveOrReject, onResolveOrReject);
+                return;
+              }
+              // Already captured during this render. Continue to the next
+              // Timeout ancestor.
+              break;
+            }
+          }
+          workInProgress = workInProgress.return;
+        } while (workInProgress !== null);
+      }
+    }
+
+    // We didn't find a boundary that could handle this type of exception. Start
+    // over and traverse parent path again, this time treating the exception
+    // as an error.
+    value = createCapturedValue(value, sourceFiber);
     let workInProgress = returnFiber;
     do {
       switch (workInProgress.tag) {
@@ -190,7 +319,11 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     } while (workInProgress !== null);
   }
 
-  function unwindWork(workInProgress: Fiber) {
+  function unwindWork(
+    workInProgress: Fiber,
+    renderIsExpired: boolean,
+    renderExpirationTime: ExpirationTime,
+  ) {
     switch (workInProgress.tag) {
       case ClassComponent: {
         popLegacyContextProvider(workInProgress);
@@ -215,6 +348,14 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         popHostContext(workInProgress);
         return null;
       }
+      case TimeoutComponent: {
+        const effectTag = workInProgress.effectTag;
+        if (effectTag & ShouldCapture) {
+          workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
+          return workInProgress;
+        }
+        return null;
+      }
       case HostPortal:
         popHostContainer(workInProgress);
         return null;
diff --git a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
new file mode 100644
index 0000000000..e834ca5eda
--- /dev/null
+++ b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
@@ -0,0 +1,946 @@
+let React;
+let ReactFeatureFlags;
+let Fragment;
+let ReactNoop;
+let SimpleCacheProvider;
+let Timeout;
+
+let cache;
+let TextResource;
+let textResourceShouldFail;
+
+describe('ReactSuspense', () => {
+  beforeEach(() => {
+    jest.resetModules();
+    ReactFeatureFlags = require('shared/ReactFeatureFlags');
+    ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
+    ReactFeatureFlags.enableSuspense = true;
+    React = require('react');
+    Fragment = React.Fragment;
+    ReactNoop = require('react-noop-renderer');
+    SimpleCacheProvider = require('simple-cache-provider');
+    Timeout = React.Timeout;
+
+    function invalidateCache() {
+      cache = SimpleCacheProvider.createCache(invalidateCache);
+    }
+    invalidateCache();
+    TextResource = SimpleCacheProvider.createResource(([text, ms = 0]) => {
+      return new Promise((resolve, reject) =>
+        setTimeout(() => {
+          if (textResourceShouldFail) {
+            ReactNoop.yield(`Promise rejected [${text}]`);
+            reject(new Error('Failed to load: ' + text));
+          } else {
+            ReactNoop.yield(`Promise resolved [${text}]`);
+            resolve(text);
+          }
+        }, ms),
+      );
+    }, ([text, ms]) => text);
+    textResourceShouldFail = false;
+  });
+
+  function div(...children) {
+    children = children.map(c => (typeof c === 'string' ? {text: c} : c));
+    return {type: 'div', children, prop: undefined};
+  }
+
+  function span(prop) {
+    return {type: 'span', children: [], prop};
+  }
+
+  function advanceTimers(ms) {
+    // Note: This advances Jest's virtual time but not React's. Use
+    // ReactNoop.expire for that.
+    if (typeof ms !== 'number') {
+      throw new Error('Must specify ms');
+    }
+    jest.advanceTimersByTime(ms);
+    // Wait until the end of the current tick
+    return new Promise(resolve => {
+      setImmediate(resolve);
+    });
+  }
+
+  function Text(props) {
+    ReactNoop.yield(props.text);
+    return <span prop={props.text} />;
+  }
+
+  function AsyncText(props) {
+    const text = props.text;
+    try {
+      TextResource.read(cache, [props.text, props.ms]);
+      ReactNoop.yield(text);
+      return <span prop={text} />;
+    } catch (promise) {
+      if (typeof promise.then === 'function') {
+        ReactNoop.yield(`Suspend! [${text}]`);
+      } else {
+        ReactNoop.yield(`Error! [${text}]`);
+      }
+      throw promise;
+    }
+  }
+
+  function Fallback(props) {
+    return (
+      <Timeout ms={props.timeout}>
+        {didExpire => (didExpire ? props.placeholder : props.children)}
+      </Timeout>
+    );
+  }
+  it('suspends rendering and continues later', async () => {
+    function Bar(props) {
+      ReactNoop.yield('Bar');
+      return props.children;
+    }
+
+    function Foo() {
+      ReactNoop.yield('Foo');
+      return (
+        <Fallback>
+          <Bar>
+            <AsyncText text="A" ms={100} />
+            <Text text="B" />
+          </Bar>
+        </Fallback>
+      );
+    }
+
+    ReactNoop.render(<Foo />);
+    expect(ReactNoop.flush()).toEqual([
+      'Foo',
+      'Bar',
+      // A suspends
+      'Suspend! [A]',
+      // But we keep rendering the siblings
+      'B',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Flush some of the time
+    await advanceTimers(50);
+    // Still nothing...
+    expect(ReactNoop.flush()).toEqual([]);
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Flush the promise completely
+    await advanceTimers(50);
+    // Renders successfully
+    expect(ReactNoop.flush()).toEqual([
+      'Promise resolved [A]',
+      'Foo',
+      'Bar',
+      'A',
+      'B',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([span('A'), span('B')]);
+  });
+
+  it('continues rendering siblings after suspending', async () => {
+    ReactNoop.render(
+      <Fallback>
+        <Text text="A" />
+        <AsyncText text="B" />
+        <Text text="C" />
+        <Text text="D" />
+      </Fallback>,
+    );
+    // B suspends. Continue rendering the remaining siblings.
+    expect(ReactNoop.flush()).toEqual(['A', 'Suspend! [B]', 'C', 'D']);
+    // Did not commit yet.
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Wait for data to resolve
+    await advanceTimers(100);
+    // Renders successfully
+    expect(ReactNoop.flush()).toEqual([
+      'Promise resolved [B]',
+      'A',
+      'B',
+      'C',
+      'D',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([
+      span('A'),
+      span('B'),
+      span('C'),
+      span('D'),
+    ]);
+  });
+
+  it('retries on error', async () => {
+    class ErrorBoundary extends React.Component {
+      state = {error: null};
+      componentDidCatch(error) {
+        this.setState({error});
+      }
+      reset() {
+        this.setState({error: null});
+      }
+      render() {
+        if (this.state.error !== null) {
+          return <Text text={'Caught error: ' + this.state.error.message} />;
+        }
+        return this.props.children;
+      }
+    }
+
+    const errorBoundary = React.createRef();
+    function App() {
+      return (
+        <Fallback>
+          <ErrorBoundary ref={errorBoundary}>
+            <AsyncText text="Result" ms={1000} />
+          </ErrorBoundary>
+        </Fallback>
+      );
+    }
+
+    ReactNoop.render(<App />);
+    expect(ReactNoop.flush()).toEqual(['Suspend! [Result]']);
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    textResourceShouldFail = true;
+    ReactNoop.expire(1000);
+    await advanceTimers(1000);
+    textResourceShouldFail = false;
+
+    expect(ReactNoop.flush()).toEqual([
+      'Promise rejected [Result]',
+      'Error! [Result]',
+      'Caught error: Failed to load: Result',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([
+      span('Caught error: Failed to load: Result'),
+    ]);
+
+    // Reset the error boundary and cache, and try again.
+    errorBoundary.current.reset();
+    cache.invalidate();
+
+    expect(ReactNoop.flush()).toEqual(['Suspend! [Result]']);
+    ReactNoop.expire(1000);
+    await advanceTimers(1000);
+    expect(ReactNoop.flush()).toEqual(['Promise resolved [Result]', 'Result']);
+    expect(ReactNoop.getChildren()).toEqual([span('Result')]);
+  });
+
+  it('retries on error after falling back to a placeholder', async () => {
+    class ErrorBoundary extends React.Component {
+      state = {error: null};
+      componentDidCatch(error) {
+        this.setState({error});
+      }
+      reset() {
+        this.setState({error: null});
+      }
+      render() {
+        if (this.state.error !== null) {
+          return <Text text={'Caught error: ' + this.state.error.message} />;
+        }
+        return this.props.children;
+      }
+    }
+
+    const errorBoundary = React.createRef();
+    function App() {
+      return (
+        <Fallback timeout={1000} placeholder={<Text text="Loading..." />}>
+          <ErrorBoundary ref={errorBoundary}>
+            <AsyncText text="Result" ms={3000} />
+          </ErrorBoundary>
+        </Fallback>
+      );
+    }
+
+    ReactNoop.render(<App />);
+    expect(ReactNoop.flush()).toEqual(['Suspend! [Result]']);
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    ReactNoop.expire(2000);
+    await advanceTimers(2000);
+    expect(ReactNoop.flush()).toEqual(['Suspend! [Result]', 'Loading...']);
+    expect(ReactNoop.getChildren()).toEqual([span('Loading...')]);
+
+    textResourceShouldFail = true;
+    ReactNoop.expire(1000);
+    await advanceTimers(1000);
+    textResourceShouldFail = false;
+
+    expect(ReactNoop.flush()).toEqual([
+      'Promise rejected [Result]',
+      'Error! [Result]',
+      'Caught error: Failed to load: Result',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([
+      span('Caught error: Failed to load: Result'),
+    ]);
+
+    // Reset the error boundary and cache, and try again.
+    errorBoundary.current.reset();
+    cache.invalidate();
+
+    expect(ReactNoop.flush()).toEqual(['Suspend! [Result]']);
+    ReactNoop.expire(3000);
+    await advanceTimers(3000);
+    expect(ReactNoop.flush()).toEqual(['Promise resolved [Result]', 'Result']);
+    expect(ReactNoop.getChildren()).toEqual([span('Result')]);
+  });
+
+  it('can update at a higher priority while in a suspended state', async () => {
+    function App(props) {
+      return (
+        <Fallback>
+          <Text text={props.highPri} />
+          <AsyncText text={props.lowPri} />
+        </Fallback>
+      );
+    }
+
+    // Initial mount
+    ReactNoop.render(<App highPri="A" lowPri="1" />);
+    ReactNoop.flush();
+    await advanceTimers(0);
+    ReactNoop.flush();
+    expect(ReactNoop.getChildren()).toEqual([span('A'), span('1')]);
+
+    // Update the low-pri text
+    ReactNoop.render(<App highPri="A" lowPri="2" />);
+    expect(ReactNoop.flush()).toEqual([
+      'A',
+      // Suspends
+      'Suspend! [2]',
+    ]);
+
+    // While we're still waiting for the low-pri update to complete, update the
+    // high-pri text at high priority.
+    ReactNoop.flushSync(() => {
+      ReactNoop.render(<App highPri="B" lowPri="1" />);
+    });
+    expect(ReactNoop.flush()).toEqual(['B', '1']);
+    expect(ReactNoop.getChildren()).toEqual([span('B'), span('1')]);
+
+    // Unblock the low-pri text and finish
+    await advanceTimers(0);
+    expect(ReactNoop.flush()).toEqual(['Promise resolved [2]']);
+    expect(ReactNoop.getChildren()).toEqual([span('B'), span('1')]);
+  });
+
+  it('keeps working on lower priority work after being pinged', async () => {
+    function App(props) {
+      return (
+        <Fallback>
+          <AsyncText text="A" />
+          {props.showB && <Text text="B" />}
+        </Fallback>
+      );
+    }
+
+    ReactNoop.render(<App showB={false} />);
+    expect(ReactNoop.flush()).toEqual(['Suspend! [A]']);
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Advance React's virtual time by enough to fall into a new async bucket.
+    ReactNoop.expire(1200);
+    ReactNoop.render(<App showB={true} />);
+    expect(ReactNoop.flush()).toEqual(['Suspend! [A]', 'B']);
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    await advanceTimers(0);
+    expect(ReactNoop.flush()).toEqual(['Promise resolved [A]', 'A', 'B']);
+    expect(ReactNoop.getChildren()).toEqual([span('A'), span('B')]);
+  });
+
+  it('tries rendering a lower priority pending update even if a higher priority one suspends', async () => {
+    function App(props) {
+      if (props.hide) {
+        return <Text text="(empty)" />;
+      }
+      return (
+        <Fallback>
+          <AsyncText ms={2000} text="Async" />
+        </Fallback>
+      );
+    }
+
+    // Schedule a high pri update and a low pri update, without rendering in
+    // between.
+    ReactNoop.interactiveUpdates(() => {
+      // High pri
+      ReactNoop.render(<App />);
+    });
+    // Low pri
+    ReactNoop.render(<App hide={true} />);
+
+    expect(ReactNoop.flush()).toEqual([
+      // The first update suspends
+      'Suspend! [Async]',
+      // but we have another pending update that we can work on
+      '(empty)',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([span('(empty)')]);
+  });
+
+  it('coalesces all async updates when in a suspended state', async () => {
+    ReactNoop.render(
+      <Fallback>
+        <AsyncText text="A" />
+      </Fallback>,
+    );
+    ReactNoop.flush();
+    await advanceTimers(0);
+    ReactNoop.flush();
+    expect(ReactNoop.getChildren()).toEqual([span('A')]);
+
+    ReactNoop.render(
+      <Fallback>
+        <AsyncText text="B" ms={50} />
+      </Fallback>,
+    );
+    expect(ReactNoop.flush()).toEqual(['Suspend! [B]']);
+    expect(ReactNoop.getChildren()).toEqual([span('A')]);
+
+    // Advance React's virtual time so that C falls into a new expiration bucket
+    ReactNoop.expire(1000);
+    ReactNoop.render(
+      <Fallback>
+        <AsyncText text="C" ms={100} />
+      </Fallback>,
+    );
+    expect(ReactNoop.flush()).toEqual([
+      // Tries C first, since it has a later expiration time
+      'Suspend! [C]',
+      // Does not retry B, because its promise has not resolved yet.
+    ]);
+
+    expect(ReactNoop.getChildren()).toEqual([span('A')]);
+
+    // Unblock B
+    await advanceTimers(90);
+    // Even though B's promise resolved, the view is still suspended because it
+    // coalesced with C.
+    expect(ReactNoop.flush()).toEqual(['Promise resolved [B]']);
+    expect(ReactNoop.getChildren()).toEqual([span('A')]);
+
+    // Unblock C
+    await advanceTimers(50);
+    expect(ReactNoop.flush()).toEqual(['Promise resolved [C]', 'C']);
+    expect(ReactNoop.getChildren()).toEqual([span('C')]);
+  });
+
+  it('forces an expiration after an update times out', async () => {
+    ReactNoop.render(
+      <Fragment>
+        <Fallback placeholder={<Text text="Loading..." />}>
+          <AsyncText text="Async" ms={20000} />
+        </Fallback>
+        <Text text="Sync" />
+      </Fragment>,
+    );
+
+    expect(ReactNoop.flush()).toEqual([
+      // The async child suspends
+      'Suspend! [Async]',
+      // Continue on the sibling
+      'Sync',
+    ]);
+    // The update hasn't expired yet, so we commit nothing.
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Advance both React's virtual time and Jest's timers by enough to expire
+    // the update, but not by enough to flush the suspending promise.
+    ReactNoop.expire(10000);
+    await advanceTimers(10000);
+    expect(ReactNoop.flushExpired()).toEqual([
+      // Still suspended.
+      'Suspend! [Async]',
+      // Now that the update has expired, we render the fallback UI
+      'Loading...',
+      'Sync',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([span('Loading...'), span('Sync')]);
+
+    // Once the promise resolves, we render the suspended view
+    await advanceTimers(10000);
+    expect(ReactNoop.flush()).toEqual(['Promise resolved [Async]', 'Async']);
+    expect(ReactNoop.getChildren()).toEqual([span('Async'), span('Sync')]);
+  });
+
+  it('switches to an inner fallback even if it expires later', async () => {
+    ReactNoop.render(
+      <Fragment>
+        <Text text="Sync" />
+        <Fallback timeout={1000} placeholder={<Text text="Loading outer..." />}>
+          <AsyncText text="Outer content" ms={2000} />
+          <Fallback
+            timeout={3000}
+            placeholder={<Text text="Loading inner..." />}>
+            <AsyncText text="Inner content" ms={4000} />
+          </Fallback>
+        </Fallback>
+      </Fragment>,
+    );
+
+    expect(ReactNoop.flush()).toEqual([
+      'Sync',
+      // The async content suspends
+      'Suspend! [Outer content]',
+      'Suspend! [Inner content]',
+    ]);
+    // The update hasn't expired yet, so we commit nothing.
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Expire the outer timeout, but don't expire the inner one.
+    // We should see the outer loading placeholder.
+    ReactNoop.expire(1500);
+    await advanceTimers(1500);
+    expect(ReactNoop.flush()).toEqual([
+      'Sync',
+      // Still suspended.
+      'Suspend! [Outer content]',
+      'Suspend! [Inner content]',
+      // We attempt to fallback to the inner placeholder
+      'Loading inner...',
+      // But the outer content is still suspended, so we need to fallback to
+      // the outer placeholder.
+      'Loading outer...',
+    ]);
+
+    expect(ReactNoop.getChildren()).toEqual([
+      span('Sync'),
+      span('Loading outer...'),
+    ]);
+
+    // Resolve the outer content's promise
+    ReactNoop.expire(1000);
+    await advanceTimers(1000);
+    expect(ReactNoop.flush()).toEqual([
+      'Promise resolved [Outer content]',
+      'Outer content',
+      // Inner content still hasn't loaded
+      'Suspend! [Inner content]',
+      'Loading inner...',
+    ]);
+    // We should now see the inner fallback UI.
+    expect(ReactNoop.getChildren()).toEqual([
+      span('Sync'),
+      span('Outer content'),
+      span('Loading inner...'),
+    ]);
+
+    // Finally, flush the inner promise. We should see the complete screen.
+    ReactNoop.expire(3000);
+    await advanceTimers(3000);
+    expect(ReactNoop.flush()).toEqual([
+      'Promise resolved [Inner content]',
+      'Inner content',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([
+      span('Sync'),
+      span('Outer content'),
+      span('Inner content'),
+    ]);
+  });
+
+  it('renders an expiration boundary synchronously', async () => {
+    // Synchronously render a tree that suspends
+    ReactNoop.flushSync(() =>
+      ReactNoop.render(
+        <Fragment>
+          <Fallback placeholder={<Text text="Loading..." />}>
+            <AsyncText text="Async" />
+          </Fallback>
+          <Text text="Sync" />
+        </Fragment>,
+      ),
+    );
+    expect(ReactNoop.clearYields()).toEqual([
+      // The async child suspends
+      'Suspend! [Async]',
+      // We immediately render the fallback UI
+      'Loading...',
+      // Continue on the sibling
+      'Sync',
+    ]);
+    // The tree commits synchronously
+    expect(ReactNoop.getChildren()).toEqual([span('Loading...'), span('Sync')]);
+
+    // Once the promise resolves, we render the suspended view
+    await advanceTimers(0);
+    expect(ReactNoop.flush()).toEqual(['Promise resolved [Async]', 'Async']);
+    expect(ReactNoop.getChildren()).toEqual([span('Async'), span('Sync')]);
+  });
+
+  it('suspending inside an expired expiration boundary will bubble to the next one', async () => {
+    ReactNoop.flushSync(() =>
+      ReactNoop.render(
+        <Fragment>
+          <Fallback placeholder={<Text text="Loading (outer)..." />}>
+            <Fallback placeholder={<AsyncText text="Loading (inner)..." />}>
+              <AsyncText text="Async" />
+            </Fallback>
+            <Text text="Sync" />
+          </Fallback>
+        </Fragment>,
+      ),
+    );
+    expect(ReactNoop.clearYields()).toEqual([
+      'Suspend! [Async]',
+      'Suspend! [Loading (inner)...]',
+      'Sync',
+      'Loading (outer)...',
+    ]);
+    // The tree commits synchronously
+    expect(ReactNoop.getChildren()).toEqual([span('Loading (outer)...')]);
+  });
+
+  it('expires early with a `timeout` option', async () => {
+    ReactNoop.render(
+      <Fragment>
+        <Fallback timeout={1000} placeholder={<Text text="Loading..." />}>
+          <AsyncText text="Async" ms={3000} />
+        </Fallback>
+        <Text text="Sync" />
+      </Fragment>,
+    );
+
+    expect(ReactNoop.flush()).toEqual([
+      // The async child suspends
+      'Suspend! [Async]',
+      // Continue on the sibling
+      'Sync',
+    ]);
+    // The update hasn't expired yet, so we commit nothing.
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Advance both React's virtual time and Jest's timers by enough to trigger
+    // the timeout, but not by enough to flush the promise or reach the true
+    // expiration time.
+    ReactNoop.expire(2000);
+    await advanceTimers(2000);
+    expect(ReactNoop.flush()).toEqual([
+      // Still suspended.
+      'Suspend! [Async]',
+      // Now that the expiration view has timed out, we render the fallback UI
+      'Loading...',
+      'Sync',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([span('Loading...'), span('Sync')]);
+
+    // Once the promise resolves, we render the suspended view
+    await advanceTimers(1000);
+    expect(ReactNoop.flush()).toEqual(['Promise resolved [Async]', 'Async']);
+    expect(ReactNoop.getChildren()).toEqual([span('Async'), span('Sync')]);
+  });
+
+  it('throws a helpful error when a synchronous update is suspended', () => {
+    expect(() => {
+      ReactNoop.flushSync(() =>
+        ReactNoop.render(<Timeout>{() => <AsyncText text="Async" />}</Timeout>),
+      );
+    }).toThrow(
+      'A synchronous update was suspended, but no fallback UI was provided.',
+    );
+  });
+
+  it('throws a helpful error when an expired update is suspended', async () => {
+    ReactNoop.render(
+      <Timeout>{() => <AsyncText text="Async" ms={20000} />}</Timeout>,
+    );
+    expect(ReactNoop.flush()).toEqual(['Suspend! [Async]']);
+    await advanceTimers(10000);
+    ReactNoop.expire(10000);
+    expect(() => {
+      expect(ReactNoop.flush()).toEqual(['Suspend! [Async]']);
+    }).toThrow(
+      'An update was suspended for longer than the timeout, but no fallback ' +
+        'UI was provided.',
+    );
+  });
+
+  it('a Timeout component correctly handles more than one suspended child', async () => {
+    ReactNoop.render(
+      <Fallback timeout={0}>
+        <AsyncText text="A" ms={100} />
+        <AsyncText text="B" ms={100} />
+      </Fallback>,
+    );
+    ReactNoop.expire(10000);
+    expect(ReactNoop.flush()).toEqual(['Suspend! [A]', 'Suspend! [B]']);
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    await advanceTimers(100);
+
+    expect(ReactNoop.flush()).toEqual([
+      'Promise resolved [A]',
+      'Promise resolved [B]',
+      'A',
+      'B',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([span('A'), span('B')]);
+  });
+
+  it('can resume rendering earlier than a timeout', async () => {
+    ReactNoop.render(
+      <Fallback timeout={1000} placeholder={<Text text="Loading..." />}>
+        <AsyncText text="Async" ms={100} />
+      </Fallback>,
+    );
+    expect(ReactNoop.flush()).toEqual(['Suspend! [Async]']);
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Advance time by an amount slightly smaller than what's necessary to
+    // resolve the promise
+    await advanceTimers(99);
+
+    // Nothing has rendered yet
+    expect(ReactNoop.flush()).toEqual([]);
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Resolve the promise
+    await advanceTimers(1);
+    // We can now resume rendering
+    expect(ReactNoop.flush()).toEqual(['Promise resolved [Async]', 'Async']);
+    expect(ReactNoop.getChildren()).toEqual([span('Async')]);
+  });
+
+  it('starts working on an update even if its priority falls between two suspended levels', async () => {
+    function App(props) {
+      return (
+        <Fallback timeout={10000}>
+          {props.text === 'C' ? (
+            <Text text="C" />
+          ) : (
+            <AsyncText text={props.text} ms={10000} />
+          )}
+        </Fallback>
+      );
+    }
+
+    // Schedule an update
+    ReactNoop.render(<App text="A" />);
+    // The update should suspend.
+    expect(ReactNoop.flush()).toEqual(['Suspend! [A]']);
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Advance time until right before it expires. This number may need to
+    // change if the default expiration for low priority updates is adjusted.
+    await advanceTimers(4999);
+    ReactNoop.expire(4999);
+    expect(ReactNoop.flush()).toEqual([]);
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Schedule another low priority update.
+    ReactNoop.render(<App text="B" />);
+    // This update should also suspend.
+    expect(ReactNoop.flush()).toEqual(['Suspend! [B]']);
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Schedule a high priority update. Its expiration time will fall between
+    // the expiration times of the previous two updates.
+    ReactNoop.interactiveUpdates(() => {
+      ReactNoop.render(<App text="C" />);
+    });
+    expect(ReactNoop.flush()).toEqual(['C']);
+    expect(ReactNoop.getChildren()).toEqual([span('C')]);
+
+    await advanceTimers(10000);
+    // Flush the remaining work.
+    expect(ReactNoop.flush()).toEqual([
+      'Promise resolved [A]',
+      'Promise resolved [B]',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([span('C')]);
+  });
+
+  it('can hide a tree to unblock its surroundings', async () => {
+    function App() {
+      return (
+        <Timeout ms={1000}>
+          {didTimeout => (
+            <Fragment>
+              <div hidden={didTimeout}>
+                <AsyncText text="Async" ms={3000} />
+              </div>
+              {didTimeout ? <Text text="Loading..." /> : null}
+            </Fragment>
+          )}
+        </Timeout>
+      );
+    }
+
+    ReactNoop.render(<App />);
+    expect(ReactNoop.flush()).toEqual(['Suspend! [Async]']);
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    ReactNoop.expire(2000);
+    await advanceTimers(2000);
+    expect(ReactNoop.flush()).toEqual([
+      'Suspend! [Async]',
+      'Loading...',
+      'Suspend! [Async]',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([div(), span('Loading...')]);
+
+    ReactNoop.expire(1000);
+    await advanceTimers(1000);
+
+    expect(ReactNoop.flush()).toEqual(['Promise resolved [Async]', 'Async']);
+    expect(ReactNoop.getChildren()).toEqual([div(span('Async'))]);
+  });
+
+  describe('splitting a high-pri update into high and low', () => {
+    React = require('react');
+
+    class AsyncValue extends React.Component {
+      state = {asyncValue: this.props.defaultValue};
+      componentDidMount() {
+        ReactNoop.deferredUpdates(() => {
+          this.setState((state, props) => ({asyncValue: props.value}));
+        });
+      }
+      componentDidUpdate() {
+        if (this.props.value !== this.state.asyncValue) {
+          ReactNoop.deferredUpdates(() => {
+            this.setState((state, props) => ({asyncValue: props.value}));
+          });
+        }
+      }
+      render() {
+        return this.props.children(this.state.asyncValue);
+      }
+    }
+
+    it('coalesces async values when in a suspended state', async () => {
+      function App(props) {
+        const highPriText = props.text;
+        return (
+          <Fallback>
+            <AsyncValue value={highPriText} defaultValue={null}>
+              {lowPriText => (
+                <Fragment>
+                  <Text text={`High-pri: ${highPriText}`} />
+                  {lowPriText && (
+                    <AsyncText text={`Low-pri: ${lowPriText}`} ms={100} />
+                  )}
+                </Fragment>
+              )}
+            </AsyncValue>
+          </Fallback>
+        );
+      }
+
+      function renderAppSync(props) {
+        ReactNoop.flushSync(() => ReactNoop.render(<App {...props} />));
+      }
+
+      // Initial mount
+      renderAppSync({text: 'A'});
+      expect(ReactNoop.flush()).toEqual([
+        // First we render at high priority
+        'High-pri: A',
+        // Then we come back later to render a low priority
+        'High-pri: A',
+        // The low-pri view suspends
+        'Suspend! [Low-pri: A]',
+      ]);
+      expect(ReactNoop.getChildren()).toEqual([span('High-pri: A')]);
+
+      // Partially flush the promise for 'A', not by enough to resolve it.
+      await advanceTimers(99);
+
+      // Advance React's virtual time so that the next update falls into a new
+      // expiration bucket
+      ReactNoop.expire(2000);
+      // Update to B. At this point, the low-pri view still hasn't updated
+      // to 'A'.
+      renderAppSync({text: 'B'});
+      expect(ReactNoop.flush()).toEqual([
+        // First we render at high priority
+        'High-pri: B',
+        // Then we come back later to render a low priority
+        'High-pri: B',
+        // The low-pri view suspends
+        'Suspend! [Low-pri: B]',
+      ]);
+      expect(ReactNoop.getChildren()).toEqual([span('High-pri: B')]);
+
+      // Flush the rest of the promise for 'A', without flushing the one
+      // for 'B'.
+      await advanceTimers(1);
+      expect(ReactNoop.flush()).toEqual([
+        // A is unblocked
+        'Promise resolved [Low-pri: A]',
+        // But we don't try to render it, because there's a lower priority
+        // update that is also suspended.
+      ]);
+      expect(ReactNoop.getChildren()).toEqual([span('High-pri: B')]);
+
+      // Flush the remaining work.
+      await advanceTimers(99);
+      expect(ReactNoop.flush()).toEqual([
+        // B is unblocked
+        'Promise resolved [Low-pri: B]',
+        // Now we can continue rendering the async view
+        'High-pri: B',
+        'Low-pri: B',
+      ]);
+      expect(ReactNoop.getChildren()).toEqual([
+        span('High-pri: B'),
+        span('Low-pri: B'),
+      ]);
+    });
+  });
+
+  describe('a Delay component', () => {
+    function Never() {
+      // Throws a promise that resolves after some arbitrarily large
+      // number of seconds. The idea is that this component will never
+      // resolve. It's always wrapped by a Timeout.
+      throw new Promise(resolve => setTimeout(() => resolve(), 10000));
+    }
+
+    function Delay({ms}) {
+      return (
+        <Timeout ms={ms}>
+          {didTimeout => {
+            if (didTimeout) {
+              // Once ms has elapsed, render null. This allows the rest of the
+              // tree to resume rendering.
+              return null;
+            }
+            return <Never />;
+          }}
+        </Timeout>
+      );
+    }
+
+    function DebouncedText({text, ms}) {
+      return (
+        <Fragment>
+          <Delay ms={ms} />
+          <Text text={text} />
+        </Fragment>
+      );
+    }
+
+    it('works', async () => {
+      ReactNoop.render(<DebouncedText text="A" ms={1000} />);
+      ReactNoop.flush();
+      expect(ReactNoop.getChildren()).toEqual([]);
+
+      await advanceTimers(800);
+      ReactNoop.expire(800);
+      ReactNoop.flush();
+      expect(ReactNoop.getChildren()).toEqual([]);
+
+      await advanceTimers(1000);
+      ReactNoop.expire(1000);
+      ReactNoop.flush();
+      expect(ReactNoop.getChildren()).toEqual([span('A')]);
+    });
+  });
+});
diff --git a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
index 119c55154e..4ef5ab8201 100644
--- a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
+++ b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ReactDebugFiberPerf captures all lifecycles 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Mount
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -15,7 +15,7 @@ exports[`ReactDebugFiberPerf captures all lifecycles 1`] = `
   ⚛ (Calling Lifecycle Methods: 1 Total)
     ⚛ AllLifecycles.componentDidMount
 
-⚛ (Waiting for async callback... will force flush in 5230 ms)
+⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Update
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -31,7 +31,7 @@ exports[`ReactDebugFiberPerf captures all lifecycles 1`] = `
   ⚛ (Calling Lifecycle Methods: 2 Total)
     ⚛ AllLifecycles.componentDidUpdate
 
-⚛ (Waiting for async callback... will force flush in 5230 ms)
+⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Unmount
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -45,7 +45,7 @@ exports[`ReactDebugFiberPerf captures all lifecycles 1`] = `
 `;
 
 exports[`ReactDebugFiberPerf deduplicates lifecycle names during commit to reduce overhead 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // The commit phase should mention A and B just once
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -62,7 +62,7 @@ exports[`ReactDebugFiberPerf deduplicates lifecycle names during commit to reduc
     ⚛ A.componentDidUpdate
     ⚛ B.componentDidUpdate
 
-⚛ (Waiting for async callback... will force flush in 5230 ms)
+⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Because of deduplication, we don't know B was cascading,
 // but we should still see the warning for the commit phase.
@@ -92,7 +92,7 @@ exports[`ReactDebugFiberPerf deduplicates lifecycle names during commit to reduc
 `;
 
 exports[`ReactDebugFiberPerf does not include AsyncMode, StrictMode, or Profiler components in measurements 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Mount
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -108,7 +108,7 @@ exports[`ReactDebugFiberPerf does not include AsyncMode, StrictMode, or Profiler
 `;
 
 exports[`ReactDebugFiberPerf does not include context provider or consumer in measurements 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Mount
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -143,7 +143,7 @@ exports[`ReactDebugFiberPerf does not schedule an extra callback if setState is
 `;
 
 exports[`ReactDebugFiberPerf does not treat setState from cWM or cWRP as cascading 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Should not print a warning
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -156,7 +156,7 @@ exports[`ReactDebugFiberPerf does not treat setState from cWM or cWRP as cascadi
   ⚛ (Committing Host Effects: 1 Total)
   ⚛ (Calling Lifecycle Methods: 0 Total)
 
-⚛ (Waiting for async callback... will force flush in 5230 ms)
+⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Should not print a warning
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -172,7 +172,7 @@ exports[`ReactDebugFiberPerf does not treat setState from cWM or cWRP as cascadi
 `;
 
 exports[`ReactDebugFiberPerf measures a simple reconciliation 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Mount
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -184,7 +184,7 @@ exports[`ReactDebugFiberPerf measures a simple reconciliation 1`] = `
   ⚛ (Committing Host Effects: 1 Total)
   ⚛ (Calling Lifecycle Methods: 0 Total)
 
-⚛ (Waiting for async callback... will force flush in 5230 ms)
+⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Update
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -196,7 +196,7 @@ exports[`ReactDebugFiberPerf measures a simple reconciliation 1`] = `
   ⚛ (Committing Host Effects: 2 Total)
   ⚛ (Calling Lifecycle Methods: 2 Total)
 
-⚛ (Waiting for async callback... will force flush in 5230 ms)
+⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Unmount
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -209,7 +209,7 @@ exports[`ReactDebugFiberPerf measures a simple reconciliation 1`] = `
 `;
 
 exports[`ReactDebugFiberPerf measures deferred work in chunks 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Start mounting Parent and A
 ⚛ (React Tree Reconciliation: Yielded)
@@ -217,14 +217,14 @@ exports[`ReactDebugFiberPerf measures deferred work in chunks 1`] = `
     ⚛ A [mount]
       ⚛ Child [mount]
 
-⚛ (Waiting for async callback... will force flush in 5230 ms)
+⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Mount B just a little (but not enough to memoize)
 ⚛ (React Tree Reconciliation: Yielded)
   ⚛ Parent [mount]
     ⚛ B [mount]
 
-⚛ (Waiting for async callback... will force flush in 5230 ms)
+⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Complete B and Parent
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -263,7 +263,7 @@ exports[`ReactDebugFiberPerf measures deprioritized work 1`] = `
 `;
 
 exports[`ReactDebugFiberPerf properly displays the forwardRef component in measurements 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Mount
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -283,7 +283,7 @@ exports[`ReactDebugFiberPerf properly displays the forwardRef component in measu
 `;
 
 exports[`ReactDebugFiberPerf recovers from caught errors 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Stop on Baddie and restart from Boundary
 ⚛ (React Tree Reconciliation: Yielded)
@@ -313,7 +313,7 @@ exports[`ReactDebugFiberPerf recovers from caught errors 1`] = `
 `;
 
 exports[`ReactDebugFiberPerf recovers from fatal errors 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Will fatal
 ⚛ (React Tree Reconciliation: Yielded)
@@ -327,7 +327,7 @@ exports[`ReactDebugFiberPerf recovers from fatal errors 1`] = `
   ⚛ (Committing Host Effects: 1 Total)
   ⚛ (Calling Lifecycle Methods: 1 Total)
 
-⚛ (Waiting for async callback... will force flush in 5230 ms)
+⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Will reconcile from a clean state
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -342,7 +342,7 @@ exports[`ReactDebugFiberPerf recovers from fatal errors 1`] = `
 `;
 
 exports[`ReactDebugFiberPerf skips parents during setState 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Should include just A and B, no Parents
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -357,7 +357,7 @@ exports[`ReactDebugFiberPerf skips parents during setState 1`] = `
 `;
 
 exports[`ReactDebugFiberPerf supports portals 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 ⚛ (React Tree Reconciliation: Completed Root)
   ⚛ Parent [mount]
@@ -371,7 +371,7 @@ exports[`ReactDebugFiberPerf supports portals 1`] = `
 `;
 
 exports[`ReactDebugFiberPerf supports returns 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 ⚛ (React Tree Reconciliation: Completed Root)
   ⚛ App [mount]
@@ -390,12 +390,12 @@ exports[`ReactDebugFiberPerf supports returns 1`] = `
 `;
 
 exports[`ReactDebugFiberPerf warns if an in-progress update is interrupted 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 ⚛ (React Tree Reconciliation: Yielded)
   ⚛ Foo [mount]
 
-⚛ (Waiting for async callback... will force flush in 5230 ms)
+⚛ (Waiting for async callback... will force flush in 5250 ms)
   ⛔ (React Tree Reconciliation: Completed Root) Warning: A top-level update interrupted the previous render
     ⚛ Foo [mount]
   ⚛ (Committing Changes)
@@ -413,7 +413,7 @@ exports[`ReactDebugFiberPerf warns if an in-progress update is interrupted 1`] =
 `;
 
 exports[`ReactDebugFiberPerf warns if async work expires (starvation) 1`] = `
-"⛔ (Waiting for async callback... will force flush in 5230 ms) Warning: React was blocked by main thread
+"⛔ (Waiting for async callback... will force flush in 5250 ms) Warning: React was blocked by main thread
 
 ⚛ (React Tree Reconciliation: Completed Root)
   ⚛ Foo [mount]
@@ -426,7 +426,7 @@ exports[`ReactDebugFiberPerf warns if async work expires (starvation) 1`] = `
 `;
 
 exports[`ReactDebugFiberPerf warns on cascading renders from setState 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Should print a warning
 ⚛ (React Tree Reconciliation: Completed Root)
@@ -450,7 +450,7 @@ exports[`ReactDebugFiberPerf warns on cascading renders from setState 1`] = `
 `;
 
 exports[`ReactDebugFiberPerf warns on cascading renders from top-level render 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5230 ms)
+"⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Rendering the first root
 ⚛ (React Tree Reconciliation: Completed Root)
diff --git a/packages/react/src/React.js b/packages/react/src/React.js
index d474040611..2f6221a23e 100644
--- a/packages/react/src/React.js
+++ b/packages/react/src/React.js
@@ -12,7 +12,9 @@ import {
   REACT_FRAGMENT_TYPE,
   REACT_PROFILER_TYPE,
   REACT_STRICT_MODE_TYPE,
+  REACT_TIMEOUT_TYPE,
 } from 'shared/ReactSymbols';
+import {enableSuspense} from 'shared/ReactFeatureFlags';
 
 import {Component, PureComponent} from './ReactBaseClasses';
 import {createRef} from './ReactCreateRef';
@@ -53,6 +55,7 @@ const React = {
   StrictMode: REACT_STRICT_MODE_TYPE,
   unstable_AsyncMode: REACT_ASYNC_MODE_TYPE,
   unstable_Profiler: REACT_PROFILER_TYPE,
+  Timeout: REACT_TIMEOUT_TYPE,
 
   createElement: __DEV__ ? createElementWithValidation : createElement,
   cloneElement: __DEV__ ? cloneElementWithValidation : cloneElement,
@@ -68,6 +71,10 @@ const React = {
   },
 };
 
+if (enableSuspense) {
+  React.Timeout = REACT_TIMEOUT_TYPE;
+}
+
 if (__DEV__) {
   Object.assign(React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, {
     // These should not be included in production.
diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
index 614a1b6cc7..16a44b21c9 100644
--- a/packages/shared/ReactFeatureFlags.js
+++ b/packages/shared/ReactFeatureFlags.js
@@ -21,6 +21,8 @@ export const enablePersistentReconciler = false;
 // Experimental error-boundary API that can recover from errors within a single
 // render phase
 export const enableGetDerivedStateFromCatch = false;
+// Suspense
+export const enableSuspense = false;
 // Helps identify side effects in begin-phase lifecycle hooks and setState reducers:
 export const debugRenderPhaseSideEffects = false;
 
diff --git a/packages/shared/ReactSymbols.js b/packages/shared/ReactSymbols.js
index 672e51de8e..9dc1d3627a 100644
--- a/packages/shared/ReactSymbols.js
+++ b/packages/shared/ReactSymbols.js
@@ -42,6 +42,9 @@ export const REACT_ASYNC_MODE_TYPE = hasSymbol
 export const REACT_FORWARD_REF_TYPE = hasSymbol
   ? Symbol.for('react.forward_ref')
   : 0xead0;
+export const REACT_TIMEOUT_TYPE = hasSymbol
+  ? Symbol.for('react.timeout')
+  : 0xead1;
 
 const MAYBE_ITERATOR_SYMBOL = typeof Symbol === 'function' && Symbol.iterator;
 const FAUX_ITERATOR_SYMBOL = '@@iterator';
diff --git a/packages/shared/ReactTypeOfWork.js b/packages/shared/ReactTypeOfWork.js
index 1c672bb4b5..e6c1ace1d9 100644
--- a/packages/shared/ReactTypeOfWork.js
+++ b/packages/shared/ReactTypeOfWork.js
@@ -23,7 +23,8 @@ export type TypeOfWork =
   | 12
   | 13
   | 14
-  | 15;
+  | 15
+  | 16;
 
 export const IndeterminateComponent = 0; // Before we know whether it is functional or class
 export const FunctionalComponent = 1;
@@ -41,3 +42,4 @@ export const ContextConsumer = 12;
 export const ContextProvider = 13;
 export const ForwardRef = 14;
 export const Profiler = 15;
+export const TimeoutComponent = 16;
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
index 7eb809c952..3ad3795f2a 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
@@ -16,6 +16,7 @@ export const debugRenderPhaseSideEffects = false;
 export const debugRenderPhaseSideEffectsForStrictMode = false;
 export const enableUserTimingAPI = __DEV__;
 export const enableGetDerivedStateFromCatch = false;
+export const enableSuspense = false;
 export const warnAboutDeprecatedLifecycles = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableProfilerTimer = __DEV__;
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
index c6b30c6532..501818e8f2 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
@@ -16,6 +16,7 @@ export const debugRenderPhaseSideEffects = false;
 export const debugRenderPhaseSideEffectsForStrictMode = false;
 export const enableUserTimingAPI = __DEV__;
 export const enableGetDerivedStateFromCatch = false;
+export const enableSuspense = false;
 export const warnAboutDeprecatedLifecycles = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableProfilerTimer = false;
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js
index 51e2133a67..034e8bbeed 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js
@@ -15,6 +15,7 @@ import typeof * as FeatureFlagsShimType from './ReactFeatureFlags.native-fb';
 // Re-export dynamic flags from the fbsource version.
 export const {
   enableGetDerivedStateFromCatch,
+  enableSuspense,
   debugRenderPhaseSideEffects,
   debugRenderPhaseSideEffectsForStrictMode,
   warnAboutDeprecatedLifecycles,
diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js
index 5e03310dc0..92503166ee 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js
@@ -15,6 +15,7 @@ import typeof * as FeatureFlagsShimType from './ReactFeatureFlags.native-oss';
 export const debugRenderPhaseSideEffects = false;
 export const debugRenderPhaseSideEffectsForStrictMode = false;
 export const enableGetDerivedStateFromCatch = false;
+export const enableSuspense = false;
 export const enableMutatingReconciler = true;
 export const enableNoopReconciler = false;
 export const enablePersistentReconciler = false;
diff --git a/packages/shared/forks/ReactFeatureFlags.persistent.js b/packages/shared/forks/ReactFeatureFlags.persistent.js
index 780c62db4d..06c3b7dec0 100644
--- a/packages/shared/forks/ReactFeatureFlags.persistent.js
+++ b/packages/shared/forks/ReactFeatureFlags.persistent.js
@@ -16,6 +16,7 @@ export const debugRenderPhaseSideEffects = false;
 export const debugRenderPhaseSideEffectsForStrictMode = false;
 export const enableUserTimingAPI = __DEV__;
 export const enableGetDerivedStateFromCatch = false;
+export const enableSuspense = false;
 export const warnAboutDeprecatedLifecycles = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableProfilerTimer = false;
diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
index 486aecfa68..2ac0e75d1b 100644
--- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js
+++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
@@ -16,6 +16,7 @@ export const debugRenderPhaseSideEffects = false;
 export const debugRenderPhaseSideEffectsForStrictMode = false;
 export const enableUserTimingAPI = __DEV__;
 export const enableGetDerivedStateFromCatch = false;
+export const enableSuspense = false;
 export const warnAboutDeprecatedLifecycles = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = false;
 export const enableMutatingReconciler = true;
diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js
index 523e1604a6..aaa1ecc17c 100644
--- a/packages/shared/forks/ReactFeatureFlags.www.js
+++ b/packages/shared/forks/ReactFeatureFlags.www.js
@@ -12,6 +12,7 @@ import typeof * as FeatureFlagsShimType from './ReactFeatureFlags.www';
 
 // Re-export dynamic flags from the www version.
 export const {
+  enableSuspense,
   debugRenderPhaseSideEffects,
   debugRenderPhaseSideEffectsForStrictMode,
   enableGetDerivedStateFromCatch,
diff --git a/packages/shared/isValidElementType.js b/packages/shared/isValidElementType.js
index c9a759d502..3e99627225 100644
--- a/packages/shared/isValidElementType.js
+++ b/packages/shared/isValidElementType.js
@@ -15,6 +15,7 @@ import {
   REACT_PROFILER_TYPE,
   REACT_PROVIDER_TYPE,
   REACT_STRICT_MODE_TYPE,
+  REACT_TIMEOUT_TYPE,
 } from 'shared/ReactSymbols';
 
 export default function isValidElementType(type: mixed) {
@@ -26,6 +27,7 @@ export default function isValidElementType(type: mixed) {
     type === REACT_ASYNC_MODE_TYPE ||
     type === REACT_PROFILER_TYPE ||
     type === REACT_STRICT_MODE_TYPE ||
+    type === REACT_TIMEOUT_TYPE ||
     (typeof type === 'object' &&
       type !== null &&
       (type.$$typeof === REACT_PROVIDER_TYPE ||

From b0726e99476ea67c7558cbf268685998a38ade7c Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Thu, 10 May 2018 18:34:01 -0700
Subject: [PATCH 029/277] Support sharing context objects between concurrent
 renderers (#12779)

* Support concurrent primary and secondary renderers.

As a workaround to support multiple concurrent renderers, we categorize
some renderers as primary and others as secondary. We only expect
there to be two concurrent renderers at most: React Native (primary) and
Fabric (secondary); React DOM (primary) and React ART (secondary).
Secondary renderers store their context values on separate fields.

* Add back concurrent renderer warning

Only warn for two concurrent primary or two concurrent secondary renderers.

* Change "_secondary" suffix to "2"

#EveryBitCounts
---
 packages/react-art/src/ReactART.js            |  3 +
 .../react-art/src/__tests__/ReactART-test.js  | 54 ++++++++++++++
 packages/react-dom/src/client/ReactDOM.js     |  2 +
 .../src/ReactFabricRenderer.js                |  3 +
 .../src/ReactNativeFiberRenderer.js           |  2 +
 packages/react-noop-renderer/src/ReactNoop.js |  2 +
 .../src/ReactFiberBeginWork.js                | 10 ++-
 .../src/ReactFiberNewContext.js               | 70 ++++++++++++++-----
 .../src/ReactFiberReconciler.js               |  5 ++
 .../src/ReactFiberScheduler.js                |  2 +-
 .../src/ReactTestRenderer.js                  |  2 +
 packages/react/src/ReactContext.js            |  8 +++
 packages/shared/ReactTypes.js                 |  3 +
 13 files changed, 144 insertions(+), 22 deletions(-)

diff --git a/packages/react-art/src/ReactART.js b/packages/react-art/src/ReactART.js
index 04478434e8..a7f9a3064c 100644
--- a/packages/react-art/src/ReactART.js
+++ b/packages/react-art/src/ReactART.js
@@ -478,6 +478,9 @@ const ARTRenderer = ReactFiberReconciler({
 
   now: ReactScheduler.now,
 
+  // The ART renderer is secondary to the React DOM renderer.
+  isPrimaryRenderer: false,
+
   mutation: {
     appendChild(parentInstance, child) {
       if (child.parentNode === parentInstance) {
diff --git a/packages/react-art/src/__tests__/ReactART-test.js b/packages/react-art/src/__tests__/ReactART-test.js
index fbce04a9a2..ace737e526 100644
--- a/packages/react-art/src/__tests__/ReactART-test.js
+++ b/packages/react-art/src/__tests__/ReactART-test.js
@@ -339,6 +339,60 @@ describe('ReactART', () => {
     doClick(instance);
     expect(onClick2).toBeCalled();
   });
+
+  it('can concurrently render with a "primary" renderer while sharing context', () => {
+    const CurrentRendererContext = React.createContext(null);
+
+    function Yield(props) {
+      testRenderer.unstable_yield(props.value);
+      return null;
+    }
+
+    let ops = [];
+    function LogCurrentRenderer() {
+      return (
+        <CurrentRendererContext.Consumer>
+          {currentRenderer => {
+            ops.push(currentRenderer);
+            return null;
+          }}
+        </CurrentRendererContext.Consumer>
+      );
+    }
+
+    // Using test renderer instead of the DOM renderer here because async
+    // testing APIs for the DOM renderer don't exist.
+    const testRenderer = renderer.create(
+      <CurrentRendererContext.Provider value="Test">
+        <Yield value="A" />
+        <Yield value="B" />
+        <LogCurrentRenderer />
+        <Yield value="C" />
+      </CurrentRendererContext.Provider>,
+      {
+        unstable_isAsync: true,
+      },
+    );
+
+    testRenderer.unstable_flushThrough(['A']);
+
+    ReactDOM.render(
+      <Surface>
+        <LogCurrentRenderer />
+        <CurrentRendererContext.Provider value="ART">
+          <LogCurrentRenderer />
+        </CurrentRendererContext.Provider>
+      </Surface>,
+      container,
+    );
+
+    expect(ops).toEqual([null, 'ART']);
+
+    ops = [];
+    expect(testRenderer.unstable_flushAll()).toEqual(['B', 'C']);
+
+    expect(ops).toEqual(['Test']);
+  });
 });
 
 describe('ReactARTComponents', () => {
diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js
index 82032f1d1d..81683c4774 100644
--- a/packages/react-dom/src/client/ReactDOM.js
+++ b/packages/react-dom/src/client/ReactDOM.js
@@ -690,6 +690,8 @@ const DOMRenderer = ReactFiberReconciler({
 
   now: ReactScheduler.now,
 
+  isPrimaryRenderer: true,
+
   mutation: {
     commitMount(
       domElement: Instance,
diff --git a/packages/react-native-renderer/src/ReactFabricRenderer.js b/packages/react-native-renderer/src/ReactFabricRenderer.js
index 0ec040bddf..fa2fabef64 100644
--- a/packages/react-native-renderer/src/ReactFabricRenderer.js
+++ b/packages/react-native-renderer/src/ReactFabricRenderer.js
@@ -217,6 +217,9 @@ const ReactFabricRenderer = ReactFiberReconciler({
 
   now: ReactNativeFrameScheduling.now,
 
+  // The Fabric renderer is secondary to the existing React Native renderer.
+  isPrimaryRenderer: false,
+
   prepareForCommit(): void {
     // Noop
   },
diff --git a/packages/react-native-renderer/src/ReactNativeFiberRenderer.js b/packages/react-native-renderer/src/ReactNativeFiberRenderer.js
index 7de768b3b2..2854f6488f 100644
--- a/packages/react-native-renderer/src/ReactNativeFiberRenderer.js
+++ b/packages/react-native-renderer/src/ReactNativeFiberRenderer.js
@@ -169,6 +169,8 @@ const NativeRenderer = ReactFiberReconciler({
 
   now: ReactNativeFrameScheduling.now,
 
+  isPrimaryRenderer: true,
+
   prepareForCommit(): void {
     // Noop
   },
diff --git a/packages/react-noop-renderer/src/ReactNoop.js b/packages/react-noop-renderer/src/ReactNoop.js
index 5cd6df0fbd..e9c82cbe9c 100644
--- a/packages/react-noop-renderer/src/ReactNoop.js
+++ b/packages/react-noop-renderer/src/ReactNoop.js
@@ -185,6 +185,8 @@ let SharedHostConfig = {
   now(): number {
     return elapsedTimeInMs;
   },
+
+  isPrimaryRenderer: true,
 };
 
 const NoopRenderer = ReactFiberReconciler({
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 489393bebb..14927b2db9 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -104,7 +104,11 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
 
   const {pushHostContext, pushHostContainer} = hostContext;
 
-  const {pushProvider} = newContext;
+  const {
+    pushProvider,
+    getContextCurrentValue,
+    getContextChangedBits,
+  } = newContext;
 
   const {
     markActualRenderTimeStarted,
@@ -1048,8 +1052,8 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     const newProps = workInProgress.pendingProps;
     const oldProps = workInProgress.memoizedProps;
 
-    const newValue = context._currentValue;
-    const changedBits = context._changedBits;
+    const newValue = getContextCurrentValue(context);
+    const changedBits = getContextChangedBits(context);
 
     if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
diff --git a/packages/react-reconciler/src/ReactFiberNewContext.js b/packages/react-reconciler/src/ReactFiberNewContext.js
index ab9c27e88a..3aaf553ec5 100644
--- a/packages/react-reconciler/src/ReactFiberNewContext.js
+++ b/packages/react-reconciler/src/ReactFiberNewContext.js
@@ -11,14 +11,16 @@ import type {Fiber} from './ReactFiber';
 import type {ReactContext} from 'shared/ReactTypes';
 import type {StackCursor, Stack} from './ReactFiberStack';
 
-import warning from 'fbjs/lib/warning';
-
 export type NewContext = {
   pushProvider(providerFiber: Fiber): void,
   popProvider(providerFiber: Fiber): void,
+  getContextCurrentValue(context: ReactContext<any>): any,
+  getContextChangedBits(context: ReactContext<any>): number,
 };
 
-export default function(stack: Stack) {
+import warning from 'fbjs/lib/warning';
+
+export default function(stack: Stack, isPrimaryRenderer: boolean) {
   const {createCursor, push, pop} = stack;
 
   const providerCursor: StackCursor<Fiber | null> = createCursor(null);
@@ -34,21 +36,38 @@ export default function(stack: Stack) {
   function pushProvider(providerFiber: Fiber): void {
     const context: ReactContext<any> = providerFiber.type._context;
 
-    push(changedBitsCursor, context._changedBits, providerFiber);
-    push(valueCursor, context._currentValue, providerFiber);
-    push(providerCursor, providerFiber, providerFiber);
+    if (isPrimaryRenderer) {
+      push(changedBitsCursor, context._changedBits, providerFiber);
+      push(valueCursor, context._currentValue, providerFiber);
+      push(providerCursor, providerFiber, providerFiber);
 
-    context._currentValue = providerFiber.pendingProps.value;
-    context._changedBits = providerFiber.stateNode;
+      context._currentValue = providerFiber.pendingProps.value;
+      context._changedBits = providerFiber.stateNode;
+      if (__DEV__) {
+        warning(
+          context._currentRenderer === null ||
+            context._currentRenderer === rendererSigil,
+          'Detected multiple renderers concurrently rendering the ' +
+            'same context provider. This is currently unsupported.',
+        );
+        context._currentRenderer = rendererSigil;
+      }
+    } else {
+      push(changedBitsCursor, context._changedBits2, providerFiber);
+      push(valueCursor, context._currentValue2, providerFiber);
+      push(providerCursor, providerFiber, providerFiber);
 
-    if (__DEV__) {
-      warning(
-        context._currentRenderer === null ||
-          context._currentRenderer === rendererSigil,
-        'Detected multiple renderers concurrently rendering the ' +
-          'same context provider. This is currently unsupported.',
-      );
-      context._currentRenderer = rendererSigil;
+      context._currentValue2 = providerFiber.pendingProps.value;
+      context._changedBits2 = providerFiber.stateNode;
+      if (__DEV__) {
+        warning(
+          context._currentRenderer2 === null ||
+            context._currentRenderer2 === rendererSigil,
+          'Detected multiple renderers concurrently rendering the ' +
+            'same context provider. This is currently unsupported.',
+        );
+        context._currentRenderer2 = rendererSigil;
+      }
     }
   }
 
@@ -61,12 +80,27 @@ export default function(stack: Stack) {
     pop(changedBitsCursor, providerFiber);
 
     const context: ReactContext<any> = providerFiber.type._context;
-    context._currentValue = currentValue;
-    context._changedBits = changedBits;
+    if (isPrimaryRenderer) {
+      context._currentValue = currentValue;
+      context._changedBits = changedBits;
+    } else {
+      context._currentValue2 = currentValue;
+      context._changedBits2 = changedBits;
+    }
+  }
+
+  function getContextCurrentValue(context: ReactContext<any>): any {
+    return isPrimaryRenderer ? context._currentValue : context._currentValue2;
+  }
+
+  function getContextChangedBits(context: ReactContext<any>): number {
+    return isPrimaryRenderer ? context._changedBits : context._changedBits2;
   }
 
   return {
     pushProvider,
     popProvider,
+    getContextCurrentValue,
+    getContextChangedBits,
   };
 }
diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js
index dd395af753..52a42646ba 100644
--- a/packages/react-reconciler/src/ReactFiberReconciler.js
+++ b/packages/react-reconciler/src/ReactFiberReconciler.js
@@ -95,6 +95,11 @@ export type HostConfig<T, P, I, TI, HI, PI, C, CC, CX, PL> = {
 
   now(): number,
 
+  // Temporary workaround for scenario where multiple renderers concurrently
+  // render using the same context objects. E.g. React DOM and React ART on the
+  // same page. DOM is the primary renderer; ART is the secondary renderer.
+  isPrimaryRenderer: boolean,
+
   +hydration?: HydrationHostConfig<T, P, I, TI, HI, C, CX, PL>,
 
   +mutation?: MutableUpdatesHostConfig<T, P, I, TI, C, PL>,
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 5c9657876c..562039393d 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -181,7 +181,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
   const stack = ReactFiberStack();
   const hostContext = ReactFiberHostContext(config, stack);
   const legacyContext = ReactFiberLegacyContext(stack);
-  const newContext = ReactFiberNewContext(stack);
+  const newContext = ReactFiberNewContext(stack, config.isPrimaryRenderer);
   const profilerTimer = createProfilerTimer(now);
   const {popHostContext, popHostContainer} = hostContext;
   const {
diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js
index 561aed6c58..7fa54534d3 100644
--- a/packages/react-test-renderer/src/ReactTestRenderer.js
+++ b/packages/react-test-renderer/src/ReactTestRenderer.js
@@ -226,6 +226,8 @@ const TestRenderer = ReactFiberReconciler({
   // Even after the reconciler has initialized and read host config values.
   now: () => nowImplementation(),
 
+  isPrimaryRenderer: true,
+
   mutation: {
     commitUpdate(
       instance: Instance,
diff --git a/packages/react/src/ReactContext.js b/packages/react/src/ReactContext.js
index 10190accc4..d15163e813 100644
--- a/packages/react/src/ReactContext.js
+++ b/packages/react/src/ReactContext.js
@@ -36,7 +36,14 @@ export function createContext<T>(
     _calculateChangedBits: calculateChangedBits,
     _defaultValue: defaultValue,
     _currentValue: defaultValue,
+    // As a workaround to support multiple concurrent renderers, we categorize
+    // some renderers as primary and others as secondary. We only expect
+    // there to be two concurrent renderers at most: React Native (primary) and
+    // Fabric (secondary); React DOM (primary) and React ART (secondary).
+    // Secondary renderers store their context values on separate fields.
+    _currentValue2: defaultValue,
     _changedBits: 0,
+    _changedBits2: 0,
     // These are circular
     Provider: (null: any),
     Consumer: (null: any),
@@ -50,6 +57,7 @@ export function createContext<T>(
 
   if (__DEV__) {
     context._currentRenderer = null;
+    context._currentRenderer2 = null;
   }
 
   return context;
diff --git a/packages/shared/ReactTypes.js b/packages/shared/ReactTypes.js
index 689ed18bf9..c47a380a92 100644
--- a/packages/shared/ReactTypes.js
+++ b/packages/shared/ReactTypes.js
@@ -85,10 +85,13 @@ export type ReactContext<T> = {
   _defaultValue: T,
 
   _currentValue: T,
+  _currentValue2: T,
   _changedBits: number,
+  _changedBits2: number,
 
   // DEV only
   _currentRenderer?: Object | null,
+  _currentRenderer2?: Object | null,
 };
 
 export type ReactPortal = {

From 4f459bb144cad7c12e49d8afa2449ff6d9ed9e1f Mon Sep 17 00:00:00 2001
From: Filipp Riabchun <talpa@yandex.ru>
Date: Fri, 11 May 2018 20:03:08 +0300
Subject: [PATCH 030/277] Shallow renderer: pass component instance to setState
 updater as `this` (#12784)

* Shallow renderer: pass component instance to setState updater as `this`

* Run prettier
---
 .../src/ReactShallowRenderer.js               |  6 +++++-
 .../__tests__/ReactShallowRenderer-test.js    | 21 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js
index 9cafeeb2f1..3134f991ee 100644
--- a/packages/react-test-renderer/src/ReactShallowRenderer.js
+++ b/packages/react-test-renderer/src/ReactShallowRenderer.js
@@ -298,7 +298,11 @@ class Updater {
     const currentState = this._renderer._newState || publicInstance.state;
 
     if (typeof partialState === 'function') {
-      partialState = partialState(currentState, publicInstance.props);
+      partialState = partialState.call(
+        publicInstance,
+        currentState,
+        publicInstance.props,
+      );
     }
 
     // Null and undefined are treated as no-ops.
diff --git a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
index ce62bba280..c4cdcd6b65 100644
--- a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
@@ -945,6 +945,27 @@ describe('ReactShallowRenderer', () => {
     expect(result.props.children).toEqual(2);
   });
 
+  it('can access component instance from setState updater function', done => {
+    let instance;
+
+    class SimpleComponent extends React.Component {
+      state = {};
+
+      render() {
+        instance = this;
+        return null;
+      }
+    }
+
+    const shallowRenderer = createRenderer();
+    shallowRenderer.render(<SimpleComponent />);
+
+    instance.setState(function updater(state, props) {
+      expect(this).toBe(instance);
+      done();
+    });
+  });
+
   it('can setState with a callback', () => {
     let instance;
 

From 4b2e65d32e3adec7d4ef5ddd5fcb35e617e0cde6 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Fri, 11 May 2018 18:45:00 -0700
Subject: [PATCH 031/277] Put recent change to getDerivedStateFromProps behind
 a feature flag (#12788)

This will allow us to safely ship it at Facebook and get a better idea
for if/how it breaks existing product code.
---
 .../src/ReactFiberClassComponent.js           | 15 ++++---
 .../ReactIncremental-test.internal.js         | 45 +++++++++++++++++++
 packages/shared/ReactFeatureFlags.js          |  3 ++
 .../ReactFeatureFlags.native-fabric-fb.js     |  1 +
 .../ReactFeatureFlags.native-fabric-oss.js    |  1 +
 .../forks/ReactFeatureFlags.native-fb.js      |  1 +
 .../forks/ReactFeatureFlags.native-oss.js     |  1 +
 .../forks/ReactFeatureFlags.persistent.js     |  1 +
 .../forks/ReactFeatureFlags.test-renderer.js  |  1 +
 .../shared/forks/ReactFeatureFlags.www.js     |  1 +
 10 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js
index 36bb58ecc5..0d63543971 100644
--- a/packages/react-reconciler/src/ReactFiberClassComponent.js
+++ b/packages/react-reconciler/src/ReactFiberClassComponent.js
@@ -16,6 +16,7 @@ import {
   debugRenderPhaseSideEffects,
   debugRenderPhaseSideEffectsForStrictMode,
   warnAboutDeprecatedLifecycles,
+  fireGetDerivedStateFromPropsOnStateUpdates,
 } from 'shared/ReactFeatureFlags';
 import ReactStrictModeWarnings from './ReactStrictModeWarnings';
 import {isMounted} from 'react-reconciler/reflection';
@@ -937,12 +938,14 @@ export default function(
     }
 
     if (typeof getDerivedStateFromProps === 'function') {
-      applyDerivedStateFromProps(
-        workInProgress,
-        getDerivedStateFromProps,
-        newProps,
-      );
-      newState = workInProgress.memoizedState;
+      if (fireGetDerivedStateFromPropsOnStateUpdates || oldProps !== newProps) {
+        applyDerivedStateFromProps(
+          workInProgress,
+          getDerivedStateFromProps,
+          newProps,
+        );
+        newState = workInProgress.memoizedState;
+      }
     }
 
     if (
diff --git a/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
index a8b66373d8..20df85d404 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
@@ -1464,6 +1464,51 @@ describe('ReactIncremental', () => {
     expect(instance.state).toEqual({foo: 'foo'});
   });
 
+  it('does not call getDerivedStateFromProps for state-only updates if feature flag is disabled', () => {
+    jest.resetModules();
+    ReactFeatureFlags = require('shared/ReactFeatureFlags');
+    ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
+    ReactFeatureFlags.fireGetDerivedStateFromPropsOnStateUpdates = false;
+    React = require('react');
+    ReactNoop = require('react-noop-renderer');
+
+    let ops = [];
+    let instance;
+
+    class LifeCycle extends React.Component {
+      state = {};
+      static getDerivedStateFromProps(props, prevState) {
+        ops.push('getDerivedStateFromProps');
+        return {foo: 'foo'};
+      }
+      changeState() {
+        this.setState({foo: 'bar'});
+      }
+      componentDidUpdate() {
+        ops.push('componentDidUpdate');
+      }
+      render() {
+        ops.push('render');
+        instance = this;
+        return null;
+      }
+    }
+
+    ReactNoop.render(<LifeCycle />);
+    ReactNoop.flush();
+
+    expect(ops).toEqual(['getDerivedStateFromProps', 'render']);
+    expect(instance.state).toEqual({foo: 'foo'});
+
+    ops = [];
+
+    instance.changeState();
+    ReactNoop.flush();
+
+    expect(ops).toEqual(['render', 'componentDidUpdate']);
+    expect(instance.state).toEqual({foo: 'bar'});
+  });
+
   xit('does not call componentWillReceiveProps for state-only updates', () => {
     let ops = [];
 
diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
index 16a44b21c9..beefc20c0e 100644
--- a/packages/shared/ReactFeatureFlags.js
+++ b/packages/shared/ReactFeatureFlags.js
@@ -42,6 +42,9 @@ export const warnAboutDeprecatedLifecycles = false;
 // Gather advanced timing metrics for Profiler subtrees.
 export const enableProfilerTimer = false;
 
+// Fires getDerivedStateFromProps for state *or* props changes
+export const fireGetDerivedStateFromPropsOnStateUpdates = true;
+
 // Only used in www builds.
 export function addUserTimingListener() {
   invariant(false, 'Not implemented.');
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
index 3ad3795f2a..cd5c6f115e 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
@@ -25,6 +25,7 @@ export const enableProfilerTimer = __DEV__;
 export const enableMutatingReconciler = false;
 export const enableNoopReconciler = false;
 export const enablePersistentReconciler = true;
+export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
index 501818e8f2..aa9dc6dd4c 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
@@ -25,6 +25,7 @@ export const enableProfilerTimer = false;
 export const enableMutatingReconciler = false;
 export const enableNoopReconciler = false;
 export const enablePersistentReconciler = true;
+export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js
index 034e8bbeed..a98a2fe144 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js
@@ -21,6 +21,7 @@ export const {
   warnAboutDeprecatedLifecycles,
   replayFailedUnitOfWorkWithInvokeGuardedCallback,
   enableProfilerTimer,
+  fireGetDerivedStateFromPropsOnStateUpdates,
 } = require('ReactFeatureFlags');
 
 // The rest of the flags are static for better dead code elimination.
diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js
index 92503166ee..0b93bcbd3a 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js
@@ -23,6 +23,7 @@ export const enableUserTimingAPI = __DEV__;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const warnAboutDeprecatedLifecycles = false;
 export const enableProfilerTimer = false;
+export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.persistent.js b/packages/shared/forks/ReactFeatureFlags.persistent.js
index 06c3b7dec0..ecb19ad1bc 100644
--- a/packages/shared/forks/ReactFeatureFlags.persistent.js
+++ b/packages/shared/forks/ReactFeatureFlags.persistent.js
@@ -20,6 +20,7 @@ export const enableSuspense = false;
 export const warnAboutDeprecatedLifecycles = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableProfilerTimer = false;
+export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
 // react-reconciler/persistent entry point
 // uses a persistent reconciler.
diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
index 2ac0e75d1b..7aad93e150 100644
--- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js
+++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
@@ -23,6 +23,7 @@ export const enableMutatingReconciler = true;
 export const enableNoopReconciler = false;
 export const enablePersistentReconciler = false;
 export const enableProfilerTimer = false;
+export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js
index aaa1ecc17c..725ff1c5e5 100644
--- a/packages/shared/forks/ReactFeatureFlags.www.js
+++ b/packages/shared/forks/ReactFeatureFlags.www.js
@@ -19,6 +19,7 @@ export const {
   replayFailedUnitOfWorkWithInvokeGuardedCallback,
   warnAboutDeprecatedLifecycles,
   enableProfilerTimer,
+  fireGetDerivedStateFromPropsOnStateUpdates,
 } = require('ReactFeatureFlags');
 
 // The rest of the flags are static for better dead code elimination.

From 7b19f93ab9159164ad35b09abcd0c7a936ff3e3c Mon Sep 17 00:00:00 2001
From: Dan <dan.abramov@gmail.com>
Date: Sun, 13 May 2018 21:12:25 +0100
Subject: [PATCH 032/277] Record sizes

---
 scripts/error-codes/codes.json |   3 +-
 scripts/rollup/results.json    | 208 ++++++++++++++++-----------------
 2 files changed, 106 insertions(+), 105 deletions(-)

diff --git a/scripts/error-codes/codes.json b/scripts/error-codes/codes.json
index 6627e703d1..4d190fe68f 100644
--- a/scripts/error-codes/codes.json
+++ b/scripts/error-codes/codes.json
@@ -267,5 +267,6 @@
   "265": "This unit of work tag cannot capture errors.  This error is likely caused by a bug in React. Please file an issue.",
   "266": "A subscription must return an unsubscribe function.",
   "267": "React.cloneElement(...): The argument must be a React element, but you passed %s.",
-  "268": "Argument appears to not be a ReactComponent. Keys: %s"
+  "268": "Argument appears to not be a ReactComponent. Keys: %s",
+  "269": "Profiler must specify an \"id\" string and \"onRender\" function as props"
 }
diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index f265beaf72..01863fae3d 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -4,29 +4,29 @@
       "filename": "react.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react",
-      "size": 57115,
-      "gzip": 15675
+      "size": 58796,
+      "gzip": 16346
     },
     {
       "filename": "react.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react",
-      "size": 7194,
-      "gzip": 3050
+      "size": 7279,
+      "gzip": 3082
     },
     {
       "filename": "react.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react",
-      "size": 47530,
-      "gzip": 13262
+      "size": 49211,
+      "gzip": 13949
     },
     {
       "filename": "react.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react",
-      "size": 5698,
-      "gzip": 2476
+      "size": 5781,
+      "gzip": 2502
     },
     {
       "filename": "React-dev.js",
@@ -46,29 +46,29 @@
       "filename": "react-dom.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-dom",
-      "size": 639980,
-      "gzip": 147756
+      "size": 657360,
+      "gzip": 151075
     },
     {
       "filename": "react-dom.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-dom",
-      "size": 103714,
-      "gzip": 33074
+      "size": 104902,
+      "gzip": 33416
     },
     {
       "filename": "react-dom.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 623973,
-      "gzip": 143563
+      "size": 641349,
+      "gzip": 146842
     },
     {
       "filename": "react-dom.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
-      "size": 102103,
-      "gzip": 32217
+      "size": 103269,
+      "gzip": 32503
     },
     {
       "filename": "ReactDOM-dev.js",
@@ -165,8 +165,8 @@
       "filename": "react-dom-server.browser.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-dom",
-      "size": 103942,
-      "gzip": 27140
+      "size": 104020,
+      "gzip": 27181
     },
     {
       "filename": "react-dom-server.browser.production.min.js",
@@ -179,8 +179,8 @@
       "filename": "react-dom-server.browser.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 92986,
-      "gzip": 24826
+      "size": 93064,
+      "gzip": 24867
     },
     {
       "filename": "react-dom-server.browser.production.min.js",
@@ -207,8 +207,8 @@
       "filename": "react-dom-server.node.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 94954,
-      "gzip": 25386
+      "size": 95032,
+      "gzip": 25427
     },
     {
       "filename": "react-dom-server.node.production.min.js",
@@ -221,29 +221,29 @@
       "filename": "react-art.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-art",
-      "size": 438185,
-      "gzip": 95469
+      "size": 455628,
+      "gzip": 98884
     },
     {
       "filename": "react-art.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-art",
-      "size": 93805,
-      "gzip": 28540
+      "size": 94976,
+      "gzip": 28852
     },
     {
       "filename": "react-art.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-art",
-      "size": 362236,
-      "gzip": 76390
+      "size": 379675,
+      "gzip": 79763
     },
     {
       "filename": "react-art.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-art",
-      "size": 57462,
-      "gzip": 17574
+      "size": 58630,
+      "gzip": 17902
     },
     {
       "filename": "ReactART-dev.js",
@@ -291,29 +291,29 @@
       "filename": "react-test-renderer.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-test-renderer",
-      "size": 367787,
-      "gzip": 77332
+      "size": 385091,
+      "gzip": 80661
     },
     {
       "filename": "react-test-renderer.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-test-renderer",
-      "size": 57216,
-      "gzip": 17399
+      "size": 58378,
+      "gzip": 17695
     },
     {
       "filename": "react-test-renderer.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-test-renderer",
-      "size": 358388,
-      "gzip": 74592
+      "size": 375688,
+      "gzip": 77920
     },
     {
       "filename": "react-test-renderer.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-test-renderer",
-      "size": 56410,
-      "gzip": 16995
+      "size": 57578,
+      "gzip": 17367
     },
     {
       "filename": "ReactTestRenderer-dev.js",
@@ -326,29 +326,29 @@
       "filename": "react-test-renderer-shallow.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-test-renderer",
-      "size": 24939,
-      "gzip": 6654
+      "size": 24960,
+      "gzip": 6657
     },
     {
       "filename": "react-test-renderer-shallow.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-test-renderer",
-      "size": 7377,
-      "gzip": 2416
+      "size": 7384,
+      "gzip": 2418
     },
     {
       "filename": "react-test-renderer-shallow.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-test-renderer",
-      "size": 14595,
-      "gzip": 3660
+      "size": 14616,
+      "gzip": 3663
     },
     {
       "filename": "react-test-renderer-shallow.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-test-renderer",
-      "size": 7314,
-      "gzip": 2398
+      "size": 7321,
+      "gzip": 2401
     },
     {
       "filename": "ReactShallowRenderer-dev.js",
@@ -361,43 +361,43 @@
       "filename": "react-noop-renderer.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-noop-renderer",
-      "size": 18684,
-      "gzip": 5165
+      "size": 18791,
+      "gzip": 5222
     },
     {
       "filename": "react-noop-renderer.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-noop-renderer",
-      "size": 6479,
-      "gzip": 2549
+      "size": 6500,
+      "gzip": 2562
     },
     {
       "filename": "react-reconciler.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-reconciler",
-      "size": 337878,
-      "gzip": 69868
+      "size": 355226,
+      "gzip": 73207
     },
     {
       "filename": "react-reconciler.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-reconciler",
-      "size": 48996,
-      "gzip": 14768
+      "size": 50143,
+      "gzip": 15094
     },
     {
       "filename": "react-reconciler-persistent.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-reconciler",
-      "size": 337140,
-      "gzip": 69575
+      "size": 354412,
+      "gzip": 72892
     },
     {
       "filename": "react-reconciler-persistent.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-reconciler",
-      "size": 47919,
-      "gzip": 14583
+      "size": 49057,
+      "gzip": 14893
     },
     {
       "filename": "react-reconciler-reflection.development.js",
@@ -431,29 +431,29 @@
       "filename": "react-is.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-is",
-      "size": 4685,
-      "gzip": 1302
+      "size": 4791,
+      "gzip": 1326
     },
     {
       "filename": "react-is.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-is",
-      "size": 1892,
-      "gzip": 773
+      "size": 1937,
+      "gzip": 786
     },
     {
       "filename": "react-is.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-is",
-      "size": 4496,
-      "gzip": 1245
+      "size": 4602,
+      "gzip": 1268
     },
     {
       "filename": "react-is.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-is",
-      "size": 1840,
-      "gzip": 707
+      "size": 1886,
+      "gzip": 721
     },
     {
       "filename": "ReactIs-dev.js",
@@ -501,29 +501,29 @@
       "filename": "React-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react",
-      "size": 47536,
-      "gzip": 12932
+      "size": 49318,
+      "gzip": 13556
     },
     {
       "filename": "React-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react",
-      "size": 13822,
-      "gzip": 3825
+      "size": 13793,
+      "gzip": 3864
     },
     {
       "filename": "ReactDOM-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-dom",
-      "size": 649280,
-      "gzip": 146389
+      "size": 667163,
+      "gzip": 149794
     },
     {
       "filename": "ReactDOM-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-dom",
-      "size": 299975,
-      "gzip": 54678
+      "size": 311309,
+      "gzip": 56436
     },
     {
       "filename": "ReactTestUtils-dev.js",
@@ -550,8 +550,8 @@
       "filename": "ReactDOMServer-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-dom",
-      "size": 96543,
-      "gzip": 24639
+      "size": 96693,
+      "gzip": 24675
     },
     {
       "filename": "ReactDOMServer-prod.js",
@@ -564,99 +564,99 @@
       "filename": "ReactART-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-art",
-      "size": 370976,
-      "gzip": 75980
+      "size": 388922,
+      "gzip": 79451
     },
     {
       "filename": "ReactART-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-art",
-      "size": 179924,
-      "gzip": 29606
+      "size": 191156,
+      "gzip": 31368
     },
     {
       "filename": "ReactNativeRenderer-dev.js",
       "bundleType": "RN_FB_DEV",
       "packageName": "react-native-renderer",
-      "size": 481278,
-      "gzip": 102913
+      "size": 499080,
+      "gzip": 106402
     },
     {
       "filename": "ReactNativeRenderer-prod.js",
       "bundleType": "RN_FB_PROD",
       "packageName": "react-native-renderer",
-      "size": 230529,
-      "gzip": 38569
+      "size": 241853,
+      "gzip": 40274
     },
     {
       "filename": "ReactNativeRenderer-dev.js",
       "bundleType": "RN_OSS_DEV",
       "packageName": "react-native-renderer",
-      "size": 480999,
-      "gzip": 102846
+      "size": 498734,
+      "gzip": 106325
     },
     {
       "filename": "ReactNativeRenderer-prod.js",
       "bundleType": "RN_OSS_PROD",
       "packageName": "react-native-renderer",
-      "size": 224503,
-      "gzip": 37480
+      "size": 227735,
+      "gzip": 38044
     },
     {
       "filename": "ReactFabric-dev.js",
       "bundleType": "RN_FB_DEV",
       "packageName": "react-native-renderer",
-      "size": 463244,
-      "gzip": 98382
+      "size": 481057,
+      "gzip": 101898
     },
     {
       "filename": "ReactFabric-prod.js",
       "bundleType": "RN_FB_PROD",
       "packageName": "react-native-renderer",
-      "size": 209798,
-      "gzip": 34820
+      "size": 212992,
+      "gzip": 35357
     },
     {
       "filename": "ReactFabric-dev.js",
       "bundleType": "RN_OSS_DEV",
       "packageName": "react-native-renderer",
-      "size": 463280,
-      "gzip": 98398
+      "size": 481093,
+      "gzip": 101917
     },
     {
       "filename": "ReactFabric-prod.js",
       "bundleType": "RN_OSS_PROD",
       "packageName": "react-native-renderer",
-      "size": 209834,
-      "gzip": 34837
+      "size": 213028,
+      "gzip": 35376
     },
     {
       "filename": "ReactTestRenderer-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-test-renderer",
-      "size": 367404,
-      "gzip": 74293
+      "size": 385220,
+      "gzip": 77735
     },
     {
       "filename": "ReactShallowRenderer-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-test-renderer",
-      "size": 15318,
-      "gzip": 3781
+      "size": 15371,
+      "gzip": 3790
     },
     {
       "filename": "ReactIs-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-is",
-      "size": 4564,
-      "gzip": 1270
+      "size": 4674,
+      "gzip": 1294
     },
     {
       "filename": "ReactIs-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-is",
-      "size": 3653,
-      "gzip": 977
+      "size": 3760,
+      "gzip": 998
     },
     {
       "filename": "react-scheduler.development.js",

From 8506062975b36cad1b92a39e66bfa59f637ee672 Mon Sep 17 00:00:00 2001
From: Bartosz Kaszubowski <gosimek@gmail.com>
Date: Mon, 14 May 2018 12:18:31 +0200
Subject: [PATCH 033/277] remove unused ES3-specific packages - refs #12716
 (#12797)

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

diff --git a/package.json b/package.json
index 9b625ea397..ed1a5cad14 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,6 @@
     "babel-plugin-transform-es2015-shorthand-properties": "^6.5.0",
     "babel-plugin-transform-es2015-spread": "^6.5.2",
     "babel-plugin-transform-es2015-template-literals": "^6.5.2",
-    "babel-plugin-transform-es3-member-expression-literals": "^6.5.0",
-    "babel-plugin-transform-es3-property-literals": "^6.5.0",
     "babel-plugin-transform-object-rest-spread": "^6.6.5",
     "babel-plugin-transform-react-jsx-source": "^6.8.0",
     "babel-plugin-transform-regenerator": "^6.26.0",

From d430e1358227f316ef41650c8e1b9674de11ab84 Mon Sep 17 00:00:00 2001
From: Toru Kobayashi <koba0004@gmail.com>
Date: Mon, 14 May 2018 20:35:20 +0900
Subject: [PATCH 034/277] Fix a typo (#12798)

---
 .../src/__tests__/ReactShallowRenderer-test.js                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
index c4cdcd6b65..5ff7eae701 100644
--- a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
@@ -1353,7 +1353,7 @@ describe('ReactShallowRenderer', () => {
     ]);
   });
 
-  it('should stop the upade when setState returns null or undefined', () => {
+  it('should stop the update when setState returns null or undefined', () => {
     const log = [];
     let instance;
     class Component extends React.Component {

From 0470854f5522dde521d46049bcac894b2e86d280 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 14 May 2018 13:57:33 +0100
Subject: [PATCH 035/277] Split ReactNoop into normal and persistent exports
 (#12793)

* Copy-paste ReactNoop into ReactNoopPersistent

* Split ReactNoop into normal and persistent exports

* ReactNoopShared -> createReactNoop
---
 .../react-noop-renderer/npm/persistent.js     |   7 +
 packages/react-noop-renderer/package.json     |   1 +
 packages/react-noop-renderer/persistent.js    |  18 +
 packages/react-noop-renderer/src/ReactNoop.js | 579 +----------------
 .../src/ReactNoopPersistent.js                |  23 +
 .../src/createReactNoop.js                    | 582 ++++++++++++++++++
 .../ReactPersistent-test.internal.js          |  28 +-
 scripts/rollup/bundles.js                     |  23 +
 8 files changed, 671 insertions(+), 590 deletions(-)
 create mode 100644 packages/react-noop-renderer/npm/persistent.js
 create mode 100644 packages/react-noop-renderer/persistent.js
 create mode 100644 packages/react-noop-renderer/src/ReactNoopPersistent.js
 create mode 100644 packages/react-noop-renderer/src/createReactNoop.js

diff --git a/packages/react-noop-renderer/npm/persistent.js b/packages/react-noop-renderer/npm/persistent.js
new file mode 100644
index 0000000000..14991d5371
--- /dev/null
+++ b/packages/react-noop-renderer/npm/persistent.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-noop-renderer-persistent.production.min.js');
+} else {
+  module.exports = require('./cjs/react-noop-renderer-persistent.development.js');
+}
diff --git a/packages/react-noop-renderer/package.json b/packages/react-noop-renderer/package.json
index afd4aaef71..25b3a429e5 100644
--- a/packages/react-noop-renderer/package.json
+++ b/packages/react-noop-renderer/package.json
@@ -20,6 +20,7 @@
     "LICENSE",
     "README.md",
     "index.js",
+    "persistent.js",
     "cjs/"
   ]
 }
diff --git a/packages/react-noop-renderer/persistent.js b/packages/react-noop-renderer/persistent.js
new file mode 100644
index 0000000000..f235fad17b
--- /dev/null
+++ b/packages/react-noop-renderer/persistent.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+'use strict';
+
+const ReactNoopPersistent = require('./src/ReactNoopPersistent');
+
+// TODO: decide on the top-level export form.
+// This is hacky but makes it work with both Rollup and Jest.
+module.exports = ReactNoopPersistent.default
+  ? ReactNoopPersistent.default
+  : ReactNoopPersistent;
diff --git a/packages/react-noop-renderer/src/ReactNoop.js b/packages/react-noop-renderer/src/ReactNoop.js
index e9c82cbe9c..91ae6ca749 100644
--- a/packages/react-noop-renderer/src/ReactNoop.js
+++ b/packages/react-noop-renderer/src/ReactNoop.js
@@ -14,581 +14,10 @@
  * environment.
  */
 
-import type {Fiber} from 'react-reconciler/src/ReactFiber';
-import type {UpdateQueue} from 'react-reconciler/src/ReactUpdateQueue';
-import type {ReactNodeList} from 'shared/ReactTypes';
-import ReactFiberReconciler from 'react-reconciler';
-import {enablePersistentReconciler} from 'shared/ReactFeatureFlags';
-import * as ReactPortal from 'shared/ReactPortal';
-import emptyObject from 'fbjs/lib/emptyObject';
-import expect from 'expect';
+import createReactNoop from './createReactNoop';
 
-const UPDATE_SIGNAL = {};
-
-let scheduledCallback = null;
-
-type Container = {rootID: string, children: Array<Instance | TextInstance>};
-type Props = {prop: any, hidden?: boolean};
-type Instance = {|
-  type: string,
-  id: number,
-  children: Array<Instance | TextInstance>,
-  prop: any,
-|};
-type TextInstance = {|text: string, id: number|};
-
-let instanceCounter = 0;
-let failInBeginPhase = false;
-
-function appendChild(
-  parentInstance: Instance | Container,
-  child: Instance | TextInstance,
-): void {
-  const index = parentInstance.children.indexOf(child);
-  if (index !== -1) {
-    parentInstance.children.splice(index, 1);
-  }
-  parentInstance.children.push(child);
-}
-
-function insertBefore(
-  parentInstance: Instance | Container,
-  child: Instance | TextInstance,
-  beforeChild: Instance | TextInstance,
-): void {
-  const index = parentInstance.children.indexOf(child);
-  if (index !== -1) {
-    parentInstance.children.splice(index, 1);
-  }
-  const beforeIndex = parentInstance.children.indexOf(beforeChild);
-  if (beforeIndex === -1) {
-    throw new Error('This child does not exist.');
-  }
-  parentInstance.children.splice(beforeIndex, 0, child);
-}
-
-function removeChild(
-  parentInstance: Instance | Container,
-  child: Instance | TextInstance,
-): void {
-  const index = parentInstance.children.indexOf(child);
-  if (index === -1) {
-    throw new Error('This child does not exist.');
-  }
-  parentInstance.children.splice(index, 1);
-}
-
-let elapsedTimeInMs = 0;
-
-let SharedHostConfig = {
-  getRootHostContext() {
-    if (failInBeginPhase) {
-      throw new Error('Error in host config.');
-    }
-    return emptyObject;
-  },
-
-  getChildHostContext() {
-    return emptyObject;
-  },
-
-  getPublicInstance(instance) {
-    return instance;
-  },
-
-  createInstance(type: string, props: Props): Instance {
-    const inst = {
-      id: instanceCounter++,
-      type: type,
-      children: [],
-      prop: props.prop,
-    };
-    // Hide from unit tests
-    Object.defineProperty(inst, 'id', {value: inst.id, enumerable: false});
-    return inst;
-  },
-
-  appendInitialChild(
-    parentInstance: Instance,
-    child: Instance | TextInstance,
-  ): void {
-    parentInstance.children.push(child);
-  },
-
-  finalizeInitialChildren(
-    domElement: Instance,
-    type: string,
-    props: Props,
-  ): boolean {
-    return false;
-  },
-
-  prepareUpdate(
-    instance: Instance,
-    type: string,
-    oldProps: Props,
-    newProps: Props,
-  ): null | {} {
-    if (oldProps === null) {
-      throw new Error('Should have old props');
-    }
-    if (newProps === null) {
-      throw new Error('Should have new props');
-    }
-    return UPDATE_SIGNAL;
-  },
-
-  shouldSetTextContent(type: string, props: Props): boolean {
-    return (
-      typeof props.children === 'string' || typeof props.children === 'number'
-    );
-  },
-
-  shouldDeprioritizeSubtree(type: string, props: Props): boolean {
-    return !!props.hidden;
-  },
-
-  createTextInstance(
-    text: string,
-    rootContainerInstance: Container,
-    hostContext: Object,
-    internalInstanceHandle: Object,
-  ): TextInstance {
-    const inst = {text: text, id: instanceCounter++};
-    // Hide from unit tests
-    Object.defineProperty(inst, 'id', {value: inst.id, enumerable: false});
-    return inst;
-  },
-
-  scheduleDeferredCallback(callback) {
-    if (scheduledCallback) {
-      throw new Error(
-        'Scheduling a callback twice is excessive. Instead, keep track of ' +
-          'whether the callback has already been scheduled.',
-      );
-    }
-    scheduledCallback = callback;
-    return 0;
-  },
-
-  cancelDeferredCallback() {
-    if (scheduledCallback === null) {
-      throw new Error('No callback is scheduled.');
-    }
-    scheduledCallback = null;
-  },
-
-  prepareForCommit(): void {},
-
-  resetAfterCommit(): void {},
-
-  now(): number {
-    return elapsedTimeInMs;
-  },
-
-  isPrimaryRenderer: true,
-};
-
-const NoopRenderer = ReactFiberReconciler({
-  ...SharedHostConfig,
-  mutation: {
-    commitMount(instance: Instance, type: string, newProps: Props): void {
-      // Noop
-    },
-
-    commitUpdate(
-      instance: Instance,
-      updatePayload: Object,
-      type: string,
-      oldProps: Props,
-      newProps: Props,
-    ): void {
-      if (oldProps === null) {
-        throw new Error('Should have old props');
-      }
-      instance.prop = newProps.prop;
-    },
-
-    commitTextUpdate(
-      textInstance: TextInstance,
-      oldText: string,
-      newText: string,
-    ): void {
-      textInstance.text = newText;
-    },
-
-    appendChild: appendChild,
-    appendChildToContainer: appendChild,
-    insertBefore: insertBefore,
-    insertInContainerBefore: insertBefore,
-    removeChild: removeChild,
-    removeChildFromContainer: removeChild,
-
-    resetTextContent(instance: Instance): void {},
-  },
-});
-
-const PersistentNoopRenderer = enablePersistentReconciler
-  ? ReactFiberReconciler({
-      ...SharedHostConfig,
-      persistence: {
-        cloneInstance(
-          instance: Instance,
-          updatePayload: null | Object,
-          type: string,
-          oldProps: Props,
-          newProps: Props,
-          internalInstanceHandle: Object,
-          keepChildren: boolean,
-          recyclableInstance: null | Instance,
-        ): Instance {
-          const clone = {
-            id: instance.id,
-            type: type,
-            children: keepChildren ? instance.children : [],
-            prop: newProps.prop,
-          };
-          Object.defineProperty(clone, 'id', {
-            value: clone.id,
-            enumerable: false,
-          });
-          return clone;
-        },
-
-        createContainerChildSet(
-          container: Container,
-        ): Array<Instance | TextInstance> {
-          return [];
-        },
-
-        appendChildToContainerChildSet(
-          childSet: Array<Instance | TextInstance>,
-          child: Instance | TextInstance,
-        ): void {
-          childSet.push(child);
-        },
-
-        finalizeContainerChildren(
-          container: Container,
-          newChildren: Array<Instance | TextInstance>,
-        ): void {},
-
-        replaceContainerChildren(
-          container: Container,
-          newChildren: Array<Instance | TextInstance>,
-        ): void {
-          container.children = newChildren;
-        },
-      },
-    })
-  : null;
-
-const rootContainers = new Map();
-const roots = new Map();
-const persistentRoots = new Map();
-const DEFAULT_ROOT_ID = '<default>';
-
-let yieldedValues = null;
-
-let unitsRemaining;
-
-function* flushUnitsOfWork(n: number): Generator<Array<mixed>, void, void> {
-  let didStop = false;
-  while (!didStop && scheduledCallback !== null) {
-    let cb = scheduledCallback;
-    scheduledCallback = null;
-    unitsRemaining = n;
-    cb({
-      timeRemaining() {
-        if (yieldedValues !== null) {
-          return 0;
-        }
-        if (unitsRemaining-- > 0) {
-          return 999;
-        }
-        didStop = true;
-        return 0;
-      },
-      // React's scheduler has its own way of keeping track of expired
-      // work and doesn't read this, so don't bother setting it to the
-      // correct value.
-      didTimeout: false,
-    });
-
-    if (yieldedValues !== null) {
-      const values = yieldedValues;
-      yieldedValues = null;
-      yield values;
-    }
-  }
-}
-
-const ReactNoop = {
-  getChildren(rootID: string = DEFAULT_ROOT_ID) {
-    const container = rootContainers.get(rootID);
-    if (container) {
-      return container.children;
-    } else {
-      return null;
-    }
-  },
-
-  createPortal(
-    children: ReactNodeList,
-    container: Container,
-    key: ?string = null,
-  ) {
-    return ReactPortal.createPortal(children, container, null, key);
-  },
-
-  // Shortcut for testing a single root
-  render(element: React$Element<any>, callback: ?Function) {
-    ReactNoop.renderToRootWithID(element, DEFAULT_ROOT_ID, callback);
-  },
-
-  renderToRootWithID(
-    element: React$Element<any>,
-    rootID: string,
-    callback: ?Function,
-  ) {
-    let root = roots.get(rootID);
-    if (!root) {
-      const container = {rootID: rootID, children: []};
-      rootContainers.set(rootID, container);
-      root = NoopRenderer.createContainer(container, true, false);
-      roots.set(rootID, root);
-    }
-    NoopRenderer.updateContainer(element, root, null, callback);
-  },
-
-  renderToPersistentRootWithID(
-    element: React$Element<any>,
-    rootID: string,
-    callback: ?Function,
-  ) {
-    if (PersistentNoopRenderer === null) {
-      throw new Error(
-        'Enable ReactFeatureFlags.enablePersistentReconciler to use it in tests.',
-      );
-    }
-    let root = persistentRoots.get(rootID);
-    if (!root) {
-      const container = {rootID: rootID, children: []};
-      rootContainers.set(rootID, container);
-      root = PersistentNoopRenderer.createContainer(container, true, false);
-      persistentRoots.set(rootID, root);
-    }
-    PersistentNoopRenderer.updateContainer(element, root, null, callback);
-  },
-
-  unmountRootWithID(rootID: string) {
-    const root = roots.get(rootID);
-    if (root) {
-      NoopRenderer.updateContainer(null, root, null, () => {
-        roots.delete(rootID);
-        rootContainers.delete(rootID);
-      });
-    }
-  },
-
-  findInstance(
-    componentOrElement: Element | ?React$Component<any, any>,
-  ): null | Instance | TextInstance {
-    if (componentOrElement == null) {
-      return null;
-    }
-    // Unsound duck typing.
-    const component = (componentOrElement: any);
-    if (typeof component.id === 'number') {
-      return component;
-    }
-    return NoopRenderer.findHostInstance(component);
-  },
-
-  flushDeferredPri(timeout: number = Infinity): Array<mixed> {
-    // The legacy version of this function decremented the timeout before
-    // returning the new time.
-    // TODO: Convert tests to use flushUnitsOfWork or flushAndYield instead.
-    const n = timeout / 5 - 1;
-
-    let values = [];
-    // eslint-disable-next-line no-for-of-loops/no-for-of-loops
-    for (const value of flushUnitsOfWork(n)) {
-      values.push(...value);
-    }
-    return values;
-  },
-
-  flush(): Array<mixed> {
-    return ReactNoop.flushUnitsOfWork(Infinity);
-  },
-
-  flushAndYield(
-    unitsOfWork: number = Infinity,
-  ): Generator<Array<mixed>, void, void> {
-    return flushUnitsOfWork(unitsOfWork);
-  },
-
-  flushUnitsOfWork(n: number): Array<mixed> {
-    let values = yieldedValues || [];
-    yieldedValues = null;
-    // eslint-disable-next-line no-for-of-loops/no-for-of-loops
-    for (const value of flushUnitsOfWork(n)) {
-      values.push(...value);
-    }
-    return values;
-  },
-
-  flushThrough(expected: Array<mixed>): void {
-    let actual = [];
-    if (expected.length !== 0) {
-      // eslint-disable-next-line no-for-of-loops/no-for-of-loops
-      for (const value of flushUnitsOfWork(Infinity)) {
-        actual.push(...value);
-        if (actual.length >= expected.length) {
-          break;
-        }
-      }
-    }
-    expect(actual).toEqual(expected);
-  },
-
-  expire(ms: number): void {
-    elapsedTimeInMs += ms;
-  },
-
-  flushExpired(): Array<mixed> {
-    return ReactNoop.flushUnitsOfWork(0);
-  },
-
-  yield(value: mixed) {
-    if (yieldedValues === null) {
-      yieldedValues = [value];
-    } else {
-      yieldedValues.push(value);
-    }
-  },
-
-  clearYields() {
-    const values = yieldedValues;
-    yieldedValues = null;
-    return values;
-  },
-
-  hasScheduledCallback() {
-    return !!scheduledCallback;
-  },
-
-  batchedUpdates: NoopRenderer.batchedUpdates,
-
-  deferredUpdates: NoopRenderer.deferredUpdates,
-
-  unbatchedUpdates: NoopRenderer.unbatchedUpdates,
-
-  interactiveUpdates: NoopRenderer.interactiveUpdates,
-
-  flushSync(fn: () => mixed) {
-    yieldedValues = [];
-    NoopRenderer.flushSync(fn);
-    return yieldedValues;
-  },
-
-  // Logs the current state of the tree.
-  dumpTree(rootID: string = DEFAULT_ROOT_ID) {
-    const root = roots.get(rootID);
-    const rootContainer = rootContainers.get(rootID);
-    if (!root || !rootContainer) {
-      console.log('Nothing rendered yet.');
-      return;
-    }
-
-    let bufferedLog = [];
-    function log(...args) {
-      bufferedLog.push(...args, '\n');
-    }
-
-    function logHostInstances(children: Array<Instance | TextInstance>, depth) {
-      for (let i = 0; i < children.length; i++) {
-        const child = children[i];
-        const indent = '  '.repeat(depth);
-        if (typeof child.text === 'string') {
-          log(indent + '- ' + child.text);
-        } else {
-          // $FlowFixMe - The child should've been refined now.
-          log(indent + '- ' + child.type + '#' + child.id);
-          // $FlowFixMe - The child should've been refined now.
-          logHostInstances(child.children, depth + 1);
-        }
-      }
-    }
-    function logContainer(container: Container, depth) {
-      log('  '.repeat(depth) + '- [root#' + container.rootID + ']');
-      logHostInstances(container.children, depth + 1);
-    }
-
-    function logUpdateQueue(updateQueue: UpdateQueue<mixed>, depth) {
-      log('  '.repeat(depth + 1) + 'QUEUED UPDATES');
-      const firstUpdate = updateQueue.firstUpdate;
-      if (!firstUpdate) {
-        return;
-      }
-
-      log('  '.repeat(depth + 1) + '~', '[' + firstUpdate.expirationTime + ']');
-      while (firstUpdate.next) {
-        log(
-          '  '.repeat(depth + 1) + '~',
-          '[' + firstUpdate.expirationTime + ']',
-        );
-      }
-    }
-
-    function logFiber(fiber: Fiber, depth) {
-      log(
-        '  '.repeat(depth) +
-          '- ' +
-          // need to explicitly coerce Symbol to a string
-          (fiber.type ? fiber.type.name || fiber.type.toString() : '[root]'),
-        '[' + fiber.expirationTime + (fiber.pendingProps ? '*' : '') + ']',
-      );
-      if (fiber.updateQueue) {
-        logUpdateQueue(fiber.updateQueue, depth);
-      }
-      // const childInProgress = fiber.progressedChild;
-      // if (childInProgress && childInProgress !== fiber.child) {
-      //   log(
-      //     '  '.repeat(depth + 1) + 'IN PROGRESS: ' + fiber.pendingWorkPriority,
-      //   );
-      //   logFiber(childInProgress, depth + 1);
-      //   if (fiber.child) {
-      //     log('  '.repeat(depth + 1) + 'CURRENT');
-      //   }
-      // } else if (fiber.child && fiber.updateQueue) {
-      //   log('  '.repeat(depth + 1) + 'CHILDREN');
-      // }
-      if (fiber.child) {
-        logFiber(fiber.child, depth + 1);
-      }
-      if (fiber.sibling) {
-        logFiber(fiber.sibling, depth);
-      }
-    }
-
-    log('HOST INSTANCES:');
-    logContainer(rootContainer, 0);
-    log('FIBERS:');
-    logFiber(root.current, 0);
-
-    console.log(...bufferedLog);
-  },
-
-  simulateErrorInHostConfig(fn: () => void) {
-    failInBeginPhase = true;
-    try {
-      fn();
-    } finally {
-      failInBeginPhase = false;
-    }
-  },
-};
+const ReactNoop = createReactNoop(
+  true, // useMutation
+);
 
 export default ReactNoop;
diff --git a/packages/react-noop-renderer/src/ReactNoopPersistent.js b/packages/react-noop-renderer/src/ReactNoopPersistent.js
new file mode 100644
index 0000000000..32c6dcebcb
--- /dev/null
+++ b/packages/react-noop-renderer/src/ReactNoopPersistent.js
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+/**
+ * This is a renderer of React that doesn't have a render target output.
+ * It is useful to demonstrate the internals of the reconciler in isolation
+ * and for testing semantics of reconciliation separate from the host
+ * environment.
+ */
+
+import createReactNoop from './createReactNoop';
+
+const ReactNoopPersistent = createReactNoop(
+  false, // useMutation
+);
+
+export default ReactNoopPersistent;
diff --git a/packages/react-noop-renderer/src/createReactNoop.js b/packages/react-noop-renderer/src/createReactNoop.js
new file mode 100644
index 0000000000..2667122928
--- /dev/null
+++ b/packages/react-noop-renderer/src/createReactNoop.js
@@ -0,0 +1,582 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+/**
+ * This is a renderer of React that doesn't have a render target output.
+ * It is useful to demonstrate the internals of the reconciler in isolation
+ * and for testing semantics of reconciliation separate from the host
+ * environment.
+ */
+
+import type {Fiber} from 'react-reconciler/src/ReactFiber';
+import type {UpdateQueue} from 'react-reconciler/src/ReactUpdateQueue';
+import type {ReactNodeList} from 'shared/ReactTypes';
+
+import ReactFiberReconciler from 'react-reconciler';
+import * as ReactPortal from 'shared/ReactPortal';
+import emptyObject from 'fbjs/lib/emptyObject';
+import expect from 'expect';
+
+type Container = {rootID: string, children: Array<Instance | TextInstance>};
+type Props = {prop: any, hidden?: boolean};
+type Instance = {|
+  type: string,
+  id: number,
+  children: Array<Instance | TextInstance>,
+  prop: any,
+|};
+type TextInstance = {|text: string, id: number|};
+
+function createReactNoop(useMutation: boolean) {
+  const UPDATE_SIGNAL = {};
+  let scheduledCallback = null;
+
+  let instanceCounter = 0;
+  let failInBeginPhase = false;
+
+  function appendChild(
+    parentInstance: Instance | Container,
+    child: Instance | TextInstance,
+  ): void {
+    const index = parentInstance.children.indexOf(child);
+    if (index !== -1) {
+      parentInstance.children.splice(index, 1);
+    }
+    parentInstance.children.push(child);
+  }
+
+  function insertBefore(
+    parentInstance: Instance | Container,
+    child: Instance | TextInstance,
+    beforeChild: Instance | TextInstance,
+  ): void {
+    const index = parentInstance.children.indexOf(child);
+    if (index !== -1) {
+      parentInstance.children.splice(index, 1);
+    }
+    const beforeIndex = parentInstance.children.indexOf(beforeChild);
+    if (beforeIndex === -1) {
+      throw new Error('This child does not exist.');
+    }
+    parentInstance.children.splice(beforeIndex, 0, child);
+  }
+
+  function removeChild(
+    parentInstance: Instance | Container,
+    child: Instance | TextInstance,
+  ): void {
+    const index = parentInstance.children.indexOf(child);
+    if (index === -1) {
+      throw new Error('This child does not exist.');
+    }
+    parentInstance.children.splice(index, 1);
+  }
+
+  let elapsedTimeInMs = 0;
+
+  const sharedHostConfig = {
+    getRootHostContext() {
+      if (failInBeginPhase) {
+        throw new Error('Error in host config.');
+      }
+      return emptyObject;
+    },
+
+    getChildHostContext() {
+      return emptyObject;
+    },
+
+    getPublicInstance(instance) {
+      return instance;
+    },
+
+    createInstance(type: string, props: Props): Instance {
+      const inst = {
+        id: instanceCounter++,
+        type: type,
+        children: [],
+        prop: props.prop,
+      };
+      // Hide from unit tests
+      Object.defineProperty(inst, 'id', {value: inst.id, enumerable: false});
+      return inst;
+    },
+
+    appendInitialChild(
+      parentInstance: Instance,
+      child: Instance | TextInstance,
+    ): void {
+      parentInstance.children.push(child);
+    },
+
+    finalizeInitialChildren(
+      domElement: Instance,
+      type: string,
+      props: Props,
+    ): boolean {
+      return false;
+    },
+
+    prepareUpdate(
+      instance: Instance,
+      type: string,
+      oldProps: Props,
+      newProps: Props,
+    ): null | {} {
+      if (oldProps === null) {
+        throw new Error('Should have old props');
+      }
+      if (newProps === null) {
+        throw new Error('Should have new props');
+      }
+      return UPDATE_SIGNAL;
+    },
+
+    shouldSetTextContent(type: string, props: Props): boolean {
+      return (
+        typeof props.children === 'string' || typeof props.children === 'number'
+      );
+    },
+
+    shouldDeprioritizeSubtree(type: string, props: Props): boolean {
+      return !!props.hidden;
+    },
+
+    createTextInstance(
+      text: string,
+      rootContainerInstance: Container,
+      hostContext: Object,
+      internalInstanceHandle: Object,
+    ): TextInstance {
+      const inst = {text: text, id: instanceCounter++};
+      // Hide from unit tests
+      Object.defineProperty(inst, 'id', {value: inst.id, enumerable: false});
+      return inst;
+    },
+
+    scheduleDeferredCallback(callback) {
+      if (scheduledCallback) {
+        throw new Error(
+          'Scheduling a callback twice is excessive. Instead, keep track of ' +
+            'whether the callback has already been scheduled.',
+        );
+      }
+      scheduledCallback = callback;
+      return 0;
+    },
+
+    cancelDeferredCallback() {
+      if (scheduledCallback === null) {
+        throw new Error('No callback is scheduled.');
+      }
+      scheduledCallback = null;
+    },
+
+    prepareForCommit(): void {},
+
+    resetAfterCommit(): void {},
+
+    now(): number {
+      return elapsedTimeInMs;
+    },
+
+    isPrimaryRenderer: true,
+  };
+
+  const hostConfig = useMutation
+    ? {
+        ...sharedHostConfig,
+        mutation: {
+          commitMount(instance: Instance, type: string, newProps: Props): void {
+            // Noop
+          },
+
+          commitUpdate(
+            instance: Instance,
+            updatePayload: Object,
+            type: string,
+            oldProps: Props,
+            newProps: Props,
+          ): void {
+            if (oldProps === null) {
+              throw new Error('Should have old props');
+            }
+            instance.prop = newProps.prop;
+          },
+
+          commitTextUpdate(
+            textInstance: TextInstance,
+            oldText: string,
+            newText: string,
+          ): void {
+            textInstance.text = newText;
+          },
+
+          appendChild: appendChild,
+          appendChildToContainer: appendChild,
+          insertBefore: insertBefore,
+          insertInContainerBefore: insertBefore,
+          removeChild: removeChild,
+          removeChildFromContainer: removeChild,
+
+          resetTextContent(instance: Instance): void {},
+        },
+      }
+    : {
+        ...sharedHostConfig,
+        persistence: {
+          cloneInstance(
+            instance: Instance,
+            updatePayload: null | Object,
+            type: string,
+            oldProps: Props,
+            newProps: Props,
+            internalInstanceHandle: Object,
+            keepChildren: boolean,
+            recyclableInstance: null | Instance,
+          ): Instance {
+            const clone = {
+              id: instance.id,
+              type: type,
+              children: keepChildren ? instance.children : [],
+              prop: newProps.prop,
+            };
+            Object.defineProperty(clone, 'id', {
+              value: clone.id,
+              enumerable: false,
+            });
+            return clone;
+          },
+
+          createContainerChildSet(
+            container: Container,
+          ): Array<Instance | TextInstance> {
+            return [];
+          },
+
+          appendChildToContainerChildSet(
+            childSet: Array<Instance | TextInstance>,
+            child: Instance | TextInstance,
+          ): void {
+            childSet.push(child);
+          },
+
+          finalizeContainerChildren(
+            container: Container,
+            newChildren: Array<Instance | TextInstance>,
+          ): void {},
+
+          replaceContainerChildren(
+            container: Container,
+            newChildren: Array<Instance | TextInstance>,
+          ): void {
+            container.children = newChildren;
+          },
+        },
+      };
+
+  const NoopRenderer = ReactFiberReconciler(hostConfig);
+
+  const rootContainers = new Map();
+  const roots = new Map();
+  const DEFAULT_ROOT_ID = '<default>';
+
+  let yieldedValues = null;
+
+  let unitsRemaining;
+
+  function* flushUnitsOfWork(n: number): Generator<Array<mixed>, void, void> {
+    let didStop = false;
+    while (!didStop && scheduledCallback !== null) {
+      let cb = scheduledCallback;
+      scheduledCallback = null;
+      unitsRemaining = n;
+      cb({
+        timeRemaining() {
+          if (yieldedValues !== null) {
+            return 0;
+          }
+          if (unitsRemaining-- > 0) {
+            return 999;
+          }
+          didStop = true;
+          return 0;
+        },
+        // React's scheduler has its own way of keeping track of expired
+        // work and doesn't read this, so don't bother setting it to the
+        // correct value.
+        didTimeout: false,
+      });
+
+      if (yieldedValues !== null) {
+        const values = yieldedValues;
+        yieldedValues = null;
+        yield values;
+      }
+    }
+  }
+
+  const ReactNoop = {
+    getChildren(rootID: string = DEFAULT_ROOT_ID) {
+      const container = rootContainers.get(rootID);
+      if (container) {
+        return container.children;
+      } else {
+        return null;
+      }
+    },
+
+    createPortal(
+      children: ReactNodeList,
+      container: Container,
+      key: ?string = null,
+    ) {
+      return ReactPortal.createPortal(children, container, null, key);
+    },
+
+    // Shortcut for testing a single root
+    render(element: React$Element<any>, callback: ?Function) {
+      ReactNoop.renderToRootWithID(element, DEFAULT_ROOT_ID, callback);
+    },
+
+    renderToRootWithID(
+      element: React$Element<any>,
+      rootID: string,
+      callback: ?Function,
+    ) {
+      let root = roots.get(rootID);
+      if (!root) {
+        const container = {rootID: rootID, children: []};
+        rootContainers.set(rootID, container);
+        root = NoopRenderer.createContainer(container, true, false);
+        roots.set(rootID, root);
+      }
+      NoopRenderer.updateContainer(element, root, null, callback);
+    },
+
+    unmountRootWithID(rootID: string) {
+      const root = roots.get(rootID);
+      if (root) {
+        NoopRenderer.updateContainer(null, root, null, () => {
+          roots.delete(rootID);
+          rootContainers.delete(rootID);
+        });
+      }
+    },
+
+    findInstance(
+      componentOrElement: Element | ?React$Component<any, any>,
+    ): null | Instance | TextInstance {
+      if (componentOrElement == null) {
+        return null;
+      }
+      // Unsound duck typing.
+      const component = (componentOrElement: any);
+      if (typeof component.id === 'number') {
+        return component;
+      }
+      return NoopRenderer.findHostInstance(component);
+    },
+
+    flushDeferredPri(timeout: number = Infinity): Array<mixed> {
+      // The legacy version of this function decremented the timeout before
+      // returning the new time.
+      // TODO: Convert tests to use flushUnitsOfWork or flushAndYield instead.
+      const n = timeout / 5 - 1;
+
+      let values = [];
+      // eslint-disable-next-line no-for-of-loops/no-for-of-loops
+      for (const value of flushUnitsOfWork(n)) {
+        values.push(...value);
+      }
+      return values;
+    },
+
+    flush(): Array<mixed> {
+      return ReactNoop.flushUnitsOfWork(Infinity);
+    },
+
+    flushAndYield(
+      unitsOfWork: number = Infinity,
+    ): Generator<Array<mixed>, void, void> {
+      return flushUnitsOfWork(unitsOfWork);
+    },
+
+    flushUnitsOfWork(n: number): Array<mixed> {
+      let values = yieldedValues || [];
+      yieldedValues = null;
+      // eslint-disable-next-line no-for-of-loops/no-for-of-loops
+      for (const value of flushUnitsOfWork(n)) {
+        values.push(...value);
+      }
+      return values;
+    },
+
+    flushThrough(expected: Array<mixed>): void {
+      let actual = [];
+      if (expected.length !== 0) {
+        // eslint-disable-next-line no-for-of-loops/no-for-of-loops
+        for (const value of flushUnitsOfWork(Infinity)) {
+          actual.push(...value);
+          if (actual.length >= expected.length) {
+            break;
+          }
+        }
+      }
+      expect(actual).toEqual(expected);
+    },
+
+    expire(ms: number): void {
+      elapsedTimeInMs += ms;
+    },
+
+    flushExpired(): Array<mixed> {
+      return ReactNoop.flushUnitsOfWork(0);
+    },
+
+    yield(value: mixed) {
+      if (yieldedValues === null) {
+        yieldedValues = [value];
+      } else {
+        yieldedValues.push(value);
+      }
+    },
+
+    clearYields() {
+      const values = yieldedValues;
+      yieldedValues = null;
+      return values;
+    },
+
+    hasScheduledCallback() {
+      return !!scheduledCallback;
+    },
+
+    batchedUpdates: NoopRenderer.batchedUpdates,
+
+    deferredUpdates: NoopRenderer.deferredUpdates,
+
+    unbatchedUpdates: NoopRenderer.unbatchedUpdates,
+
+    interactiveUpdates: NoopRenderer.interactiveUpdates,
+
+    flushSync(fn: () => mixed) {
+      yieldedValues = [];
+      NoopRenderer.flushSync(fn);
+      return yieldedValues;
+    },
+
+    // Logs the current state of the tree.
+    dumpTree(rootID: string = DEFAULT_ROOT_ID) {
+      const root = roots.get(rootID);
+      const rootContainer = rootContainers.get(rootID);
+      if (!root || !rootContainer) {
+        console.log('Nothing rendered yet.');
+        return;
+      }
+
+      let bufferedLog = [];
+      function log(...args) {
+        bufferedLog.push(...args, '\n');
+      }
+
+      function logHostInstances(
+        children: Array<Instance | TextInstance>,
+        depth,
+      ) {
+        for (let i = 0; i < children.length; i++) {
+          const child = children[i];
+          const indent = '  '.repeat(depth);
+          if (typeof child.text === 'string') {
+            log(indent + '- ' + child.text);
+          } else {
+            // $FlowFixMe - The child should've been refined now.
+            log(indent + '- ' + child.type + '#' + child.id);
+            // $FlowFixMe - The child should've been refined now.
+            logHostInstances(child.children, depth + 1);
+          }
+        }
+      }
+      function logContainer(container: Container, depth) {
+        log('  '.repeat(depth) + '- [root#' + container.rootID + ']');
+        logHostInstances(container.children, depth + 1);
+      }
+
+      function logUpdateQueue(updateQueue: UpdateQueue<mixed>, depth) {
+        log('  '.repeat(depth + 1) + 'QUEUED UPDATES');
+        const firstUpdate = updateQueue.firstUpdate;
+        if (!firstUpdate) {
+          return;
+        }
+
+        log(
+          '  '.repeat(depth + 1) + '~',
+          '[' + firstUpdate.expirationTime + ']',
+        );
+        while (firstUpdate.next) {
+          log(
+            '  '.repeat(depth + 1) + '~',
+            '[' + firstUpdate.expirationTime + ']',
+          );
+        }
+      }
+
+      function logFiber(fiber: Fiber, depth) {
+        log(
+          '  '.repeat(depth) +
+            '- ' +
+            // need to explicitly coerce Symbol to a string
+            (fiber.type ? fiber.type.name || fiber.type.toString() : '[root]'),
+          '[' + fiber.expirationTime + (fiber.pendingProps ? '*' : '') + ']',
+        );
+        if (fiber.updateQueue) {
+          logUpdateQueue(fiber.updateQueue, depth);
+        }
+        // const childInProgress = fiber.progressedChild;
+        // if (childInProgress && childInProgress !== fiber.child) {
+        //   log(
+        //     '  '.repeat(depth + 1) + 'IN PROGRESS: ' + fiber.pendingWorkPriority,
+        //   );
+        //   logFiber(childInProgress, depth + 1);
+        //   if (fiber.child) {
+        //     log('  '.repeat(depth + 1) + 'CURRENT');
+        //   }
+        // } else if (fiber.child && fiber.updateQueue) {
+        //   log('  '.repeat(depth + 1) + 'CHILDREN');
+        // }
+        if (fiber.child) {
+          logFiber(fiber.child, depth + 1);
+        }
+        if (fiber.sibling) {
+          logFiber(fiber.sibling, depth);
+        }
+      }
+
+      log('HOST INSTANCES:');
+      logContainer(rootContainer, 0);
+      log('FIBERS:');
+      logFiber(root.current, 0);
+
+      console.log(...bufferedLog);
+    },
+
+    simulateErrorInHostConfig(fn: () => void) {
+      failInBeginPhase = true;
+      try {
+        fn();
+      } finally {
+        failInBeginPhase = false;
+      }
+    },
+  };
+
+  return ReactNoop;
+}
+
+export default createReactNoop;
diff --git a/packages/react-reconciler/src/__tests__/ReactPersistent-test.internal.js b/packages/react-reconciler/src/__tests__/ReactPersistent-test.internal.js
index 1445ddb798..1757e95a78 100644
--- a/packages/react-reconciler/src/__tests__/ReactPersistent-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactPersistent-test.internal.js
@@ -11,7 +11,7 @@
 'use strict';
 
 let React;
-let ReactNoop;
+let ReactNoopPersistent;
 let ReactPortal;
 
 describe('ReactPersistent', () => {
@@ -24,14 +24,12 @@ describe('ReactPersistent', () => {
     ReactFeatureFlags.enableNoopReconciler = false;
 
     React = require('react');
-    ReactNoop = require('react-noop-renderer');
+    ReactNoopPersistent = require('react-noop-renderer/persistent');
     ReactPortal = require('shared/ReactPortal');
   });
 
-  const DEFAULT_ROOT_ID = 'persistent-test';
-
   function render(element) {
-    ReactNoop.renderToPersistentRootWithID(element, DEFAULT_ROOT_ID);
+    ReactNoopPersistent.render(element);
   }
 
   function div(...children) {
@@ -44,7 +42,7 @@ describe('ReactPersistent', () => {
   }
 
   function getChildren() {
-    return ReactNoop.getChildren(DEFAULT_ROOT_ID);
+    return ReactNoopPersistent.getChildren();
   }
 
   it('can update child nodes of a host instance', () => {
@@ -62,12 +60,12 @@ describe('ReactPersistent', () => {
     }
 
     render(<Foo text="Hello" />);
-    ReactNoop.flush();
+    ReactNoopPersistent.flush();
     const originalChildren = getChildren();
     expect(originalChildren).toEqual([div(span())]);
 
     render(<Foo text="World" />);
-    ReactNoop.flush();
+    ReactNoopPersistent.flush();
     const newChildren = getChildren();
     expect(newChildren).toEqual([div(span(), span())]);
 
@@ -96,12 +94,12 @@ describe('ReactPersistent', () => {
     }
 
     render(<Foo text="Hello" />);
-    ReactNoop.flush();
+    ReactNoopPersistent.flush();
     const originalChildren = getChildren();
     expect(originalChildren).toEqual([div(span('Hello'))]);
 
     render(<Foo text="World" />);
-    ReactNoop.flush();
+    ReactNoopPersistent.flush();
     const newChildren = getChildren();
     expect(newChildren).toEqual([div(span('Hello'), span('World'))]);
 
@@ -122,12 +120,12 @@ describe('ReactPersistent', () => {
     }
 
     render(<Foo text="Hello" />);
-    ReactNoop.flush();
+    ReactNoopPersistent.flush();
     const originalChildren = getChildren();
     expect(originalChildren).toEqual([div('Hello', span())]);
 
     render(<Foo text="World" />);
-    ReactNoop.flush();
+    ReactNoopPersistent.flush();
     const newChildren = getChildren();
     expect(newChildren).toEqual([div('World', span())]);
 
@@ -167,7 +165,7 @@ describe('ReactPersistent', () => {
         {ReactPortal.createPortal(<Child />, portalContainer, null)}
       </Parent>,
     );
-    ReactNoop.flush();
+    ReactNoopPersistent.flush();
 
     expect(emptyPortalChildSet).toEqual([]);
 
@@ -185,7 +183,7 @@ describe('ReactPersistent', () => {
         )}
       </Parent>,
     );
-    ReactNoop.flush();
+    ReactNoopPersistent.flush();
 
     const newChildren = getChildren();
     expect(newChildren).toEqual([div()]);
@@ -202,7 +200,7 @@ describe('ReactPersistent', () => {
 
     // Deleting the Portal, should clear its children
     render(<Parent />);
-    ReactNoop.flush();
+    ReactNoopPersistent.flush();
 
     const clearedPortalChildren = portalContainer.children;
     expect(clearedPortalChildren).toEqual([]);
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index f6681c6467..e9f54a11de 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -275,6 +275,29 @@ const bundles = [
       }),
   },
 
+  /******* React Noop Persistent Renderer (used for tests) *******/
+  {
+    label: 'noop-persistent',
+    bundleTypes: [NODE_DEV, NODE_PROD],
+    moduleType: RENDERER,
+    entry: 'react-noop-renderer/persistent',
+    global: 'ReactNoopRendererPersistent',
+    externals: ['react', 'expect'],
+    // React Noop uses generators. However GCC currently
+    // breaks when we attempt to use them in the output.
+    // So we precompile them with regenerator, and include
+    // it as a runtime dependency of React Noop. In practice
+    // this isn't an issue because React Noop is only used
+    // in our tests. We wouldn't want to do this for any
+    // public package though.
+    babel: opts =>
+      Object.assign({}, opts, {
+        plugins: opts.plugins.concat([
+          require.resolve('babel-plugin-transform-regenerator'),
+        ]),
+      }),
+  },
+
   /******* React Reconciler *******/
   {
     label: 'react-reconciler',

From 37d12e29169f4ef4ab06eb0626cde4f0fee729cc Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 14 May 2018 16:20:33 +0100
Subject: [PATCH 036/277] Update lockfile

---
 yarn.lock | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0c9feb48b6..caca3e89e2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -784,18 +784,6 @@ babel-plugin-transform-es2015-template-literals@^6.5.2:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es3-member-expression-literals@^6.5.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es3-member-expression-literals/-/babel-plugin-transform-es3-member-expression-literals-6.22.0.tgz#733d3444f3ecc41bef8ed1a6a4e09657b8969ebb"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es3-property-literals@^6.5.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es3-property-literals/-/babel-plugin-transform-es3-property-literals-6.22.0.tgz#b2078d5842e22abf40f73e8cde9cd3711abd5758"
-  dependencies:
-    babel-runtime "^6.22.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"

From 72542030cffee83ac359374a5e7cec9742183b11 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 14 May 2018 17:49:41 +0100
Subject: [PATCH 037/277] Use Java version of Google Closure Compiler (#12800)

* makes closure compiler threaded

* Dans PR with a closure compiler java version

* Remove unused dep

* Pin GCC

* Prettier

* Nit rename

* Fix error handling

* Name plugins consistently

* Fix lint

* Maybe this works?

* or this

* AppVeyor

* Fix lint
---
 .circleci/config.yml                       |  2 +-
 appveyor.yml                               |  4 +-
 package.json                               |  2 +-
 scripts/rollup/build.js                    | 28 +++++++-------
 scripts/rollup/plugins/closure-plugin.js   | 35 ++++++++++++++++++
 scripts/rollup/plugins/sizes-plugin.js     |  1 +
 scripts/rollup/plugins/use-forks-plugin.js |  1 +
 yarn.lock                                  | 43 ++++++++--------------
 8 files changed, 71 insertions(+), 45 deletions(-)
 create mode 100644 scripts/rollup/plugins/closure-plugin.js

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 86fd8c7412..73a6ca773c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
   build:
 
     docker:
-      - image: circleci/node:8
+      - image: circleci/openjdk:8-jdk-node-browsers
 
     environment:
       TZ: /usr/share/zoneinfo/America/Los_Angeles
diff --git a/appveyor.yml b/appveyor.yml
index 0c97cd4d10..6437f33d3d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,8 +5,8 @@ init:
   - git config --global core.autocrlf input
 
 environment:
-  matrix:
-    - nodejs_version: 8
+  nodejs_version: 8
+  JAVA_HOME: C:\Program Files\Java\jdk1.8.0
 
 # Finish on first failed build
 matrix:
diff --git a/package.json b/package.json
index ed1a5cad14..3b1e2f6168 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
     "git-branch": "^0.3.0",
     "glob": "^6.0.4",
     "glob-stream": "^6.1.0",
+    "google-closure-compiler": "20180506.0.0",
     "gzip-js": "~0.3.2",
     "gzip-size": "^3.0.0",
     "jasmine-check": "^1.0.0-rc.0",
@@ -84,7 +85,6 @@
     "rimraf": "^2.6.1",
     "rollup": "^0.52.1",
     "rollup-plugin-babel": "^3.0.1",
-    "rollup-plugin-closure-compiler-js": "^1.0.6",
     "rollup-plugin-commonjs": "^8.2.6",
     "rollup-plugin-node-resolve": "^2.1.1",
     "rollup-plugin-prettier": "^0.3.0",
diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index 1a9e075814..3f736b87c6 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -2,7 +2,7 @@
 
 const {rollup} = require('rollup');
 const babel = require('rollup-plugin-babel');
-const closure = require('rollup-plugin-closure-compiler-js');
+const closure = require('./plugins/closure-plugin');
 const commonjs = require('rollup-plugin-commonjs');
 const prettier = require('rollup-plugin-prettier');
 const replace = require('rollup-plugin-replace');
@@ -62,15 +62,15 @@ const errorCodeOpts = {
 };
 
 const closureOptions = {
-  compilationLevel: 'SIMPLE',
-  languageIn: 'ECMASCRIPT5_STRICT',
-  languageOut: 'ECMASCRIPT5_STRICT',
+  compilation_level: 'SIMPLE',
+  language_in: 'ECMASCRIPT5_STRICT',
+  language_out: 'ECMASCRIPT5_STRICT',
   env: 'CUSTOM',
-  warningLevel: 'QUIET',
-  applyInputSourceMaps: false,
-  useTypesForOptimization: false,
-  processCommonJsModules: false,
-  rewritePolyfills: false,
+  warning_level: 'QUIET',
+  apply_input_source_maps: false,
+  use_types_for_optimization: false,
+  process_common_js_modules: false,
+  rewrite_polyfills: false,
 };
 
 function getBabelConfig(updateBabelOptions, bundleType, filename) {
@@ -264,7 +264,7 @@ function getPlugins(
         Object.assign({}, closureOptions, {
           // Don't let it create global variables in the browser.
           // https://github.com/facebook/react/issues/10909
-          assumeFunctionWrapper: !isInGlobalScope,
+          assume_function_wrapper: !isInGlobalScope,
           // Works because `google-closure-compiler-js` is forked in Yarn lockfile.
           // We can remove this if GCC merges my PR:
           // https://github.com/google/closure-compiler/pull/2707
@@ -460,9 +460,9 @@ function handleRollupError(error) {
   console.error(
     `\x1b[31m-- ${error.code}${error.plugin ? ` (${error.plugin})` : ''} --`
   );
-  console.error(error.message);
-  const {file, line, column} = error.loc;
-  if (file) {
+  console.error(error.stack);
+  if (error.loc && error.loc.file) {
+    const {file, line, column} = error.loc;
     // This looks like an error from Rollup, e.g. missing export.
     // We'll use the accurate line numbers provided by Rollup but
     // use Babel code frame because it looks nicer.
@@ -473,7 +473,7 @@ function handleRollupError(error) {
       highlightCode: true,
     });
     console.error(frame);
-  } else {
+  } else if (error.codeFrame) {
     // This looks like an error from a plugin (e.g. Babel).
     // In this case we'll resort to displaying the provided code frame
     // because we can't be sure the reported location is accurate.
diff --git a/scripts/rollup/plugins/closure-plugin.js b/scripts/rollup/plugins/closure-plugin.js
new file mode 100644
index 0000000000..0c95ee99e2
--- /dev/null
+++ b/scripts/rollup/plugins/closure-plugin.js
@@ -0,0 +1,35 @@
+'use strict';
+
+const ClosureCompiler = require('google-closure-compiler').compiler;
+const {promisify} = require('util');
+const fs = require('fs');
+const tmp = require('tmp');
+const writeFileAsync = promisify(fs.writeFile);
+
+function compile(flags) {
+  return new Promise((resolve, reject) => {
+    const closureCompiler = new ClosureCompiler(flags);
+    closureCompiler.run(function(exitCode, stdOut, stdErr) {
+      if (!stdErr) {
+        resolve(stdOut);
+      } else {
+        reject(new Error(stdErr));
+      }
+    });
+  });
+}
+
+module.exports = function closure(flags = {}) {
+  return {
+    name: 'scripts/rollup/plugins/closure-plugin',
+    async transformBundle(code) {
+      const inputFile = tmp.fileSync();
+      const tempPath = inputFile.name;
+      flags = Object.assign({}, flags, {js: tempPath});
+      await writeFileAsync(tempPath, code, 'utf8');
+      const compiledCode = await compile(flags);
+      inputFile.removeCallback();
+      return {code: compiledCode};
+    },
+  };
+};
diff --git a/scripts/rollup/plugins/sizes-plugin.js b/scripts/rollup/plugins/sizes-plugin.js
index 514795464d..d581d6e0e4 100644
--- a/scripts/rollup/plugins/sizes-plugin.js
+++ b/scripts/rollup/plugins/sizes-plugin.js
@@ -10,6 +10,7 @@ const gzip = require('gzip-size');
 
 module.exports = function sizes(options) {
   return {
+    name: 'scripts/rollup/plugins/sizes-plugin',
     ongenerate(bundle, obj) {
       const size = Buffer.byteLength(obj.code);
       const gzipSize = gzip.sync(obj.code);
diff --git a/scripts/rollup/plugins/use-forks-plugin.js b/scripts/rollup/plugins/use-forks-plugin.js
index a1c06b1849..b0f7e4e1b9 100644
--- a/scripts/rollup/plugins/use-forks-plugin.js
+++ b/scripts/rollup/plugins/use-forks-plugin.js
@@ -37,6 +37,7 @@ function useForks(forks) {
     );
   });
   return {
+    name: 'scripts/rollup/plugins/use-forks-plugin',
     resolveId(importee, importer) {
       if (!importer || !importee) {
         return null;
diff --git a/yarn.lock b/yarn.lock
index caca3e89e2..08eb3a49a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2548,13 +2548,13 @@ glogg@^1.0.0:
   dependencies:
     sparkles "^1.0.0"
 
-google-closure-compiler-js@>20170000:
-  version "20180402.0.0"
-  resolved "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20180402.0.0.tgz#b90ee11c597030b90ed1c6a054dd728aba81ab2d"
+google-closure-compiler@20180506.0.0:
+  version "20180506.0.0"
+  resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20180506.0.0.tgz#f59cc34dbf8c9a4f48fba3ebb2cf098d25e345ab"
   dependencies:
-    minimist "^1.2.0"
+    chalk "^1.0.0"
     vinyl "^2.0.1"
-    webpack-core "^0.6.8"
+    vinyl-sourcemaps-apply "^0.2.0"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4:
   version "4.1.11"
@@ -4814,12 +4814,6 @@ rollup-plugin-babel@^3.0.1:
   dependencies:
     rollup-pluginutils "^1.5.0"
 
-rollup-plugin-closure-compiler-js@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-closure-compiler-js/-/rollup-plugin-closure-compiler-js-1.0.6.tgz#58e3e31297ad1a532d9114108bc06f2756d72c3d"
-  dependencies:
-    google-closure-compiler-js ">20170000"
-
 rollup-plugin-commonjs@^8.2.6:
   version "8.2.6"
   resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz#27e5b9069ff94005bb01e01bb46a1e4873784677"
@@ -5007,10 +5001,6 @@ sntp@2.x.x:
   dependencies:
     hoek "4.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.2.10:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.2.10.tgz#ea5a3900a1c1cb25096a0ae8cc5c2b4b10ded3dc"
@@ -5035,7 +5025,7 @@ source-map@0.1.32:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.4.4, source-map@~0.4.0, source-map@~0.4.1, source-map@~0.4.2:
+source-map@^0.4.4, source-map@~0.4.0, source-map@~0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
@@ -5045,14 +5035,14 @@ source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, sour
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
+source-map@^0.5.1, source-map@~0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
 source-map@^0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
-source-map@~0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
 sparkles@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
@@ -5546,6 +5536,12 @@ verror@1.3.6:
   dependencies:
     extsprintf "1.0.2"
 
+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.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
@@ -5591,13 +5587,6 @@ webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
 
-webpack-core@^0.6.8:
-  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"
-
 whatwg-encoding@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4"

From 2a4d2ca7fc2857bf3ca5d3628211747d7885ed6b Mon Sep 17 00:00:00 2001
From: Sophie Alpert <git@sophiebits.com>
Date: Mon, 14 May 2018 10:07:31 -0700
Subject: [PATCH 038/277] Set owner correctly inside forwardRef and context
 consumer (#12777)

Previously, _owner would be null if you create an element inside forwardRef or inside a context consumer. This is used by ReactNativeFiberInspector when traversing the hierarchy and also to give more info in some warning texts. This also means you'll now correctly get a warning if you call setState inside one of these.

Test Plan: Tim tried it in the RN inspector.
---
 .../src/ReactFiberBeginWork.js                | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 14927b2db9..d08ebd1330 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -201,7 +201,17 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         return bailoutOnAlreadyFinishedWork(current, workInProgress);
       }
     }
-    const nextChildren = render(nextProps, ref);
+
+    let nextChildren;
+    if (__DEV__) {
+      ReactCurrentOwner.current = workInProgress;
+      ReactDebugCurrentFiber.setCurrentPhase('render');
+      nextChildren = render(nextProps, ref);
+      ReactDebugCurrentFiber.setCurrentPhase(null);
+    } else {
+      nextChildren = render(nextProps, ref);
+    }
+
     reconcileChildren(current, workInProgress, nextChildren);
     memoizeProps(workInProgress, nextProps);
     return workInProgress.child;
@@ -1101,7 +1111,16 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       );
     }
 
-    const newChildren = render(newValue);
+    let newChildren;
+    if (__DEV__) {
+      ReactCurrentOwner.current = workInProgress;
+      ReactDebugCurrentFiber.setCurrentPhase('render');
+      newChildren = render(newValue);
+      ReactDebugCurrentFiber.setCurrentPhase(null);
+    } else {
+      newChildren = render(newValue);
+    }
+
     // React DevTools reads this flag.
     workInProgress.effectTag |= PerformedWork;
     reconcileChildren(current, workInProgress, newChildren);

From c4abfa401503b483944d044c2d6c12c5562a1a8b Mon Sep 17 00:00:00 2001
From: Sophie Alpert <git@sophiebits.com>
Date: Mon, 14 May 2018 10:10:36 -0700
Subject: [PATCH 039/277] Add context provider/consumer to getComponentName
 (#12778)

RN Inspector uses these.
---
 packages/shared/getComponentName.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/shared/getComponentName.js b/packages/shared/getComponentName.js
index ed448d8152..a5f61c5efc 100644
--- a/packages/shared/getComponentName.js
+++ b/packages/shared/getComponentName.js
@@ -12,11 +12,13 @@ import type {Fiber} from 'react-reconciler/src/ReactFiber';
 import {
   REACT_ASYNC_MODE_TYPE,
   REACT_CALL_TYPE,
+  REACT_CONTEXT_TYPE,
   REACT_FORWARD_REF_TYPE,
   REACT_FRAGMENT_TYPE,
-  REACT_RETURN_TYPE,
   REACT_PORTAL_TYPE,
   REACT_PROFILER_TYPE,
+  REACT_PROVIDER_TYPE,
+  REACT_RETURN_TYPE,
   REACT_STRICT_MODE_TYPE,
 } from 'shared/ReactSymbols';
 
@@ -33,12 +35,16 @@ function getComponentName(fiber: Fiber): string | null {
       return 'AsyncMode';
     case REACT_CALL_TYPE:
       return 'ReactCall';
+    case REACT_CONTEXT_TYPE:
+      return 'Context.Consumer';
     case REACT_FRAGMENT_TYPE:
       return 'ReactFragment';
     case REACT_PORTAL_TYPE:
       return 'ReactPortal';
     case REACT_PROFILER_TYPE:
       return `Profiler(${fiber.pendingProps.id})`;
+    case REACT_PROVIDER_TYPE:
+      return 'Context.Provider';
     case REACT_RETURN_TYPE:
       return 'ReactReturn';
     case REACT_STRICT_MODE_TYPE:

From 0ba63aa141e56887127de975704569c9b27c2014 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Mon, 14 May 2018 10:39:30 -0700
Subject: [PATCH 040/277] Mark React Native and Fabric renderers as @generated
 (#12801)

Mark React Native and Fabric renderers as @generated
---
 scripts/rollup/wrappers.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/rollup/wrappers.js b/scripts/rollup/wrappers.js
index ecec9d82df..26c2dfdd50 100644
--- a/scripts/rollup/wrappers.js
+++ b/scripts/rollup/wrappers.js
@@ -129,6 +129,7 @@ ${license}
  * @noflow
  * @providesModule ${globalName}-dev
  * @preventMunge
+ * ${'@gen' + 'erated'}
  */
 
 'use strict';
@@ -148,6 +149,7 @@ ${license}
  * @noflow
  * @providesModule ${globalName}-prod
  * @preventMunge
+ * ${'@gen' + 'erated'}
  */
 
 ${source}`;
@@ -160,6 +162,7 @@ ${license}
  *
  * @noflow
  * @preventMunge
+ * ${'@gen' + 'erated'}
  */
 
 'use strict';
@@ -178,6 +181,7 @@ ${license}
  *
  * @noflow
  * @preventMunge
+ * ${'@gen' + 'erated'}
  */
 
 ${source}`;

From c5d3104fc0958027820972f3416ec572ded89f28 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Mon, 14 May 2018 14:56:48 -0700
Subject: [PATCH 041/277] Do not fire getDerivedStateFromProps unless props or
 state have changed (#12802)

Fixes an oversight from #12600. getDerivedStateFromProps should fire
if either props *or* state have changed, but not if *neither* have
changed. This prevents a parent from re-rendering if a deep child
receives an update.
---
 .../src/ReactFiberClassComponent.js           | 41 +++++++++----------
 .../ReactIncremental-test.internal.js         | 33 +++++++++++++++
 2 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js
index 0d63543971..52a6346ffb 100644
--- a/packages/react-reconciler/src/ReactFiberClassComponent.js
+++ b/packages/react-reconciler/src/ReactFiberClassComponent.js
@@ -802,16 +802,6 @@ export default function(
       );
       newState = workInProgress.memoizedState;
     }
-
-    if (typeof getDerivedStateFromProps === 'function') {
-      applyDerivedStateFromProps(
-        workInProgress,
-        getDerivedStateFromProps,
-        newProps,
-      );
-      newState = workInProgress.memoizedState;
-    }
-
     if (
       oldProps === newProps &&
       oldState === newState &&
@@ -829,6 +819,15 @@ export default function(
       return false;
     }
 
+    if (typeof getDerivedStateFromProps === 'function') {
+      applyDerivedStateFromProps(
+        workInProgress,
+        getDerivedStateFromProps,
+        newProps,
+      );
+      newState = workInProgress.memoizedState;
+    }
+
     const shouldUpdate = checkShouldComponentUpdate(
       workInProgress,
       oldProps,
@@ -937,17 +936,6 @@ export default function(
       newState = workInProgress.memoizedState;
     }
 
-    if (typeof getDerivedStateFromProps === 'function') {
-      if (fireGetDerivedStateFromPropsOnStateUpdates || oldProps !== newProps) {
-        applyDerivedStateFromProps(
-          workInProgress,
-          getDerivedStateFromProps,
-          newProps,
-        );
-        newState = workInProgress.memoizedState;
-      }
-    }
-
     if (
       oldProps === newProps &&
       oldState === newState &&
@@ -978,6 +966,17 @@ export default function(
       return false;
     }
 
+    if (typeof getDerivedStateFromProps === 'function') {
+      if (fireGetDerivedStateFromPropsOnStateUpdates || oldProps !== newProps) {
+        applyDerivedStateFromProps(
+          workInProgress,
+          getDerivedStateFromProps,
+          newProps,
+        );
+        newState = workInProgress.memoizedState;
+      }
+    }
+
     const shouldUpdate = checkShouldComponentUpdate(
       workInProgress,
       oldProps,
diff --git a/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
index 20df85d404..a8289b113d 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
@@ -1464,6 +1464,39 @@ describe('ReactIncremental', () => {
     expect(instance.state).toEqual({foo: 'foo'});
   });
 
+  it('does not call getDerivedStateFromProps if neither state nor props have changed', () => {
+    class Parent extends React.Component {
+      state = {parentRenders: 0};
+      static getDerivedStateFromProps(props, prevState) {
+        ReactNoop.yield('getDerivedStateFromProps');
+        return prevState.parentRenders + 1;
+      }
+      render() {
+        ReactNoop.yield('Parent');
+        return <Child parentRenders={this.state.parentRenders} ref={child} />;
+      }
+    }
+
+    class Child extends React.Component {
+      render() {
+        ReactNoop.yield('Child');
+        return this.props.parentRenders;
+      }
+    }
+
+    const child = React.createRef(null);
+    ReactNoop.render(<Parent />);
+    expect(ReactNoop.flush()).toEqual([
+      'getDerivedStateFromProps',
+      'Parent',
+      'Child',
+    ]);
+
+    // Schedule an update on the child. The parent should not re-render.
+    child.current.setState({});
+    expect(ReactNoop.flush()).toEqual(['Child']);
+  });
+
   it('does not call getDerivedStateFromProps for state-only updates if feature flag is disabled', () => {
     jest.resetModules();
     ReactFeatureFlags = require('shared/ReactFeatureFlags');

From c802d29bd16753aef15863db8fb3f338c0067c75 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Mon, 14 May 2018 15:34:01 -0700
Subject: [PATCH 042/277] Use HostContext to warn about invalid View/Text
 nesting (#12766)

---
 .../src/ReactFabricRenderer.js                |  45 +++++--
 .../src/ReactNativeFiberRenderer.js           |  44 ++++++-
 .../__tests__/ReactFabric-test.internal.js    | 120 ++++++++++++++----
 .../ReactFabricAndNative-test.internal.js     |   4 +-
 .../ReactNativeEvents-test.internal.js        |   2 +-
 .../ReactNativeMount-test.internal.js         | 102 +++++++++++++--
 .../ReactFabric-test.internal.js.snap         |  92 +++++++-------
 .../ReactNativeMount-test.internal.js.snap    |  84 ++++++------
 8 files changed, 352 insertions(+), 141 deletions(-)

diff --git a/packages/react-native-renderer/src/ReactFabricRenderer.js b/packages/react-native-renderer/src/ReactFabricRenderer.js
index fa2fabef64..9c597c2e53 100644
--- a/packages/react-native-renderer/src/ReactFabricRenderer.js
+++ b/packages/react-native-renderer/src/ReactFabricRenderer.js
@@ -22,7 +22,7 @@ import * as ReactNativeViewConfigRegistry from 'ReactNativeViewConfigRegistry';
 import ReactFiberReconciler from 'react-reconciler';
 
 import deepFreezeAndThrowOnMutationInDev from 'deepFreezeAndThrowOnMutationInDev';
-import emptyObject from 'fbjs/lib/emptyObject';
+import invariant from 'fbjs/lib/invariant';
 
 // Modules provided by RN:
 import TextInputState from 'TextInputState';
@@ -35,6 +35,10 @@ import UIManager from 'UIManager';
 // This means that they never overlap.
 let nextReactTag = 2;
 
+type HostContext = $ReadOnly<{|
+  isInAParentText: boolean,
+|}>;
+
 /**
  * This is used for refs on host components.
  */
@@ -135,7 +139,7 @@ const ReactFabricRenderer = ReactFiberReconciler({
     type: string,
     props: Props,
     rootContainerInstance: Container,
-    hostContext: {},
+    hostContext: HostContext,
     internalInstanceHandle: Object,
   ): Instance {
     const tag = nextReactTag;
@@ -151,6 +155,11 @@ const ReactFabricRenderer = ReactFiberReconciler({
       }
     }
 
+    invariant(
+      type !== 'RCTView' || !hostContext.isInAParentText,
+      'Nesting of <View> within <Text> is not currently supported.',
+    );
+
     const updatePayload = ReactNativeAttributePayload.create(
       props,
       viewConfig.validAttributes,
@@ -175,9 +184,14 @@ const ReactFabricRenderer = ReactFiberReconciler({
   createTextInstance(
     text: string,
     rootContainerInstance: Container,
-    hostContext: {},
+    hostContext: HostContext,
     internalInstanceHandle: Object,
   ): TextInstance {
+    invariant(
+      hostContext.isInAParentText,
+      'Text strings must be rendered within a <Text> component.',
+    );
+
     const tag = nextReactTag;
     nextReactTag += 2;
 
@@ -203,12 +217,27 @@ const ReactFabricRenderer = ReactFiberReconciler({
     return false;
   },
 
-  getRootHostContext(): {} {
-    return emptyObject;
+  getRootHostContext(rootContainerInstance: Container): HostContext {
+    return {isInAParentText: false};
   },
 
-  getChildHostContext(): {} {
-    return emptyObject;
+  getChildHostContext(
+    parentHostContext: HostContext,
+    type: string,
+  ): HostContext {
+    const prevIsInAParentText = parentHostContext.isInAParentText;
+    const isInAParentText =
+      type === 'AndroidTextInput' || // Android
+      type === 'RCTMultilineTextInputView' || // iOS
+      type === 'RCTSinglelineTextInputView' || // iOS
+      type === 'RCTText' ||
+      type === 'RCTVirtualText';
+
+    if (prevIsInAParentText !== isInAParentText) {
+      return {isInAParentText};
+    } else {
+      return parentHostContext;
+    }
   },
 
   getPublicInstance(instance) {
@@ -230,7 +259,7 @@ const ReactFabricRenderer = ReactFiberReconciler({
     oldProps: Props,
     newProps: Props,
     rootContainerInstance: Container,
-    hostContext: {},
+    hostContext: HostContext,
   ): null | Object {
     const viewConfig = instance.canonical.viewConfig;
     const updatePayload = ReactNativeAttributePayload.diff(
diff --git a/packages/react-native-renderer/src/ReactNativeFiberRenderer.js b/packages/react-native-renderer/src/ReactNativeFiberRenderer.js
index 2854f6488f..01fe4816b4 100644
--- a/packages/react-native-renderer/src/ReactNativeFiberRenderer.js
+++ b/packages/react-native-renderer/src/ReactNativeFiberRenderer.js
@@ -12,6 +12,7 @@ import type {ReactNativeBaseComponentViewConfig} from './ReactNativeTypes';
 import ReactFiberReconciler from 'react-reconciler';
 import emptyObject from 'fbjs/lib/emptyObject';
 import invariant from 'fbjs/lib/invariant';
+
 // Modules provided by RN:
 import UIManager from 'UIManager';
 import deepFreezeAndThrowOnMutationInDev from 'deepFreezeAndThrowOnMutationInDev';
@@ -35,6 +36,10 @@ export type Instance = {
 type Props = Object;
 type TextInstance = number;
 
+type HostContext = $ReadOnly<{|
+  isInAParentText: boolean,
+|}>;
+
 // Counter for uniquely identifying views.
 // % 10 === 1 means it is a rootTag.
 // % 2 === 0 means it is a Fabric tag.
@@ -71,7 +76,7 @@ const NativeRenderer = ReactFiberReconciler({
     type: string,
     props: Props,
     rootContainerInstance: Container,
-    hostContext: {},
+    hostContext: HostContext,
     internalInstanceHandle: Object,
   ): Instance {
     const tag = allocateTag();
@@ -85,6 +90,11 @@ const NativeRenderer = ReactFiberReconciler({
       }
     }
 
+    invariant(
+      type !== 'RCTView' || !hostContext.isInAParentText,
+      'Nesting of <View> within <Text> is not currently supported.',
+    );
+
     const updatePayload = ReactNativeAttributePayload.create(
       props,
       viewConfig.validAttributes,
@@ -110,9 +120,14 @@ const NativeRenderer = ReactFiberReconciler({
   createTextInstance(
     text: string,
     rootContainerInstance: Container,
-    hostContext: {},
+    hostContext: HostContext,
     internalInstanceHandle: Object,
   ): TextInstance {
+    invariant(
+      hostContext.isInAParentText,
+      'Text strings must be rendered within a <Text> component.',
+    );
+
     const tag = allocateTag();
 
     UIManager.createView(
@@ -155,12 +170,27 @@ const NativeRenderer = ReactFiberReconciler({
     return false;
   },
 
-  getRootHostContext(): {} {
-    return emptyObject;
+  getRootHostContext(rootContainerInstance: Container): HostContext {
+    return {isInAParentText: false};
   },
 
-  getChildHostContext(): {} {
-    return emptyObject;
+  getChildHostContext(
+    parentHostContext: HostContext,
+    type: string,
+  ): HostContext {
+    const prevIsInAParentText = parentHostContext.isInAParentText;
+    const isInAParentText =
+      type === 'AndroidTextInput' || // Android
+      type === 'RCTMultilineTextInputView' || // iOS
+      type === 'RCTSinglelineTextInputView' || // iOS
+      type === 'RCTText' ||
+      type === 'RCTVirtualText';
+
+    if (prevIsInAParentText !== isInAParentText) {
+      return {isInAParentText};
+    } else {
+      return parentHostContext;
+    }
   },
 
   getPublicInstance(instance) {
@@ -181,7 +211,7 @@ const NativeRenderer = ReactFiberReconciler({
     oldProps: Props,
     newProps: Props,
     rootContainerInstance: Container,
-    hostContext: {},
+    hostContext: HostContext,
   ): null | Object {
     return emptyObject;
   },
diff --git a/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js b/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js
index a1741f7dc4..cc697f4ddb 100644
--- a/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js
+++ b/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js
@@ -33,9 +33,9 @@ describe('ReactFabric', () => {
   });
 
   it('should be able to create and render a native component', () => {
-    const View = createReactNativeComponentClass('View', () => ({
+    const View = createReactNativeComponentClass('RCTView', () => ({
       validAttributes: {foo: true},
-      uiViewClassName: 'View',
+      uiViewClassName: 'RCTView',
     }));
 
     ReactFabric.render(<View foo="test" />, 1);
@@ -45,9 +45,9 @@ describe('ReactFabric', () => {
   });
 
   it('should be able to create and update a native component', () => {
-    const View = createReactNativeComponentClass('View', () => ({
+    const View = createReactNativeComponentClass('RCTView', () => ({
       validAttributes: {foo: true},
-      uiViewClassName: 'View',
+      uiViewClassName: 'RCTView',
     }));
 
     const firstNode = {};
@@ -67,9 +67,9 @@ describe('ReactFabric', () => {
   });
 
   it('should not call FabricUIManager.cloneNode after render for properties that have not changed', () => {
-    const Text = createReactNativeComponentClass('Text', () => ({
+    const Text = createReactNativeComponentClass('RCTText', () => ({
       validAttributes: {foo: true},
-      uiViewClassName: 'Text',
+      uiViewClassName: 'RCTText',
     }));
 
     ReactFabric.render(<Text foo="a">1</Text>, 11);
@@ -110,15 +110,15 @@ describe('ReactFabric', () => {
   });
 
   it('should only pass props diffs to FabricUIManager.cloneNode', () => {
-    const View = createReactNativeComponentClass('View', () => ({
+    const Text = createReactNativeComponentClass('RCTText', () => ({
       validAttributes: {foo: true, bar: true},
-      uiViewClassName: 'View',
+      uiViewClassName: 'RCTText',
     }));
 
     ReactFabric.render(
-      <View foo="a" bar="a">
+      <Text foo="a" bar="a">
         1
-      </View>,
+      </Text>,
       11,
     );
     expect(FabricUIManager.cloneNode).not.toBeCalled();
@@ -127,9 +127,9 @@ describe('ReactFabric', () => {
     expect(FabricUIManager.cloneNodeWithNewChildrenAndProps).not.toBeCalled();
 
     ReactFabric.render(
-      <View foo="a" bar="b">
+      <Text foo="a" bar="b">
         1
-      </View>,
+      </Text>,
       11,
     );
     expect(FabricUIManager.cloneNodeWithNewProps.mock.calls[0][1]).toEqual({
@@ -138,9 +138,9 @@ describe('ReactFabric', () => {
     expect(FabricUIManager.__dumpHierarchyForJestTestsOnly()).toMatchSnapshot();
 
     ReactFabric.render(
-      <View foo="b" bar="b">
+      <Text foo="b" bar="b">
         2
-      </View>,
+      </Text>,
       11,
     );
     expect(
@@ -152,9 +152,9 @@ describe('ReactFabric', () => {
   });
 
   it('should not call UIManager.updateView from setNativeProps for properties that have not changed', () => {
-    const View = createReactNativeComponentClass('View', () => ({
+    const View = createReactNativeComponentClass('RCTView', () => ({
       validAttributes: {foo: true},
-      uiViewClassName: 'View',
+      uiViewClassName: 'RCTView',
     }));
 
     class Subclass extends ReactFabric.NativeComponent {
@@ -187,9 +187,9 @@ describe('ReactFabric', () => {
   });
 
   it('returns the correct instance and calls it in the callback', () => {
-    const View = createReactNativeComponentClass('View', () => ({
+    const View = createReactNativeComponentClass('RCTView', () => ({
       validAttributes: {foo: true},
-      uiViewClassName: 'View',
+      uiViewClassName: 'RCTView',
     }));
 
     let a;
@@ -208,9 +208,9 @@ describe('ReactFabric', () => {
   });
 
   it('renders and reorders children', () => {
-    const View = createReactNativeComponentClass('View', () => ({
+    const View = createReactNativeComponentClass('RCTView', () => ({
       validAttributes: {title: true},
-      uiViewClassName: 'View',
+      uiViewClassName: 'RCTView',
     }));
 
     class Component extends React.Component {
@@ -249,9 +249,9 @@ describe('ReactFabric', () => {
   });
 
   it('should call complete after inserting children', () => {
-    const View = createReactNativeComponentClass('View', () => ({
+    const View = createReactNativeComponentClass('RCTView', () => ({
       validAttributes: {foo: true},
-      uiViewClassName: 'View',
+      uiViewClassName: 'RCTView',
     }));
 
     const snapshots = [];
@@ -272,4 +272,80 @@ describe('ReactFabric', () => {
     );
     expect(snapshots).toMatchSnapshot();
   });
+
+  it('should throw when <View> is used inside of a <Text> ancestor', () => {
+    const Image = createReactNativeComponentClass('RCTImage', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTImage',
+    }));
+    const Text = createReactNativeComponentClass('RCTText', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTText',
+    }));
+    const View = createReactNativeComponentClass('RCTView', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTView',
+    }));
+
+    expect(() =>
+      ReactFabric.render(
+        <Text>
+          <View />
+        </Text>,
+        11,
+      ),
+    ).toThrow('Nesting of <View> within <Text> is not currently supported.');
+
+    // Non-View things (e.g. Image) are fine
+    ReactFabric.render(
+      <Text>
+        <Image />
+      </Text>,
+      11,
+    );
+  });
+
+  it('should throw for text not inside of a <Text> ancestor', () => {
+    const ScrollView = createReactNativeComponentClass('RCTScrollView', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTScrollView',
+    }));
+    const Text = createReactNativeComponentClass('RCTText', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTText',
+    }));
+    const View = createReactNativeComponentClass('RCTView', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTView',
+    }));
+
+    expect(() => ReactFabric.render(<View>this should warn</View>, 11)).toThrow(
+      'Text strings must be rendered within a <Text> component.',
+    );
+
+    expect(() =>
+      ReactFabric.render(
+        <Text>
+          <ScrollView>hi hello hi</ScrollView>
+        </Text>,
+        11,
+      ),
+    ).toThrow('Text strings must be rendered within a <Text> component.');
+  });
+
+  it('should not throw for text inside of an indirect <Text> ancestor', () => {
+    const Text = createReactNativeComponentClass('RCTText', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTText',
+    }));
+
+    const Indirection = () => 'Hi';
+
+    ReactFabric.render(
+      <Text>
+        <Indirection />
+      </Text>,
+      11,
+    );
+  });
 });
diff --git a/packages/react-native-renderer/src/__tests__/ReactFabricAndNative-test.internal.js b/packages/react-native-renderer/src/__tests__/ReactFabricAndNative-test.internal.js
index a78dd5d228..faaa82f3ef 100644
--- a/packages/react-native-renderer/src/__tests__/ReactFabricAndNative-test.internal.js
+++ b/packages/react-native-renderer/src/__tests__/ReactFabricAndNative-test.internal.js
@@ -31,9 +31,9 @@ describe('ReactFabric', () => {
   });
 
   it('find Fabric nodes with the RN renderer', () => {
-    const View = createReactNativeComponentClass('View', () => ({
+    const View = createReactNativeComponentClass('RCTView', () => ({
       validAttributes: {title: true},
-      uiViewClassName: 'View',
+      uiViewClassName: 'RCTView',
     }));
 
     let ref = React.createRef();
diff --git a/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.internal.js b/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.internal.js
index 07fbe1692a..13fce4d77d 100644
--- a/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.internal.js
+++ b/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.internal.js
@@ -153,7 +153,7 @@ it('handles events', () => {
 it('handles events on text nodes', () => {
   expect(RCTEventEmitter.register.mock.calls.length).toBe(1);
   const EventEmitter = RCTEventEmitter.register.mock.calls[0][0];
-  const Text = fakeRequireNativeComponent('Text', {});
+  const Text = fakeRequireNativeComponent('RCTText', {});
 
   class ContextHack extends React.Component {
     static childContextTypes = {isInAParentText: PropTypes.bool};
diff --git a/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.internal.js b/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.internal.js
index f93a369d87..60b5d79f5d 100644
--- a/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.internal.js
+++ b/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.internal.js
@@ -27,9 +27,9 @@ describe('ReactNative', () => {
   });
 
   it('should be able to create and render a native component', () => {
-    const View = createReactNativeComponentClass('View', () => ({
+    const View = createReactNativeComponentClass('RCTView', () => ({
       validAttributes: {foo: true},
-      uiViewClassName: 'View',
+      uiViewClassName: 'RCTView',
     }));
 
     ReactNative.render(<View foo="test" />, 1);
@@ -40,9 +40,9 @@ describe('ReactNative', () => {
   });
 
   it('should be able to create and update a native component', () => {
-    const View = createReactNativeComponentClass('View', () => ({
+    const View = createReactNativeComponentClass('RCTView', () => ({
       validAttributes: {foo: true},
-      uiViewClassName: 'View',
+      uiViewClassName: 'RCTView',
     }));
 
     ReactNative.render(<View foo="foo" />, 11);
@@ -57,13 +57,13 @@ describe('ReactNative', () => {
     expect(UIManager.createView.mock.calls.length).toBe(1);
     expect(UIManager.setChildren.mock.calls.length).toBe(1);
     expect(UIManager.manageChildren).not.toBeCalled();
-    expect(UIManager.updateView).toBeCalledWith(3, 'View', {foo: 'bar'});
+    expect(UIManager.updateView).toBeCalledWith(3, 'RCTView', {foo: 'bar'});
   });
 
   it('should not call UIManager.updateView after render for properties that have not changed', () => {
-    const Text = createReactNativeComponentClass('Text', () => ({
+    const Text = createReactNativeComponentClass('RCTText', () => ({
       validAttributes: {foo: true},
-      uiViewClassName: 'Text',
+      uiViewClassName: 'RCTText',
     }));
 
     ReactNative.render(<Text foo="a">1</Text>, 11);
@@ -87,9 +87,9 @@ describe('ReactNative', () => {
   });
 
   it('should not call UIManager.updateView from setNativeProps for properties that have not changed', () => {
-    const View = createReactNativeComponentClass('View', () => ({
+    const View = createReactNativeComponentClass('RCTView', () => ({
       validAttributes: {foo: true},
-      uiViewClassName: 'View',
+      uiViewClassName: 'RCTView',
     }));
 
     class Subclass extends ReactNative.NativeComponent {
@@ -122,9 +122,9 @@ describe('ReactNative', () => {
   });
 
   it('returns the correct instance and calls it in the callback', () => {
-    const View = createReactNativeComponentClass('View', () => ({
+    const View = createReactNativeComponentClass('RCTView', () => ({
       validAttributes: {foo: true},
-      uiViewClassName: 'View',
+      uiViewClassName: 'RCTView',
     }));
 
     let a;
@@ -143,9 +143,9 @@ describe('ReactNative', () => {
   });
 
   it('renders and reorders children', () => {
-    const View = createReactNativeComponentClass('View', () => ({
+    const View = createReactNativeComponentClass('RCTView', () => ({
       validAttributes: {title: true},
-      uiViewClassName: 'View',
+      uiViewClassName: 'RCTView',
     }));
 
     class Component extends React.Component {
@@ -182,4 +182,80 @@ describe('ReactNative', () => {
     ReactNative.render(<Component />, 11);
     expect(mockArgs.length).toEqual(0);
   });
+
+  it('should throw when <View> is used inside of a <Text> ancestor', () => {
+    const Image = createReactNativeComponentClass('RCTImage', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTImage',
+    }));
+    const Text = createReactNativeComponentClass('RCTText', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTText',
+    }));
+    const View = createReactNativeComponentClass('RCTView', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTView',
+    }));
+
+    expect(() =>
+      ReactNative.render(
+        <Text>
+          <View />
+        </Text>,
+        11,
+      ),
+    ).toThrow('Nesting of <View> within <Text> is not currently supported.');
+
+    // Non-View things (e.g. Image) are fine
+    ReactNative.render(
+      <Text>
+        <Image />
+      </Text>,
+      11,
+    );
+  });
+
+  it('should throw for text not inside of a <Text> ancestor', () => {
+    const ScrollView = createReactNativeComponentClass('RCTScrollView', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTScrollView',
+    }));
+    const Text = createReactNativeComponentClass('RCTText', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTText',
+    }));
+    const View = createReactNativeComponentClass('RCTView', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTView',
+    }));
+
+    expect(() => ReactNative.render(<View>this should warn</View>, 11)).toThrow(
+      'Text strings must be rendered within a <Text> component.',
+    );
+
+    expect(() =>
+      ReactNative.render(
+        <Text>
+          <ScrollView>hi hello hi</ScrollView>
+        </Text>,
+        11,
+      ),
+    ).toThrow('Text strings must be rendered within a <Text> component.');
+  });
+
+  it('should not throw for text inside of an indirect <Text> ancestor', () => {
+    const Text = createReactNativeComponentClass('RCTText', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTText',
+    }));
+
+    const Indirection = () => 'Hi';
+
+    ReactNative.render(
+      <Text>
+        <Indirection />
+      </Text>,
+      11,
+    );
+  });
 });
diff --git a/packages/react-native-renderer/src/__tests__/__snapshots__/ReactFabric-test.internal.js.snap b/packages/react-native-renderer/src/__tests__/__snapshots__/ReactFabric-test.internal.js.snap
index 6e190e635d..4a0f4d8cf5 100644
--- a/packages/react-native-renderer/src/__tests__/__snapshots__/ReactFabric-test.internal.js.snap
+++ b/packages/react-native-renderer/src/__tests__/__snapshots__/ReactFabric-test.internal.js.snap
@@ -2,69 +2,69 @@
 
 exports[`ReactFabric renders and reorders children 1`] = `
 "11
- 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\\"}"
+ RCTView null
+   RCTView {\\"title\\":\\"a\\"}
+   RCTView {\\"title\\":\\"b\\"}
+   RCTView {\\"title\\":\\"c\\"}
+   RCTView {\\"title\\":\\"d\\"}
+   RCTView {\\"title\\":\\"e\\"}
+   RCTView {\\"title\\":\\"f\\"}
+   RCTView {\\"title\\":\\"g\\"}
+   RCTView {\\"title\\":\\"h\\"}
+   RCTView {\\"title\\":\\"i\\"}
+   RCTView {\\"title\\":\\"j\\"}
+   RCTView {\\"title\\":\\"k\\"}
+   RCTView {\\"title\\":\\"l\\"}
+   RCTView {\\"title\\":\\"m\\"}
+   RCTView {\\"title\\":\\"n\\"}
+   RCTView {\\"title\\":\\"o\\"}
+   RCTView {\\"title\\":\\"p\\"}
+   RCTView {\\"title\\":\\"q\\"}
+   RCTView {\\"title\\":\\"r\\"}
+   RCTView {\\"title\\":\\"s\\"}
+   RCTView {\\"title\\":\\"t\\"}"
 `;
 
 exports[`ReactFabric renders and reorders children 2`] = `
 "11
- 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\\"}"
+ RCTView null
+   RCTView {\\"title\\":\\"m\\"}
+   RCTView {\\"title\\":\\"x\\"}
+   RCTView {\\"title\\":\\"h\\"}
+   RCTView {\\"title\\":\\"p\\"}
+   RCTView {\\"title\\":\\"g\\"}
+   RCTView {\\"title\\":\\"w\\"}
+   RCTView {\\"title\\":\\"f\\"}
+   RCTView {\\"title\\":\\"r\\"}
+   RCTView {\\"title\\":\\"a\\"}
+   RCTView {\\"title\\":\\"l\\"}
+   RCTView {\\"title\\":\\"k\\"}
+   RCTView {\\"title\\":\\"e\\"}
+   RCTView {\\"title\\":\\"o\\"}
+   RCTView {\\"title\\":\\"i\\"}
+   RCTView {\\"title\\":\\"v\\"}
+   RCTView {\\"title\\":\\"c\\"}
+   RCTView {\\"title\\":\\"s\\"}
+   RCTView {\\"title\\":\\"t\\"}
+   RCTView {\\"title\\":\\"z\\"}
+   RCTView {\\"title\\":\\"y\\"}"
 `;
 
 exports[`ReactFabric should call complete after inserting children 1`] = `
 Array [
-  "View {\\"foo\\":\\"a\\"}
-  View {\\"foo\\":\\"b\\"}",
+  "RCTView {\\"foo\\":\\"a\\"}
+  RCTView {\\"foo\\":\\"b\\"}",
 ]
 `;
 
 exports[`ReactFabric should only pass props diffs to FabricUIManager.cloneNode 1`] = `
 "11
- View {\\"foo\\":\\"a\\",\\"bar\\":\\"b\\"}
+ RCTText {\\"foo\\":\\"a\\",\\"bar\\":\\"b\\"}
    RCTRawText {\\"text\\":\\"1\\"}"
 `;
 
 exports[`ReactFabric should only pass props diffs to FabricUIManager.cloneNode 2`] = `
 "11
- View {\\"foo\\":\\"b\\",\\"bar\\":\\"b\\"}
+ RCTText {\\"foo\\":\\"b\\",\\"bar\\":\\"b\\"}
    RCTRawText {\\"text\\":\\"2\\"}"
 `;
diff --git a/packages/react-native-renderer/src/__tests__/__snapshots__/ReactNativeMount-test.internal.js.snap b/packages/react-native-renderer/src/__tests__/__snapshots__/ReactNativeMount-test.internal.js.snap
index 5225479968..9cf7df9217 100644
--- a/packages/react-native-renderer/src/__tests__/__snapshots__/ReactNativeMount-test.internal.js.snap
+++ b/packages/react-native-renderer/src/__tests__/__snapshots__/ReactNativeMount-test.internal.js.snap
@@ -2,50 +2,50 @@
 
 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\\"}"
+  RCTView null
+    RCTView {\\"title\\":\\"a\\"}
+    RCTView {\\"title\\":\\"b\\"}
+    RCTView {\\"title\\":\\"c\\"}
+    RCTView {\\"title\\":\\"d\\"}
+    RCTView {\\"title\\":\\"e\\"}
+    RCTView {\\"title\\":\\"f\\"}
+    RCTView {\\"title\\":\\"g\\"}
+    RCTView {\\"title\\":\\"h\\"}
+    RCTView {\\"title\\":\\"i\\"}
+    RCTView {\\"title\\":\\"j\\"}
+    RCTView {\\"title\\":\\"k\\"}
+    RCTView {\\"title\\":\\"l\\"}
+    RCTView {\\"title\\":\\"m\\"}
+    RCTView {\\"title\\":\\"n\\"}
+    RCTView {\\"title\\":\\"o\\"}
+    RCTView {\\"title\\":\\"p\\"}
+    RCTView {\\"title\\":\\"q\\"}
+    RCTView {\\"title\\":\\"r\\"}
+    RCTView {\\"title\\":\\"s\\"}
+    RCTView {\\"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\\"}"
+  RCTView null
+    RCTView {\\"title\\":\\"m\\"}
+    RCTView {\\"title\\":\\"x\\"}
+    RCTView {\\"title\\":\\"h\\"}
+    RCTView {\\"title\\":\\"p\\"}
+    RCTView {\\"title\\":\\"g\\"}
+    RCTView {\\"title\\":\\"w\\"}
+    RCTView {\\"title\\":\\"f\\"}
+    RCTView {\\"title\\":\\"r\\"}
+    RCTView {\\"title\\":\\"a\\"}
+    RCTView {\\"title\\":\\"l\\"}
+    RCTView {\\"title\\":\\"k\\"}
+    RCTView {\\"title\\":\\"e\\"}
+    RCTView {\\"title\\":\\"o\\"}
+    RCTView {\\"title\\":\\"i\\"}
+    RCTView {\\"title\\":\\"v\\"}
+    RCTView {\\"title\\":\\"c\\"}
+    RCTView {\\"title\\":\\"s\\"}
+    RCTView {\\"title\\":\\"t\\"}
+    RCTView {\\"title\\":\\"z\\"}
+    RCTView {\\"title\\":\\"y\\"}"
 `;

From b2d16047ae8a6405983e8244bf3b482bc57cd5a4 Mon Sep 17 00:00:00 2001
From: Timothy Yung <yungsters@gmail.com>
Date: Mon, 14 May 2018 16:36:50 -0700
Subject: [PATCH 043/277] Fix Type for ReactNative.NativeComponent (#12805)

---
 .../src/ReactNativeTypes.js                   | 24 ++++++++++++++++---
 packages/shared/ReactTypes.js                 |  1 -
 scripts/circleci/check_modules.sh             |  4 +---
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/packages/react-native-renderer/src/ReactNativeTypes.js b/packages/react-native-renderer/src/ReactNativeTypes.js
index bf94119739..c38b0b44eb 100644
--- a/packages/react-native-renderer/src/ReactNativeTypes.js
+++ b/packages/react-native-renderer/src/ReactNativeTypes.js
@@ -4,10 +4,12 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ * @format
  * @flow
- * @providesModule ReactNativeTypes
  */
 
+import React from 'react';
+
 export type MeasureOnSuccessCallback = (
   x: number,
   y: number,
@@ -52,6 +54,22 @@ export type ReactNativeBaseComponentViewConfig = {
 
 export type ViewConfigGetter = () => ReactNativeBaseComponentViewConfig;
 
+/**
+ * Class only exists for its Flow type.
+ */
+class ReactNativeComponent<Props> extends React.Component<Props> {
+  blur(): void {}
+  focus(): void {}
+  measure(callback: MeasureOnSuccessCallback): void {}
+  measureInWindow(callback: MeasureInWindowOnSuccessCallback): void {}
+  measureLayout(
+    relativeToNativeNode: number,
+    onSuccess: MeasureLayoutOnSuccessCallback,
+    onFail?: () => void,
+  ): void {}
+  setNativeProps(nativeProps: Object): void {}
+}
+
 /**
  * This type keeps ReactNativeFiberHostComponent and NativeMethodsMixin in sync.
  * It can also provide types for ReactNative applications that use NMM or refs.
@@ -87,7 +105,7 @@ type SecretInternalsFabricType = {
  * Provide minimal Flow typing for the high-level RN API and call it a day.
  */
 export type ReactNativeType = {
-  NativeComponent: any,
+  NativeComponent: typeof ReactNativeComponent,
   findNodeHandle(componentOrHandle: any): ?number,
   render(
     element: React$Element<any>,
@@ -102,7 +120,7 @@ export type ReactNativeType = {
 };
 
 export type ReactFabricType = {
-  NativeComponent: any,
+  NativeComponent: typeof ReactNativeComponent,
   findNodeHandle(componentOrHandle: any): ?number,
   render(
     element: React$Element<any>,
diff --git a/packages/shared/ReactTypes.js b/packages/shared/ReactTypes.js
index c47a380a92..ac4eed362d 100644
--- a/packages/shared/ReactTypes.js
+++ b/packages/shared/ReactTypes.js
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @flow
- * @providesModule ReactTypes
  */
 
 export type ReactNode =
diff --git a/scripts/circleci/check_modules.sh b/scripts/circleci/check_modules.sh
index 176f4a8ba4..b9ee63b6ee 100755
--- a/scripts/circleci/check_modules.sh
+++ b/scripts/circleci/check_modules.sh
@@ -3,9 +3,7 @@
 set -e
 
 # Make sure we don't introduce accidental @providesModule annotations.
-EXPECTED='packages/react-native-renderer/src/ReactNativeTypes.js
-packages/shared/ReactTypes.js
-scripts/rollup/wrappers.js'
+EXPECTED='scripts/rollup/wrappers.js'
 ACTUAL=$(git grep -l @providesModule -- './*.js' ':!scripts/rollup/shims/*.js')
 
 # Colors

From 45b90d48668dae48aad611819b891d029aa2fb27 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 15 May 2018 01:12:28 +0100
Subject: [PATCH 044/277] Move renderer host configs into separate modules
 (#12791)

* Separate test renderer host config

* Separate ART renderer host config

* Separate ReactDOM host config

* Extract RN Fabric host config

* Extract RN host config
---
 packages/react-art/src/ReactART.js            | 410 +------------
 packages/react-art/src/ReactARTHostConfig.js  | 390 ++++++++++++
 packages/react-art/src/ReactARTInternals.js   |  34 ++
 packages/react-dom/src/client/ReactDOM.js     | 547 +----------------
 .../src/client/ReactDOMHostConfig.js          | 568 ++++++++++++++++++
 .../src/ReactFabricHostConfig.js              | 355 +++++++++++
 .../src/ReactFabricRenderer.js                | 345 +----------
 .../src/ReactNativeFiberHostComponent.js      |   2 +-
 ...erRenderer.js => ReactNativeHostConfig.js} |   9 +-
 .../src/ReactNativeRenderer.js                |   5 +-
 .../src/ReactTestHostConfig.js                | 218 +++++++
 .../src/ReactTestRenderer.js                  | 299 +--------
 .../src/ReactTestRendererScheduling.js        | 100 +++
 13 files changed, 1697 insertions(+), 1585 deletions(-)
 create mode 100644 packages/react-art/src/ReactARTHostConfig.js
 create mode 100644 packages/react-art/src/ReactARTInternals.js
 create mode 100644 packages/react-dom/src/client/ReactDOMHostConfig.js
 create mode 100644 packages/react-native-renderer/src/ReactFabricHostConfig.js
 rename packages/react-native-renderer/src/{ReactNativeFiberRenderer.js => ReactNativeHostConfig.js} (98%)
 create mode 100644 packages/react-test-renderer/src/ReactTestHostConfig.js
 create mode 100644 packages/react-test-renderer/src/ReactTestRendererScheduling.js

diff --git a/packages/react-art/src/ReactART.js b/packages/react-art/src/ReactART.js
index a7f9a3064c..d24395c462 100644
--- a/packages/react-art/src/ReactART.js
+++ b/packages/react-art/src/ReactART.js
@@ -7,267 +7,18 @@
 
 import React from 'react';
 import ReactFiberReconciler from 'react-reconciler';
-import * as ReactScheduler from 'react-scheduler';
+import Transform from 'art/core/transform';
 import Mode from 'art/modes/current';
 import FastNoSideEffects from 'art/modes/fast-noSideEffects';
-import Transform from 'art/core/transform';
-import invariant from 'fbjs/lib/invariant';
-import emptyObject from 'fbjs/lib/emptyObject';
+
+import ReactARTHostConfig from './ReactARTHostConfig';
+import {TYPES, childrenAsString} from './ReactARTInternals';
 
 Mode.setCurrent(
   // Change to 'art/modes/dom' for easier debugging via SVG
   FastNoSideEffects,
 );
 
-const pooledTransform = new Transform();
-
-const EVENT_TYPES = {
-  onClick: 'click',
-  onMouseMove: 'mousemove',
-  onMouseOver: 'mouseover',
-  onMouseOut: 'mouseout',
-  onMouseUp: 'mouseup',
-  onMouseDown: 'mousedown',
-};
-
-const TYPES = {
-  CLIPPING_RECTANGLE: 'ClippingRectangle',
-  GROUP: 'Group',
-  SHAPE: 'Shape',
-  TEXT: 'Text',
-};
-
-const UPDATE_SIGNAL = {};
-
-/** Helper Methods */
-
-function addEventListeners(instance, type, listener) {
-  // We need to explicitly unregister before unmount.
-  // For this reason we need to track subscriptions.
-  if (!instance._listeners) {
-    instance._listeners = {};
-    instance._subscriptions = {};
-  }
-
-  instance._listeners[type] = listener;
-
-  if (listener) {
-    if (!instance._subscriptions[type]) {
-      instance._subscriptions[type] = instance.subscribe(
-        type,
-        createEventHandler(instance),
-        instance,
-      );
-    }
-  } else {
-    if (instance._subscriptions[type]) {
-      instance._subscriptions[type]();
-      delete instance._subscriptions[type];
-    }
-  }
-}
-
-function childrenAsString(children) {
-  if (!children) {
-    return '';
-  } else if (typeof children === 'string') {
-    return children;
-  } else if (children.length) {
-    return children.join('');
-  } else {
-    return '';
-  }
-}
-
-function createEventHandler(instance) {
-  return function handleEvent(event) {
-    const listener = instance._listeners[event.type];
-
-    if (!listener) {
-      // Noop
-    } else if (typeof listener === 'function') {
-      listener.call(instance, event);
-    } else if (listener.handleEvent) {
-      listener.handleEvent(event);
-    }
-  };
-}
-
-function destroyEventListeners(instance) {
-  if (instance._subscriptions) {
-    for (let type in instance._subscriptions) {
-      instance._subscriptions[type]();
-    }
-  }
-
-  instance._subscriptions = null;
-  instance._listeners = null;
-}
-
-function getScaleX(props) {
-  if (props.scaleX != null) {
-    return props.scaleX;
-  } else if (props.scale != null) {
-    return props.scale;
-  } else {
-    return 1;
-  }
-}
-
-function getScaleY(props) {
-  if (props.scaleY != null) {
-    return props.scaleY;
-  } else if (props.scale != null) {
-    return props.scale;
-  } else {
-    return 1;
-  }
-}
-
-function isSameFont(oldFont, newFont) {
-  if (oldFont === newFont) {
-    return true;
-  } else if (typeof newFont === 'string' || typeof oldFont === 'string') {
-    return false;
-  } else {
-    return (
-      newFont.fontSize === oldFont.fontSize &&
-      newFont.fontStyle === oldFont.fontStyle &&
-      newFont.fontVariant === oldFont.fontVariant &&
-      newFont.fontWeight === oldFont.fontWeight &&
-      newFont.fontFamily === oldFont.fontFamily
-    );
-  }
-}
-
-/** Render Methods */
-
-function applyClippingRectangleProps(instance, props, prevProps = {}) {
-  applyNodeProps(instance, props, prevProps);
-
-  instance.width = props.width;
-  instance.height = props.height;
-}
-
-function applyGroupProps(instance, props, prevProps = {}) {
-  applyNodeProps(instance, props, prevProps);
-
-  instance.width = props.width;
-  instance.height = props.height;
-}
-
-function applyNodeProps(instance, props, prevProps = {}) {
-  const scaleX = getScaleX(props);
-  const scaleY = getScaleY(props);
-
-  pooledTransform
-    .transformTo(1, 0, 0, 1, 0, 0)
-    .move(props.x || 0, props.y || 0)
-    .rotate(props.rotation || 0, props.originX, props.originY)
-    .scale(scaleX, scaleY, props.originX, props.originY);
-
-  if (props.transform != null) {
-    pooledTransform.transform(props.transform);
-  }
-
-  if (
-    instance.xx !== pooledTransform.xx ||
-    instance.yx !== pooledTransform.yx ||
-    instance.xy !== pooledTransform.xy ||
-    instance.yy !== pooledTransform.yy ||
-    instance.x !== pooledTransform.x ||
-    instance.y !== pooledTransform.y
-  ) {
-    instance.transformTo(pooledTransform);
-  }
-
-  if (props.cursor !== prevProps.cursor || props.title !== prevProps.title) {
-    instance.indicate(props.cursor, props.title);
-  }
-
-  if (instance.blend && props.opacity !== prevProps.opacity) {
-    instance.blend(props.opacity == null ? 1 : props.opacity);
-  }
-
-  if (props.visible !== prevProps.visible) {
-    if (props.visible == null || props.visible) {
-      instance.show();
-    } else {
-      instance.hide();
-    }
-  }
-
-  for (let type in EVENT_TYPES) {
-    addEventListeners(instance, EVENT_TYPES[type], props[type]);
-  }
-}
-
-function applyRenderableNodeProps(instance, props, prevProps = {}) {
-  applyNodeProps(instance, props, prevProps);
-
-  if (prevProps.fill !== props.fill) {
-    if (props.fill && props.fill.applyFill) {
-      props.fill.applyFill(instance);
-    } else {
-      instance.fill(props.fill);
-    }
-  }
-  if (
-    prevProps.stroke !== props.stroke ||
-    prevProps.strokeWidth !== props.strokeWidth ||
-    prevProps.strokeCap !== props.strokeCap ||
-    prevProps.strokeJoin !== props.strokeJoin ||
-    // TODO: Consider deep check of stokeDash; may benefit VML in IE.
-    prevProps.strokeDash !== props.strokeDash
-  ) {
-    instance.stroke(
-      props.stroke,
-      props.strokeWidth,
-      props.strokeCap,
-      props.strokeJoin,
-      props.strokeDash,
-    );
-  }
-}
-
-function applyShapeProps(instance, props, prevProps = {}) {
-  applyRenderableNodeProps(instance, props, prevProps);
-
-  const path = props.d || childrenAsString(props.children);
-
-  const prevDelta = instance._prevDelta;
-  const prevPath = instance._prevPath;
-
-  if (
-    path !== prevPath ||
-    path.delta !== prevDelta ||
-    prevProps.height !== props.height ||
-    prevProps.width !== props.width
-  ) {
-    instance.draw(path, props.width, props.height);
-
-    instance._prevDelta = path.delta;
-    instance._prevPath = path;
-  }
-}
-
-function applyTextProps(instance, props, prevProps = {}) {
-  applyRenderableNodeProps(instance, props, prevProps);
-
-  const string = props.children;
-
-  if (
-    instance._currentString !== string ||
-    !isSameFont(props.font, prevProps.font) ||
-    props.alignment !== prevProps.alignment ||
-    props.path !== prevProps.path
-  ) {
-    instance.draw(string, props.font, props.alignment, props.path);
-
-    instance._currentString = string;
-  }
-}
-
 /** Declarative fill-type objects; API design not finalized */
 
 const slice = Array.prototype.slice;
@@ -383,158 +134,7 @@ class Text extends React.Component {
 
 /** ART Renderer */
 
-const ARTRenderer = ReactFiberReconciler({
-  appendInitialChild(parentInstance, child) {
-    if (typeof child === 'string') {
-      // Noop for string children of Text (eg <Text>{'foo'}{'bar'}</Text>)
-      invariant(false, 'Text children should already be flattened.');
-      return;
-    }
-
-    child.inject(parentInstance);
-  },
-
-  createInstance(type, props, internalInstanceHandle) {
-    let instance;
-
-    switch (type) {
-      case TYPES.CLIPPING_RECTANGLE:
-        instance = Mode.ClippingRectangle();
-        instance._applyProps = applyClippingRectangleProps;
-        break;
-      case TYPES.GROUP:
-        instance = Mode.Group();
-        instance._applyProps = applyGroupProps;
-        break;
-      case TYPES.SHAPE:
-        instance = Mode.Shape();
-        instance._applyProps = applyShapeProps;
-        break;
-      case TYPES.TEXT:
-        instance = Mode.Text(
-          props.children,
-          props.font,
-          props.alignment,
-          props.path,
-        );
-        instance._applyProps = applyTextProps;
-        break;
-    }
-
-    invariant(instance, 'ReactART does not support the type "%s"', type);
-
-    instance._applyProps(instance, props);
-
-    return instance;
-  },
-
-  createTextInstance(text, rootContainerInstance, internalInstanceHandle) {
-    return text;
-  },
-
-  finalizeInitialChildren(domElement, type, props) {
-    return false;
-  },
-
-  getPublicInstance(instance) {
-    return instance;
-  },
-
-  prepareForCommit() {
-    // Noop
-  },
-
-  prepareUpdate(domElement, type, oldProps, newProps) {
-    return UPDATE_SIGNAL;
-  },
-
-  resetAfterCommit() {
-    // Noop
-  },
-
-  resetTextContent(domElement) {
-    // Noop
-  },
-
-  shouldDeprioritizeSubtree(type, props) {
-    return false;
-  },
-
-  getRootHostContext() {
-    return emptyObject;
-  },
-
-  getChildHostContext() {
-    return emptyObject;
-  },
-
-  scheduleDeferredCallback: ReactScheduler.rIC,
-
-  shouldSetTextContent(type, props) {
-    return (
-      typeof props.children === 'string' || typeof props.children === 'number'
-    );
-  },
-
-  now: ReactScheduler.now,
-
-  // The ART renderer is secondary to the React DOM renderer.
-  isPrimaryRenderer: false,
-
-  mutation: {
-    appendChild(parentInstance, child) {
-      if (child.parentNode === parentInstance) {
-        child.eject();
-      }
-      child.inject(parentInstance);
-    },
-
-    appendChildToContainer(parentInstance, child) {
-      if (child.parentNode === parentInstance) {
-        child.eject();
-      }
-      child.inject(parentInstance);
-    },
-
-    insertBefore(parentInstance, child, beforeChild) {
-      invariant(
-        child !== beforeChild,
-        'ReactART: Can not insert node before itself',
-      );
-      child.injectBefore(beforeChild);
-    },
-
-    insertInContainerBefore(parentInstance, child, beforeChild) {
-      invariant(
-        child !== beforeChild,
-        'ReactART: Can not insert node before itself',
-      );
-      child.injectBefore(beforeChild);
-    },
-
-    removeChild(parentInstance, child) {
-      destroyEventListeners(child);
-      child.eject();
-    },
-
-    removeChildFromContainer(parentInstance, child) {
-      destroyEventListeners(child);
-      child.eject();
-    },
-
-    commitTextUpdate(textInstance, oldText, newText) {
-      // Noop
-    },
-
-    commitMount(instance, type, newProps) {
-      // Noop
-    },
-
-    commitUpdate(instance, updatePayload, type, oldProps, newProps) {
-      instance._applyProps(instance, newProps, oldProps);
-    },
-  },
-});
+const ARTRenderer = ReactFiberReconciler(ReactARTHostConfig);
 
 /** API */
 
diff --git a/packages/react-art/src/ReactARTHostConfig.js b/packages/react-art/src/ReactARTHostConfig.js
new file mode 100644
index 0000000000..cd059537cc
--- /dev/null
+++ b/packages/react-art/src/ReactARTHostConfig.js
@@ -0,0 +1,390 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import * as ReactScheduler from 'react-scheduler';
+import Transform from 'art/core/transform';
+import Mode from 'art/modes/current';
+import invariant from 'fbjs/lib/invariant';
+import emptyObject from 'fbjs/lib/emptyObject';
+
+import {TYPES, EVENT_TYPES, childrenAsString} from './ReactARTInternals';
+
+const pooledTransform = new Transform();
+
+const UPDATE_SIGNAL = {};
+
+/** Helper Methods */
+
+function addEventListeners(instance, type, listener) {
+  // We need to explicitly unregister before unmount.
+  // For this reason we need to track subscriptions.
+  if (!instance._listeners) {
+    instance._listeners = {};
+    instance._subscriptions = {};
+  }
+
+  instance._listeners[type] = listener;
+
+  if (listener) {
+    if (!instance._subscriptions[type]) {
+      instance._subscriptions[type] = instance.subscribe(
+        type,
+        createEventHandler(instance),
+        instance,
+      );
+    }
+  } else {
+    if (instance._subscriptions[type]) {
+      instance._subscriptions[type]();
+      delete instance._subscriptions[type];
+    }
+  }
+}
+
+function createEventHandler(instance) {
+  return function handleEvent(event) {
+    const listener = instance._listeners[event.type];
+
+    if (!listener) {
+      // Noop
+    } else if (typeof listener === 'function') {
+      listener.call(instance, event);
+    } else if (listener.handleEvent) {
+      listener.handleEvent(event);
+    }
+  };
+}
+
+function destroyEventListeners(instance) {
+  if (instance._subscriptions) {
+    for (let type in instance._subscriptions) {
+      instance._subscriptions[type]();
+    }
+  }
+
+  instance._subscriptions = null;
+  instance._listeners = null;
+}
+
+function getScaleX(props) {
+  if (props.scaleX != null) {
+    return props.scaleX;
+  } else if (props.scale != null) {
+    return props.scale;
+  } else {
+    return 1;
+  }
+}
+
+function getScaleY(props) {
+  if (props.scaleY != null) {
+    return props.scaleY;
+  } else if (props.scale != null) {
+    return props.scale;
+  } else {
+    return 1;
+  }
+}
+
+function isSameFont(oldFont, newFont) {
+  if (oldFont === newFont) {
+    return true;
+  } else if (typeof newFont === 'string' || typeof oldFont === 'string') {
+    return false;
+  } else {
+    return (
+      newFont.fontSize === oldFont.fontSize &&
+      newFont.fontStyle === oldFont.fontStyle &&
+      newFont.fontVariant === oldFont.fontVariant &&
+      newFont.fontWeight === oldFont.fontWeight &&
+      newFont.fontFamily === oldFont.fontFamily
+    );
+  }
+}
+
+/** Render Methods */
+
+function applyClippingRectangleProps(instance, props, prevProps = {}) {
+  applyNodeProps(instance, props, prevProps);
+
+  instance.width = props.width;
+  instance.height = props.height;
+}
+
+function applyGroupProps(instance, props, prevProps = {}) {
+  applyNodeProps(instance, props, prevProps);
+
+  instance.width = props.width;
+  instance.height = props.height;
+}
+
+function applyNodeProps(instance, props, prevProps = {}) {
+  const scaleX = getScaleX(props);
+  const scaleY = getScaleY(props);
+
+  pooledTransform
+    .transformTo(1, 0, 0, 1, 0, 0)
+    .move(props.x || 0, props.y || 0)
+    .rotate(props.rotation || 0, props.originX, props.originY)
+    .scale(scaleX, scaleY, props.originX, props.originY);
+
+  if (props.transform != null) {
+    pooledTransform.transform(props.transform);
+  }
+
+  if (
+    instance.xx !== pooledTransform.xx ||
+    instance.yx !== pooledTransform.yx ||
+    instance.xy !== pooledTransform.xy ||
+    instance.yy !== pooledTransform.yy ||
+    instance.x !== pooledTransform.x ||
+    instance.y !== pooledTransform.y
+  ) {
+    instance.transformTo(pooledTransform);
+  }
+
+  if (props.cursor !== prevProps.cursor || props.title !== prevProps.title) {
+    instance.indicate(props.cursor, props.title);
+  }
+
+  if (instance.blend && props.opacity !== prevProps.opacity) {
+    instance.blend(props.opacity == null ? 1 : props.opacity);
+  }
+
+  if (props.visible !== prevProps.visible) {
+    if (props.visible == null || props.visible) {
+      instance.show();
+    } else {
+      instance.hide();
+    }
+  }
+
+  for (let type in EVENT_TYPES) {
+    addEventListeners(instance, EVENT_TYPES[type], props[type]);
+  }
+}
+
+function applyRenderableNodeProps(instance, props, prevProps = {}) {
+  applyNodeProps(instance, props, prevProps);
+
+  if (prevProps.fill !== props.fill) {
+    if (props.fill && props.fill.applyFill) {
+      props.fill.applyFill(instance);
+    } else {
+      instance.fill(props.fill);
+    }
+  }
+  if (
+    prevProps.stroke !== props.stroke ||
+    prevProps.strokeWidth !== props.strokeWidth ||
+    prevProps.strokeCap !== props.strokeCap ||
+    prevProps.strokeJoin !== props.strokeJoin ||
+    // TODO: Consider deep check of stokeDash; may benefit VML in IE.
+    prevProps.strokeDash !== props.strokeDash
+  ) {
+    instance.stroke(
+      props.stroke,
+      props.strokeWidth,
+      props.strokeCap,
+      props.strokeJoin,
+      props.strokeDash,
+    );
+  }
+}
+
+function applyShapeProps(instance, props, prevProps = {}) {
+  applyRenderableNodeProps(instance, props, prevProps);
+
+  const path = props.d || childrenAsString(props.children);
+
+  const prevDelta = instance._prevDelta;
+  const prevPath = instance._prevPath;
+
+  if (
+    path !== prevPath ||
+    path.delta !== prevDelta ||
+    prevProps.height !== props.height ||
+    prevProps.width !== props.width
+  ) {
+    instance.draw(path, props.width, props.height);
+
+    instance._prevDelta = path.delta;
+    instance._prevPath = path;
+  }
+}
+
+function applyTextProps(instance, props, prevProps = {}) {
+  applyRenderableNodeProps(instance, props, prevProps);
+
+  const string = props.children;
+
+  if (
+    instance._currentString !== string ||
+    !isSameFont(props.font, prevProps.font) ||
+    props.alignment !== prevProps.alignment ||
+    props.path !== prevProps.path
+  ) {
+    instance.draw(string, props.font, props.alignment, props.path);
+
+    instance._currentString = string;
+  }
+}
+
+const ReactARTHostConfig = {
+  appendInitialChild(parentInstance, child) {
+    if (typeof child === 'string') {
+      // Noop for string children of Text (eg <Text>{'foo'}{'bar'}</Text>)
+      invariant(false, 'Text children should already be flattened.');
+      return;
+    }
+
+    child.inject(parentInstance);
+  },
+
+  createInstance(type, props, internalInstanceHandle) {
+    let instance;
+
+    switch (type) {
+      case TYPES.CLIPPING_RECTANGLE:
+        instance = Mode.ClippingRectangle();
+        instance._applyProps = applyClippingRectangleProps;
+        break;
+      case TYPES.GROUP:
+        instance = Mode.Group();
+        instance._applyProps = applyGroupProps;
+        break;
+      case TYPES.SHAPE:
+        instance = Mode.Shape();
+        instance._applyProps = applyShapeProps;
+        break;
+      case TYPES.TEXT:
+        instance = Mode.Text(
+          props.children,
+          props.font,
+          props.alignment,
+          props.path,
+        );
+        instance._applyProps = applyTextProps;
+        break;
+    }
+
+    invariant(instance, 'ReactART does not support the type "%s"', type);
+
+    instance._applyProps(instance, props);
+
+    return instance;
+  },
+
+  createTextInstance(text, rootContainerInstance, internalInstanceHandle) {
+    return text;
+  },
+
+  finalizeInitialChildren(domElement, type, props) {
+    return false;
+  },
+
+  getPublicInstance(instance) {
+    return instance;
+  },
+
+  prepareForCommit() {
+    // Noop
+  },
+
+  prepareUpdate(domElement, type, oldProps, newProps) {
+    return UPDATE_SIGNAL;
+  },
+
+  resetAfterCommit() {
+    // Noop
+  },
+
+  resetTextContent(domElement) {
+    // Noop
+  },
+
+  shouldDeprioritizeSubtree(type, props) {
+    return false;
+  },
+
+  getRootHostContext() {
+    return emptyObject;
+  },
+
+  getChildHostContext() {
+    return emptyObject;
+  },
+
+  scheduleDeferredCallback: ReactScheduler.rIC,
+
+  shouldSetTextContent(type, props) {
+    return (
+      typeof props.children === 'string' || typeof props.children === 'number'
+    );
+  },
+
+  now: ReactScheduler.now,
+
+  // The ART renderer is secondary to the React DOM renderer.
+  isPrimaryRenderer: false,
+
+  mutation: {
+    appendChild(parentInstance, child) {
+      if (child.parentNode === parentInstance) {
+        child.eject();
+      }
+      child.inject(parentInstance);
+    },
+
+    appendChildToContainer(parentInstance, child) {
+      if (child.parentNode === parentInstance) {
+        child.eject();
+      }
+      child.inject(parentInstance);
+    },
+
+    insertBefore(parentInstance, child, beforeChild) {
+      invariant(
+        child !== beforeChild,
+        'ReactART: Can not insert node before itself',
+      );
+      child.injectBefore(beforeChild);
+    },
+
+    insertInContainerBefore(parentInstance, child, beforeChild) {
+      invariant(
+        child !== beforeChild,
+        'ReactART: Can not insert node before itself',
+      );
+      child.injectBefore(beforeChild);
+    },
+
+    removeChild(parentInstance, child) {
+      destroyEventListeners(child);
+      child.eject();
+    },
+
+    removeChildFromContainer(parentInstance, child) {
+      destroyEventListeners(child);
+      child.eject();
+    },
+
+    commitTextUpdate(textInstance, oldText, newText) {
+      // Noop
+    },
+
+    commitMount(instance, type, newProps) {
+      // Noop
+    },
+
+    commitUpdate(instance, updatePayload, type, oldProps, newProps) {
+      instance._applyProps(instance, newProps, oldProps);
+    },
+  },
+};
+
+export default ReactARTHostConfig;
diff --git a/packages/react-art/src/ReactARTInternals.js b/packages/react-art/src/ReactARTInternals.js
new file mode 100644
index 0000000000..b31c9c8964
--- /dev/null
+++ b/packages/react-art/src/ReactARTInternals.js
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+export const TYPES = {
+  CLIPPING_RECTANGLE: 'ClippingRectangle',
+  GROUP: 'Group',
+  SHAPE: 'Shape',
+  TEXT: 'Text',
+};
+
+export const EVENT_TYPES = {
+  onClick: 'click',
+  onMouseMove: 'mousemove',
+  onMouseOver: 'mouseover',
+  onMouseOut: 'mouseout',
+  onMouseUp: 'mouseup',
+  onMouseDown: 'mousedown',
+};
+
+export function childrenAsString(children) {
+  if (!children) {
+    return '';
+  } else if (typeof children === 'string') {
+    return children;
+  } else if (children.length) {
+    return children.join('');
+  } else {
+    return '';
+  }
+}
diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js
index 81683c4774..40450e5f5e 100644
--- a/packages/react-dom/src/client/ReactDOM.js
+++ b/packages/react-dom/src/client/ReactDOM.js
@@ -14,12 +14,12 @@ import type {
   FiberRoot,
   Batch as FiberRootBatch,
 } from 'react-reconciler/src/ReactFiberRoot';
+import type {Container} from './ReactDOMHostConfig';
 
 import '../shared/checkReact';
 import './ReactDOMClientInjection';
 
 import ReactFiberReconciler from 'react-reconciler';
-// TODO: direct imports like some-package/src/* are bad. Fix me.
 import * as ReactPortal from 'shared/ReactPortal';
 import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
 import * as ReactGenericBatching from 'events/ReactGenericBatching';
@@ -29,53 +29,29 @@ import * as EventPluginRegistry from 'events/EventPluginRegistry';
 import * as EventPropagators from 'events/EventPropagators';
 import * as ReactInstanceMap from 'shared/ReactInstanceMap';
 import ReactVersion from 'shared/ReactVersion';
-import * as ReactScheduler from 'react-scheduler';
 import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'fbjs/lib/invariant';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
 import warning from 'fbjs/lib/warning';
 
+import ReactDOMHostConfig from './ReactDOMHostConfig';
 import * as ReactDOMComponentTree from './ReactDOMComponentTree';
 import * as ReactDOMFiberComponent from './ReactDOMFiberComponent';
-import * as ReactInputSelection from './ReactInputSelection';
-import setTextContent from './setTextContent';
-import validateDOMNesting from './validateDOMNesting';
-import * as ReactBrowserEventEmitter from '../events/ReactBrowserEventEmitter';
 import * as ReactDOMEventListener from '../events/ReactDOMEventListener';
-import {getChildNamespace} from '../shared/DOMNamespaces';
 import {
   ELEMENT_NODE,
-  TEXT_NODE,
   COMMENT_NODE,
   DOCUMENT_NODE,
   DOCUMENT_FRAGMENT_NODE,
 } from '../shared/HTMLNodeType';
 import {ROOT_ATTRIBUTE_NAME} from '../shared/DOMProperty';
-const {
-  createElement,
-  createTextNode,
-  setInitialProperties,
-  diffProperties,
-  updateProperties,
-  diffHydratedProperties,
-  diffHydratedText,
-  warnForUnmatchedText,
-  warnForDeletedHydratableElement,
-  warnForDeletedHydratableText,
-  warnForInsertedHydratedElement,
-  warnForInsertedHydratedText,
-} = ReactDOMFiberComponent;
-const {updatedAncestorInfo} = validateDOMNesting;
-const {precacheFiberNode, updateFiberProps} = ReactDOMComponentTree;
 
-let SUPPRESS_HYDRATION_WARNING;
 let topLevelUpdateWarnings;
 let warnOnInvalidCallback;
 let didWarnAboutUnstableCreatePortal = false;
 
 if (__DEV__) {
-  SUPPRESS_HYDRATION_WARNING = 'suppressHydrationWarning';
   if (
     typeof Map !== 'function' ||
     Map.prototype == null ||
@@ -157,26 +133,6 @@ type DOMContainer =
       _reactRootContainer: ?Root,
     });
 
-type Container = Element | Document;
-type Props = {
-  autoFocus?: boolean,
-  children?: mixed,
-  hidden?: boolean,
-  suppressHydrationWarning?: boolean,
-};
-type Instance = Element;
-type TextInstance = Text;
-
-type HostContextDev = {
-  namespace: string,
-  ancestorInfo: mixed,
-};
-type HostContextProd = string;
-type HostContext = HostContextDev | HostContextProd;
-
-let eventsEnabled: ?boolean = null;
-let selectionInformation: ?mixed = null;
-
 type Batch = FiberRootBatch & {
   render(children: ReactNodeList): Work,
   then(onComplete: () => mixed): void,
@@ -491,504 +447,7 @@ function shouldHydrateDueToLegacyHeuristic(container) {
   );
 }
 
-function shouldAutoFocusHostComponent(type: string, props: Props): boolean {
-  switch (type) {
-    case 'button':
-    case 'input':
-    case 'select':
-    case 'textarea':
-      return !!props.autoFocus;
-  }
-  return false;
-}
-
-const DOMRenderer = ReactFiberReconciler({
-  getRootHostContext(rootContainerInstance: Container): HostContext {
-    let type;
-    let namespace;
-    const nodeType = rootContainerInstance.nodeType;
-    switch (nodeType) {
-      case DOCUMENT_NODE:
-      case DOCUMENT_FRAGMENT_NODE: {
-        type = nodeType === DOCUMENT_NODE ? '#document' : '#fragment';
-        let root = (rootContainerInstance: any).documentElement;
-        namespace = root ? root.namespaceURI : getChildNamespace(null, '');
-        break;
-      }
-      default: {
-        const container: any =
-          nodeType === COMMENT_NODE
-            ? rootContainerInstance.parentNode
-            : rootContainerInstance;
-        const ownNamespace = container.namespaceURI || null;
-        type = container.tagName;
-        namespace = getChildNamespace(ownNamespace, type);
-        break;
-      }
-    }
-    if (__DEV__) {
-      const validatedTag = type.toLowerCase();
-      const ancestorInfo = updatedAncestorInfo(null, validatedTag, null);
-      return {namespace, ancestorInfo};
-    }
-    return namespace;
-  },
-
-  getChildHostContext(
-    parentHostContext: HostContext,
-    type: string,
-  ): HostContext {
-    if (__DEV__) {
-      const parentHostContextDev = ((parentHostContext: any): HostContextDev);
-      const namespace = getChildNamespace(parentHostContextDev.namespace, type);
-      const ancestorInfo = updatedAncestorInfo(
-        parentHostContextDev.ancestorInfo,
-        type,
-        null,
-      );
-      return {namespace, ancestorInfo};
-    }
-    const parentNamespace = ((parentHostContext: any): HostContextProd);
-    return getChildNamespace(parentNamespace, type);
-  },
-
-  getPublicInstance(instance) {
-    return instance;
-  },
-
-  prepareForCommit(): void {
-    eventsEnabled = ReactBrowserEventEmitter.isEnabled();
-    selectionInformation = ReactInputSelection.getSelectionInformation();
-    ReactBrowserEventEmitter.setEnabled(false);
-  },
-
-  resetAfterCommit(): void {
-    ReactInputSelection.restoreSelection(selectionInformation);
-    selectionInformation = null;
-    ReactBrowserEventEmitter.setEnabled(eventsEnabled);
-    eventsEnabled = null;
-  },
-
-  createInstance(
-    type: string,
-    props: Props,
-    rootContainerInstance: Container,
-    hostContext: HostContext,
-    internalInstanceHandle: Object,
-  ): Instance {
-    let parentNamespace: string;
-    if (__DEV__) {
-      // TODO: take namespace into account when validating.
-      const hostContextDev = ((hostContext: any): HostContextDev);
-      validateDOMNesting(type, null, hostContextDev.ancestorInfo);
-      if (
-        typeof props.children === 'string' ||
-        typeof props.children === 'number'
-      ) {
-        const string = '' + props.children;
-        const ownAncestorInfo = updatedAncestorInfo(
-          hostContextDev.ancestorInfo,
-          type,
-          null,
-        );
-        validateDOMNesting(null, string, ownAncestorInfo);
-      }
-      parentNamespace = hostContextDev.namespace;
-    } else {
-      parentNamespace = ((hostContext: any): HostContextProd);
-    }
-    const domElement: Instance = createElement(
-      type,
-      props,
-      rootContainerInstance,
-      parentNamespace,
-    );
-    precacheFiberNode(internalInstanceHandle, domElement);
-    updateFiberProps(domElement, props);
-    return domElement;
-  },
-
-  appendInitialChild(
-    parentInstance: Instance,
-    child: Instance | TextInstance,
-  ): void {
-    parentInstance.appendChild(child);
-  },
-
-  finalizeInitialChildren(
-    domElement: Instance,
-    type: string,
-    props: Props,
-    rootContainerInstance: Container,
-  ): boolean {
-    setInitialProperties(domElement, type, props, rootContainerInstance);
-    return shouldAutoFocusHostComponent(type, props);
-  },
-
-  prepareUpdate(
-    domElement: Instance,
-    type: string,
-    oldProps: Props,
-    newProps: Props,
-    rootContainerInstance: Container,
-    hostContext: HostContext,
-  ): null | Array<mixed> {
-    if (__DEV__) {
-      const hostContextDev = ((hostContext: any): HostContextDev);
-      if (
-        typeof newProps.children !== typeof oldProps.children &&
-        (typeof newProps.children === 'string' ||
-          typeof newProps.children === 'number')
-      ) {
-        const string = '' + newProps.children;
-        const ownAncestorInfo = updatedAncestorInfo(
-          hostContextDev.ancestorInfo,
-          type,
-          null,
-        );
-        validateDOMNesting(null, string, ownAncestorInfo);
-      }
-    }
-    return diffProperties(
-      domElement,
-      type,
-      oldProps,
-      newProps,
-      rootContainerInstance,
-    );
-  },
-
-  shouldSetTextContent(type: string, props: Props): boolean {
-    return (
-      type === 'textarea' ||
-      typeof props.children === 'string' ||
-      typeof props.children === 'number' ||
-      (typeof props.dangerouslySetInnerHTML === 'object' &&
-        props.dangerouslySetInnerHTML !== null &&
-        typeof props.dangerouslySetInnerHTML.__html === 'string')
-    );
-  },
-
-  shouldDeprioritizeSubtree(type: string, props: Props): boolean {
-    return !!props.hidden;
-  },
-
-  createTextInstance(
-    text: string,
-    rootContainerInstance: Container,
-    hostContext: HostContext,
-    internalInstanceHandle: Object,
-  ): TextInstance {
-    if (__DEV__) {
-      const hostContextDev = ((hostContext: any): HostContextDev);
-      validateDOMNesting(null, text, hostContextDev.ancestorInfo);
-    }
-    const textNode: TextInstance = createTextNode(text, rootContainerInstance);
-    precacheFiberNode(internalInstanceHandle, textNode);
-    return textNode;
-  },
-
-  now: ReactScheduler.now,
-
-  isPrimaryRenderer: true,
-
-  mutation: {
-    commitMount(
-      domElement: Instance,
-      type: string,
-      newProps: Props,
-      internalInstanceHandle: Object,
-    ): void {
-      // Despite the naming that might imply otherwise, this method only
-      // fires if there is an `Update` effect scheduled during mounting.
-      // This happens if `finalizeInitialChildren` returns `true` (which it
-      // does to implement the `autoFocus` attribute on the client). But
-      // there are also other cases when this might happen (such as patching
-      // up text content during hydration mismatch). So we'll check this again.
-      if (shouldAutoFocusHostComponent(type, newProps)) {
-        ((domElement: any):
-          | HTMLButtonElement
-          | HTMLInputElement
-          | HTMLSelectElement
-          | HTMLTextAreaElement).focus();
-      }
-    },
-
-    commitUpdate(
-      domElement: Instance,
-      updatePayload: Array<mixed>,
-      type: string,
-      oldProps: Props,
-      newProps: Props,
-      internalInstanceHandle: Object,
-    ): void {
-      // Update the props handle so that we know which props are the ones with
-      // with current event handlers.
-      updateFiberProps(domElement, newProps);
-      // Apply the diff to the DOM node.
-      updateProperties(domElement, updatePayload, type, oldProps, newProps);
-    },
-
-    resetTextContent(domElement: Instance): void {
-      setTextContent(domElement, '');
-    },
-
-    commitTextUpdate(
-      textInstance: TextInstance,
-      oldText: string,
-      newText: string,
-    ): void {
-      textInstance.nodeValue = newText;
-    },
-
-    appendChild(
-      parentInstance: Instance,
-      child: Instance | TextInstance,
-    ): void {
-      parentInstance.appendChild(child);
-    },
-
-    appendChildToContainer(
-      container: Container,
-      child: Instance | TextInstance,
-    ): void {
-      if (container.nodeType === COMMENT_NODE) {
-        (container.parentNode: any).insertBefore(child, container);
-      } else {
-        container.appendChild(child);
-      }
-    },
-
-    insertBefore(
-      parentInstance: Instance,
-      child: Instance | TextInstance,
-      beforeChild: Instance | TextInstance,
-    ): void {
-      parentInstance.insertBefore(child, beforeChild);
-    },
-
-    insertInContainerBefore(
-      container: Container,
-      child: Instance | TextInstance,
-      beforeChild: Instance | TextInstance,
-    ): void {
-      if (container.nodeType === COMMENT_NODE) {
-        (container.parentNode: any).insertBefore(child, beforeChild);
-      } else {
-        container.insertBefore(child, beforeChild);
-      }
-    },
-
-    removeChild(
-      parentInstance: Instance,
-      child: Instance | TextInstance,
-    ): void {
-      parentInstance.removeChild(child);
-    },
-
-    removeChildFromContainer(
-      container: Container,
-      child: Instance | TextInstance,
-    ): void {
-      if (container.nodeType === COMMENT_NODE) {
-        (container.parentNode: any).removeChild(child);
-      } else {
-        container.removeChild(child);
-      }
-    },
-  },
-
-  hydration: {
-    canHydrateInstance(
-      instance: Instance | TextInstance,
-      type: string,
-      props: Props,
-    ): null | Instance {
-      if (
-        instance.nodeType !== ELEMENT_NODE ||
-        type.toLowerCase() !== instance.nodeName.toLowerCase()
-      ) {
-        return null;
-      }
-      // This has now been refined to an element node.
-      return ((instance: any): Instance);
-    },
-
-    canHydrateTextInstance(
-      instance: Instance | TextInstance,
-      text: string,
-    ): null | TextInstance {
-      if (text === '' || instance.nodeType !== TEXT_NODE) {
-        // Empty strings are not parsed by HTML so there won't be a correct match here.
-        return null;
-      }
-      // This has now been refined to a text node.
-      return ((instance: any): TextInstance);
-    },
-
-    getNextHydratableSibling(
-      instance: Instance | TextInstance,
-    ): null | Instance | TextInstance {
-      let node = instance.nextSibling;
-      // Skip non-hydratable nodes.
-      while (
-        node &&
-        node.nodeType !== ELEMENT_NODE &&
-        node.nodeType !== TEXT_NODE
-      ) {
-        node = node.nextSibling;
-      }
-      return (node: any);
-    },
-
-    getFirstHydratableChild(
-      parentInstance: Container | Instance,
-    ): null | Instance | TextInstance {
-      let next = parentInstance.firstChild;
-      // Skip non-hydratable nodes.
-      while (
-        next &&
-        next.nodeType !== ELEMENT_NODE &&
-        next.nodeType !== TEXT_NODE
-      ) {
-        next = next.nextSibling;
-      }
-      return (next: any);
-    },
-
-    hydrateInstance(
-      instance: Instance,
-      type: string,
-      props: Props,
-      rootContainerInstance: Container,
-      hostContext: HostContext,
-      internalInstanceHandle: Object,
-    ): null | Array<mixed> {
-      precacheFiberNode(internalInstanceHandle, instance);
-      // TODO: Possibly defer this until the commit phase where all the events
-      // get attached.
-      updateFiberProps(instance, props);
-      let parentNamespace: string;
-      if (__DEV__) {
-        const hostContextDev = ((hostContext: any): HostContextDev);
-        parentNamespace = hostContextDev.namespace;
-      } else {
-        parentNamespace = ((hostContext: any): HostContextProd);
-      }
-      return diffHydratedProperties(
-        instance,
-        type,
-        props,
-        parentNamespace,
-        rootContainerInstance,
-      );
-    },
-
-    hydrateTextInstance(
-      textInstance: TextInstance,
-      text: string,
-      internalInstanceHandle: Object,
-    ): boolean {
-      precacheFiberNode(internalInstanceHandle, textInstance);
-      return diffHydratedText(textInstance, text);
-    },
-
-    didNotMatchHydratedContainerTextInstance(
-      parentContainer: Container,
-      textInstance: TextInstance,
-      text: string,
-    ) {
-      if (__DEV__) {
-        warnForUnmatchedText(textInstance, text);
-      }
-    },
-
-    didNotMatchHydratedTextInstance(
-      parentType: string,
-      parentProps: Props,
-      parentInstance: Instance,
-      textInstance: TextInstance,
-      text: string,
-    ) {
-      if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
-        warnForUnmatchedText(textInstance, text);
-      }
-    },
-
-    didNotHydrateContainerInstance(
-      parentContainer: Container,
-      instance: Instance | TextInstance,
-    ) {
-      if (__DEV__) {
-        if (instance.nodeType === 1) {
-          warnForDeletedHydratableElement(parentContainer, (instance: any));
-        } else {
-          warnForDeletedHydratableText(parentContainer, (instance: any));
-        }
-      }
-    },
-
-    didNotHydrateInstance(
-      parentType: string,
-      parentProps: Props,
-      parentInstance: Instance,
-      instance: Instance | TextInstance,
-    ) {
-      if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
-        if (instance.nodeType === 1) {
-          warnForDeletedHydratableElement(parentInstance, (instance: any));
-        } else {
-          warnForDeletedHydratableText(parentInstance, (instance: any));
-        }
-      }
-    },
-
-    didNotFindHydratableContainerInstance(
-      parentContainer: Container,
-      type: string,
-      props: Props,
-    ) {
-      if (__DEV__) {
-        warnForInsertedHydratedElement(parentContainer, type, props);
-      }
-    },
-
-    didNotFindHydratableContainerTextInstance(
-      parentContainer: Container,
-      text: string,
-    ) {
-      if (__DEV__) {
-        warnForInsertedHydratedText(parentContainer, text);
-      }
-    },
-
-    didNotFindHydratableInstance(
-      parentType: string,
-      parentProps: Props,
-      parentInstance: Instance,
-      type: string,
-      props: Props,
-    ) {
-      if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
-        warnForInsertedHydratedElement(parentInstance, type, props);
-      }
-    },
-
-    didNotFindHydratableTextInstance(
-      parentType: string,
-      parentProps: Props,
-      parentInstance: Instance,
-      text: string,
-    ) {
-      if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
-        warnForInsertedHydratedText(parentInstance, text);
-      }
-    },
-  },
-
-  scheduleDeferredCallback: ReactScheduler.rIC,
-  cancelDeferredCallback: ReactScheduler.cIC,
-});
+const DOMRenderer = ReactFiberReconciler(ReactDOMHostConfig);
 
 ReactGenericBatching.injection.injectRenderer(DOMRenderer);
 
diff --git a/packages/react-dom/src/client/ReactDOMHostConfig.js b/packages/react-dom/src/client/ReactDOMHostConfig.js
new file mode 100644
index 0000000000..95471f2279
--- /dev/null
+++ b/packages/react-dom/src/client/ReactDOMHostConfig.js
@@ -0,0 +1,568 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import * as ReactScheduler from 'react-scheduler';
+
+import * as ReactDOMComponentTree from './ReactDOMComponentTree';
+import * as ReactDOMFiberComponent from './ReactDOMFiberComponent';
+import * as ReactInputSelection from './ReactInputSelection';
+import setTextContent from './setTextContent';
+import validateDOMNesting from './validateDOMNesting';
+import * as ReactBrowserEventEmitter from '../events/ReactBrowserEventEmitter';
+import {getChildNamespace} from '../shared/DOMNamespaces';
+import {
+  ELEMENT_NODE,
+  TEXT_NODE,
+  COMMENT_NODE,
+  DOCUMENT_NODE,
+  DOCUMENT_FRAGMENT_NODE,
+} from '../shared/HTMLNodeType';
+
+export type Container = Element | Document;
+type Props = {
+  autoFocus?: boolean,
+  children?: mixed,
+  hidden?: boolean,
+  suppressHydrationWarning?: boolean,
+};
+type Instance = Element;
+type TextInstance = Text;
+
+type HostContextDev = {
+  namespace: string,
+  ancestorInfo: mixed,
+};
+type HostContextProd = string;
+type HostContext = HostContextDev | HostContextProd;
+
+const {
+  createElement,
+  createTextNode,
+  setInitialProperties,
+  diffProperties,
+  updateProperties,
+  diffHydratedProperties,
+  diffHydratedText,
+  warnForUnmatchedText,
+  warnForDeletedHydratableElement,
+  warnForDeletedHydratableText,
+  warnForInsertedHydratedElement,
+  warnForInsertedHydratedText,
+} = ReactDOMFiberComponent;
+const {updatedAncestorInfo} = validateDOMNesting;
+const {precacheFiberNode, updateFiberProps} = ReactDOMComponentTree;
+
+let SUPPRESS_HYDRATION_WARNING;
+if (__DEV__) {
+  SUPPRESS_HYDRATION_WARNING = 'suppressHydrationWarning';
+}
+
+let eventsEnabled: ?boolean = null;
+let selectionInformation: ?mixed = null;
+
+function shouldAutoFocusHostComponent(type: string, props: Props): boolean {
+  switch (type) {
+    case 'button':
+    case 'input':
+    case 'select':
+    case 'textarea':
+      return !!props.autoFocus;
+  }
+  return false;
+}
+
+const ReactDOMHostConfig = {
+  getRootHostContext(rootContainerInstance: Container): HostContext {
+    let type;
+    let namespace;
+    const nodeType = rootContainerInstance.nodeType;
+    switch (nodeType) {
+      case DOCUMENT_NODE:
+      case DOCUMENT_FRAGMENT_NODE: {
+        type = nodeType === DOCUMENT_NODE ? '#document' : '#fragment';
+        let root = (rootContainerInstance: any).documentElement;
+        namespace = root ? root.namespaceURI : getChildNamespace(null, '');
+        break;
+      }
+      default: {
+        const container: any =
+          nodeType === COMMENT_NODE
+            ? rootContainerInstance.parentNode
+            : rootContainerInstance;
+        const ownNamespace = container.namespaceURI || null;
+        type = container.tagName;
+        namespace = getChildNamespace(ownNamespace, type);
+        break;
+      }
+    }
+    if (__DEV__) {
+      const validatedTag = type.toLowerCase();
+      const ancestorInfo = updatedAncestorInfo(null, validatedTag, null);
+      return {namespace, ancestorInfo};
+    }
+    return namespace;
+  },
+
+  getChildHostContext(
+    parentHostContext: HostContext,
+    type: string,
+  ): HostContext {
+    if (__DEV__) {
+      const parentHostContextDev = ((parentHostContext: any): HostContextDev);
+      const namespace = getChildNamespace(parentHostContextDev.namespace, type);
+      const ancestorInfo = updatedAncestorInfo(
+        parentHostContextDev.ancestorInfo,
+        type,
+        null,
+      );
+      return {namespace, ancestorInfo};
+    }
+    const parentNamespace = ((parentHostContext: any): HostContextProd);
+    return getChildNamespace(parentNamespace, type);
+  },
+
+  getPublicInstance(instance: Instance | TextInstance): * {
+    return instance;
+  },
+
+  prepareForCommit(): void {
+    eventsEnabled = ReactBrowserEventEmitter.isEnabled();
+    selectionInformation = ReactInputSelection.getSelectionInformation();
+    ReactBrowserEventEmitter.setEnabled(false);
+  },
+
+  resetAfterCommit(): void {
+    ReactInputSelection.restoreSelection(selectionInformation);
+    selectionInformation = null;
+    ReactBrowserEventEmitter.setEnabled(eventsEnabled);
+    eventsEnabled = null;
+  },
+
+  createInstance(
+    type: string,
+    props: Props,
+    rootContainerInstance: Container,
+    hostContext: HostContext,
+    internalInstanceHandle: Object,
+  ): Instance {
+    let parentNamespace: string;
+    if (__DEV__) {
+      // TODO: take namespace into account when validating.
+      const hostContextDev = ((hostContext: any): HostContextDev);
+      validateDOMNesting(type, null, hostContextDev.ancestorInfo);
+      if (
+        typeof props.children === 'string' ||
+        typeof props.children === 'number'
+      ) {
+        const string = '' + props.children;
+        const ownAncestorInfo = updatedAncestorInfo(
+          hostContextDev.ancestorInfo,
+          type,
+          null,
+        );
+        validateDOMNesting(null, string, ownAncestorInfo);
+      }
+      parentNamespace = hostContextDev.namespace;
+    } else {
+      parentNamespace = ((hostContext: any): HostContextProd);
+    }
+    const domElement: Instance = createElement(
+      type,
+      props,
+      rootContainerInstance,
+      parentNamespace,
+    );
+    precacheFiberNode(internalInstanceHandle, domElement);
+    updateFiberProps(domElement, props);
+    return domElement;
+  },
+
+  appendInitialChild(
+    parentInstance: Instance,
+    child: Instance | TextInstance,
+  ): void {
+    parentInstance.appendChild(child);
+  },
+
+  finalizeInitialChildren(
+    domElement: Instance,
+    type: string,
+    props: Props,
+    rootContainerInstance: Container,
+  ): boolean {
+    setInitialProperties(domElement, type, props, rootContainerInstance);
+    return shouldAutoFocusHostComponent(type, props);
+  },
+
+  prepareUpdate(
+    domElement: Instance,
+    type: string,
+    oldProps: Props,
+    newProps: Props,
+    rootContainerInstance: Container,
+    hostContext: HostContext,
+  ): null | Array<mixed> {
+    if (__DEV__) {
+      const hostContextDev = ((hostContext: any): HostContextDev);
+      if (
+        typeof newProps.children !== typeof oldProps.children &&
+        (typeof newProps.children === 'string' ||
+          typeof newProps.children === 'number')
+      ) {
+        const string = '' + newProps.children;
+        const ownAncestorInfo = updatedAncestorInfo(
+          hostContextDev.ancestorInfo,
+          type,
+          null,
+        );
+        validateDOMNesting(null, string, ownAncestorInfo);
+      }
+    }
+    return diffProperties(
+      domElement,
+      type,
+      oldProps,
+      newProps,
+      rootContainerInstance,
+    );
+  },
+
+  shouldSetTextContent(type: string, props: Props): boolean {
+    return (
+      type === 'textarea' ||
+      typeof props.children === 'string' ||
+      typeof props.children === 'number' ||
+      (typeof props.dangerouslySetInnerHTML === 'object' &&
+        props.dangerouslySetInnerHTML !== null &&
+        typeof props.dangerouslySetInnerHTML.__html === 'string')
+    );
+  },
+
+  shouldDeprioritizeSubtree(type: string, props: Props): boolean {
+    return !!props.hidden;
+  },
+
+  createTextInstance(
+    text: string,
+    rootContainerInstance: Container,
+    hostContext: HostContext,
+    internalInstanceHandle: Object,
+  ): TextInstance {
+    if (__DEV__) {
+      const hostContextDev = ((hostContext: any): HostContextDev);
+      validateDOMNesting(null, text, hostContextDev.ancestorInfo);
+    }
+    const textNode: TextInstance = createTextNode(text, rootContainerInstance);
+    precacheFiberNode(internalInstanceHandle, textNode);
+    return textNode;
+  },
+
+  now: ReactScheduler.now,
+
+  isPrimaryRenderer: true,
+
+  mutation: {
+    commitMount(
+      domElement: Instance,
+      type: string,
+      newProps: Props,
+      internalInstanceHandle: Object,
+    ): void {
+      // Despite the naming that might imply otherwise, this method only
+      // fires if there is an `Update` effect scheduled during mounting.
+      // This happens if `finalizeInitialChildren` returns `true` (which it
+      // does to implement the `autoFocus` attribute on the client). But
+      // there are also other cases when this might happen (such as patching
+      // up text content during hydration mismatch). So we'll check this again.
+      if (shouldAutoFocusHostComponent(type, newProps)) {
+        ((domElement: any):
+          | HTMLButtonElement
+          | HTMLInputElement
+          | HTMLSelectElement
+          | HTMLTextAreaElement).focus();
+      }
+    },
+
+    commitUpdate(
+      domElement: Instance,
+      updatePayload: Array<mixed>,
+      type: string,
+      oldProps: Props,
+      newProps: Props,
+      internalInstanceHandle: Object,
+    ): void {
+      // Update the props handle so that we know which props are the ones with
+      // with current event handlers.
+      updateFiberProps(domElement, newProps);
+      // Apply the diff to the DOM node.
+      updateProperties(domElement, updatePayload, type, oldProps, newProps);
+    },
+
+    resetTextContent(domElement: Instance): void {
+      setTextContent(domElement, '');
+    },
+
+    commitTextUpdate(
+      textInstance: TextInstance,
+      oldText: string,
+      newText: string,
+    ): void {
+      textInstance.nodeValue = newText;
+    },
+
+    appendChild(
+      parentInstance: Instance,
+      child: Instance | TextInstance,
+    ): void {
+      parentInstance.appendChild(child);
+    },
+
+    appendChildToContainer(
+      container: Container,
+      child: Instance | TextInstance,
+    ): void {
+      if (container.nodeType === COMMENT_NODE) {
+        (container.parentNode: any).insertBefore(child, container);
+      } else {
+        container.appendChild(child);
+      }
+    },
+
+    insertBefore(
+      parentInstance: Instance,
+      child: Instance | TextInstance,
+      beforeChild: Instance | TextInstance,
+    ): void {
+      parentInstance.insertBefore(child, beforeChild);
+    },
+
+    insertInContainerBefore(
+      container: Container,
+      child: Instance | TextInstance,
+      beforeChild: Instance | TextInstance,
+    ): void {
+      if (container.nodeType === COMMENT_NODE) {
+        (container.parentNode: any).insertBefore(child, beforeChild);
+      } else {
+        container.insertBefore(child, beforeChild);
+      }
+    },
+
+    removeChild(
+      parentInstance: Instance,
+      child: Instance | TextInstance,
+    ): void {
+      parentInstance.removeChild(child);
+    },
+
+    removeChildFromContainer(
+      container: Container,
+      child: Instance | TextInstance,
+    ): void {
+      if (container.nodeType === COMMENT_NODE) {
+        (container.parentNode: any).removeChild(child);
+      } else {
+        container.removeChild(child);
+      }
+    },
+  },
+
+  hydration: {
+    canHydrateInstance(
+      instance: Instance | TextInstance,
+      type: string,
+      props: Props,
+    ): null | Instance {
+      if (
+        instance.nodeType !== ELEMENT_NODE ||
+        type.toLowerCase() !== instance.nodeName.toLowerCase()
+      ) {
+        return null;
+      }
+      // This has now been refined to an element node.
+      return ((instance: any): Instance);
+    },
+
+    canHydrateTextInstance(
+      instance: Instance | TextInstance,
+      text: string,
+    ): null | TextInstance {
+      if (text === '' || instance.nodeType !== TEXT_NODE) {
+        // Empty strings are not parsed by HTML so there won't be a correct match here.
+        return null;
+      }
+      // This has now been refined to a text node.
+      return ((instance: any): TextInstance);
+    },
+
+    getNextHydratableSibling(
+      instance: Instance | TextInstance,
+    ): null | Instance | TextInstance {
+      let node = instance.nextSibling;
+      // Skip non-hydratable nodes.
+      while (
+        node &&
+        node.nodeType !== ELEMENT_NODE &&
+        node.nodeType !== TEXT_NODE
+      ) {
+        node = node.nextSibling;
+      }
+      return (node: any);
+    },
+
+    getFirstHydratableChild(
+      parentInstance: Container | Instance,
+    ): null | Instance | TextInstance {
+      let next = parentInstance.firstChild;
+      // Skip non-hydratable nodes.
+      while (
+        next &&
+        next.nodeType !== ELEMENT_NODE &&
+        next.nodeType !== TEXT_NODE
+      ) {
+        next = next.nextSibling;
+      }
+      return (next: any);
+    },
+
+    hydrateInstance(
+      instance: Instance,
+      type: string,
+      props: Props,
+      rootContainerInstance: Container,
+      hostContext: HostContext,
+      internalInstanceHandle: Object,
+    ): null | Array<mixed> {
+      precacheFiberNode(internalInstanceHandle, instance);
+      // TODO: Possibly defer this until the commit phase where all the events
+      // get attached.
+      updateFiberProps(instance, props);
+      let parentNamespace: string;
+      if (__DEV__) {
+        const hostContextDev = ((hostContext: any): HostContextDev);
+        parentNamespace = hostContextDev.namespace;
+      } else {
+        parentNamespace = ((hostContext: any): HostContextProd);
+      }
+      return diffHydratedProperties(
+        instance,
+        type,
+        props,
+        parentNamespace,
+        rootContainerInstance,
+      );
+    },
+
+    hydrateTextInstance(
+      textInstance: TextInstance,
+      text: string,
+      internalInstanceHandle: Object,
+    ): boolean {
+      precacheFiberNode(internalInstanceHandle, textInstance);
+      return diffHydratedText(textInstance, text);
+    },
+
+    didNotMatchHydratedContainerTextInstance(
+      parentContainer: Container,
+      textInstance: TextInstance,
+      text: string,
+    ) {
+      if (__DEV__) {
+        warnForUnmatchedText(textInstance, text);
+      }
+    },
+
+    didNotMatchHydratedTextInstance(
+      parentType: string,
+      parentProps: Props,
+      parentInstance: Instance,
+      textInstance: TextInstance,
+      text: string,
+    ) {
+      if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
+        warnForUnmatchedText(textInstance, text);
+      }
+    },
+
+    didNotHydrateContainerInstance(
+      parentContainer: Container,
+      instance: Instance | TextInstance,
+    ) {
+      if (__DEV__) {
+        if (instance.nodeType === 1) {
+          warnForDeletedHydratableElement(parentContainer, (instance: any));
+        } else {
+          warnForDeletedHydratableText(parentContainer, (instance: any));
+        }
+      }
+    },
+
+    didNotHydrateInstance(
+      parentType: string,
+      parentProps: Props,
+      parentInstance: Instance,
+      instance: Instance | TextInstance,
+    ) {
+      if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
+        if (instance.nodeType === 1) {
+          warnForDeletedHydratableElement(parentInstance, (instance: any));
+        } else {
+          warnForDeletedHydratableText(parentInstance, (instance: any));
+        }
+      }
+    },
+
+    didNotFindHydratableContainerInstance(
+      parentContainer: Container,
+      type: string,
+      props: Props,
+    ) {
+      if (__DEV__) {
+        warnForInsertedHydratedElement(parentContainer, type, props);
+      }
+    },
+
+    didNotFindHydratableContainerTextInstance(
+      parentContainer: Container,
+      text: string,
+    ) {
+      if (__DEV__) {
+        warnForInsertedHydratedText(parentContainer, text);
+      }
+    },
+
+    didNotFindHydratableInstance(
+      parentType: string,
+      parentProps: Props,
+      parentInstance: Instance,
+      type: string,
+      props: Props,
+    ) {
+      if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
+        warnForInsertedHydratedElement(parentInstance, type, props);
+      }
+    },
+
+    didNotFindHydratableTextInstance(
+      parentType: string,
+      parentProps: Props,
+      parentInstance: Instance,
+      text: string,
+    ) {
+      if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
+        warnForInsertedHydratedText(parentInstance, text);
+      }
+    },
+  },
+
+  scheduleDeferredCallback: ReactScheduler.rIC,
+  cancelDeferredCallback: ReactScheduler.cIC,
+};
+
+export default ReactDOMHostConfig;
diff --git a/packages/react-native-renderer/src/ReactFabricHostConfig.js b/packages/react-native-renderer/src/ReactFabricHostConfig.js
new file mode 100644
index 0000000000..921067e516
--- /dev/null
+++ b/packages/react-native-renderer/src/ReactFabricHostConfig.js
@@ -0,0 +1,355 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import type {
+  MeasureInWindowOnSuccessCallback,
+  MeasureLayoutOnSuccessCallback,
+  MeasureOnSuccessCallback,
+  NativeMethodsMixinType,
+  ReactNativeBaseComponentViewConfig,
+} from './ReactNativeTypes';
+
+import {mountSafeCallback, warnForStyleProps} from './NativeMethodsMixinUtils';
+import * as ReactNativeAttributePayload from './ReactNativeAttributePayload';
+import * as ReactNativeFrameScheduling from './ReactNativeFrameScheduling';
+import * as ReactNativeViewConfigRegistry from 'ReactNativeViewConfigRegistry';
+
+import deepFreezeAndThrowOnMutationInDev from 'deepFreezeAndThrowOnMutationInDev';
+import invariant from 'fbjs/lib/invariant';
+
+// Modules provided by RN:
+import TextInputState from 'TextInputState';
+import FabricUIManager from 'FabricUIManager';
+import UIManager from 'UIManager';
+
+// Counter for uniquely identifying views.
+// % 10 === 1 means it is a rootTag.
+// % 2 === 0 means it is a Fabric tag.
+// This means that they never overlap.
+let nextReactTag = 2;
+
+type HostContext = $ReadOnly<{|
+  isInAParentText: boolean,
+|}>;
+
+/**
+ * This is used for refs on host components.
+ */
+class ReactFabricHostComponent {
+  _nativeTag: number;
+  viewConfig: ReactNativeBaseComponentViewConfig;
+  currentProps: Props;
+
+  constructor(
+    tag: number,
+    viewConfig: ReactNativeBaseComponentViewConfig,
+    props: Props,
+  ) {
+    this._nativeTag = tag;
+    this.viewConfig = viewConfig;
+    this.currentProps = props;
+  }
+
+  blur() {
+    TextInputState.blurTextInput(this._nativeTag);
+  }
+
+  focus() {
+    TextInputState.focusTextInput(this._nativeTag);
+  }
+
+  measure(callback: MeasureOnSuccessCallback) {
+    UIManager.measure(this._nativeTag, mountSafeCallback(this, callback));
+  }
+
+  measureInWindow(callback: MeasureInWindowOnSuccessCallback) {
+    UIManager.measureInWindow(
+      this._nativeTag,
+      mountSafeCallback(this, callback),
+    );
+  }
+
+  measureLayout(
+    relativeToNativeNode: number,
+    onSuccess: MeasureLayoutOnSuccessCallback,
+    onFail: () => void /* currently unused */,
+  ) {
+    UIManager.measureLayout(
+      this._nativeTag,
+      relativeToNativeNode,
+      mountSafeCallback(this, onFail),
+      mountSafeCallback(this, onSuccess),
+    );
+  }
+
+  setNativeProps(nativeProps: Object) {
+    if (__DEV__) {
+      warnForStyleProps(nativeProps, this.viewConfig.validAttributes);
+    }
+
+    const updatePayload = ReactNativeAttributePayload.create(
+      nativeProps,
+      this.viewConfig.validAttributes,
+    );
+
+    // Avoid the overhead of bridge calls if there's no update.
+    // This is an expensive no-op for Android, and causes an unnecessary
+    // view invalidation for certain components (eg RCTTextInput) on iOS.
+    if (updatePayload != null) {
+      UIManager.updateView(
+        this._nativeTag,
+        this.viewConfig.uiViewClassName,
+        updatePayload,
+      );
+    }
+  }
+}
+
+// eslint-disable-next-line no-unused-expressions
+(ReactFabricHostComponent.prototype: NativeMethodsMixinType);
+
+type Node = Object;
+type ChildSet = Object;
+type Container = number;
+type Instance = {
+  node: Node,
+  canonical: ReactFabricHostComponent,
+};
+type Props = Object;
+type TextInstance = {
+  node: Node,
+};
+
+const ReacFabricHostConfig = {
+  appendInitialChild(
+    parentInstance: Instance,
+    child: Instance | TextInstance,
+  ): void {
+    FabricUIManager.appendChild(parentInstance.node, child.node);
+  },
+
+  createInstance(
+    type: string,
+    props: Props,
+    rootContainerInstance: Container,
+    hostContext: HostContext,
+    internalInstanceHandle: Object,
+  ): Instance {
+    const tag = nextReactTag;
+    nextReactTag += 2;
+
+    const viewConfig = ReactNativeViewConfigRegistry.get(type);
+
+    if (__DEV__) {
+      for (const key in viewConfig.validAttributes) {
+        if (props.hasOwnProperty(key)) {
+          deepFreezeAndThrowOnMutationInDev(props[key]);
+        }
+      }
+    }
+
+    invariant(
+      type !== 'RCTView' || !hostContext.isInAParentText,
+      'Nesting of <View> within <Text> is not currently supported.',
+    );
+
+    const updatePayload = ReactNativeAttributePayload.create(
+      props,
+      viewConfig.validAttributes,
+    );
+
+    const node = FabricUIManager.createNode(
+      tag, // reactTag
+      viewConfig.uiViewClassName, // viewName
+      rootContainerInstance, // rootTag
+      updatePayload, // props
+      internalInstanceHandle, // internalInstanceHandle
+    );
+
+    const component = new ReactFabricHostComponent(tag, viewConfig, props);
+
+    return {
+      node: node,
+      canonical: component,
+    };
+  },
+
+  createTextInstance(
+    text: string,
+    rootContainerInstance: Container,
+    hostContext: HostContext,
+    internalInstanceHandle: Object,
+  ): TextInstance {
+    invariant(
+      hostContext.isInAParentText,
+      'Text strings must be rendered within a <Text> component.',
+    );
+
+    const tag = nextReactTag;
+    nextReactTag += 2;
+
+    const node = FabricUIManager.createNode(
+      tag, // reactTag
+      'RCTRawText', // viewName
+      rootContainerInstance, // rootTag
+      {text: text}, // props
+      internalInstanceHandle, // instance handle
+    );
+
+    return {
+      node: node,
+    };
+  },
+
+  finalizeInitialChildren(
+    parentInstance: Instance,
+    type: string,
+    props: Props,
+    rootContainerInstance: Container,
+  ): boolean {
+    return false;
+  },
+
+  getRootHostContext(rootContainerInstance: Container): HostContext {
+    return {isInAParentText: false};
+  },
+
+  getChildHostContext(
+    parentHostContext: HostContext,
+    type: string,
+  ): HostContext {
+    const prevIsInAParentText = parentHostContext.isInAParentText;
+    const isInAParentText =
+      type === 'AndroidTextInput' || // Android
+      type === 'RCTMultilineTextInputView' || // iOS
+      type === 'RCTSinglelineTextInputView' || // iOS
+      type === 'RCTText' ||
+      type === 'RCTVirtualText';
+
+    if (prevIsInAParentText !== isInAParentText) {
+      return {isInAParentText};
+    } else {
+      return parentHostContext;
+    }
+  },
+
+  getPublicInstance(instance: Instance): * {
+    return instance.canonical;
+  },
+
+  now: ReactNativeFrameScheduling.now,
+
+  // The Fabric renderer is secondary to the existing React Native renderer.
+  isPrimaryRenderer: false,
+
+  prepareForCommit(): void {
+    // Noop
+  },
+
+  prepareUpdate(
+    instance: Instance,
+    type: string,
+    oldProps: Props,
+    newProps: Props,
+    rootContainerInstance: Container,
+    hostContext: HostContext,
+  ): null | Object {
+    const viewConfig = instance.canonical.viewConfig;
+    const updatePayload = ReactNativeAttributePayload.diff(
+      oldProps,
+      newProps,
+      viewConfig.validAttributes,
+    );
+    // TODO: If the event handlers have changed, we need to update the current props
+    // in the commit phase but there is no host config hook to do it yet.
+    return updatePayload;
+  },
+
+  resetAfterCommit(): void {
+    // Noop
+  },
+
+  scheduleDeferredCallback: ReactNativeFrameScheduling.scheduleDeferredCallback,
+  cancelDeferredCallback: ReactNativeFrameScheduling.cancelDeferredCallback,
+
+  shouldDeprioritizeSubtree(type: string, props: Props): boolean {
+    return false;
+  },
+
+  shouldSetTextContent(type: string, props: Props): boolean {
+    // TODO (bvaughn) Revisit this decision.
+    // Always returning false simplifies the createInstance() implementation,
+    // But creates an additional child Fiber for raw text children.
+    // No additional native views are created though.
+    // It's not clear to me which is better so I'm deferring for now.
+    // More context @ github.com/facebook/react/pull/8560#discussion_r92111303
+    return false;
+  },
+
+  persistence: {
+    cloneInstance(
+      instance: Instance,
+      updatePayload: null | Object,
+      type: string,
+      oldProps: Props,
+      newProps: Props,
+      internalInstanceHandle: Object,
+      keepChildren: boolean,
+      recyclableInstance: null | Instance,
+    ): Instance {
+      const node = instance.node;
+      let clone;
+      if (keepChildren) {
+        if (updatePayload !== null) {
+          clone = FabricUIManager.cloneNodeWithNewProps(node, updatePayload);
+        } else {
+          clone = FabricUIManager.cloneNode(node);
+        }
+      } else {
+        if (updatePayload !== null) {
+          clone = FabricUIManager.cloneNodeWithNewChildrenAndProps(
+            node,
+            updatePayload,
+          );
+        } else {
+          clone = FabricUIManager.cloneNodeWithNewChildren(node);
+        }
+      }
+      return {
+        node: clone,
+        canonical: instance.canonical,
+      };
+    },
+
+    createContainerChildSet(container: Container): ChildSet {
+      return FabricUIManager.createChildSet(container);
+    },
+
+    appendChildToContainerChildSet(
+      childSet: ChildSet,
+      child: Instance | TextInstance,
+    ): void {
+      FabricUIManager.appendChildToSet(childSet, child.node);
+    },
+
+    finalizeContainerChildren(
+      container: Container,
+      newChildren: ChildSet,
+    ): void {
+      FabricUIManager.completeRoot(container, newChildren);
+    },
+
+    replaceContainerChildren(
+      container: Container,
+      newChildren: ChildSet,
+    ): void {},
+  },
+};
+
+export default ReacFabricHostConfig;
diff --git a/packages/react-native-renderer/src/ReactFabricRenderer.js b/packages/react-native-renderer/src/ReactFabricRenderer.js
index 9c597c2e53..8f77d283c9 100644
--- a/packages/react-native-renderer/src/ReactFabricRenderer.js
+++ b/packages/react-native-renderer/src/ReactFabricRenderer.js
@@ -7,350 +7,9 @@
  * @flow
  */
 
-import type {
-  MeasureInWindowOnSuccessCallback,
-  MeasureLayoutOnSuccessCallback,
-  MeasureOnSuccessCallback,
-  NativeMethodsMixinType,
-  ReactNativeBaseComponentViewConfig,
-} from './ReactNativeTypes';
-
-import {mountSafeCallback, warnForStyleProps} from './NativeMethodsMixinUtils';
-import * as ReactNativeAttributePayload from './ReactNativeAttributePayload';
-import * as ReactNativeFrameScheduling from './ReactNativeFrameScheduling';
-import * as ReactNativeViewConfigRegistry from 'ReactNativeViewConfigRegistry';
 import ReactFiberReconciler from 'react-reconciler';
+import ReactFabricHostConfig from './ReactFabricHostConfig';
 
-import deepFreezeAndThrowOnMutationInDev from 'deepFreezeAndThrowOnMutationInDev';
-import invariant from 'fbjs/lib/invariant';
-
-// Modules provided by RN:
-import TextInputState from 'TextInputState';
-import FabricUIManager from 'FabricUIManager';
-import UIManager from 'UIManager';
-
-// Counter for uniquely identifying views.
-// % 10 === 1 means it is a rootTag.
-// % 2 === 0 means it is a Fabric tag.
-// This means that they never overlap.
-let nextReactTag = 2;
-
-type HostContext = $ReadOnly<{|
-  isInAParentText: boolean,
-|}>;
-
-/**
- * This is used for refs on host components.
- */
-class ReactFabricHostComponent {
-  _nativeTag: number;
-  viewConfig: ReactNativeBaseComponentViewConfig;
-  currentProps: Props;
-
-  constructor(
-    tag: number,
-    viewConfig: ReactNativeBaseComponentViewConfig,
-    props: Props,
-  ) {
-    this._nativeTag = tag;
-    this.viewConfig = viewConfig;
-    this.currentProps = props;
-  }
-
-  blur() {
-    TextInputState.blurTextInput(this._nativeTag);
-  }
-
-  focus() {
-    TextInputState.focusTextInput(this._nativeTag);
-  }
-
-  measure(callback: MeasureOnSuccessCallback) {
-    UIManager.measure(this._nativeTag, mountSafeCallback(this, callback));
-  }
-
-  measureInWindow(callback: MeasureInWindowOnSuccessCallback) {
-    UIManager.measureInWindow(
-      this._nativeTag,
-      mountSafeCallback(this, callback),
-    );
-  }
-
-  measureLayout(
-    relativeToNativeNode: number,
-    onSuccess: MeasureLayoutOnSuccessCallback,
-    onFail: () => void /* currently unused */,
-  ) {
-    UIManager.measureLayout(
-      this._nativeTag,
-      relativeToNativeNode,
-      mountSafeCallback(this, onFail),
-      mountSafeCallback(this, onSuccess),
-    );
-  }
-
-  setNativeProps(nativeProps: Object) {
-    if (__DEV__) {
-      warnForStyleProps(nativeProps, this.viewConfig.validAttributes);
-    }
-
-    const updatePayload = ReactNativeAttributePayload.create(
-      nativeProps,
-      this.viewConfig.validAttributes,
-    );
-
-    // Avoid the overhead of bridge calls if there's no update.
-    // This is an expensive no-op for Android, and causes an unnecessary
-    // view invalidation for certain components (eg RCTTextInput) on iOS.
-    if (updatePayload != null) {
-      UIManager.updateView(
-        this._nativeTag,
-        this.viewConfig.uiViewClassName,
-        updatePayload,
-      );
-    }
-  }
-}
-
-// eslint-disable-next-line no-unused-expressions
-(ReactFabricHostComponent.prototype: NativeMethodsMixinType);
-
-type Node = Object;
-type ChildSet = Object;
-type Container = number;
-type Instance = {
-  node: Node,
-  canonical: ReactFabricHostComponent,
-};
-type Props = Object;
-type TextInstance = {
-  node: Node,
-};
-
-const ReactFabricRenderer = ReactFiberReconciler({
-  appendInitialChild(
-    parentInstance: Instance,
-    child: Instance | TextInstance,
-  ): void {
-    FabricUIManager.appendChild(parentInstance.node, child.node);
-  },
-
-  createInstance(
-    type: string,
-    props: Props,
-    rootContainerInstance: Container,
-    hostContext: HostContext,
-    internalInstanceHandle: Object,
-  ): Instance {
-    const tag = nextReactTag;
-    nextReactTag += 2;
-
-    const viewConfig = ReactNativeViewConfigRegistry.get(type);
-
-    if (__DEV__) {
-      for (const key in viewConfig.validAttributes) {
-        if (props.hasOwnProperty(key)) {
-          deepFreezeAndThrowOnMutationInDev(props[key]);
-        }
-      }
-    }
-
-    invariant(
-      type !== 'RCTView' || !hostContext.isInAParentText,
-      'Nesting of <View> within <Text> is not currently supported.',
-    );
-
-    const updatePayload = ReactNativeAttributePayload.create(
-      props,
-      viewConfig.validAttributes,
-    );
-
-    const node = FabricUIManager.createNode(
-      tag, // reactTag
-      viewConfig.uiViewClassName, // viewName
-      rootContainerInstance, // rootTag
-      updatePayload, // props
-      internalInstanceHandle, // internalInstanceHandle
-    );
-
-    const component = new ReactFabricHostComponent(tag, viewConfig, props);
-
-    return {
-      node: node,
-      canonical: component,
-    };
-  },
-
-  createTextInstance(
-    text: string,
-    rootContainerInstance: Container,
-    hostContext: HostContext,
-    internalInstanceHandle: Object,
-  ): TextInstance {
-    invariant(
-      hostContext.isInAParentText,
-      'Text strings must be rendered within a <Text> component.',
-    );
-
-    const tag = nextReactTag;
-    nextReactTag += 2;
-
-    const node = FabricUIManager.createNode(
-      tag, // reactTag
-      'RCTRawText', // viewName
-      rootContainerInstance, // rootTag
-      {text: text}, // props
-      internalInstanceHandle, // instance handle
-    );
-
-    return {
-      node: node,
-    };
-  },
-
-  finalizeInitialChildren(
-    parentInstance: Instance,
-    type: string,
-    props: Props,
-    rootContainerInstance: Container,
-  ): boolean {
-    return false;
-  },
-
-  getRootHostContext(rootContainerInstance: Container): HostContext {
-    return {isInAParentText: false};
-  },
-
-  getChildHostContext(
-    parentHostContext: HostContext,
-    type: string,
-  ): HostContext {
-    const prevIsInAParentText = parentHostContext.isInAParentText;
-    const isInAParentText =
-      type === 'AndroidTextInput' || // Android
-      type === 'RCTMultilineTextInputView' || // iOS
-      type === 'RCTSinglelineTextInputView' || // iOS
-      type === 'RCTText' ||
-      type === 'RCTVirtualText';
-
-    if (prevIsInAParentText !== isInAParentText) {
-      return {isInAParentText};
-    } else {
-      return parentHostContext;
-    }
-  },
-
-  getPublicInstance(instance) {
-    return instance.canonical;
-  },
-
-  now: ReactNativeFrameScheduling.now,
-
-  // The Fabric renderer is secondary to the existing React Native renderer.
-  isPrimaryRenderer: false,
-
-  prepareForCommit(): void {
-    // Noop
-  },
-
-  prepareUpdate(
-    instance: Instance,
-    type: string,
-    oldProps: Props,
-    newProps: Props,
-    rootContainerInstance: Container,
-    hostContext: HostContext,
-  ): null | Object {
-    const viewConfig = instance.canonical.viewConfig;
-    const updatePayload = ReactNativeAttributePayload.diff(
-      oldProps,
-      newProps,
-      viewConfig.validAttributes,
-    );
-    // TODO: If the event handlers have changed, we need to update the current props
-    // in the commit phase but there is no host config hook to do it yet.
-    return updatePayload;
-  },
-
-  resetAfterCommit(): void {
-    // Noop
-  },
-
-  scheduleDeferredCallback: ReactNativeFrameScheduling.scheduleDeferredCallback,
-  cancelDeferredCallback: ReactNativeFrameScheduling.cancelDeferredCallback,
-
-  shouldDeprioritizeSubtree(type: string, props: Props): boolean {
-    return false;
-  },
-
-  shouldSetTextContent(type: string, props: Props): boolean {
-    // TODO (bvaughn) Revisit this decision.
-    // Always returning false simplifies the createInstance() implementation,
-    // But creates an additional child Fiber for raw text children.
-    // No additional native views are created though.
-    // It's not clear to me which is better so I'm deferring for now.
-    // More context @ github.com/facebook/react/pull/8560#discussion_r92111303
-    return false;
-  },
-
-  persistence: {
-    cloneInstance(
-      instance: Instance,
-      updatePayload: null | Object,
-      type: string,
-      oldProps: Props,
-      newProps: Props,
-      internalInstanceHandle: Object,
-      keepChildren: boolean,
-      recyclableInstance: null | Instance,
-    ): Instance {
-      const node = instance.node;
-      let clone;
-      if (keepChildren) {
-        if (updatePayload !== null) {
-          clone = FabricUIManager.cloneNodeWithNewProps(node, updatePayload);
-        } else {
-          clone = FabricUIManager.cloneNode(node);
-        }
-      } else {
-        if (updatePayload !== null) {
-          clone = FabricUIManager.cloneNodeWithNewChildrenAndProps(
-            node,
-            updatePayload,
-          );
-        } else {
-          clone = FabricUIManager.cloneNodeWithNewChildren(node);
-        }
-      }
-      return {
-        node: clone,
-        canonical: instance.canonical,
-      };
-    },
-
-    createContainerChildSet(container: Container): ChildSet {
-      return FabricUIManager.createChildSet(container);
-    },
-
-    appendChildToContainerChildSet(
-      childSet: ChildSet,
-      child: Instance | TextInstance,
-    ): void {
-      FabricUIManager.appendChildToSet(childSet, child.node);
-    },
-
-    finalizeContainerChildren(
-      container: Container,
-      newChildren: ChildSet,
-    ): void {
-      FabricUIManager.completeRoot(container, newChildren);
-    },
-
-    replaceContainerChildren(
-      container: Container,
-      newChildren: ChildSet,
-    ): void {},
-  },
-});
+const ReactFabricRenderer = ReactFiberReconciler(ReactFabricHostConfig);
 
 export default ReactFabricRenderer;
diff --git a/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js b/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js
index 86c0d3ad70..3d5bf5bbc9 100644
--- a/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js
+++ b/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js
@@ -14,7 +14,7 @@ import type {
   NativeMethodsMixinType,
   ReactNativeBaseComponentViewConfig,
 } from './ReactNativeTypes';
-import type {Instance} from './ReactNativeFiberRenderer';
+import type {Instance} from './ReactNativeHostConfig';
 
 // Modules provided by RN:
 import TextInputState from 'TextInputState';
diff --git a/packages/react-native-renderer/src/ReactNativeFiberRenderer.js b/packages/react-native-renderer/src/ReactNativeHostConfig.js
similarity index 98%
rename from packages/react-native-renderer/src/ReactNativeFiberRenderer.js
rename to packages/react-native-renderer/src/ReactNativeHostConfig.js
index 01fe4816b4..b766d1e655 100644
--- a/packages/react-native-renderer/src/ReactNativeFiberRenderer.js
+++ b/packages/react-native-renderer/src/ReactNativeHostConfig.js
@@ -9,7 +9,6 @@
 
 import type {ReactNativeBaseComponentViewConfig} from './ReactNativeTypes';
 
-import ReactFiberReconciler from 'react-reconciler';
 import emptyObject from 'fbjs/lib/emptyObject';
 import invariant from 'fbjs/lib/invariant';
 
@@ -64,7 +63,7 @@ function recursivelyUncacheFiberNode(node: Instance | TextInstance) {
   }
 }
 
-const NativeRenderer = ReactFiberReconciler({
+const ReactNativeHostConfig = {
   appendInitialChild(
     parentInstance: Instance,
     child: Instance | TextInstance,
@@ -193,7 +192,7 @@ const NativeRenderer = ReactFiberReconciler({
     }
   },
 
-  getPublicInstance(instance) {
+  getPublicInstance(instance: Instance): * {
     return instance;
   },
 
@@ -427,6 +426,6 @@ const NativeRenderer = ReactFiberReconciler({
       // Noop
     },
   },
-});
+};
 
-export default NativeRenderer;
+export default ReactNativeHostConfig;
diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js
index f8e984d0e6..ce55def9e6 100644
--- a/packages/react-native-renderer/src/ReactNativeRenderer.js
+++ b/packages/react-native-renderer/src/ReactNativeRenderer.js
@@ -12,6 +12,7 @@ import type {ReactNodeList} from 'shared/ReactTypes';
 
 import './ReactNativeInjection';
 
+import ReactFiberReconciler from 'react-reconciler';
 import * as ReactPortal from 'shared/ReactPortal';
 import * as ReactGenericBatching from 'events/ReactGenericBatching';
 import ReactVersion from 'shared/ReactVersion';
@@ -20,16 +21,18 @@ import UIManager from 'UIManager';
 
 import {getStackAddendumByWorkInProgressFiber} from 'shared/ReactFiberComponentTreeHook';
 
+import ReactNativeHostConfig from './ReactNativeHostConfig';
 import NativeMethodsMixin from './NativeMethodsMixin';
 import ReactNativeComponent from './ReactNativeComponent';
 import * as ReactNativeComponentTree from './ReactNativeComponentTree';
-import ReactNativeFiberRenderer from './ReactNativeFiberRenderer';
 import {getInspectorDataForViewTag} from './ReactNativeFiberInspector';
 
 import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
 import getComponentName from 'shared/getComponentName';
 import warning from 'fbjs/lib/warning';
 
+const ReactNativeFiberRenderer = ReactFiberReconciler(ReactNativeHostConfig);
+
 const findHostInstance = ReactNativeFiberRenderer.findHostInstance;
 
 function findNodeHandle(componentOrHandle: any): ?number {
diff --git a/packages/react-test-renderer/src/ReactTestHostConfig.js b/packages/react-test-renderer/src/ReactTestHostConfig.js
new file mode 100644
index 0000000000..ef7c6c927c
--- /dev/null
+++ b/packages/react-test-renderer/src/ReactTestHostConfig.js
@@ -0,0 +1,218 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import emptyObject from 'fbjs/lib/emptyObject';
+
+import * as TestRendererScheduling from './ReactTestRendererScheduling';
+
+export type Instance = {|
+  type: string,
+  props: Object,
+  children: Array<Instance | TextInstance>,
+  rootContainerInstance: Container,
+  tag: 'INSTANCE',
+|};
+
+export type TextInstance = {|
+  text: string,
+  tag: 'TEXT',
+|};
+
+type Container = {|
+  children: Array<Instance | TextInstance>,
+  createNodeMock: Function,
+  tag: 'CONTAINER',
+|};
+
+type Props = Object;
+
+const UPDATE_SIGNAL = {};
+
+function getPublicInstance(inst: Instance | TextInstance): * {
+  switch (inst.tag) {
+    case 'INSTANCE':
+      const createNodeMock = inst.rootContainerInstance.createNodeMock;
+      return createNodeMock({
+        type: inst.type,
+        props: inst.props,
+      });
+    default:
+      return inst;
+  }
+}
+
+function appendChild(
+  parentInstance: Instance | Container,
+  child: Instance | TextInstance,
+): void {
+  const index = parentInstance.children.indexOf(child);
+  if (index !== -1) {
+    parentInstance.children.splice(index, 1);
+  }
+  parentInstance.children.push(child);
+}
+
+function insertBefore(
+  parentInstance: Instance | Container,
+  child: Instance | TextInstance,
+  beforeChild: Instance | TextInstance,
+): void {
+  const index = parentInstance.children.indexOf(child);
+  if (index !== -1) {
+    parentInstance.children.splice(index, 1);
+  }
+  const beforeIndex = parentInstance.children.indexOf(beforeChild);
+  parentInstance.children.splice(beforeIndex, 0, child);
+}
+
+function removeChild(
+  parentInstance: Instance | Container,
+  child: Instance | TextInstance,
+): void {
+  const index = parentInstance.children.indexOf(child);
+  parentInstance.children.splice(index, 1);
+}
+
+const ReactTestHostConfig = {
+  getRootHostContext() {
+    return emptyObject;
+  },
+
+  getChildHostContext() {
+    return emptyObject;
+  },
+
+  prepareForCommit(): void {
+    // noop
+  },
+
+  resetAfterCommit(): void {
+    // noop
+  },
+
+  createInstance(
+    type: string,
+    props: Props,
+    rootContainerInstance: Container,
+    hostContext: Object,
+    internalInstanceHandle: Object,
+  ): Instance {
+    return {
+      type,
+      props,
+      children: [],
+      rootContainerInstance,
+      tag: 'INSTANCE',
+    };
+  },
+
+  appendInitialChild(
+    parentInstance: Instance,
+    child: Instance | TextInstance,
+  ): void {
+    const index = parentInstance.children.indexOf(child);
+    if (index !== -1) {
+      parentInstance.children.splice(index, 1);
+    }
+    parentInstance.children.push(child);
+  },
+
+  finalizeInitialChildren(
+    testElement: Instance,
+    type: string,
+    props: Props,
+    rootContainerInstance: Container,
+  ): boolean {
+    return false;
+  },
+
+  prepareUpdate(
+    testElement: Instance,
+    type: string,
+    oldProps: Props,
+    newProps: Props,
+    rootContainerInstance: Container,
+    hostContext: Object,
+  ): null | {} {
+    return UPDATE_SIGNAL;
+  },
+
+  shouldSetTextContent(type: string, props: Props): boolean {
+    return false;
+  },
+
+  shouldDeprioritizeSubtree(type: string, props: Props): boolean {
+    return false;
+  },
+
+  createTextInstance(
+    text: string,
+    rootContainerInstance: Container,
+    hostContext: Object,
+    internalInstanceHandle: Object,
+  ): TextInstance {
+    return {
+      text,
+      tag: 'TEXT',
+    };
+  },
+
+  getPublicInstance,
+
+  scheduleDeferredCallback: TestRendererScheduling.scheduleDeferredCallback,
+  cancelDeferredCallback: TestRendererScheduling.cancelDeferredCallback,
+  // This approach enables `now` to be mocked by tests,
+  // Even after the reconciler has initialized and read host config values.
+  now: () => TestRendererScheduling.nowImplementation(),
+
+  isPrimaryRenderer: true,
+
+  mutation: {
+    commitUpdate(
+      instance: Instance,
+      updatePayload: {},
+      type: string,
+      oldProps: Props,
+      newProps: Props,
+      internalInstanceHandle: Object,
+    ): void {
+      instance.type = type;
+      instance.props = newProps;
+    },
+
+    commitMount(
+      instance: Instance,
+      type: string,
+      newProps: Props,
+      internalInstanceHandle: Object,
+    ): void {
+      // noop
+    },
+
+    commitTextUpdate(
+      textInstance: TextInstance,
+      oldText: string,
+      newText: string,
+    ): void {
+      textInstance.text = newText;
+    },
+    resetTextContent(testElement: Instance): void {
+      // noop
+    },
+
+    appendChild: appendChild,
+    appendChildToContainer: appendChild,
+    insertBefore: insertBefore,
+    insertInContainerBefore: insertBefore,
+    removeChild: removeChild,
+    removeChildFromContainer: removeChild,
+  },
+};
+
+export default ReactTestHostConfig;
diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js
index 7fa54534d3..5fab9af606 100644
--- a/packages/react-test-renderer/src/ReactTestRenderer.js
+++ b/packages/react-test-renderer/src/ReactTestRenderer.js
@@ -9,12 +9,11 @@
 
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
 import type {FiberRoot} from 'react-reconciler/src/ReactFiberRoot';
-import type {Deadline} from 'react-reconciler/src/ReactFiberReconciler';
+import type {Instance, TextInstance} from './ReactTestHostConfig';
 
 import ReactFiberReconciler from 'react-reconciler';
 import {batchedUpdates} from 'events/ReactGenericBatching';
 import {findCurrentFiberUsingSlowPath} from 'react-reconciler/reflection';
-import emptyObject from 'fbjs/lib/emptyObject';
 import {
   Fragment,
   FunctionalComponent,
@@ -31,6 +30,9 @@ import {
 } from 'shared/ReactTypeOfWork';
 import invariant from 'fbjs/lib/invariant';
 
+import ReactTestHostConfig from './ReactTestHostConfig';
+import * as TestRendererScheduling from './ReactTestRendererScheduling';
+
 type TestRendererOptions = {
   createNodeMock: (element: React$Element<any>) => any,
   unstable_isAsync: boolean,
@@ -44,26 +46,6 @@ type ReactTestRendererJSON = {|
 |};
 type ReactTestRendererNode = ReactTestRendererJSON | string;
 
-type Container = {|
-  children: Array<Instance | TextInstance>,
-  createNodeMock: Function,
-  tag: 'CONTAINER',
-|};
-
-type Props = Object;
-type Instance = {|
-  type: string,
-  props: Object,
-  children: Array<Instance | TextInstance>,
-  rootContainerInstance: Container,
-  tag: 'INSTANCE',
-|};
-
-type TextInstance = {|
-  text: string,
-  tag: 'TEXT',
-|};
-
 type FindOptions = $Shape<{
   // performs a "greedy" search: if a matching node is found, will continue
   // to search within the matching node's children. (default: true)
@@ -72,203 +54,7 @@ type FindOptions = $Shape<{
 
 export type Predicate = (node: ReactTestInstance) => ?boolean;
 
-const UPDATE_SIGNAL = {};
-
-function getPublicInstance(inst: Instance | TextInstance): * {
-  switch (inst.tag) {
-    case 'INSTANCE':
-      const createNodeMock = inst.rootContainerInstance.createNodeMock;
-      return createNodeMock({
-        type: inst.type,
-        props: inst.props,
-      });
-    default:
-      return inst;
-  }
-}
-
-function appendChild(
-  parentInstance: Instance | Container,
-  child: Instance | TextInstance,
-): void {
-  const index = parentInstance.children.indexOf(child);
-  if (index !== -1) {
-    parentInstance.children.splice(index, 1);
-  }
-  parentInstance.children.push(child);
-}
-
-function insertBefore(
-  parentInstance: Instance | Container,
-  child: Instance | TextInstance,
-  beforeChild: Instance | TextInstance,
-): void {
-  const index = parentInstance.children.indexOf(child);
-  if (index !== -1) {
-    parentInstance.children.splice(index, 1);
-  }
-  const beforeIndex = parentInstance.children.indexOf(beforeChild);
-  parentInstance.children.splice(beforeIndex, 0, child);
-}
-
-function removeChild(
-  parentInstance: Instance | Container,
-  child: Instance | TextInstance,
-): void {
-  const index = parentInstance.children.indexOf(child);
-  parentInstance.children.splice(index, 1);
-}
-
-// Current virtual time
-let nowImplementation = () => 0;
-let scheduledCallback: ((deadline: Deadline) => mixed) | null = null;
-let yieldedValues: Array<mixed> | null = null;
-
-const TestRenderer = ReactFiberReconciler({
-  getRootHostContext() {
-    return emptyObject;
-  },
-
-  getChildHostContext() {
-    return emptyObject;
-  },
-
-  prepareForCommit(): void {
-    // noop
-  },
-
-  resetAfterCommit(): void {
-    // noop
-  },
-
-  createInstance(
-    type: string,
-    props: Props,
-    rootContainerInstance: Container,
-    hostContext: Object,
-    internalInstanceHandle: Object,
-  ): Instance {
-    return {
-      type,
-      props,
-      children: [],
-      rootContainerInstance,
-      tag: 'INSTANCE',
-    };
-  },
-
-  appendInitialChild(
-    parentInstance: Instance,
-    child: Instance | TextInstance,
-  ): void {
-    const index = parentInstance.children.indexOf(child);
-    if (index !== -1) {
-      parentInstance.children.splice(index, 1);
-    }
-    parentInstance.children.push(child);
-  },
-
-  finalizeInitialChildren(
-    testElement: Instance,
-    type: string,
-    props: Props,
-    rootContainerInstance: Container,
-  ): boolean {
-    return false;
-  },
-
-  prepareUpdate(
-    testElement: Instance,
-    type: string,
-    oldProps: Props,
-    newProps: Props,
-    rootContainerInstance: Container,
-    hostContext: Object,
-  ): null | {} {
-    return UPDATE_SIGNAL;
-  },
-
-  shouldSetTextContent(type: string, props: Props): boolean {
-    return false;
-  },
-
-  shouldDeprioritizeSubtree(type: string, props: Props): boolean {
-    return false;
-  },
-
-  createTextInstance(
-    text: string,
-    rootContainerInstance: Container,
-    hostContext: Object,
-    internalInstanceHandle: Object,
-  ): TextInstance {
-    return {
-      text,
-      tag: 'TEXT',
-    };
-  },
-
-  scheduleDeferredCallback(
-    callback: (deadline: Deadline) => mixed,
-    options?: {timeout: number},
-  ): number {
-    scheduledCallback = callback;
-    return 0;
-  },
-
-  cancelDeferredCallback(timeoutID: number): void {
-    scheduledCallback = null;
-  },
-
-  getPublicInstance,
-
-  // This approach enables `now` to be mocked by tests,
-  // Even after the reconciler has initialized and read host config values.
-  now: () => nowImplementation(),
-
-  isPrimaryRenderer: true,
-
-  mutation: {
-    commitUpdate(
-      instance: Instance,
-      updatePayload: {},
-      type: string,
-      oldProps: Props,
-      newProps: Props,
-      internalInstanceHandle: Object,
-    ): void {
-      instance.type = type;
-      instance.props = newProps;
-    },
-
-    commitMount(
-      instance: Instance,
-      type: string,
-      newProps: Props,
-      internalInstanceHandle: Object,
-    ): void {
-      // noop
-    },
-
-    commitTextUpdate(
-      textInstance: TextInstance,
-      oldText: string,
-      newText: string,
-    ): void {
-      textInstance.text = newText;
-    },
-    resetTextContent(testElement: Instance): void {
-      // noop
-    },
-
-    appendChild: appendChild,
-    appendChildToContainer: appendChild,
-    insertBefore: insertBefore,
-    insertInContainerBefore: insertBefore,
-    removeChild: removeChild,
-    removeChildFromContainer: removeChild,
-  },
-});
+const TestRenderer = ReactFiberReconciler(ReactTestHostConfig);
 
 const defaultTestOptions = {
   createNodeMock: function() {
@@ -444,7 +230,7 @@ class ReactTestInstance {
 
   get instance() {
     if (this._fiber.tag === HostComponent) {
-      return getPublicInstance(this._fiber.stateNode);
+      return ReactTestHostConfig.getPublicInstance(this._fiber.stateNode);
     } else {
       return this._fiber.stateNode;
     }
@@ -676,77 +462,20 @@ const ReactTestRendererFiber = {
         container = null;
         root = null;
       },
-      unstable_flushAll(): Array<mixed> {
-        yieldedValues = null;
-        while (scheduledCallback !== null) {
-          const cb = scheduledCallback;
-          scheduledCallback = null;
-          cb({
-            timeRemaining() {
-              // Keep rendering until there's no more work
-              return 999;
-            },
-            // React's scheduler has its own way of keeping track of expired
-            // work and doesn't read this, so don't bother setting it to the
-            // correct value.
-            didTimeout: false,
-          });
-        }
-        if (yieldedValues === null) {
-          // Always return an array.
-          return [];
-        }
-        return yieldedValues;
-      },
-      unstable_flushThrough(expectedValues: Array<mixed>): Array<mixed> {
-        let didStop = false;
-        yieldedValues = null;
-        while (scheduledCallback !== null && !didStop) {
-          const cb = scheduledCallback;
-          scheduledCallback = null;
-          cb({
-            timeRemaining() {
-              if (
-                yieldedValues !== null &&
-                yieldedValues.length >= expectedValues.length
-              ) {
-                // We at least as many values as expected. Stop rendering.
-                didStop = true;
-                return 0;
-              }
-              // Keep rendering.
-              return 999;
-            },
-            // React's scheduler has its own way of keeping track of expired
-            // work and doesn't read this, so don't bother setting it to the
-            // correct value.
-            didTimeout: false,
-          });
-        }
-        if (yieldedValues === null) {
-          // Always return an array.
-          return [];
-        }
-        return yieldedValues;
-      },
-      unstable_yield(value: mixed): void {
-        if (yieldedValues === null) {
-          yieldedValues = [value];
-        } else {
-          yieldedValues.push(value);
-        }
-      },
       getInstance() {
         if (root == null || root.current == null) {
           return null;
         }
         return TestRenderer.getPublicRootInstance(root);
       },
+      unstable_flushAll: TestRendererScheduling.flushAll,
       unstable_flushSync(fn: Function) {
-        yieldedValues = [];
-        TestRenderer.flushSync(fn);
-        return yieldedValues;
+        return TestRendererScheduling.withCleanYields(() => {
+          TestRenderer.flushSync(fn);
+        });
       },
+      unstable_flushThrough: TestRendererScheduling.flushThrough,
+      unstable_yield: TestRendererScheduling.yieldValue,
     };
 
     Object.defineProperty(
@@ -771,9 +500,7 @@ const ReactTestRendererFiber = {
   unstable_batchedUpdates: batchedUpdates,
   /* eslint-enable camelcase */
 
-  unstable_setNowImplementation(implementation: () => number): void {
-    nowImplementation = implementation;
-  },
+  unstable_setNowImplementation: TestRendererScheduling.setNowImplementation,
 };
 
 export default ReactTestRendererFiber;
diff --git a/packages/react-test-renderer/src/ReactTestRendererScheduling.js b/packages/react-test-renderer/src/ReactTestRendererScheduling.js
new file mode 100644
index 0000000000..dfa7616a3b
--- /dev/null
+++ b/packages/react-test-renderer/src/ReactTestRendererScheduling.js
@@ -0,0 +1,100 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import type {Deadline} from 'react-reconciler/src/ReactFiberReconciler';
+
+// Current virtual time
+export let nowImplementation = () => 0;
+export let scheduledCallback: ((deadline: Deadline) => mixed) | null = null;
+export let yieldedValues: Array<mixed> | null = null;
+
+export function scheduleDeferredCallback(
+  callback: (deadline: Deadline) => mixed,
+  options?: {timeout: number},
+): number {
+  scheduledCallback = callback;
+  return 0;
+}
+
+export function cancelDeferredCallback(timeoutID: number): void {
+  scheduledCallback = null;
+}
+
+export function setNowImplementation(implementation: () => number): void {
+  nowImplementation = implementation;
+}
+
+export function flushAll(): Array<mixed> {
+  yieldedValues = null;
+  while (scheduledCallback !== null) {
+    const cb = scheduledCallback;
+    scheduledCallback = null;
+    cb({
+      timeRemaining() {
+        // Keep rendering until there's no more work
+        return 999;
+      },
+      // React's scheduler has its own way of keeping track of expired
+      // work and doesn't read this, so don't bother setting it to the
+      // correct value.
+      didTimeout: false,
+    });
+  }
+  if (yieldedValues === null) {
+    // Always return an array.
+    return [];
+  }
+  return yieldedValues;
+}
+
+export function flushThrough(expectedValues: Array<mixed>): Array<mixed> {
+  let didStop = false;
+  yieldedValues = null;
+  while (scheduledCallback !== null && !didStop) {
+    const cb = scheduledCallback;
+    scheduledCallback = null;
+    cb({
+      timeRemaining() {
+        if (
+          yieldedValues !== null &&
+          yieldedValues.length >= expectedValues.length
+        ) {
+          // We at least as many values as expected. Stop rendering.
+          didStop = true;
+          return 0;
+        }
+        // Keep rendering.
+        return 999;
+      },
+      // React's scheduler has its own way of keeping track of expired
+      // work and doesn't read this, so don't bother setting it to the
+      // correct value.
+      didTimeout: false,
+    });
+  }
+  if (yieldedValues === null) {
+    // Always return an array.
+    return [];
+  }
+  return yieldedValues;
+}
+
+export function yieldValue(value: mixed): void {
+  if (yieldedValues === null) {
+    yieldedValues = [value];
+  } else {
+    yieldedValues.push(value);
+  }
+}
+
+export function withCleanYields(fn: Function) {
+  yieldedValues = [];
+  fn();
+  return yieldedValues;
+}

From 369dd4fb1742917cb14486e33bb0e59bda62b23d Mon Sep 17 00:00:00 2001
From: Timothy Yung <yungsters@gmail.com>
Date: Mon, 14 May 2018 17:47:47 -0700
Subject: [PATCH 045/277] Update headers for React Native shims (#12806)

---
 packages/react-native-renderer/src/ReactNativeTypes.js         | 2 ++
 scripts/rollup/shims/react-native-fb/ReactFeatureFlags.js      | 3 ++-
 scripts/rollup/shims/react-native/NativeMethodsMixin.js        | 2 +-
 scripts/rollup/shims/react-native/ReactDebugTool.js            | 3 ++-
 scripts/rollup/shims/react-native/ReactFabric.js               | 3 ++-
 scripts/rollup/shims/react-native/ReactNative.js               | 3 ++-
 scripts/rollup/shims/react-native/ReactNativeComponentTree.js  | 2 +-
 .../rollup/shims/react-native/ReactNativeViewConfigRegistry.js | 3 ++-
 scripts/rollup/shims/react-native/ReactPerf.js                 | 3 ++-
 .../shims/react-native/createReactNativeComponentClass.js      | 2 +-
 10 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/react-native-renderer/src/ReactNativeTypes.js b/packages/react-native-renderer/src/ReactNativeTypes.js
index c38b0b44eb..70a3203658 100644
--- a/packages/react-native-renderer/src/ReactNativeTypes.js
+++ b/packages/react-native-renderer/src/ReactNativeTypes.js
@@ -89,7 +89,9 @@ export type NativeMethodsMixinType = {
 
 type SecretInternalsType = {
   NativeMethodsMixin: NativeMethodsMixinType,
+  ReactDebugTool?: any,
   ReactNativeComponentTree: any,
+  ReactPerf?: any,
   computeComponentStackForErrorReporting(tag: number): string,
   // TODO (bvaughn) Decide which additional types to expose here?
   // And how much information to fill in for the above types.
diff --git a/scripts/rollup/shims/react-native-fb/ReactFeatureFlags.js b/scripts/rollup/shims/react-native-fb/ReactFeatureFlags.js
index 44add71fc5..ea5c5ba0f1 100644
--- a/scripts/rollup/shims/react-native-fb/ReactFeatureFlags.js
+++ b/scripts/rollup/shims/react-native-fb/ReactFeatureFlags.js
@@ -4,7 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @providesModule ReactFeatureFlags
+ * @format
+ * @flow
  */
 
 'use strict';
diff --git a/scripts/rollup/shims/react-native/NativeMethodsMixin.js b/scripts/rollup/shims/react-native/NativeMethodsMixin.js
index cd0e673b3b..70e1d9dda5 100644
--- a/scripts/rollup/shims/react-native/NativeMethodsMixin.js
+++ b/scripts/rollup/shims/react-native/NativeMethodsMixin.js
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @providesModule NativeMethodsMixin
+ * @format
  * @flow
  */
 
diff --git a/scripts/rollup/shims/react-native/ReactDebugTool.js b/scripts/rollup/shims/react-native/ReactDebugTool.js
index e45af4fb09..edde3b629e 100644
--- a/scripts/rollup/shims/react-native/ReactDebugTool.js
+++ b/scripts/rollup/shims/react-native/ReactDebugTool.js
@@ -4,7 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @providesModule ReactDebugTool
+ * @format
+ * @flow
  */
 
 'use strict';
diff --git a/scripts/rollup/shims/react-native/ReactFabric.js b/scripts/rollup/shims/react-native/ReactFabric.js
index 4162ca62fe..a5e317ba4a 100644
--- a/scripts/rollup/shims/react-native/ReactFabric.js
+++ b/scripts/rollup/shims/react-native/ReactFabric.js
@@ -4,9 +4,10 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @providesModule ReactFabric
+ * @format
  * @flow
  */
+
 'use strict';
 
 const BatchedBridge = require('BatchedBridge');
diff --git a/scripts/rollup/shims/react-native/ReactNative.js b/scripts/rollup/shims/react-native/ReactNative.js
index a648cafbc3..fd7d3e3dbe 100644
--- a/scripts/rollup/shims/react-native/ReactNative.js
+++ b/scripts/rollup/shims/react-native/ReactNative.js
@@ -4,9 +4,10 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @providesModule ReactNative
+ * @format
  * @flow
  */
+
 'use strict';
 
 import type {ReactNativeType} from 'ReactNativeTypes';
diff --git a/scripts/rollup/shims/react-native/ReactNativeComponentTree.js b/scripts/rollup/shims/react-native/ReactNativeComponentTree.js
index 30ec5257f4..702b621a5e 100644
--- a/scripts/rollup/shims/react-native/ReactNativeComponentTree.js
+++ b/scripts/rollup/shims/react-native/ReactNativeComponentTree.js
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @providesModule ReactNativeComponentTree
+ * @format
  * @flow
  */
 
diff --git a/scripts/rollup/shims/react-native/ReactNativeViewConfigRegistry.js b/scripts/rollup/shims/react-native/ReactNativeViewConfigRegistry.js
index ffb0fa213f..44a7f1827d 100644
--- a/scripts/rollup/shims/react-native/ReactNativeViewConfigRegistry.js
+++ b/scripts/rollup/shims/react-native/ReactNativeViewConfigRegistry.js
@@ -4,9 +4,10 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @providesModule ReactNativeViewConfigRegistry
+ * @format
  * @flow
  */
+
 'use strict';
 
 import type {
diff --git a/scripts/rollup/shims/react-native/ReactPerf.js b/scripts/rollup/shims/react-native/ReactPerf.js
index bb6777fff0..637036afaf 100644
--- a/scripts/rollup/shims/react-native/ReactPerf.js
+++ b/scripts/rollup/shims/react-native/ReactPerf.js
@@ -4,7 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @providesModule ReactPerf
+ * @format
+ * @flow
  */
 
 'use strict';
diff --git a/scripts/rollup/shims/react-native/createReactNativeComponentClass.js b/scripts/rollup/shims/react-native/createReactNativeComponentClass.js
index 1a050e8b3c..4ea7d28183 100644
--- a/scripts/rollup/shims/react-native/createReactNativeComponentClass.js
+++ b/scripts/rollup/shims/react-native/createReactNativeComponentClass.js
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @providesModule createReactNativeComponentClass
+ * @format
  * @flow
  */
 

From 8c747d01cb395ce06d93c2db6bb3f7b95b57d09d Mon Sep 17 00:00:00 2001
From: Sophie Alpert <git@sophiebits.com>
Date: Mon, 14 May 2018 18:47:40 -0700
Subject: [PATCH 046/277] Use ReactFiberErrorDialog fork for Fabric renderer
 (#12807)

---
 scripts/rollup/forks.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js
index 97f73879ea..0a223c59ae 100644
--- a/scripts/rollup/forks.js
+++ b/scripts/rollup/forks.js
@@ -121,6 +121,7 @@ const forks = Object.freeze({
       case RN_FB_PROD:
         switch (entry) {
           case 'react-native-renderer':
+          case 'react-native-renderer/fabric':
             // Use the RN fork which plays well with redbox.
             return 'react-reconciler/src/forks/ReactFiberErrorDialog.native.js';
           default:

From 73f59e6f3152f0579625ecd50caa936920c8e5eb Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Mon, 14 May 2018 19:18:47 -0700
Subject: [PATCH 047/277] Use global state for `hasForceUpdate` instead of
 persisting to queue (#12808)

* Use global state for `hasForceUpdate` instead of persisting to queue

Fixes a bug where `hasForceUpdate` was not reset on commit.

Ideally we'd use a tuple and return `hasForceUpdate` from
`processUpdateQueue`.

* Remove underscore and add comment

* Remove temporary variables
---
 .../src/ReactFiberClassComponent.js           | 60 +++++++++----------
 .../react-reconciler/src/ReactUpdateQueue.js  | 23 ++++---
 .../ReactIncremental-test.internal.js         | 23 +++++++
 3 files changed, 67 insertions(+), 39 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js
index 52a6346ffb..0a0cebddae 100644
--- a/packages/react-reconciler/src/ReactFiberClassComponent.js
+++ b/packages/react-reconciler/src/ReactFiberClassComponent.js
@@ -32,6 +32,8 @@ import {StrictMode} from './ReactTypeOfMode';
 import {
   enqueueUpdate,
   processUpdateQueue,
+  checkHasForceUpdateAfterProcessing,
+  resetHasForceUpdateBeforeProcessing,
   createUpdate,
   ReplaceState,
   ForceUpdate,
@@ -235,14 +237,6 @@ export default function(
     newState,
     newContext,
   ) {
-    if (
-      workInProgress.updateQueue !== null &&
-      workInProgress.updateQueue.hasForceUpdate
-    ) {
-      // If forceUpdate was called, disregard sCU.
-      return true;
-    }
-
     const instance = workInProgress.stateNode;
     const ctor = workInProgress.type;
     if (typeof instance.shouldComponentUpdate === 'function') {
@@ -789,6 +783,8 @@ export default function(
       }
     }
 
+    resetHasForceUpdateBeforeProcessing();
+
     const oldState = workInProgress.memoizedState;
     let newState = (instance.state = oldState);
     let updateQueue = workInProgress.updateQueue;
@@ -806,10 +802,7 @@ export default function(
       oldProps === newProps &&
       oldState === newState &&
       !hasContextChanged() &&
-      !(
-        workInProgress.updateQueue !== null &&
-        workInProgress.updateQueue.hasForceUpdate
-      )
+      !checkHasForceUpdateAfterProcessing()
     ) {
       // If an update was already in progress, we should schedule an Update
       // effect even though we're bailing out, so that cWU/cDU are called.
@@ -828,14 +821,16 @@ export default function(
       newState = workInProgress.memoizedState;
     }
 
-    const shouldUpdate = checkShouldComponentUpdate(
-      workInProgress,
-      oldProps,
-      newProps,
-      oldState,
-      newState,
-      newContext,
-    );
+    const shouldUpdate =
+      checkHasForceUpdateAfterProcessing() ||
+      checkShouldComponentUpdate(
+        workInProgress,
+        oldProps,
+        newProps,
+        oldState,
+        newState,
+        newContext,
+      );
 
     if (shouldUpdate) {
       // In order to support react-lifecycles-compat polyfilled components,
@@ -922,6 +917,8 @@ export default function(
       }
     }
 
+    resetHasForceUpdateBeforeProcessing();
+
     const oldState = workInProgress.memoizedState;
     let newState = (instance.state = oldState);
     let updateQueue = workInProgress.updateQueue;
@@ -940,10 +937,7 @@ export default function(
       oldProps === newProps &&
       oldState === newState &&
       !hasContextChanged() &&
-      !(
-        workInProgress.updateQueue !== null &&
-        workInProgress.updateQueue.hasForceUpdate
-      )
+      !checkHasForceUpdateAfterProcessing()
     ) {
       // If an update was already in progress, we should schedule an Update
       // effect even though we're bailing out, so that cWU/cDU are called.
@@ -977,14 +971,16 @@ export default function(
       }
     }
 
-    const shouldUpdate = checkShouldComponentUpdate(
-      workInProgress,
-      oldProps,
-      newProps,
-      oldState,
-      newState,
-      newContext,
-    );
+    const shouldUpdate =
+      checkHasForceUpdateAfterProcessing() ||
+      checkShouldComponentUpdate(
+        workInProgress,
+        oldProps,
+        newProps,
+        oldState,
+        newState,
+        newContext,
+      );
 
     if (shouldUpdate) {
       // In order to support react-lifecycles-compat polyfilled components,
diff --git a/packages/react-reconciler/src/ReactUpdateQueue.js b/packages/react-reconciler/src/ReactUpdateQueue.js
index 574a3c0740..dc3791c4e1 100644
--- a/packages/react-reconciler/src/ReactUpdateQueue.js
+++ b/packages/react-reconciler/src/ReactUpdateQueue.js
@@ -131,9 +131,6 @@ export type UpdateQueue<State> = {
 
   firstCapturedEffect: Update<State> | null,
   lastCapturedEffect: Update<State> | null,
-
-  // TODO: Workaround for lack of tuples. Could use global state instead.
-  hasForceUpdate: boolean,
 };
 
 export const UpdateState = 0;
@@ -141,6 +138,11 @@ export const ReplaceState = 1;
 export const ForceUpdate = 2;
 export const CaptureUpdate = 3;
 
+// Global state that is reset at the beginning of calling `processUpdateQueue`.
+// It should only be read right after calling `processUpdateQueue`, via
+// `checkHasForceUpdateAfterProcessing`.
+let hasForceUpdate = false;
+
 let didWarnUpdateInsideUpdate;
 let currentlyProcessingQueue;
 export let resetCurrentlyProcessingQueue;
@@ -164,7 +166,6 @@ export function createUpdateQueue<State>(baseState: State): UpdateQueue<State> {
     lastEffect: null,
     firstCapturedEffect: null,
     lastCapturedEffect: null,
-    hasForceUpdate: false,
   };
   return queue;
 }
@@ -183,8 +184,6 @@ function cloneUpdateQueue<State>(
     firstCapturedUpdate: null,
     lastCapturedUpdate: null,
 
-    hasForceUpdate: false,
-
     firstEffect: null,
     lastEffect: null,
 
@@ -423,7 +422,7 @@ function getStateFromUpdate<State>(
       return Object.assign({}, prevState, partialState);
     }
     case ForceUpdate: {
-      queue.hasForceUpdate = true;
+      hasForceUpdate = true;
       return prevState;
     }
   }
@@ -437,6 +436,8 @@ export function processUpdateQueue<State>(
   instance: any,
   renderExpirationTime: ExpirationTime,
 ): void {
+  hasForceUpdate = false;
+
   if (
     queue.expirationTime === NoWork ||
     queue.expirationTime > renderExpirationTime
@@ -595,6 +596,14 @@ function callCallback(callback, context) {
   callback.call(context);
 }
 
+export function resetHasForceUpdateBeforeProcessing() {
+  hasForceUpdate = false;
+}
+
+export function checkHasForceUpdateAfterProcessing(): boolean {
+  return hasForceUpdate;
+}
+
 export function commitUpdateQueue<State>(
   finishedWork: Fiber,
   finishedQueue: UpdateQueue<State>,
diff --git a/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
index a8289b113d..f58228d952 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
@@ -1115,6 +1115,29 @@ describe('ReactIncremental', () => {
     expect(ops).toEqual(['Foo', 'Bar', 'Baz', 'Bar', 'Baz']);
   });
 
+  it('should clear forceUpdate after update is flushed', () => {
+    let a = 0;
+
+    class Foo extends React.PureComponent {
+      render() {
+        const msg = `A: ${a}, B: ${this.props.b}`;
+        ReactNoop.yield(msg);
+        return msg;
+      }
+    }
+
+    const foo = React.createRef(null);
+    ReactNoop.render(<Foo ref={foo} b={0} />);
+    expect(ReactNoop.flush()).toEqual(['A: 0, B: 0']);
+
+    a = 1;
+    foo.current.forceUpdate();
+    expect(ReactNoop.flush()).toEqual(['A: 1, B: 0']);
+
+    ReactNoop.render(<Foo ref={foo} b={0} />);
+    expect(ReactNoop.flush()).toEqual([]);
+  });
+
   xit('can call sCU while resuming a partly mounted component', () => {
     let ops = [];
 

From bde4b1659fd4aea796482f24d40c2e834fca635f Mon Sep 17 00:00:00 2001
From: Timothy Yung <yungsters@gmail.com>
Date: Mon, 14 May 2018 20:28:55 -0700
Subject: [PATCH 048/277] Delete ReactPerf and ReactDebugTool Stubs (#12809)

---
 .../react-native-renderer/src/ReactFabric.js  | 22 -------------------
 .../src/ReactNativeRenderer.js                | 22 -------------------
 .../src/ReactNativeTypes.js                   |  2 --
 .../shims/react-native/ReactDebugTool.js      | 18 ---------------
 .../rollup/shims/react-native/ReactPerf.js    | 17 --------------
 5 files changed, 81 deletions(-)
 delete mode 100644 scripts/rollup/shims/react-native/ReactDebugTool.js
 delete mode 100644 scripts/rollup/shims/react-native/ReactPerf.js

diff --git a/packages/react-native-renderer/src/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js
index 9e2c82548d..130b199580 100644
--- a/packages/react-native-renderer/src/ReactFabric.js
+++ b/packages/react-native-renderer/src/ReactFabric.js
@@ -118,28 +118,6 @@ const ReactFabric: ReactFabricType = {
   },
 };
 
-if (__DEV__) {
-  // $FlowFixMe
-  Object.assign(
-    ReactFabric.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-    {
-      // TODO: none of these work since Fiber. Remove these dependencies.
-      // Used by RCTRenderingPerf, Systrace:
-      ReactDebugTool: {
-        addHook() {},
-        removeHook() {},
-      },
-      // Used by ReactPerfStallHandler, RCTRenderingPerf:
-      ReactPerf: {
-        start() {},
-        stop() {},
-        printInclusive() {},
-        printWasted() {},
-      },
-    },
-  );
-}
-
 ReactFabricRenderer.injectIntoDevTools({
   findFiberByHostInstance: ReactNativeComponentTree.getClosestInstanceFromNode,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js
index ce55def9e6..7b5f3c7805 100644
--- a/packages/react-native-renderer/src/ReactNativeRenderer.js
+++ b/packages/react-native-renderer/src/ReactNativeRenderer.js
@@ -147,28 +147,6 @@ const ReactNativeRenderer: ReactNativeType = {
   },
 };
 
-if (__DEV__) {
-  // $FlowFixMe
-  Object.assign(
-    ReactNativeRenderer.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-    {
-      // TODO: none of these work since Fiber. Remove these dependencies.
-      // Used by RCTRenderingPerf, Systrace:
-      ReactDebugTool: {
-        addHook() {},
-        removeHook() {},
-      },
-      // Used by ReactPerfStallHandler, RCTRenderingPerf:
-      ReactPerf: {
-        start() {},
-        stop() {},
-        printInclusive() {},
-        printWasted() {},
-      },
-    },
-  );
-}
-
 ReactNativeFiberRenderer.injectIntoDevTools({
   findFiberByHostInstance: ReactNativeComponentTree.getClosestInstanceFromNode,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
diff --git a/packages/react-native-renderer/src/ReactNativeTypes.js b/packages/react-native-renderer/src/ReactNativeTypes.js
index 70a3203658..c38b0b44eb 100644
--- a/packages/react-native-renderer/src/ReactNativeTypes.js
+++ b/packages/react-native-renderer/src/ReactNativeTypes.js
@@ -89,9 +89,7 @@ export type NativeMethodsMixinType = {
 
 type SecretInternalsType = {
   NativeMethodsMixin: NativeMethodsMixinType,
-  ReactDebugTool?: any,
   ReactNativeComponentTree: any,
-  ReactPerf?: any,
   computeComponentStackForErrorReporting(tag: number): string,
   // TODO (bvaughn) Decide which additional types to expose here?
   // And how much information to fill in for the above types.
diff --git a/scripts/rollup/shims/react-native/ReactDebugTool.js b/scripts/rollup/shims/react-native/ReactDebugTool.js
deleted file mode 100644
index edde3b629e..0000000000
--- a/scripts/rollup/shims/react-native/ReactDebugTool.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @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.ReactDebugTool;
diff --git a/scripts/rollup/shims/react-native/ReactPerf.js b/scripts/rollup/shims/react-native/ReactPerf.js
deleted file mode 100644
index 637036afaf..0000000000
--- a/scripts/rollup/shims/react-native/ReactPerf.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @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.ReactPerf;

From 1047980dca0830cd55e1622f3fbefc38aeaadb91 Mon Sep 17 00:00:00 2001
From: Maxim <gatilin222@gmail.com>
Date: Tue, 15 May 2018 12:18:35 +0300
Subject: [PATCH 049/277] Remove unused context param from `countChildren`
 (#12787)

---
 packages/react/src/ReactChildren.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/src/ReactChildren.js b/packages/react/src/ReactChildren.js
index b44b833912..635db9c8a0 100644
--- a/packages/react/src/ReactChildren.js
+++ b/packages/react/src/ReactChildren.js
@@ -361,7 +361,7 @@ function mapChildren(children, func, context) {
  * @param {?*} children Children tree container.
  * @return {number} The number of children.
  */
-function countChildren(children, context) {
+function countChildren(children) {
   return traverseAllChildren(children, emptyFunction.thatReturnsNull, null);
 }
 

From e96dc140599363029bd05565d58bcd4a432db370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Spie=C3=9F?= <hello@philippspiess.com>
Date: Tue, 15 May 2018 11:38:50 +0200
Subject: [PATCH 050/277] Use browser event names for top-level event types in
 React DOM (#12629)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add TopLevelEventTypes

* Fix `ReactBrowserEventEmitter`

* Fix EventPluginUtils

* Fix TapEventPlugin

* Fix ResponderEventPlugin

* Update ReactDOMFiberComponent

* Fix BeforeInputEventPlugin

* Fix ChangeEventPlugin

* Fix EnterLeaveEventPlugin

* Add missing non top event type used in ChangeEventPlugin

* Fix SelectEventPlugin

* Fix SimpleEventPlugin

* Fix outstanding Flow issues and move TopLevelEventTypes

* Inline a list of all events in `ReactTestUtils`

* Fix tests

* Make it pretty

* Fix completly unrelated typo

* Don’t use map constructor because of IE11

* Update typings, revert changes to native code

* Make topLevelTypes in ResponderEventPlugin injectable and create DOM and ReactNative variant

* Set proper dependencies for DOMResponderEventPlugin

* Prettify

* Make some react dom tests no longer depend on internal API

* Use factories to create top level speific generic event modules

* Remove unused dependency

* Revert exposed module renaming, hide store creation, and inline dependency decleration

* Add Flow types to createResponderEventPlugin and its consumers

* Remove unused dependency

* Use opaque flow type for TopLevelType

* Add missing semis

* Use raw event names as top level identifer

* Upgrade baylon

This is required for parsing opaque flow types in our CI tests.

* Clean up flow types

* Revert Map changes of ReactBrowserEventEmitter

* Upgrade babel-* packages

Apparently local unit tests also have issues with parsing JavaScript
modules that contain opaque types (not sure why I didn't notice
earlier!?).

* Revert Map changes of SimpleEventPlugin

* Clean up ReactTestUtils

* Add missing semi

* Fix Flow issue

* Make TopLevelType clearer

* Favor for loops

* Explain the new DOMTopLevelEventTypes concept

* Use static injection for Responder plugin types

* Remove null check and rely on flow checks

* Add missing ResponderEventPlugin dependencies
---
 .../fixtures/password-inputs/index.js         |    2 +-
 package.json                                  |    2 +-
 packages/events/EventPluginHub.js             |    5 +-
 packages/events/EventPluginUtils.js           |   15 -
 packages/events/PluginModuleType.js           |    3 +-
 packages/events/ReactSyntheticEventType.js    |    3 +-
 packages/events/ResponderEventPlugin.js       |   90 +-
 .../events/ResponderTopLevelEventTypes.js     |   31 +
 packages/events/ResponderTouchHistoryStore.js |    2 +-
 packages/events/TopLevelEventTypes.js         |   23 +
 .../forks/ResponderTopLevelEventTypes.dom.js  |   41 +
 .../react-dom/src/__tests__/ReactDOM-test.js  |   11 +-
 .../src/__tests__/ReactDOMFiber-test.js       |   20 +-
 .../src/__tests__/ReactDOMInput-test.js       |    7 +-
 .../src/client/ReactDOMFiberComponent.js      |   62 +-
 .../src/events/BeforeInputEventPlugin.js      |   98 +-
 .../src/events/BrowserEventConstants.js       |   97 --
 .../react-dom/src/events/ChangeEventPlugin.js |   44 +-
 .../src/events/DOMTopLevelEventTypes.js       |  205 +++
 .../src/events/EnterLeaveEventPlugin.js       |   11 +-
 .../react-dom/src/events/EventListener.js     |    4 +-
 .../src/events/ReactBrowserEventEmitter.js    |   55 +-
 .../src/events/ReactDOMEventListener.js       |   44 +-
 .../react-dom/src/events/SelectEventPlugin.js |   42 +-
 .../react-dom/src/events/SimpleEventPlugin.js |  303 ++--
 .../react-dom/src/events/TapEventPlugin.js    |   35 +-
 .../__tests__/TapEventPlugin-test.internal.js |    0
 .../src/test-utils/ReactTestUtils.js          |  155 +-
 .../src/ReactNativeBridgeEventPlugin.js       |    3 +-
 .../src/ReactNativeEventEmitter.js            |    7 +-
 scripts/rollup/forks.js                       |    8 +
 yarn.lock                                     | 1541 ++++++++++++-----
 32 files changed, 1969 insertions(+), 1000 deletions(-)
 create mode 100644 packages/events/ResponderTopLevelEventTypes.js
 create mode 100644 packages/events/TopLevelEventTypes.js
 create mode 100644 packages/events/forks/ResponderTopLevelEventTypes.dom.js
 delete mode 100644 packages/react-dom/src/events/BrowserEventConstants.js
 create mode 100644 packages/react-dom/src/events/DOMTopLevelEventTypes.js
 rename packages/react-dom/src/{ => events}/__tests__/TapEventPlugin-test.internal.js (100%)

diff --git a/fixtures/dom/src/components/fixtures/password-inputs/index.js b/fixtures/dom/src/components/fixtures/password-inputs/index.js
index f94dce97dc..1c37f09d58 100644
--- a/fixtures/dom/src/components/fixtures/password-inputs/index.js
+++ b/fixtures/dom/src/components/fixtures/password-inputs/index.js
@@ -15,7 +15,7 @@ function NumberInputs() {
         `}
         affectedBrowsers="IE Edge, IE 11">
         <TestCase.Steps>
-          <li>Type any string (not an actual password</li>
+          <li>Type any string (not an actual password)</li>
         </TestCase.Steps>
 
         <TestCase.ExpectedResult>
diff --git a/package.json b/package.json
index 3b1e2f6168..b8eb946ea7 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "babel-plugin-transform-regenerator": "^6.26.0",
     "babel-preset-react": "^6.5.0",
     "babel-traverse": "^6.9.0",
-    "babylon": "6.15.0",
+    "babylon": "6.18.0",
     "bundle-collapser": "^1.1.1",
     "chalk": "^1.1.3",
     "cli-table": "^0.3.1",
diff --git a/packages/events/EventPluginHub.js b/packages/events/EventPluginHub.js
index d59ba35ff6..27840402ef 100644
--- a/packages/events/EventPluginHub.js
+++ b/packages/events/EventPluginHub.js
@@ -25,6 +25,7 @@ import type {PluginModule} from './PluginModuleType';
 import type {ReactSyntheticEvent} from './ReactSyntheticEventType';
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
 import type {AnyNativeEvent} from './PluginModuleType';
+import type {TopLevelType} from './TopLevelEventTypes';
 
 /**
  * Internal queue of events that have accumulated their dispatches and are
@@ -165,7 +166,7 @@ export function getListener(inst: Fiber, registrationName: string) {
  * @internal
  */
 function extractEvents(
-  topLevelType: string,
+  topLevelType: TopLevelType,
   targetInst: Fiber,
   nativeEvent: AnyNativeEvent,
   nativeEventTarget: EventTarget,
@@ -227,7 +228,7 @@ export function runEventsInBatch(
 }
 
 export function runExtractedEventsInBatch(
-  topLevelType: string,
+  topLevelType: TopLevelType,
   targetInst: Fiber,
   nativeEvent: AnyNativeEvent,
   nativeEventTarget: EventTarget,
diff --git a/packages/events/EventPluginUtils.js b/packages/events/EventPluginUtils.js
index d5e5a5e847..19a89e30de 100644
--- a/packages/events/EventPluginUtils.js
+++ b/packages/events/EventPluginUtils.js
@@ -30,21 +30,6 @@ export const injection = {
   },
 };
 
-export function isEndish(topLevelType) {
-  return (
-    topLevelType === 'topMouseUp' ||
-    topLevelType === 'topTouchEnd' ||
-    topLevelType === 'topTouchCancel'
-  );
-}
-
-export function isMoveish(topLevelType) {
-  return topLevelType === 'topMouseMove' || topLevelType === 'topTouchMove';
-}
-export function isStartish(topLevelType) {
-  return topLevelType === 'topMouseDown' || topLevelType === 'topTouchStart';
-}
-
 let validateEventDispatches;
 if (__DEV__) {
   validateEventDispatches = function(event) {
diff --git a/packages/events/PluginModuleType.js b/packages/events/PluginModuleType.js
index 5657ac3514..22d53b1ccb 100644
--- a/packages/events/PluginModuleType.js
+++ b/packages/events/PluginModuleType.js
@@ -12,6 +12,7 @@ import type {
   DispatchConfig,
   ReactSyntheticEvent,
 } from './ReactSyntheticEventType';
+import type {TopLevelType} from './TopLevelEventTypes';
 
 export type EventTypes = {[key: string]: DispatchConfig};
 
@@ -22,7 +23,7 @@ export type PluginName = string;
 export type PluginModule<NativeEvent> = {
   eventTypes: EventTypes,
   extractEvents: (
-    topLevelType: string,
+    topLevelType: TopLevelType,
     targetInst: Fiber,
     nativeTarget: NativeEvent,
     nativeEventTarget: EventTarget,
diff --git a/packages/events/ReactSyntheticEventType.js b/packages/events/ReactSyntheticEventType.js
index b2b0b688fc..2f248f7029 100644
--- a/packages/events/ReactSyntheticEventType.js
+++ b/packages/events/ReactSyntheticEventType.js
@@ -9,9 +9,10 @@
  */
 
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
+import type {TopLevelType} from './TopLevelEventTypes';
 
 export type DispatchConfig = {
-  dependencies: Array<string>,
+  dependencies: Array<TopLevelType>,
   phasedRegistrationNames?: {
     bubbled: string,
     captured: string,
diff --git a/packages/events/ResponderEventPlugin.js b/packages/events/ResponderEventPlugin.js
index 202f8931f9..dc14523fff 100644
--- a/packages/events/ResponderEventPlugin.js
+++ b/packages/events/ResponderEventPlugin.js
@@ -8,9 +8,6 @@
 import {getLowestCommonAncestor, isAncestor} from 'shared/ReactTreeTraversal';
 
 import {
-  isStartish,
-  isMoveish,
-  isEndish,
   executeDirectDispatch,
   hasDispatches,
   executeDispatchesInOrderStopAtTrue,
@@ -24,6 +21,17 @@ import {
 import ResponderSyntheticEvent from './ResponderSyntheticEvent';
 import ResponderTouchHistoryStore from './ResponderTouchHistoryStore';
 import accumulate from './accumulate';
+import {
+  TOP_SCROLL,
+  TOP_SELECTION_CHANGE,
+  TOP_TOUCH_CANCEL,
+  isStartish,
+  isMoveish,
+  isEndish,
+  startDependencies,
+  moveDependencies,
+  endDependencies,
+} from './ResponderTopLevelEventTypes';
 
 /**
  * Instance of element that should respond to touch/move types of interactions,
@@ -37,11 +45,6 @@ let responderInst = null;
  */
 let trackedTouchCount = 0;
 
-/**
- * Last reported number of active touches.
- */
-let previousActiveTouches = 0;
-
 const changeResponder = function(nextResponderInst, blockHostResponder) {
   const oldResponderInst = responderInst;
   responderInst = nextResponderInst;
@@ -64,6 +67,7 @@ const eventTypes = {
       bubbled: 'onStartShouldSetResponder',
       captured: 'onStartShouldSetResponderCapture',
     },
+    dependencies: startDependencies,
   },
 
   /**
@@ -80,6 +84,7 @@ const eventTypes = {
       bubbled: 'onScrollShouldSetResponder',
       captured: 'onScrollShouldSetResponderCapture',
     },
+    dependencies: [TOP_SCROLL],
   },
 
   /**
@@ -94,6 +99,7 @@ const eventTypes = {
       bubbled: 'onSelectionChangeShouldSetResponder',
       captured: 'onSelectionChangeShouldSetResponderCapture',
     },
+    dependencies: [TOP_SELECTION_CHANGE],
   },
 
   /**
@@ -105,21 +111,44 @@ const eventTypes = {
       bubbled: 'onMoveShouldSetResponder',
       captured: 'onMoveShouldSetResponderCapture',
     },
+    dependencies: moveDependencies,
   },
 
   /**
    * Direct responder events dispatched directly to responder. Do not bubble.
    */
-  responderStart: {registrationName: 'onResponderStart'},
-  responderMove: {registrationName: 'onResponderMove'},
-  responderEnd: {registrationName: 'onResponderEnd'},
-  responderRelease: {registrationName: 'onResponderRelease'},
+  responderStart: {
+    registrationName: 'onResponderStart',
+    dependencies: startDependencies,
+  },
+  responderMove: {
+    registrationName: 'onResponderMove',
+    dependencies: moveDependencies,
+  },
+  responderEnd: {
+    registrationName: 'onResponderEnd',
+    dependencies: endDependencies,
+  },
+  responderRelease: {
+    registrationName: 'onResponderRelease',
+    dependencies: endDependencies,
+  },
   responderTerminationRequest: {
     registrationName: 'onResponderTerminationRequest',
+    dependencies: [],
+  },
+  responderGrant: {
+    registrationName: 'onResponderGrant',
+    dependencies: [],
+  },
+  responderReject: {
+    registrationName: 'onResponderReject',
+    dependencies: [],
+  },
+  responderTerminate: {
+    registrationName: 'onResponderTerminate',
+    dependencies: [],
   },
-  responderGrant: {registrationName: 'onResponderGrant'},
-  responderReject: {registrationName: 'onResponderReject'},
-  responderTerminate: {registrationName: 'onResponderTerminate'},
 };
 
 /**
@@ -322,7 +351,7 @@ function setResponderAndExtractTransfer(
     ? eventTypes.startShouldSetResponder
     : isMoveish(topLevelType)
       ? eventTypes.moveShouldSetResponder
-      : topLevelType === 'topSelectionChange'
+      : topLevelType === TOP_SELECTION_CHANGE
         ? eventTypes.selectionChangeShouldSetResponder
         : eventTypes.scrollShouldSetResponder;
 
@@ -427,8 +456,8 @@ function canTriggerTransfer(topLevelType, topLevelInst, nativeEvent) {
     // 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') ||
+    ((topLevelType === TOP_SCROLL && !nativeEvent.responderIgnoreScroll) ||
+      (trackedTouchCount > 0 && topLevelType === TOP_SELECTION_CHANGE) ||
       isStartish(topLevelType) ||
       isMoveish(topLevelType))
   );
@@ -534,7 +563,7 @@ const ResponderEventPlugin = {
     }
 
     const isResponderTerminate =
-      responderInst && topLevelType === 'topTouchCancel';
+      responderInst && topLevelType === TOP_TOUCH_CANCEL;
     const isResponderRelease =
       responderInst &&
       !isResponderTerminate &&
@@ -556,23 +585,10 @@ const ResponderEventPlugin = {
       changeResponder(null);
     }
 
-    const numberActiveTouches =
-      ResponderTouchHistoryStore.touchHistory.numberActiveTouches;
-    if (
-      ResponderEventPlugin.GlobalInteractionHandler &&
-      numberActiveTouches !== previousActiveTouches
-    ) {
-      ResponderEventPlugin.GlobalInteractionHandler.onChange(
-        numberActiveTouches,
-      );
-    }
-    previousActiveTouches = numberActiveTouches;
-
     return extracted;
   },
 
   GlobalResponderHandler: null,
-  GlobalInteractionHandler: null,
 
   injection: {
     /**
@@ -580,17 +596,9 @@ const ResponderEventPlugin = {
      * Object that handles any change in responder. Use this to inject
      * integration with an existing touch handling system etc.
      */
-    injectGlobalResponderHandler: function(GlobalResponderHandler) {
+    injectGlobalResponderHandler(GlobalResponderHandler) {
       ResponderEventPlugin.GlobalResponderHandler = GlobalResponderHandler;
     },
-
-    /**
-     * @param {{onChange: (numberActiveTouches) => void} GlobalInteractionHandler
-     * Object that handles any change in the number of active touches.
-     */
-    injectGlobalInteractionHandler: function(GlobalInteractionHandler) {
-      ResponderEventPlugin.GlobalInteractionHandler = GlobalInteractionHandler;
-    },
   },
 };
 
diff --git a/packages/events/ResponderTopLevelEventTypes.js b/packages/events/ResponderTopLevelEventTypes.js
new file mode 100644
index 0000000000..54ad053a66
--- /dev/null
+++ b/packages/events/ResponderTopLevelEventTypes.js
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export const TOP_TOUCH_START = 'topTouchStart';
+export const TOP_TOUCH_MOVE = 'topTouchMove';
+export const TOP_TOUCH_END = 'topTouchEnd';
+export const TOP_TOUCH_CANCEL = 'topTouchCancel';
+export const TOP_SCROLL = 'topScroll';
+export const TOP_SELECTION_CHANGE = 'topSelectionChange';
+
+export function isStartish(topLevelType: mixed): boolean {
+  return topLevelType === TOP_TOUCH_START;
+}
+
+export function isMoveish(topLevelType: mixed): boolean {
+  return topLevelType === TOP_TOUCH_MOVE;
+}
+
+export function isEndish(topLevelType: mixed): boolean {
+  return topLevelType === TOP_TOUCH_END || topLevelType === TOP_TOUCH_CANCEL;
+}
+
+export const startDependencies = [TOP_TOUCH_START];
+export const moveDependencies = [TOP_TOUCH_MOVE];
+export const endDependencies = [TOP_TOUCH_CANCEL, TOP_TOUCH_END];
diff --git a/packages/events/ResponderTouchHistoryStore.js b/packages/events/ResponderTouchHistoryStore.js
index 0c703a5970..807a5a08d9 100644
--- a/packages/events/ResponderTouchHistoryStore.js
+++ b/packages/events/ResponderTouchHistoryStore.js
@@ -10,7 +10,7 @@
 import invariant from 'fbjs/lib/invariant';
 import warning from 'fbjs/lib/warning';
 
-import {isEndish, isMoveish, isStartish} from './EventPluginUtils';
+import {isStartish, isMoveish, isEndish} from './ResponderTopLevelEventTypes';
 
 /**
  * Tracks the position and time of each active touch by `touch.identifier`. We
diff --git a/packages/events/TopLevelEventTypes.js b/packages/events/TopLevelEventTypes.js
new file mode 100644
index 0000000000..f9d4722abb
--- /dev/null
+++ b/packages/events/TopLevelEventTypes.js
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import type {DOMTopLevelEventType} from 'react-dom/src/events/DOMTopLevelEventTypes';
+
+type RNTopLevelEventType =
+  | 'topMouseDown'
+  | 'topMouseMove'
+  | 'topMouseUp'
+  | 'topScroll'
+  | 'topSelectionChange'
+  | 'topTouchCancel'
+  | 'topTouchEnd'
+  | 'topTouchMove'
+  | 'topTouchStart';
+
+export type TopLevelType = DOMTopLevelEventType | RNTopLevelEventType;
diff --git a/packages/events/forks/ResponderTopLevelEventTypes.dom.js b/packages/events/forks/ResponderTopLevelEventTypes.dom.js
new file mode 100644
index 0000000000..5e009dc56c
--- /dev/null
+++ b/packages/events/forks/ResponderTopLevelEventTypes.dom.js
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+// Note: ideally these would be imported from DOMTopLevelEventTypes,
+// but our build system currently doesn't let us do that from a fork.
+
+export const TOP_TOUCH_START = 'touchstart';
+export const TOP_TOUCH_MOVE = 'touchmove';
+export const TOP_TOUCH_END = 'touchend';
+export const TOP_TOUCH_CANCEL = 'touchcancel';
+export const TOP_SCROLL = 'scroll';
+export const TOP_SELECTION_CHANGE = 'selectionchange';
+export const TOP_MOUSE_DOWN = 'mousedown';
+export const TOP_MOUSE_MOVE = 'mousemove';
+export const TOP_MOUSE_UP = 'mouseup';
+
+export function isStartish(topLevelType: mixed): boolean {
+  return topLevelType === TOP_TOUCH_START || topLevelType === TOP_MOUSE_DOWN;
+}
+
+export function isMoveish(topLevelType: mixed): boolean {
+  return topLevelType === TOP_TOUCH_MOVE || topLevelType === TOP_MOUSE_MOVE;
+}
+
+export function isEndish(topLevelType: mixed): boolean {
+  return (
+    topLevelType === TOP_TOUCH_END ||
+    topLevelType === TOP_TOUCH_CANCEL ||
+    topLevelType === TOP_MOUSE_UP
+  );
+}
+
+export const startDependencies = [TOP_TOUCH_START, TOP_MOUSE_DOWN];
+export const moveDependencies = [TOP_TOUCH_MOVE, TOP_MOUSE_MOVE];
+export const endDependencies = [TOP_TOUCH_CANCEL, TOP_TOUCH_END, TOP_MOUSE_UP];
diff --git a/packages/react-dom/src/__tests__/ReactDOM-test.js b/packages/react-dom/src/__tests__/ReactDOM-test.js
index 5e7d2772e3..cca40165fd 100644
--- a/packages/react-dom/src/__tests__/ReactDOM-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOM-test.js
@@ -309,14 +309,9 @@ describe('ReactDOM', () => {
     const actual = [];
 
     function click(node) {
-      const fakeNativeEvent = function() {};
-      fakeNativeEvent.target = node;
-      fakeNativeEvent.path = [node, container];
-      ReactTestUtils.simulateNativeEventOnNode(
-        'topClick',
-        node,
-        fakeNativeEvent,
-      );
+      ReactTestUtils.Simulate.click(node, {
+        path: [node, container],
+      });
     }
 
     class Wrapper extends React.Component {
diff --git a/packages/react-dom/src/__tests__/ReactDOMFiber-test.js b/packages/react-dom/src/__tests__/ReactDOMFiber-test.js
index deffd4680d..a93dda6ce1 100644
--- a/packages/react-dom/src/__tests__/ReactDOMFiber-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMFiber-test.js
@@ -838,12 +838,7 @@ describe('ReactDOMFiber', () => {
 
     expect(portal.tagName).toBe('DIV');
 
-    const fakeNativeEvent = {};
-    ReactTestUtils.simulateNativeEventOnNode(
-      'topClick',
-      portal,
-      fakeNativeEvent,
-    );
+    ReactTestUtils.Simulate.click(portal);
 
     expect(ops).toEqual(['portal clicked', 'parent clicked']);
   });
@@ -858,14 +853,12 @@ describe('ReactDOMFiber', () => {
 
     function simulateMouseMove(from, to) {
       if (from) {
-        ReactTestUtils.simulateNativeEventOnNode('topMouseOut', from, {
-          target: from,
+        ReactTestUtils.SimulateNative.mouseOut(from, {
           relatedTarget: to,
         });
       }
       if (to) {
-        ReactTestUtils.simulateNativeEventOnNode('topMouseOver', to, {
-          target: to,
+        ReactTestUtils.SimulateNative.mouseOver(to, {
           relatedTarget: from,
         });
       }
@@ -983,12 +976,7 @@ describe('ReactDOMFiber', () => {
     expect(node.tagName).toEqual('DIV');
 
     function click(target) {
-      const fakeNativeEvent = {};
-      ReactTestUtils.simulateNativeEventOnNode(
-        'topClick',
-        target,
-        fakeNativeEvent,
-      );
+      ReactTestUtils.Simulate.click(target);
     }
 
     click(node);
diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index 03eed7bc1e..f5513557ec 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -694,10 +694,9 @@ describe('ReactDOMInput', () => {
 
     setUntrackedValue.call(node, 'giraffe');
 
-    const fakeNativeEvent = function() {};
-    fakeNativeEvent.target = node;
-    fakeNativeEvent.path = [node, container];
-    ReactTestUtils.simulateNativeEventOnNode('topInput', node, fakeNativeEvent);
+    ReactTestUtils.SimulateNative.input(node, {
+      path: [node, container],
+    });
 
     expect(handled).toBe(true);
   });
diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js
index ceb20873c2..4c3c7a9c1d 100644
--- a/packages/react-dom/src/client/ReactDOMFiberComponent.js
+++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js
@@ -21,8 +21,16 @@ import * as ReactDOMFiberTextarea from './ReactDOMFiberTextarea';
 import * as inputValueTracking from './inputValueTracking';
 import setInnerHTML from './setInnerHTML';
 import setTextContent from './setTextContent';
+import {
+  TOP_ERROR,
+  TOP_INVALID,
+  TOP_LOAD,
+  TOP_RESET,
+  TOP_SUBMIT,
+  TOP_TOGGLE,
+} from '../events/DOMTopLevelEventTypes';
 import {listenTo, trapBubbledEvent} from '../events/ReactBrowserEventEmitter';
-import {mediaEventTypes} from '../events/BrowserEventConstants';
+import {mediaEventTypes} from '../events/DOMTopLevelEventTypes';
 import * as CSSPropertyOperations from '../shared/CSSPropertyOperations';
 import {Namespaces, getIntrinsicNamespace} from '../shared/DOMNamespaces';
 import {
@@ -440,43 +448,41 @@ export function setInitialProperties(
   switch (tag) {
     case 'iframe':
     case 'object':
-      trapBubbledEvent('topLoad', 'load', domElement);
+      trapBubbledEvent(TOP_LOAD, domElement);
       props = rawProps;
       break;
     case 'video':
     case 'audio':
       // Create listener for each media event
-      for (const event in mediaEventTypes) {
-        if (mediaEventTypes.hasOwnProperty(event)) {
-          trapBubbledEvent(event, mediaEventTypes[event], domElement);
-        }
+      for (let i = 0; i < mediaEventTypes.length; i++) {
+        trapBubbledEvent(mediaEventTypes[i], domElement);
       }
       props = rawProps;
       break;
     case 'source':
-      trapBubbledEvent('topError', 'error', domElement);
+      trapBubbledEvent(TOP_ERROR, domElement);
       props = rawProps;
       break;
     case 'img':
     case 'image':
     case 'link':
-      trapBubbledEvent('topError', 'error', domElement);
-      trapBubbledEvent('topLoad', 'load', domElement);
+      trapBubbledEvent(TOP_ERROR, domElement);
+      trapBubbledEvent(TOP_LOAD, domElement);
       props = rawProps;
       break;
     case 'form':
-      trapBubbledEvent('topReset', 'reset', domElement);
-      trapBubbledEvent('topSubmit', 'submit', domElement);
+      trapBubbledEvent(TOP_RESET, domElement);
+      trapBubbledEvent(TOP_SUBMIT, domElement);
       props = rawProps;
       break;
     case 'details':
-      trapBubbledEvent('topToggle', 'toggle', domElement);
+      trapBubbledEvent(TOP_TOGGLE, domElement);
       props = rawProps;
       break;
     case 'input':
       ReactDOMFiberInput.initWrapperState(domElement, rawProps);
       props = ReactDOMFiberInput.getHostProps(domElement, rawProps);
-      trapBubbledEvent('topInvalid', 'invalid', domElement);
+      trapBubbledEvent(TOP_INVALID, domElement);
       // For controlled components we always need to ensure we're listening
       // to onChange. Even if there is no listener.
       ensureListeningTo(rootContainerElement, 'onChange');
@@ -488,7 +494,7 @@ export function setInitialProperties(
     case 'select':
       ReactDOMFiberSelect.initWrapperState(domElement, rawProps);
       props = ReactDOMFiberSelect.getHostProps(domElement, rawProps);
-      trapBubbledEvent('topInvalid', 'invalid', domElement);
+      trapBubbledEvent(TOP_INVALID, domElement);
       // For controlled components we always need to ensure we're listening
       // to onChange. Even if there is no listener.
       ensureListeningTo(rootContainerElement, 'onChange');
@@ -496,7 +502,7 @@ export function setInitialProperties(
     case 'textarea':
       ReactDOMFiberTextarea.initWrapperState(domElement, rawProps);
       props = ReactDOMFiberTextarea.getHostProps(domElement, rawProps);
-      trapBubbledEvent('topInvalid', 'invalid', domElement);
+      trapBubbledEvent(TOP_INVALID, domElement);
       // For controlled components we always need to ensure we're listening
       // to onChange. Even if there is no listener.
       ensureListeningTo(rootContainerElement, 'onChange');
@@ -829,36 +835,34 @@ export function diffHydratedProperties(
   switch (tag) {
     case 'iframe':
     case 'object':
-      trapBubbledEvent('topLoad', 'load', domElement);
+      trapBubbledEvent(TOP_LOAD, domElement);
       break;
     case 'video':
     case 'audio':
       // Create listener for each media event
-      for (const event in mediaEventTypes) {
-        if (mediaEventTypes.hasOwnProperty(event)) {
-          trapBubbledEvent(event, mediaEventTypes[event], domElement);
-        }
+      for (let i = 0; i < mediaEventTypes.length; i++) {
+        trapBubbledEvent(mediaEventTypes[i], domElement);
       }
       break;
     case 'source':
-      trapBubbledEvent('topError', 'error', domElement);
+      trapBubbledEvent(TOP_ERROR, domElement);
       break;
     case 'img':
     case 'image':
     case 'link':
-      trapBubbledEvent('topError', 'error', domElement);
-      trapBubbledEvent('topLoad', 'load', domElement);
+      trapBubbledEvent(TOP_ERROR, domElement);
+      trapBubbledEvent(TOP_LOAD, domElement);
       break;
     case 'form':
-      trapBubbledEvent('topReset', 'reset', domElement);
-      trapBubbledEvent('topSubmit', 'submit', domElement);
+      trapBubbledEvent(TOP_RESET, domElement);
+      trapBubbledEvent(TOP_SUBMIT, domElement);
       break;
     case 'details':
-      trapBubbledEvent('topToggle', 'toggle', domElement);
+      trapBubbledEvent(TOP_TOGGLE, domElement);
       break;
     case 'input':
       ReactDOMFiberInput.initWrapperState(domElement, rawProps);
-      trapBubbledEvent('topInvalid', 'invalid', domElement);
+      trapBubbledEvent(TOP_INVALID, domElement);
       // For controlled components we always need to ensure we're listening
       // to onChange. Even if there is no listener.
       ensureListeningTo(rootContainerElement, 'onChange');
@@ -868,14 +872,14 @@ export function diffHydratedProperties(
       break;
     case 'select':
       ReactDOMFiberSelect.initWrapperState(domElement, rawProps);
-      trapBubbledEvent('topInvalid', 'invalid', domElement);
+      trapBubbledEvent(TOP_INVALID, domElement);
       // For controlled components we always need to ensure we're listening
       // to onChange. Even if there is no listener.
       ensureListeningTo(rootContainerElement, 'onChange');
       break;
     case 'textarea':
       ReactDOMFiberTextarea.initWrapperState(domElement, rawProps);
-      trapBubbledEvent('topInvalid', 'invalid', domElement);
+      trapBubbledEvent(TOP_INVALID, domElement);
       // For controlled components we always need to ensure we're listening
       // to onChange. Even if there is no listener.
       ensureListeningTo(rootContainerElement, 'onChange');
diff --git a/packages/react-dom/src/events/BeforeInputEventPlugin.js b/packages/react-dom/src/events/BeforeInputEventPlugin.js
index 3307a70bde..9bdb8dab7d 100644
--- a/packages/react-dom/src/events/BeforeInputEventPlugin.js
+++ b/packages/react-dom/src/events/BeforeInputEventPlugin.js
@@ -5,11 +5,23 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {TopLevelTypes} from './BrowserEventConstants';
+import type {TopLevelType} from 'events/TopLevelEventTypes';
 
 import {accumulateTwoPhaseDispatches} from 'events/EventPropagators';
 import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
 
+import {
+  TOP_BLUR,
+  TOP_COMPOSITION_START,
+  TOP_COMPOSITION_END,
+  TOP_COMPOSITION_UPDATE,
+  TOP_KEY_DOWN,
+  TOP_KEY_PRESS,
+  TOP_KEY_UP,
+  TOP_MOUSE_DOWN,
+  TOP_TEXT_INPUT,
+  TOP_PASTE,
+} from './DOMTopLevelEventTypes';
 import * as FallbackCompositionState from './FallbackCompositionState';
 import SyntheticCompositionEvent from './SyntheticCompositionEvent';
 import SyntheticInputEvent from './SyntheticInputEvent';
@@ -50,10 +62,10 @@ const eventTypes = {
       captured: 'onBeforeInputCapture',
     },
     dependencies: [
-      'topCompositionEnd',
-      'topKeyPress',
-      'topTextInput',
-      'topPaste',
+      TOP_COMPOSITION_END,
+      TOP_KEY_PRESS,
+      TOP_TEXT_INPUT,
+      TOP_PASTE,
     ],
   },
   compositionEnd: {
@@ -62,12 +74,12 @@ const eventTypes = {
       captured: 'onCompositionEndCapture',
     },
     dependencies: [
-      'topBlur',
-      'topCompositionEnd',
-      'topKeyDown',
-      'topKeyPress',
-      'topKeyUp',
-      'topMouseDown',
+      TOP_BLUR,
+      TOP_COMPOSITION_END,
+      TOP_KEY_DOWN,
+      TOP_KEY_PRESS,
+      TOP_KEY_UP,
+      TOP_MOUSE_DOWN,
     ],
   },
   compositionStart: {
@@ -76,12 +88,12 @@ const eventTypes = {
       captured: 'onCompositionStartCapture',
     },
     dependencies: [
-      'topBlur',
-      'topCompositionStart',
-      'topKeyDown',
-      'topKeyPress',
-      'topKeyUp',
-      'topMouseDown',
+      TOP_BLUR,
+      TOP_COMPOSITION_START,
+      TOP_KEY_DOWN,
+      TOP_KEY_PRESS,
+      TOP_KEY_UP,
+      TOP_MOUSE_DOWN,
     ],
   },
   compositionUpdate: {
@@ -90,12 +102,12 @@ const eventTypes = {
       captured: 'onCompositionUpdateCapture',
     },
     dependencies: [
-      'topBlur',
-      'topCompositionUpdate',
-      'topKeyDown',
-      'topKeyPress',
-      'topKeyUp',
-      'topMouseDown',
+      TOP_BLUR,
+      TOP_COMPOSITION_UPDATE,
+      TOP_KEY_DOWN,
+      TOP_KEY_PRESS,
+      TOP_KEY_UP,
+      TOP_MOUSE_DOWN,
     ],
   },
 };
@@ -124,11 +136,11 @@ function isKeypressCommand(nativeEvent) {
  */
 function getCompositionEventType(topLevelType) {
   switch (topLevelType) {
-    case 'topCompositionStart':
+    case TOP_COMPOSITION_START:
       return eventTypes.compositionStart;
-    case 'topCompositionEnd':
+    case TOP_COMPOSITION_END:
       return eventTypes.compositionEnd;
-    case 'topCompositionUpdate':
+    case TOP_COMPOSITION_UPDATE:
       return eventTypes.compositionUpdate;
   }
 }
@@ -142,7 +154,7 @@ function getCompositionEventType(topLevelType) {
  * @return {boolean}
  */
 function isFallbackCompositionStart(topLevelType, nativeEvent) {
-  return topLevelType === 'topKeyDown' && nativeEvent.keyCode === START_KEYCODE;
+  return topLevelType === TOP_KEY_DOWN && nativeEvent.keyCode === START_KEYCODE;
 }
 
 /**
@@ -154,16 +166,16 @@ function isFallbackCompositionStart(topLevelType, nativeEvent) {
  */
 function isFallbackCompositionEnd(topLevelType, nativeEvent) {
   switch (topLevelType) {
-    case 'topKeyUp':
+    case TOP_KEY_UP:
       // Command keys insert or clear IME input.
       return END_KEYCODES.indexOf(nativeEvent.keyCode) !== -1;
-    case 'topKeyDown':
+    case TOP_KEY_DOWN:
       // Expect IME keyCode on each keydown. If we get any other
       // code we must have exited earlier.
       return nativeEvent.keyCode !== START_KEYCODE;
-    case 'topKeyPress':
-    case 'topMouseDown':
-    case 'topBlur':
+    case TOP_KEY_PRESS:
+    case TOP_MOUSE_DOWN:
+    case TOP_BLUR:
       // Events are not possible without cancelling IME.
       return true;
     default:
@@ -252,15 +264,15 @@ function extractCompositionEvent(
 }
 
 /**
- * @param {TopLevelTypes} topLevelType Record from `BrowserEventConstants`.
+ * @param {TopLevelType} topLevelType Number from `TopLevelType`.
  * @param {object} nativeEvent Native browser event.
  * @return {?string} The string corresponding to this `beforeInput` event.
  */
-function getNativeBeforeInputChars(topLevelType: TopLevelTypes, nativeEvent) {
+function getNativeBeforeInputChars(topLevelType: TopLevelType, nativeEvent) {
   switch (topLevelType) {
-    case 'topCompositionEnd':
+    case TOP_COMPOSITION_END:
       return getDataFromCustomEvent(nativeEvent);
-    case 'topKeyPress':
+    case TOP_KEY_PRESS:
       /**
        * If native `textInput` events are available, our goal is to make
        * use of them. However, there is a special case: the spacebar key.
@@ -283,7 +295,7 @@ function getNativeBeforeInputChars(topLevelType: TopLevelTypes, nativeEvent) {
       hasSpaceKeypress = true;
       return SPACEBAR_CHAR;
 
-    case 'topTextInput':
+    case TOP_TEXT_INPUT:
       // Record the characters to be added to the DOM.
       const chars = nativeEvent.data;
 
@@ -306,18 +318,18 @@ function getNativeBeforeInputChars(topLevelType: TopLevelTypes, nativeEvent) {
  * For browsers that do not provide the `textInput` event, extract the
  * appropriate string to use for SyntheticInputEvent.
  *
- * @param {string} topLevelType Record from `BrowserEventConstants`.
+ * @param {number} topLevelType Number from `TopLevelEventTypes`.
  * @param {object} nativeEvent Native browser event.
  * @return {?string} The fallback string for this `beforeInput` event.
  */
-function getFallbackBeforeInputChars(topLevelType: TopLevelTypes, nativeEvent) {
+function getFallbackBeforeInputChars(topLevelType: TopLevelType, nativeEvent) {
   // If we are currently composing (IME) and using a fallback to do so,
   // try to extract the composed characters from the fallback object.
   // If composition event is available, we extract a string only at
   // compositionevent, otherwise extract it at fallback events.
   if (isComposing) {
     if (
-      topLevelType === 'topCompositionEnd' ||
+      topLevelType === TOP_COMPOSITION_END ||
       (!canUseCompositionEvent &&
         isFallbackCompositionEnd(topLevelType, nativeEvent))
     ) {
@@ -330,11 +342,11 @@ function getFallbackBeforeInputChars(topLevelType: TopLevelTypes, nativeEvent) {
   }
 
   switch (topLevelType) {
-    case 'topPaste':
+    case TOP_PASTE:
       // If a paste event occurs after a keypress, throw out the input
       // chars. Paste events should not lead to BeforeInput events.
       return null;
-    case 'topKeyPress':
+    case TOP_KEY_PRESS:
       /**
        * As of v27, Firefox may fire keypress events even when no character
        * will be inserted. A few possibilities:
@@ -365,7 +377,7 @@ function getFallbackBeforeInputChars(topLevelType: TopLevelTypes, nativeEvent) {
         }
       }
       return null;
-    case 'topCompositionEnd':
+    case TOP_COMPOSITION_END:
       return useFallbackCompositionData ? null : nativeEvent.data;
     default:
       return null;
diff --git a/packages/react-dom/src/events/BrowserEventConstants.js b/packages/react-dom/src/events/BrowserEventConstants.js
deleted file mode 100644
index 203752892f..0000000000
--- a/packages/react-dom/src/events/BrowserEventConstants.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import getVendorPrefixedEventName from './getVendorPrefixedEventName';
-
-/**
- * Types of raw signals from the browser caught at the top level.
- *
- * For events like 'submit' or audio/video events which don't consistently
- * bubble (which we trap at a lower node than `document`), binding
- * at `document` would cause duplicate events so we don't include them here.
- */
-export const topLevelTypes = {
-  topAnimationEnd: getVendorPrefixedEventName('animationend'),
-  topAnimationIteration: getVendorPrefixedEventName('animationiteration'),
-  topAnimationStart: getVendorPrefixedEventName('animationstart'),
-  topBlur: 'blur',
-  topCancel: 'cancel',
-  topChange: 'change',
-  topClick: 'click',
-  topClose: 'close',
-  topCompositionEnd: 'compositionend',
-  topCompositionStart: 'compositionstart',
-  topCompositionUpdate: 'compositionupdate',
-  topContextMenu: 'contextmenu',
-  topCopy: 'copy',
-  topCut: 'cut',
-  topDoubleClick: 'dblclick',
-  topDrag: 'drag',
-  topDragEnd: 'dragend',
-  topDragEnter: 'dragenter',
-  topDragExit: 'dragexit',
-  topDragLeave: 'dragleave',
-  topDragOver: 'dragover',
-  topDragStart: 'dragstart',
-  topDrop: 'drop',
-  topFocus: 'focus',
-  topInput: 'input',
-  topKeyDown: 'keydown',
-  topKeyPress: 'keypress',
-  topKeyUp: 'keyup',
-  topLoad: 'load',
-  topLoadStart: 'loadstart',
-  topMouseDown: 'mousedown',
-  topMouseMove: 'mousemove',
-  topMouseOut: 'mouseout',
-  topMouseOver: 'mouseover',
-  topMouseUp: 'mouseup',
-  topPaste: 'paste',
-  topScroll: 'scroll',
-  topSelectionChange: 'selectionchange',
-  topTextInput: 'textInput',
-  topToggle: 'toggle',
-  topTouchCancel: 'touchcancel',
-  topTouchEnd: 'touchend',
-  topTouchMove: 'touchmove',
-  topTouchStart: 'touchstart',
-  topTransitionEnd: getVendorPrefixedEventName('transitionend'),
-  topWheel: 'wheel',
-};
-
-// There are so many media events, it makes sense to just
-// maintain a list of them. Note these aren't technically
-// "top-level" since they don't bubble. We should come up
-// with a better naming convention if we come to refactoring
-// the event system.
-export const mediaEventTypes = {
-  topAbort: 'abort',
-  topCanPlay: 'canplay',
-  topCanPlayThrough: 'canplaythrough',
-  topDurationChange: 'durationchange',
-  topEmptied: 'emptied',
-  topEncrypted: 'encrypted',
-  topEnded: 'ended',
-  topError: 'error',
-  topLoadedData: 'loadeddata',
-  topLoadedMetadata: 'loadedmetadata',
-  topLoadStart: 'loadstart',
-  topPause: 'pause',
-  topPlay: 'play',
-  topPlaying: 'playing',
-  topProgress: 'progress',
-  topRateChange: 'ratechange',
-  topSeeked: 'seeked',
-  topSeeking: 'seeking',
-  topStalled: 'stalled',
-  topSuspend: 'suspend',
-  topTimeUpdate: 'timeupdate',
-  topVolumeChange: 'volumechange',
-  topWaiting: 'waiting',
-};
-
-export type TopLevelTypes = $Enum<typeof topLevelTypes>;
diff --git a/packages/react-dom/src/events/ChangeEventPlugin.js b/packages/react-dom/src/events/ChangeEventPlugin.js
index 5e0dcbb3be..ce0d328d87 100644
--- a/packages/react-dom/src/events/ChangeEventPlugin.js
+++ b/packages/react-dom/src/events/ChangeEventPlugin.js
@@ -13,6 +13,16 @@ import SyntheticEvent from 'events/SyntheticEvent';
 import isTextInputElement from 'shared/isTextInputElement';
 import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
 
+import {
+  TOP_BLUR,
+  TOP_CHANGE,
+  TOP_CLICK,
+  TOP_FOCUS,
+  TOP_INPUT,
+  TOP_KEY_DOWN,
+  TOP_KEY_UP,
+  TOP_SELECTION_CHANGE,
+} from './DOMTopLevelEventTypes';
 import getEventTarget from './getEventTarget';
 import isEventSupported from './isEventSupported';
 import {getNodeFromInstance} from '../client/ReactDOMComponentTree';
@@ -26,14 +36,14 @@ const eventTypes = {
       captured: 'onChangeCapture',
     },
     dependencies: [
-      'topBlur',
-      'topChange',
-      'topClick',
-      'topFocus',
-      'topInput',
-      'topKeyDown',
-      'topKeyUp',
-      'topSelectionChange',
+      TOP_BLUR,
+      TOP_CHANGE,
+      TOP_CLICK,
+      TOP_FOCUS,
+      TOP_INPUT,
+      TOP_KEY_DOWN,
+      TOP_KEY_UP,
+      TOP_SELECTION_CHANGE,
     ],
   },
 };
@@ -100,7 +110,7 @@ function getInstIfValueChanged(targetInst) {
 }
 
 function getTargetInstForChangeEvent(topLevelType, targetInst) {
-  if (topLevelType === 'topChange') {
+  if (topLevelType === TOP_CHANGE) {
     return targetInst;
   }
 }
@@ -155,7 +165,7 @@ function handlePropertyChange(nativeEvent) {
 }
 
 function handleEventsForInputEventPolyfill(topLevelType, target, targetInst) {
-  if (topLevelType === 'topFocus') {
+  if (topLevelType === TOP_FOCUS) {
     // 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
@@ -168,7 +178,7 @@ function handleEventsForInputEventPolyfill(topLevelType, target, targetInst) {
     // missed a blur event somehow.
     stopWatchingForValueChange();
     startWatchingForValueChange(target, targetInst);
-  } else if (topLevelType === 'topBlur') {
+  } else if (topLevelType === TOP_BLUR) {
     stopWatchingForValueChange();
   }
 }
@@ -176,9 +186,9 @@ function handleEventsForInputEventPolyfill(topLevelType, target, targetInst) {
 // For IE8 and IE9.
 function getTargetInstForInputEventPolyfill(topLevelType, targetInst) {
   if (
-    topLevelType === 'topSelectionChange' ||
-    topLevelType === 'topKeyUp' ||
-    topLevelType === 'topKeyDown'
+    topLevelType === TOP_SELECTION_CHANGE ||
+    topLevelType === TOP_KEY_UP ||
+    topLevelType === TOP_KEY_DOWN
   ) {
     // On the selectionchange event, the target is just document which isn't
     // helpful for us so just check activeElement instead.
@@ -210,13 +220,13 @@ function shouldUseClickEvent(elem) {
 }
 
 function getTargetInstForClickEvent(topLevelType, targetInst) {
-  if (topLevelType === 'topClick') {
+  if (topLevelType === TOP_CLICK) {
     return getInstIfValueChanged(targetInst);
   }
 }
 
 function getTargetInstForInputOrChangeEvent(topLevelType, targetInst) {
-  if (topLevelType === 'topInput' || topLevelType === 'topChange') {
+  if (topLevelType === TOP_INPUT || topLevelType === TOP_CHANGE) {
     return getInstIfValueChanged(targetInst);
   }
 }
@@ -292,7 +302,7 @@ const ChangeEventPlugin = {
     }
 
     // When blurring, set the value attribute for number inputs
-    if (topLevelType === 'topBlur') {
+    if (topLevelType === TOP_BLUR) {
       handleControlledInputBlur(targetInst, targetNode);
     }
   },
diff --git a/packages/react-dom/src/events/DOMTopLevelEventTypes.js b/packages/react-dom/src/events/DOMTopLevelEventTypes.js
new file mode 100644
index 0000000000..79f13057f9
--- /dev/null
+++ b/packages/react-dom/src/events/DOMTopLevelEventTypes.js
@@ -0,0 +1,205 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import type {TopLevelType} from 'events/TopLevelEventTypes';
+import getVendorPrefixedEventName from './getVendorPrefixedEventName';
+
+/**
+ * To identify top level events in react-dom, we use constants defined by this
+ * module. Those are completely opaque to every other module but we rely on them
+ * being the raw DOM event names inside this module. This allows us to build a
+ * very efficient mapping from top level identifiers to the raw event type.
+ *
+ * The use of an `opaque` flow type makes sure that we can only access the value
+ * of a constant in this module.
+ */
+
+// eslint-disable-next-line no-undef
+export opaque type DOMTopLevelEventType =
+  | 'abort'
+  | 'animationend'
+  | 'animationiteration'
+  | 'animationstart'
+  | 'blur'
+  | 'canplay'
+  | 'canplaythrough'
+  | 'cancel'
+  | 'change'
+  | 'click'
+  | 'close'
+  | 'compositionend'
+  | 'compositionstart'
+  | 'compositionupdate'
+  | 'contextmenu'
+  | 'copy'
+  | 'cut'
+  | 'dblclick'
+  | 'drag'
+  | 'dragend'
+  | 'dragenter'
+  | 'dragexit'
+  | 'dragleave'
+  | 'dragover'
+  | 'dragstart'
+  | 'drop'
+  | 'durationchange'
+  | 'emptied'
+  | 'encrypted'
+  | 'ended'
+  | 'error'
+  | 'focus'
+  | 'input'
+  | 'invalid'
+  | 'keydown'
+  | 'keypress'
+  | 'keyup'
+  | 'load'
+  | 'loadstart'
+  | 'loadeddata'
+  | 'loadedmetadata'
+  | 'mousedown'
+  | 'mousemove'
+  | 'mouseout'
+  | 'mouseover'
+  | 'mouseup'
+  | 'paste'
+  | 'pause'
+  | 'play'
+  | 'playing'
+  | 'progress'
+  | 'ratechange'
+  | 'reset'
+  | 'scroll'
+  | 'seeked'
+  | 'seeking'
+  | 'selectionchange'
+  | 'stalled'
+  | 'submit'
+  | 'suspend'
+  | 'textInput'
+  | 'timeupdate'
+  | 'toggle'
+  | 'touchcancel'
+  | 'touchend'
+  | 'touchmove'
+  | 'touchstart'
+  | 'transitionend'
+  | 'volumechange'
+  | 'waiting'
+  | 'wheel';
+
+export const TOP_ABORT: TopLevelType = 'abort';
+export const TOP_ANIMATION_END: TopLevelType = getVendorPrefixedEventName(
+  'animationend',
+);
+export const TOP_ANIMATION_ITERATION: TopLevelType = getVendorPrefixedEventName(
+  'animationiteration',
+);
+export const TOP_ANIMATION_START: TopLevelType = getVendorPrefixedEventName(
+  'animationstart',
+);
+export const TOP_BLUR: TopLevelType = 'blur';
+export const TOP_CAN_PLAY: TopLevelType = 'canplay';
+export const TOP_CAN_PLAY_THROUGH: TopLevelType = 'canplaythrough';
+export const TOP_CANCEL: TopLevelType = 'cancel';
+export const TOP_CHANGE: TopLevelType = 'change';
+export const TOP_CLICK: TopLevelType = 'click';
+export const TOP_CLOSE: TopLevelType = 'close';
+export const TOP_COMPOSITION_END: TopLevelType = 'compositionend';
+export const TOP_COMPOSITION_START: TopLevelType = 'compositionstart';
+export const TOP_COMPOSITION_UPDATE: TopLevelType = 'compositionupdate';
+export const TOP_CONTEXT_MENU: TopLevelType = 'contextmenu';
+export const TOP_COPY: TopLevelType = 'copy';
+export const TOP_CUT: TopLevelType = 'cut';
+export const TOP_DOUBLE_CLICK: TopLevelType = 'dblclick';
+export const TOP_DRAG: TopLevelType = 'drag';
+export const TOP_DRAG_END: TopLevelType = 'dragend';
+export const TOP_DRAG_ENTER: TopLevelType = 'dragenter';
+export const TOP_DRAG_EXIT: TopLevelType = 'dragexit';
+export const TOP_DRAG_LEAVE: TopLevelType = 'dragleave';
+export const TOP_DRAG_OVER: TopLevelType = 'dragover';
+export const TOP_DRAG_START: TopLevelType = 'dragstart';
+export const TOP_DROP: TopLevelType = 'drop';
+export const TOP_DURATION_CHANGE: TopLevelType = 'durationchange';
+export const TOP_EMPTIED: TopLevelType = 'emptied';
+export const TOP_ENCRYPTED: TopLevelType = 'encrypted';
+export const TOP_ENDED: TopLevelType = 'ended';
+export const TOP_ERROR: TopLevelType = 'error';
+export const TOP_FOCUS: TopLevelType = 'focus';
+export const TOP_INPUT: TopLevelType = 'input';
+export const TOP_INVALID: TopLevelType = 'invalid';
+export const TOP_KEY_DOWN: TopLevelType = 'keydown';
+export const TOP_KEY_PRESS: TopLevelType = 'keypress';
+export const TOP_KEY_UP: TopLevelType = 'keyup';
+export const TOP_LOAD: TopLevelType = 'load';
+export const TOP_LOAD_START: TopLevelType = 'loadstart';
+export const TOP_LOADED_DATA: TopLevelType = 'loadeddata';
+export const TOP_LOADED_METADATA: TopLevelType = 'loadedmetadata';
+export const TOP_MOUSE_DOWN: TopLevelType = 'mousedown';
+export const TOP_MOUSE_MOVE: TopLevelType = 'mousemove';
+export const TOP_MOUSE_OUT: TopLevelType = 'mouseout';
+export const TOP_MOUSE_OVER: TopLevelType = 'mouseover';
+export const TOP_MOUSE_UP: TopLevelType = 'mouseup';
+export const TOP_PASTE: TopLevelType = 'paste';
+export const TOP_PAUSE: TopLevelType = 'pause';
+export const TOP_PLAY: TopLevelType = 'play';
+export const TOP_PLAYING: TopLevelType = 'playing';
+export const TOP_PROGRESS: TopLevelType = 'progress';
+export const TOP_RATE_CHANGE: TopLevelType = 'ratechange';
+export const TOP_RESET: TopLevelType = 'reset';
+export const TOP_SCROLL: TopLevelType = 'scroll';
+export const TOP_SEEKED: TopLevelType = 'seeked';
+export const TOP_SEEKING: TopLevelType = 'seeking';
+export const TOP_SELECTION_CHANGE: TopLevelType = 'selectionchange';
+export const TOP_STALLED: TopLevelType = 'stalled';
+export const TOP_SUBMIT: TopLevelType = 'submit';
+export const TOP_SUSPEND: TopLevelType = 'suspend';
+export const TOP_TEXT_INPUT: TopLevelType = 'textInput';
+export const TOP_TIME_UPDATE: TopLevelType = 'timeupdate';
+export const TOP_TOGGLE: TopLevelType = 'toggle';
+export const TOP_TOUCH_CANCEL: TopLevelType = 'touchcancel';
+export const TOP_TOUCH_END: TopLevelType = 'touchend';
+export const TOP_TOUCH_MOVE: TopLevelType = 'touchmove';
+export const TOP_TOUCH_START: TopLevelType = 'touchstart';
+export const TOP_TRANSITION_END: TopLevelType = getVendorPrefixedEventName(
+  'transitionend',
+);
+export const TOP_VOLUME_CHANGE: TopLevelType = 'volumechange';
+export const TOP_WAITING: TopLevelType = 'waiting';
+export const TOP_WHEEL: TopLevelType = 'wheel';
+
+export const mediaEventTypes: Array<TopLevelType> = [
+  TOP_ABORT,
+  TOP_CAN_PLAY,
+  TOP_CAN_PLAY_THROUGH,
+  TOP_DURATION_CHANGE,
+  TOP_EMPTIED,
+  TOP_ENCRYPTED,
+  TOP_ENDED,
+  TOP_ERROR,
+  TOP_LOADED_DATA,
+  TOP_LOADED_METADATA,
+  TOP_LOAD_START,
+  TOP_PAUSE,
+  TOP_PLAY,
+  TOP_PLAYING,
+  TOP_PROGRESS,
+  TOP_RATE_CHANGE,
+  TOP_SEEKED,
+  TOP_SEEKING,
+  TOP_STALLED,
+  TOP_SUSPEND,
+  TOP_TIME_UPDATE,
+  TOP_VOLUME_CHANGE,
+  TOP_WAITING,
+];
+
+export function getRawEventName(topLevelType: TopLevelType): string {
+  return topLevelType;
+}
diff --git a/packages/react-dom/src/events/EnterLeaveEventPlugin.js b/packages/react-dom/src/events/EnterLeaveEventPlugin.js
index 9a2be568c1..3e15dd8a90 100644
--- a/packages/react-dom/src/events/EnterLeaveEventPlugin.js
+++ b/packages/react-dom/src/events/EnterLeaveEventPlugin.js
@@ -7,6 +7,7 @@
 
 import {accumulateEnterLeaveDispatches} from 'events/EventPropagators';
 
+import {TOP_MOUSE_OUT, TOP_MOUSE_OVER} from './DOMTopLevelEventTypes';
 import SyntheticMouseEvent from './SyntheticMouseEvent';
 import {
   getClosestInstanceFromNode,
@@ -16,11 +17,11 @@ import {
 const eventTypes = {
   mouseEnter: {
     registrationName: 'onMouseEnter',
-    dependencies: ['topMouseOut', 'topMouseOver'],
+    dependencies: [TOP_MOUSE_OUT, TOP_MOUSE_OVER],
   },
   mouseLeave: {
     registrationName: 'onMouseLeave',
-    dependencies: ['topMouseOut', 'topMouseOver'],
+    dependencies: [TOP_MOUSE_OUT, TOP_MOUSE_OVER],
   },
 };
 
@@ -41,12 +42,12 @@ const EnterLeaveEventPlugin = {
     nativeEventTarget,
   ) {
     if (
-      topLevelType === 'topMouseOver' &&
+      topLevelType === TOP_MOUSE_OVER &&
       (nativeEvent.relatedTarget || nativeEvent.fromElement)
     ) {
       return null;
     }
-    if (topLevelType !== 'topMouseOut' && topLevelType !== 'topMouseOver') {
+    if (topLevelType !== TOP_MOUSE_OUT && topLevelType !== TOP_MOUSE_OVER) {
       // Must not be a mouse in or mouse out - ignoring.
       return null;
     }
@@ -67,7 +68,7 @@ const EnterLeaveEventPlugin = {
 
     let from;
     let to;
-    if (topLevelType === 'topMouseOut') {
+    if (topLevelType === TOP_MOUSE_OUT) {
       from = targetInst;
       const related = nativeEvent.relatedTarget || nativeEvent.toElement;
       to = related ? getClosestInstanceFromNode(related) : null;
diff --git a/packages/react-dom/src/events/EventListener.js b/packages/react-dom/src/events/EventListener.js
index e87c3886eb..8bec245b13 100644
--- a/packages/react-dom/src/events/EventListener.js
+++ b/packages/react-dom/src/events/EventListener.js
@@ -8,7 +8,7 @@
  */
 
 export function addEventBubbleListener(
-  element: Element,
+  element: Document | Element,
   eventType: string,
   listener: Function,
 ): void {
@@ -16,7 +16,7 @@ export function addEventBubbleListener(
 }
 
 export function addEventCaptureListener(
-  element: Element,
+  element: Document | Element,
   eventType: string,
   listener: Function,
 ): void {
diff --git a/packages/react-dom/src/events/ReactBrowserEventEmitter.js b/packages/react-dom/src/events/ReactBrowserEventEmitter.js
index 8991734a75..0a2742a654 100644
--- a/packages/react-dom/src/events/ReactBrowserEventEmitter.js
+++ b/packages/react-dom/src/events/ReactBrowserEventEmitter.js
@@ -3,9 +3,18 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
  */
 
 import {registrationNameDependencies} from 'events/EventPluginRegistry';
+import {
+  TOP_BLUR,
+  TOP_CANCEL,
+  TOP_CLOSE,
+  TOP_FOCUS,
+  TOP_SCROLL,
+} from './DOMTopLevelEventTypes';
 import {
   setEnabled,
   isEnabled,
@@ -13,7 +22,6 @@ import {
   trapCapturedEvent,
 } from './ReactDOMEventListener';
 import isEventSupported from './isEventSupported';
-import {topLevelTypes} from './BrowserEventConstants';
 
 /**
  * Summary of `ReactBrowserEventEmitter` event handling:
@@ -79,7 +87,7 @@ let reactTopListenersCounter = 0;
  */
 const topListenersIDKey = '_reactListenersID' + ('' + Math.random()).slice(2);
 
-function getListeningForDocument(mountAt) {
+function getListeningForDocument(mountAt: any) {
   // In IE8, `mountAt` is a host object and doesn't have `hasOwnProperty`
   // directly.
   if (!Object.prototype.hasOwnProperty.call(mountAt, topListenersIDKey)) {
@@ -108,37 +116,39 @@ function getListeningForDocument(mountAt) {
  * they bubble to document.
  *
  * @param {string} registrationName Name of listener (e.g. `onClick`).
- * @param {object} contentDocumentHandle Document which owns the container
+ * @param {object} mountAt Container where to mount the listener
  */
-export function listenTo(registrationName, contentDocumentHandle) {
-  const mountAt = contentDocumentHandle;
+export function listenTo(
+  registrationName: string,
+  mountAt: Document | Element,
+) {
   const isListening = getListeningForDocument(mountAt);
   const dependencies = registrationNameDependencies[registrationName];
 
   for (let i = 0; i < dependencies.length; i++) {
     const dependency = dependencies[i];
     if (!(isListening.hasOwnProperty(dependency) && isListening[dependency])) {
-      if (dependency === 'topScroll') {
-        trapCapturedEvent('topScroll', 'scroll', mountAt);
-      } else if (dependency === 'topFocus' || dependency === 'topBlur') {
-        trapCapturedEvent('topFocus', 'focus', mountAt);
-        trapCapturedEvent('topBlur', 'blur', mountAt);
+      if (dependency === TOP_SCROLL) {
+        trapCapturedEvent(TOP_SCROLL, mountAt);
+      } else if (dependency === TOP_FOCUS || dependency === TOP_BLUR) {
+        trapCapturedEvent(TOP_FOCUS, mountAt);
+        trapCapturedEvent(TOP_BLUR, mountAt);
 
         // to make sure blur and focus event listeners are only attached once
-        isListening.topBlur = true;
-        isListening.topFocus = true;
-      } else if (dependency === 'topCancel') {
+        isListening[TOP_BLUR] = true;
+        isListening[TOP_FOCUS] = true;
+      } else if (dependency === TOP_CANCEL) {
         if (isEventSupported('cancel', true)) {
-          trapCapturedEvent('topCancel', 'cancel', mountAt);
+          trapCapturedEvent(TOP_CANCEL, mountAt);
         }
-        isListening.topCancel = true;
-      } else if (dependency === 'topClose') {
+        isListening[TOP_CANCEL] = true;
+      } else if (dependency === TOP_CLOSE) {
         if (isEventSupported('close', true)) {
-          trapCapturedEvent('topClose', 'close', mountAt);
+          trapCapturedEvent(TOP_CLOSE, mountAt);
         }
-        isListening.topClose = true;
-      } else if (topLevelTypes.hasOwnProperty(dependency)) {
-        trapBubbledEvent(dependency, topLevelTypes[dependency], mountAt);
+        isListening[TOP_CLOSE] = true;
+      } else {
+        trapBubbledEvent(dependency, mountAt);
       }
 
       isListening[dependency] = true;
@@ -146,7 +156,10 @@ export function listenTo(registrationName, contentDocumentHandle) {
   }
 }
 
-export function isListeningToAllDependencies(registrationName, mountAt) {
+export function isListeningToAllDependencies(
+  registrationName: string,
+  mountAt: Document | Element,
+) {
   const isListening = getListeningForDocument(mountAt);
   const dependencies = registrationNameDependencies[registrationName];
   for (let i = 0; i < dependencies.length; i++) {
diff --git a/packages/react-dom/src/events/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js
index df831eb848..0125a8437b 100644
--- a/packages/react-dom/src/events/ReactDOMEventListener.js
+++ b/packages/react-dom/src/events/ReactDOMEventListener.js
@@ -3,17 +3,23 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
  */
 
 import {batchedUpdates, interactiveUpdates} from 'events/ReactGenericBatching';
 import {runExtractedEventsInBatch} from 'events/EventPluginHub';
 import {isFiberMounted} from 'react-reconciler/reflection';
 import {HostRoot} from 'shared/ReactTypeOfWork';
+import type {AnyNativeEvent} from 'events/PluginModuleType';
+import type {TopLevelType} from 'events/TopLevelEventTypes';
+import type {Fiber} from 'react-reconciler/src/ReactFiber';
 
 import {addEventBubbleListener, addEventCaptureListener} from './EventListener';
 import getEventTarget from './getEventTarget';
 import {getClosestInstanceFromNode} from '../client/ReactDOMComponentTree';
 import SimpleEventPlugin from './SimpleEventPlugin';
+import {getRawEventName} from './DOMTopLevelEventTypes';
 
 const {isInteractiveTopLevelEventType} = SimpleEventPlugin;
 
@@ -40,7 +46,16 @@ function findRootContainerNode(inst) {
 }
 
 // Used to store ancestor hierarchy in top level callback
-function getTopLevelCallbackBookKeeping(topLevelType, nativeEvent, targetInst) {
+function getTopLevelCallbackBookKeeping(
+  topLevelType,
+  nativeEvent,
+  targetInst,
+): {
+  topLevelType: ?TopLevelType,
+  nativeEvent: ?AnyNativeEvent,
+  targetInst: Fiber,
+  ancestors: Array<Fiber>,
+} {
   if (callbackBookkeepingPool.length) {
     const instance = callbackBookkeepingPool.pop();
     instance.topLevelType = topLevelType;
@@ -101,7 +116,7 @@ function handleTopLevel(bookKeeping) {
 // TODO: can we stop exporting these?
 export let _enabled = true;
 
-export function setEnabled(enabled) {
+export function setEnabled(enabled: ?boolean) {
   _enabled = !!enabled;
 }
 
@@ -112,14 +127,16 @@ export function isEnabled() {
 /**
  * Traps top-level events by using event bubbling.
  *
- * @param {string} topLevelType Record from `BrowserEventConstants`.
- * @param {string} handlerBaseName Event name (e.g. "click").
+ * @param {number} topLevelType Number from `TopLevelEventTypes`.
  * @param {object} element Element on which to attach listener.
  * @return {?object} An object with a remove function which will forcefully
  *                  remove the listener.
  * @internal
  */
-export function trapBubbledEvent(topLevelType, handlerBaseName, element) {
+export function trapBubbledEvent(
+  topLevelType: TopLevelType,
+  element: Document | Element,
+) {
   if (!element) {
     return null;
   }
@@ -129,7 +146,7 @@ export function trapBubbledEvent(topLevelType, handlerBaseName, element) {
 
   addEventBubbleListener(
     element,
-    handlerBaseName,
+    getRawEventName(topLevelType),
     // Check if interactive and wrap in interactiveUpdates
     dispatch.bind(null, topLevelType),
   );
@@ -138,14 +155,16 @@ export function trapBubbledEvent(topLevelType, handlerBaseName, element) {
 /**
  * Traps a top-level event by using event capturing.
  *
- * @param {string} topLevelType Record from `BrowserEventConstants`.
- * @param {string} handlerBaseName Event name (e.g. "click").
+ * @param {number} topLevelType Number from `TopLevelEventTypes`.
  * @param {object} element Element on which to attach listener.
  * @return {?object} An object with a remove function which will forcefully
  *                  remove the listener.
  * @internal
  */
-export function trapCapturedEvent(topLevelType, handlerBaseName, element) {
+export function trapCapturedEvent(
+  topLevelType: TopLevelType,
+  element: Document | Element,
+) {
   if (!element) {
     return null;
   }
@@ -155,7 +174,7 @@ export function trapCapturedEvent(topLevelType, handlerBaseName, element) {
 
   addEventCaptureListener(
     element,
-    handlerBaseName,
+    getRawEventName(topLevelType),
     // Check if interactive and wrap in interactiveUpdates
     dispatch.bind(null, topLevelType),
   );
@@ -165,7 +184,10 @@ function dispatchInteractiveEvent(topLevelType, nativeEvent) {
   interactiveUpdates(dispatchEvent, topLevelType, nativeEvent);
 }
 
-export function dispatchEvent(topLevelType, nativeEvent) {
+export function dispatchEvent(
+  topLevelType: TopLevelType,
+  nativeEvent: AnyNativeEvent,
+) {
   if (!_enabled) {
     return;
   }
diff --git a/packages/react-dom/src/events/SelectEventPlugin.js b/packages/react-dom/src/events/SelectEventPlugin.js
index e6193c7973..81cc5d5186 100644
--- a/packages/react-dom/src/events/SelectEventPlugin.js
+++ b/packages/react-dom/src/events/SelectEventPlugin.js
@@ -12,6 +12,16 @@ import isTextInputElement from 'shared/isTextInputElement';
 import getActiveElement from 'fbjs/lib/getActiveElement';
 import shallowEqual from 'fbjs/lib/shallowEqual';
 
+import {
+  TOP_BLUR,
+  TOP_CONTEXT_MENU,
+  TOP_FOCUS,
+  TOP_KEY_DOWN,
+  TOP_KEY_UP,
+  TOP_MOUSE_DOWN,
+  TOP_MOUSE_UP,
+  TOP_SELECTION_CHANGE,
+} from './DOMTopLevelEventTypes';
 import {isListeningToAllDependencies} from './ReactBrowserEventEmitter';
 import {getNodeFromInstance} from '../client/ReactDOMComponentTree';
 import * as ReactInputSelection from '../client/ReactInputSelection';
@@ -29,14 +39,14 @@ const eventTypes = {
       captured: 'onSelectCapture',
     },
     dependencies: [
-      'topBlur',
-      'topContextMenu',
-      'topFocus',
-      'topKeyDown',
-      'topKeyUp',
-      'topMouseDown',
-      'topMouseUp',
-      'topSelectionChange',
+      TOP_BLUR,
+      TOP_CONTEXT_MENU,
+      TOP_FOCUS,
+      TOP_KEY_DOWN,
+      TOP_KEY_UP,
+      TOP_MOUSE_DOWN,
+      TOP_MOUSE_UP,
+      TOP_SELECTION_CHANGE,
     ],
   },
 };
@@ -156,7 +166,7 @@ const SelectEventPlugin = {
 
     switch (topLevelType) {
       // Track the input node that has focus.
-      case 'topFocus':
+      case TOP_FOCUS:
         if (
           isTextInputElement(targetNode) ||
           targetNode.contentEditable === 'true'
@@ -166,18 +176,18 @@ const SelectEventPlugin = {
           lastSelection = null;
         }
         break;
-      case 'topBlur':
+      case TOP_BLUR:
         activeElement = null;
         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':
+      case TOP_MOUSE_DOWN:
         mouseDown = true;
         break;
-      case 'topContextMenu':
-      case 'topMouseUp':
+      case TOP_CONTEXT_MENU:
+      case TOP_MOUSE_UP:
         mouseDown = false;
         return constructSelectEvent(nativeEvent, nativeEventTarget);
       // Chrome and IE fire non-standard event when selection is changed (and
@@ -189,13 +199,13 @@ const SelectEventPlugin = {
       // keyup, but we check on keydown as well in the case of holding down a
       // key, when multiple keydown events are fired but only one keyup is.
       // This is also our approach for IE handling, for the reason above.
-      case 'topSelectionChange':
+      case TOP_SELECTION_CHANGE:
         if (skipSelectionChangeEvent) {
           break;
         }
       // falls through
-      case 'topKeyDown':
-      case 'topKeyUp':
+      case TOP_KEY_DOWN:
+      case TOP_KEY_UP:
         return constructSelectEvent(nativeEvent, nativeEventTarget);
     }
 
diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js
index 602624dd31..6da1d244c9 100644
--- a/packages/react-dom/src/events/SimpleEventPlugin.js
+++ b/packages/react-dom/src/events/SimpleEventPlugin.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {TopLevelTypes} from './BrowserEventConstants';
+import type {TopLevelType} from 'events/TopLevelEventTypes';
 import type {
   DispatchConfig,
   ReactSyntheticEvent,
@@ -17,6 +17,8 @@ import type {EventTypes, PluginModule} from 'events/PluginModuleType';
 
 import {accumulateTwoPhaseDispatches} from 'events/EventPropagators';
 import SyntheticEvent from 'events/SyntheticEvent';
+
+import * as DOMTopLevelEventTypes from './DOMTopLevelEventTypes';
 import warning from 'fbjs/lib/warning';
 
 import SyntheticAnimationEvent from './SyntheticAnimationEvent';
@@ -41,93 +43,96 @@ import getEventCharCode from './getEventCharCode';
  *       bubbled: 'onAbort',
  *       captured: 'onAbortCapture',
  *     },
- *     dependencies: ['topAbort'],
+ *     dependencies: [TOP_ABORT],
  *   },
  *   ...
  * };
- * topLevelEventsToDispatchConfig = {
- *   'topAbort': { sameConfig }
- * };
+ * topLevelEventsToDispatchConfig = new Map([
+ *   [TOP_ABORT, { sameConfig }],
+ * ]);
  */
-const interactiveEventTypeNames: Array<string> = [
-  'blur',
-  'cancel',
-  'click',
-  'close',
-  'contextMenu',
-  'copy',
-  'cut',
-  'doubleClick',
-  'dragEnd',
-  'dragStart',
-  'drop',
-  'focus',
-  'input',
-  'invalid',
-  'keyDown',
-  'keyPress',
-  'keyUp',
-  'mouseDown',
-  'mouseUp',
-  'paste',
-  'pause',
-  'play',
-  'rateChange',
-  'reset',
-  'seeked',
-  'submit',
-  'touchCancel',
-  'touchEnd',
-  'touchStart',
-  'volumeChange',
+type EventTuple = [TopLevelType, string];
+const interactiveEventTypeNames: Array<EventTuple> = [
+  [DOMTopLevelEventTypes.TOP_BLUR, 'blur'],
+  [DOMTopLevelEventTypes.TOP_CANCEL, 'cancel'],
+  [DOMTopLevelEventTypes.TOP_CLICK, 'click'],
+  [DOMTopLevelEventTypes.TOP_CLOSE, 'close'],
+  [DOMTopLevelEventTypes.TOP_CONTEXT_MENU, 'contextMenu'],
+  [DOMTopLevelEventTypes.TOP_COPY, 'copy'],
+  [DOMTopLevelEventTypes.TOP_CUT, 'cut'],
+  [DOMTopLevelEventTypes.TOP_DOUBLE_CLICK, 'doubleClick'],
+  [DOMTopLevelEventTypes.TOP_DRAG_END, 'dragEnd'],
+  [DOMTopLevelEventTypes.TOP_DRAG_START, 'dragStart'],
+  [DOMTopLevelEventTypes.TOP_DROP, 'drop'],
+  [DOMTopLevelEventTypes.TOP_FOCUS, 'focus'],
+  [DOMTopLevelEventTypes.TOP_INPUT, 'input'],
+  [DOMTopLevelEventTypes.TOP_INVALID, 'invalid'],
+  [DOMTopLevelEventTypes.TOP_KEY_DOWN, 'keyDown'],
+  [DOMTopLevelEventTypes.TOP_KEY_PRESS, 'keyPress'],
+  [DOMTopLevelEventTypes.TOP_KEY_UP, 'keyUp'],
+  [DOMTopLevelEventTypes.TOP_MOUSE_DOWN, 'mouseDown'],
+  [DOMTopLevelEventTypes.TOP_MOUSE_UP, 'mouseUp'],
+  [DOMTopLevelEventTypes.TOP_PASTE, 'paste'],
+  [DOMTopLevelEventTypes.TOP_PAUSE, 'pause'],
+  [DOMTopLevelEventTypes.TOP_PLAY, 'play'],
+  [DOMTopLevelEventTypes.TOP_RATE_CHANGE, 'rateChange'],
+  [DOMTopLevelEventTypes.TOP_RESET, 'reset'],
+  [DOMTopLevelEventTypes.TOP_SEEKED, 'seeked'],
+  [DOMTopLevelEventTypes.TOP_SUBMIT, 'submit'],
+  [DOMTopLevelEventTypes.TOP_TOUCH_CANCEL, 'touchCancel'],
+  [DOMTopLevelEventTypes.TOP_TOUCH_END, 'touchEnd'],
+  [DOMTopLevelEventTypes.TOP_TOUCH_START, 'touchStart'],
+  [DOMTopLevelEventTypes.TOP_VOLUME_CHANGE, 'volumeChange'],
 ];
-const nonInteractiveEventTypeNames: Array<string> = [
-  'abort',
-  'animationEnd',
-  'animationIteration',
-  'animationStart',
-  'canPlay',
-  'canPlayThrough',
-  'drag',
-  'dragEnter',
-  'dragExit',
-  'dragLeave',
-  'dragOver',
-  'durationChange',
-  'emptied',
-  'encrypted',
-  'ended',
-  'error',
-  'load',
-  'loadedData',
-  'loadedMetadata',
-  'loadStart',
-  'mouseMove',
-  'mouseOut',
-  'mouseOver',
-  'playing',
-  'progress',
-  'scroll',
-  'seeking',
-  'stalled',
-  'suspend',
-  'timeUpdate',
-  'toggle',
-  'touchMove',
-  'transitionEnd',
-  'waiting',
-  'wheel',
+const nonInteractiveEventTypeNames: Array<EventTuple> = [
+  [DOMTopLevelEventTypes.TOP_ABORT, 'abort'],
+  [DOMTopLevelEventTypes.TOP_ANIMATION_END, 'animationEnd'],
+  [DOMTopLevelEventTypes.TOP_ANIMATION_ITERATION, 'animationIteration'],
+  [DOMTopLevelEventTypes.TOP_ANIMATION_START, 'animationStart'],
+  [DOMTopLevelEventTypes.TOP_CAN_PLAY, 'canPlay'],
+  [DOMTopLevelEventTypes.TOP_CAN_PLAY_THROUGH, 'canPlayThrough'],
+  [DOMTopLevelEventTypes.TOP_DRAG, 'drag'],
+  [DOMTopLevelEventTypes.TOP_DRAG_ENTER, 'dragEnter'],
+  [DOMTopLevelEventTypes.TOP_DRAG_EXIT, 'dragExit'],
+  [DOMTopLevelEventTypes.TOP_DRAG_LEAVE, 'dragLeave'],
+  [DOMTopLevelEventTypes.TOP_DRAG_OVER, 'dragOver'],
+  [DOMTopLevelEventTypes.TOP_DURATION_CHANGE, 'durationChange'],
+  [DOMTopLevelEventTypes.TOP_EMPTIED, 'emptied'],
+  [DOMTopLevelEventTypes.TOP_ENCRYPTED, 'encrypted'],
+  [DOMTopLevelEventTypes.TOP_ENDED, 'ended'],
+  [DOMTopLevelEventTypes.TOP_ERROR, 'error'],
+  [DOMTopLevelEventTypes.TOP_LOAD, 'load'],
+  [DOMTopLevelEventTypes.TOP_LOADED_DATA, 'loadedData'],
+  [DOMTopLevelEventTypes.TOP_LOADED_METADATA, 'loadedMetadata'],
+  [DOMTopLevelEventTypes.TOP_LOAD_START, 'loadStart'],
+  [DOMTopLevelEventTypes.TOP_MOUSE_MOVE, 'mouseMove'],
+  [DOMTopLevelEventTypes.TOP_MOUSE_OUT, 'mouseOut'],
+  [DOMTopLevelEventTypes.TOP_MOUSE_OVER, 'mouseOver'],
+  [DOMTopLevelEventTypes.TOP_PLAYING, 'playing'],
+  [DOMTopLevelEventTypes.TOP_PROGRESS, 'progress'],
+  [DOMTopLevelEventTypes.TOP_SCROLL, 'scroll'],
+  [DOMTopLevelEventTypes.TOP_SEEKING, 'seeking'],
+  [DOMTopLevelEventTypes.TOP_STALLED, 'stalled'],
+  [DOMTopLevelEventTypes.TOP_SUSPEND, 'suspend'],
+  [DOMTopLevelEventTypes.TOP_TIME_UPDATE, 'timeUpdate'],
+  [DOMTopLevelEventTypes.TOP_TOGGLE, 'toggle'],
+  [DOMTopLevelEventTypes.TOP_TOUCH_MOVE, 'touchMove'],
+  [DOMTopLevelEventTypes.TOP_TRANSITION_END, 'transitionEnd'],
+  [DOMTopLevelEventTypes.TOP_WAITING, 'waiting'],
+  [DOMTopLevelEventTypes.TOP_WHEEL, 'wheel'],
 ];
 
 const eventTypes: EventTypes = {};
 const topLevelEventsToDispatchConfig: {
-  [key: TopLevelTypes]: DispatchConfig,
+  [key: TopLevelType]: DispatchConfig,
 } = {};
 
-function addEventTypeNameToConfig(event: string, isInteractive: boolean) {
+function addEventTypeNameToConfig(
+  [topEvent, event]: EventTuple,
+  isInteractive: boolean,
+) {
   const capitalizedEvent = event[0].toUpperCase() + event.slice(1);
   const onEvent = 'on' + capitalizedEvent;
-  const topEvent = 'top' + capitalizedEvent;
 
   const type = {
     phasedRegistrationNames: {
@@ -141,58 +146,60 @@ function addEventTypeNameToConfig(event: string, isInteractive: boolean) {
   topLevelEventsToDispatchConfig[topEvent] = type;
 }
 
-interactiveEventTypeNames.forEach(eventTypeName => {
-  addEventTypeNameToConfig(eventTypeName, true);
+interactiveEventTypeNames.forEach(eventTuple => {
+  addEventTypeNameToConfig(eventTuple, true);
 });
-nonInteractiveEventTypeNames.forEach(eventTypeName => {
-  addEventTypeNameToConfig(eventTypeName, false);
+nonInteractiveEventTypeNames.forEach(eventTuple => {
+  addEventTypeNameToConfig(eventTuple, false);
 });
 
 // Only used in DEV for exhaustiveness validation.
-const knownHTMLTopLevelTypes = [
-  'topAbort',
-  'topCancel',
-  'topCanPlay',
-  'topCanPlayThrough',
-  'topClose',
-  'topDurationChange',
-  'topEmptied',
-  'topEncrypted',
-  'topEnded',
-  'topError',
-  'topInput',
-  'topInvalid',
-  'topLoad',
-  'topLoadedData',
-  'topLoadedMetadata',
-  'topLoadStart',
-  'topPause',
-  'topPlay',
-  'topPlaying',
-  'topProgress',
-  'topRateChange',
-  'topReset',
-  'topSeeked',
-  'topSeeking',
-  'topStalled',
-  'topSubmit',
-  'topSuspend',
-  'topTimeUpdate',
-  'topToggle',
-  'topVolumeChange',
-  'topWaiting',
+const knownHTMLTopLevelTypes: Array<TopLevelType> = [
+  DOMTopLevelEventTypes.TOP_ABORT,
+  DOMTopLevelEventTypes.TOP_CANCEL,
+  DOMTopLevelEventTypes.TOP_CAN_PLAY,
+  DOMTopLevelEventTypes.TOP_CAN_PLAY_THROUGH,
+  DOMTopLevelEventTypes.TOP_CLOSE,
+  DOMTopLevelEventTypes.TOP_DURATION_CHANGE,
+  DOMTopLevelEventTypes.TOP_EMPTIED,
+  DOMTopLevelEventTypes.TOP_ENCRYPTED,
+  DOMTopLevelEventTypes.TOP_ENDED,
+  DOMTopLevelEventTypes.TOP_ERROR,
+  DOMTopLevelEventTypes.TOP_INPUT,
+  DOMTopLevelEventTypes.TOP_INVALID,
+  DOMTopLevelEventTypes.TOP_LOAD,
+  DOMTopLevelEventTypes.TOP_LOADED_DATA,
+  DOMTopLevelEventTypes.TOP_LOADED_METADATA,
+  DOMTopLevelEventTypes.TOP_LOAD_START,
+  DOMTopLevelEventTypes.TOP_PAUSE,
+  DOMTopLevelEventTypes.TOP_PLAY,
+  DOMTopLevelEventTypes.TOP_PLAYING,
+  DOMTopLevelEventTypes.TOP_PROGRESS,
+  DOMTopLevelEventTypes.TOP_RATE_CHANGE,
+  DOMTopLevelEventTypes.TOP_RESET,
+  DOMTopLevelEventTypes.TOP_SEEKED,
+  DOMTopLevelEventTypes.TOP_SEEKING,
+  DOMTopLevelEventTypes.TOP_STALLED,
+  DOMTopLevelEventTypes.TOP_SUBMIT,
+  DOMTopLevelEventTypes.TOP_SUSPEND,
+  DOMTopLevelEventTypes.TOP_TIME_UPDATE,
+  DOMTopLevelEventTypes.TOP_TOGGLE,
+  DOMTopLevelEventTypes.TOP_VOLUME_CHANGE,
+  DOMTopLevelEventTypes.TOP_WAITING,
 ];
 
-const SimpleEventPlugin: PluginModule<MouseEvent> = {
+const SimpleEventPlugin: PluginModule<MouseEvent> & {
+  isInteractiveTopLevelEventType: (topLevelType: TopLevelType) => boolean,
+} = {
   eventTypes: eventTypes,
 
-  isInteractiveTopLevelEventType(topLevelType: TopLevelTypes): boolean {
+  isInteractiveTopLevelEventType(topLevelType: TopLevelType): boolean {
     const config = topLevelEventsToDispatchConfig[topLevelType];
     return config !== undefined && config.isInteractive === true;
   },
 
   extractEvents: function(
-    topLevelType: TopLevelTypes,
+    topLevelType: TopLevelType,
     targetInst: Fiber,
     nativeEvent: MouseEvent,
     nativeEventTarget: EventTarget,
@@ -203,7 +210,7 @@ const SimpleEventPlugin: PluginModule<MouseEvent> = {
     }
     let EventConstructor;
     switch (topLevelType) {
-      case 'topKeyPress':
+      case DOMTopLevelEventTypes.TOP_KEY_PRESS:
         // Firefox creates a keypress event for function keys too. This removes
         // the unwanted keypress events. Enter is however both printable and
         // non-printable. One would expect Tab to be as well (but it isn't).
@@ -211,65 +218,65 @@ const SimpleEventPlugin: PluginModule<MouseEvent> = {
           return null;
         }
       /* falls through */
-      case 'topKeyDown':
-      case 'topKeyUp':
+      case DOMTopLevelEventTypes.TOP_KEY_DOWN:
+      case DOMTopLevelEventTypes.TOP_KEY_UP:
         EventConstructor = SyntheticKeyboardEvent;
         break;
-      case 'topBlur':
-      case 'topFocus':
+      case DOMTopLevelEventTypes.TOP_BLUR:
+      case DOMTopLevelEventTypes.TOP_FOCUS:
         EventConstructor = SyntheticFocusEvent;
         break;
-      case 'topClick':
+      case DOMTopLevelEventTypes.TOP_CLICK:
         // Firefox creates a click event on right mouse clicks. This removes the
         // unwanted click events.
         if (nativeEvent.button === 2) {
           return null;
         }
       /* falls through */
-      case 'topDoubleClick':
-      case 'topMouseDown':
-      case 'topMouseMove':
-      case 'topMouseUp':
+      case DOMTopLevelEventTypes.TOP_DOUBLE_CLICK:
+      case DOMTopLevelEventTypes.TOP_MOUSE_DOWN:
+      case DOMTopLevelEventTypes.TOP_MOUSE_MOVE:
+      case DOMTopLevelEventTypes.TOP_MOUSE_UP:
       // TODO: Disabled elements should not respond to mouse events
       /* falls through */
-      case 'topMouseOut':
-      case 'topMouseOver':
-      case 'topContextMenu':
+      case DOMTopLevelEventTypes.TOP_MOUSE_OUT:
+      case DOMTopLevelEventTypes.TOP_MOUSE_OVER:
+      case DOMTopLevelEventTypes.TOP_CONTEXT_MENU:
         EventConstructor = SyntheticMouseEvent;
         break;
-      case 'topDrag':
-      case 'topDragEnd':
-      case 'topDragEnter':
-      case 'topDragExit':
-      case 'topDragLeave':
-      case 'topDragOver':
-      case 'topDragStart':
-      case 'topDrop':
+      case DOMTopLevelEventTypes.TOP_DRAG:
+      case DOMTopLevelEventTypes.TOP_DRAG_END:
+      case DOMTopLevelEventTypes.TOP_DRAG_ENTER:
+      case DOMTopLevelEventTypes.TOP_DRAG_EXIT:
+      case DOMTopLevelEventTypes.TOP_DRAG_LEAVE:
+      case DOMTopLevelEventTypes.TOP_DRAG_OVER:
+      case DOMTopLevelEventTypes.TOP_DRAG_START:
+      case DOMTopLevelEventTypes.TOP_DROP:
         EventConstructor = SyntheticDragEvent;
         break;
-      case 'topTouchCancel':
-      case 'topTouchEnd':
-      case 'topTouchMove':
-      case 'topTouchStart':
+      case DOMTopLevelEventTypes.TOP_TOUCH_CANCEL:
+      case DOMTopLevelEventTypes.TOP_TOUCH_END:
+      case DOMTopLevelEventTypes.TOP_TOUCH_MOVE:
+      case DOMTopLevelEventTypes.TOP_TOUCH_START:
         EventConstructor = SyntheticTouchEvent;
         break;
-      case 'topAnimationEnd':
-      case 'topAnimationIteration':
-      case 'topAnimationStart':
+      case DOMTopLevelEventTypes.TOP_ANIMATION_END:
+      case DOMTopLevelEventTypes.TOP_ANIMATION_ITERATION:
+      case DOMTopLevelEventTypes.TOP_ANIMATION_START:
         EventConstructor = SyntheticAnimationEvent;
         break;
-      case 'topTransitionEnd':
+      case DOMTopLevelEventTypes.TOP_TRANSITION_END:
         EventConstructor = SyntheticTransitionEvent;
         break;
-      case 'topScroll':
+      case DOMTopLevelEventTypes.TOP_SCROLL:
         EventConstructor = SyntheticUIEvent;
         break;
-      case 'topWheel':
+      case DOMTopLevelEventTypes.TOP_WHEEL:
         EventConstructor = SyntheticWheelEvent;
         break;
-      case 'topCopy':
-      case 'topCut':
-      case 'topPaste':
+      case DOMTopLevelEventTypes.TOP_COPY:
+      case DOMTopLevelEventTypes.TOP_CUT:
+      case DOMTopLevelEventTypes.TOP_PASTE:
         EventConstructor = SyntheticClipboardEvent;
         break;
       default:
diff --git a/packages/react-dom/src/events/TapEventPlugin.js b/packages/react-dom/src/events/TapEventPlugin.js
index e1e67a5d70..772e5d405f 100644
--- a/packages/react-dom/src/events/TapEventPlugin.js
+++ b/packages/react-dom/src/events/TapEventPlugin.js
@@ -7,12 +7,33 @@
  * @flow
  */
 
-import {isStartish, isEndish} from 'events/EventPluginUtils';
 import {accumulateTwoPhaseDispatches} from 'events/EventPropagators';
 import TouchEventUtils from 'fbjs/lib/TouchEventUtils';
+import type {TopLevelType} from 'events/TopLevelEventTypes';
 
+import {
+  TOP_MOUSE_DOWN,
+  TOP_MOUSE_MOVE,
+  TOP_MOUSE_UP,
+  TOP_TOUCH_CANCEL,
+  TOP_TOUCH_END,
+  TOP_TOUCH_MOVE,
+  TOP_TOUCH_START,
+} from './DOMTopLevelEventTypes';
 import SyntheticUIEvent from './SyntheticUIEvent';
 
+function isStartish(topLevelType) {
+  return topLevelType === TOP_MOUSE_DOWN || topLevelType === TOP_TOUCH_START;
+}
+
+function isEndish(topLevelType) {
+  return (
+    topLevelType === TOP_MOUSE_UP ||
+    topLevelType === TOP_TOUCH_END ||
+    topLevelType === TOP_TOUCH_CANCEL
+  );
+}
+
 /**
  * We are extending the Flow 'Touch' declaration to enable using bracket
  * notation to access properties.
@@ -75,13 +96,13 @@ function getDistance(coords: CoordinatesType, nativeEvent: _Touch): number {
 }
 
 const touchEvents = [
-  'topTouchStart',
-  'topTouchCancel',
-  'topTouchEnd',
-  'topTouchMove',
+  TOP_TOUCH_START,
+  TOP_TOUCH_CANCEL,
+  TOP_TOUCH_END,
+  TOP_TOUCH_MOVE,
 ];
 
-const dependencies = ['topMouseDown', 'topMouseMove', 'topMouseUp'].concat(
+const dependencies = [TOP_MOUSE_DOWN, TOP_MOUSE_MOVE, TOP_MOUSE_UP].concat(
   touchEvents,
 );
 
@@ -105,7 +126,7 @@ const TapEventPlugin = {
   eventTypes: eventTypes,
 
   extractEvents: function(
-    topLevelType: mixed,
+    topLevelType: TopLevelType,
     targetInst: mixed,
     nativeEvent: _Touch,
     nativeEventTarget: EventTarget,
diff --git a/packages/react-dom/src/__tests__/TapEventPlugin-test.internal.js b/packages/react-dom/src/events/__tests__/TapEventPlugin-test.internal.js
similarity index 100%
rename from packages/react-dom/src/__tests__/TapEventPlugin-test.internal.js
rename to packages/react-dom/src/events/__tests__/TapEventPlugin-test.internal.js
diff --git a/packages/react-dom/src/test-utils/ReactTestUtils.js b/packages/react-dom/src/test-utils/ReactTestUtils.js
index e7cf69b550..d9948291b3 100644
--- a/packages/react-dom/src/test-utils/ReactTestUtils.js
+++ b/packages/react-dom/src/test-utils/ReactTestUtils.js
@@ -18,7 +18,7 @@ import {
 import SyntheticEvent from 'events/SyntheticEvent';
 import invariant from 'fbjs/lib/invariant';
 
-import {topLevelTypes, mediaEventTypes} from '../events/BrowserEventConstants';
+import * as DOMTopLevelEventTypes from '../events/DOMTopLevelEventTypes';
 
 const {findDOMNode} = ReactDOM;
 const {
@@ -36,6 +36,33 @@ function Event(suffix) {}
  * @class ReactTestUtils
  */
 
+/**
+ * Simulates a top level event being dispatched from a raw event that occurred
+ * on an `Element` node.
+ * @param {number} topLevelType A number from `TopLevelEventTypes`
+ * @param {!Element} node The dom to simulate an event occurring on.
+ * @param {?Event} fakeNativeEvent Fake native event to use in SyntheticEvent.
+ */
+function simulateNativeEventOnNode(topLevelType, node, fakeNativeEvent) {
+  fakeNativeEvent.target = node;
+  ReactDOMEventListener.dispatchEvent(topLevelType, fakeNativeEvent);
+}
+
+/**
+ * Simulates a top level event being dispatched from a raw event that occurred
+ * on the `ReactDOMComponent` `comp`.
+ * @param {Object} topLevelType A type from `BrowserEventConstants.topLevelTypes`.
+ * @param {!ReactDOMComponent} comp
+ * @param {?Event} fakeNativeEvent Fake native event to use in SyntheticEvent.
+ */
+function simulateNativeEventOnDOMComponent(
+  topLevelType,
+  comp,
+  fakeNativeEvent,
+) {
+  simulateNativeEventOnNode(topLevelType, findDOMNode(comp), fakeNativeEvent);
+}
+
 function findAllInRenderedFiberTreeInternal(fiber, test) {
   if (!fiber) {
     return [];
@@ -291,37 +318,6 @@ const ReactTestUtils = {
     return this;
   },
 
-  /**
-   * Simulates a top level event being dispatched from a raw event that occurred
-   * on an `Element` node.
-   * @param {Object} topLevelType A type from `BrowserEventConstants.topLevelTypes`
-   * @param {!Element} node The dom to simulate an event occurring on.
-   * @param {?Event} fakeNativeEvent Fake native event to use in SyntheticEvent.
-   */
-  simulateNativeEventOnNode: function(topLevelType, node, fakeNativeEvent) {
-    fakeNativeEvent.target = node;
-    ReactDOMEventListener.dispatchEvent(topLevelType, fakeNativeEvent);
-  },
-
-  /**
-   * Simulates a top level event being dispatched from a raw event that occurred
-   * on the `ReactDOMComponent` `comp`.
-   * @param {Object} topLevelType A type from `BrowserEventConstants.topLevelTypes`.
-   * @param {!ReactDOMComponent} comp
-   * @param {?Event} fakeNativeEvent Fake native event to use in SyntheticEvent.
-   */
-  simulateNativeEventOnDOMComponent: function(
-    topLevelType,
-    comp,
-    fakeNativeEvent,
-  ) {
-    ReactTestUtils.simulateNativeEventOnNode(
-      topLevelType,
-      findDOMNode(comp),
-      fakeNativeEvent,
-    );
-  },
-
   nativeTouchData: function(x, y) {
     return {
       touches: [{pageX: x, pageY: y}],
@@ -436,20 +432,20 @@ buildSimulators();
  * to dispatch synthetic events.
  */
 
-function makeNativeSimulator(eventType) {
+function makeNativeSimulator(eventType, topLevelType) {
   return function(domComponentOrNode, nativeEventData) {
     const fakeNativeEvent = new Event(eventType);
     Object.assign(fakeNativeEvent, nativeEventData);
     if (ReactTestUtils.isDOMComponent(domComponentOrNode)) {
-      ReactTestUtils.simulateNativeEventOnDOMComponent(
-        eventType,
+      simulateNativeEventOnDOMComponent(
+        topLevelType,
         domComponentOrNode,
         fakeNativeEvent,
       );
     } else if (domComponentOrNode.tagName) {
       // Will allow on actual dom nodes.
-      ReactTestUtils.simulateNativeEventOnNode(
-        eventType,
+      simulateNativeEventOnNode(
+        topLevelType,
         domComponentOrNode,
         fakeNativeEvent,
       );
@@ -457,23 +453,84 @@ function makeNativeSimulator(eventType) {
   };
 }
 
-const eventKeys = [].concat(
-  Object.keys(topLevelTypes),
-  Object.keys(mediaEventTypes),
-);
-
-eventKeys.forEach(function(eventType) {
-  // Event type is stored as 'topClick' - we transform that to 'click'
-  const convenienceName =
-    eventType.indexOf('top') === 0
-      ? eventType.charAt(3).toLowerCase() + eventType.substr(4)
-      : eventType;
+[
+  [DOMTopLevelEventTypes.TOP_ABORT, 'abort'],
+  [DOMTopLevelEventTypes.TOP_ANIMATION_END, 'animationEnd'],
+  [DOMTopLevelEventTypes.TOP_ANIMATION_ITERATION, 'animationIteration'],
+  [DOMTopLevelEventTypes.TOP_ANIMATION_START, 'animationStart'],
+  [DOMTopLevelEventTypes.TOP_BLUR, 'blur'],
+  [DOMTopLevelEventTypes.TOP_CAN_PLAY_THROUGH, 'canPlayThrough'],
+  [DOMTopLevelEventTypes.TOP_CAN_PLAY, 'canPlay'],
+  [DOMTopLevelEventTypes.TOP_CANCEL, 'cancel'],
+  [DOMTopLevelEventTypes.TOP_CHANGE, 'change'],
+  [DOMTopLevelEventTypes.TOP_CLICK, 'click'],
+  [DOMTopLevelEventTypes.TOP_CLOSE, 'close'],
+  [DOMTopLevelEventTypes.TOP_COMPOSITION_END, 'compositionEnd'],
+  [DOMTopLevelEventTypes.TOP_COMPOSITION_START, 'compositionStart'],
+  [DOMTopLevelEventTypes.TOP_COMPOSITION_UPDATE, 'compositionUpdate'],
+  [DOMTopLevelEventTypes.TOP_CONTEXT_MENU, 'contextMenu'],
+  [DOMTopLevelEventTypes.TOP_COPY, 'copy'],
+  [DOMTopLevelEventTypes.TOP_CUT, 'cut'],
+  [DOMTopLevelEventTypes.TOP_DOUBLE_CLICK, 'doubleClick'],
+  [DOMTopLevelEventTypes.TOP_DRAG_END, 'dragEnd'],
+  [DOMTopLevelEventTypes.TOP_DRAG_ENTER, 'dragEnter'],
+  [DOMTopLevelEventTypes.TOP_DRAG_EXIT, 'dragExit'],
+  [DOMTopLevelEventTypes.TOP_DRAG_LEAVE, 'dragLeave'],
+  [DOMTopLevelEventTypes.TOP_DRAG_OVER, 'dragOver'],
+  [DOMTopLevelEventTypes.TOP_DRAG_START, 'dragStart'],
+  [DOMTopLevelEventTypes.TOP_DRAG, 'drag'],
+  [DOMTopLevelEventTypes.TOP_DROP, 'drop'],
+  [DOMTopLevelEventTypes.TOP_DURATION_CHANGE, 'durationChange'],
+  [DOMTopLevelEventTypes.TOP_EMPTIED, 'emptied'],
+  [DOMTopLevelEventTypes.TOP_ENCRYPTED, 'encrypted'],
+  [DOMTopLevelEventTypes.TOP_ENDED, 'ended'],
+  [DOMTopLevelEventTypes.TOP_ERROR, 'error'],
+  [DOMTopLevelEventTypes.TOP_FOCUS, 'focus'],
+  [DOMTopLevelEventTypes.TOP_INPUT, 'input'],
+  [DOMTopLevelEventTypes.TOP_KEY_DOWN, 'keyDown'],
+  [DOMTopLevelEventTypes.TOP_KEY_PRESS, 'keyPress'],
+  [DOMTopLevelEventTypes.TOP_KEY_UP, 'keyUp'],
+  [DOMTopLevelEventTypes.TOP_LOAD_START, 'loadStart'],
+  [DOMTopLevelEventTypes.TOP_LOAD_START, 'loadStart'],
+  [DOMTopLevelEventTypes.TOP_LOAD, 'load'],
+  [DOMTopLevelEventTypes.TOP_LOADED_DATA, 'loadedData'],
+  [DOMTopLevelEventTypes.TOP_LOADED_METADATA, 'loadedMetadata'],
+  [DOMTopLevelEventTypes.TOP_MOUSE_DOWN, 'mouseDown'],
+  [DOMTopLevelEventTypes.TOP_MOUSE_MOVE, 'mouseMove'],
+  [DOMTopLevelEventTypes.TOP_MOUSE_OUT, 'mouseOut'],
+  [DOMTopLevelEventTypes.TOP_MOUSE_OVER, 'mouseOver'],
+  [DOMTopLevelEventTypes.TOP_MOUSE_UP, 'mouseUp'],
+  [DOMTopLevelEventTypes.TOP_PASTE, 'paste'],
+  [DOMTopLevelEventTypes.TOP_PAUSE, 'pause'],
+  [DOMTopLevelEventTypes.TOP_PLAY, 'play'],
+  [DOMTopLevelEventTypes.TOP_PLAYING, 'playing'],
+  [DOMTopLevelEventTypes.TOP_PROGRESS, 'progress'],
+  [DOMTopLevelEventTypes.TOP_RATE_CHANGE, 'rateChange'],
+  [DOMTopLevelEventTypes.TOP_SCROLL, 'scroll'],
+  [DOMTopLevelEventTypes.TOP_SEEKED, 'seeked'],
+  [DOMTopLevelEventTypes.TOP_SEEKING, 'seeking'],
+  [DOMTopLevelEventTypes.TOP_SELECTION_CHANGE, 'selectionChange'],
+  [DOMTopLevelEventTypes.TOP_STALLED, 'stalled'],
+  [DOMTopLevelEventTypes.TOP_SUSPEND, 'suspend'],
+  [DOMTopLevelEventTypes.TOP_TEXT_INPUT, 'textInput'],
+  [DOMTopLevelEventTypes.TOP_TIME_UPDATE, 'timeUpdate'],
+  [DOMTopLevelEventTypes.TOP_TOGGLE, 'toggle'],
+  [DOMTopLevelEventTypes.TOP_TOUCH_CANCEL, 'touchCancel'],
+  [DOMTopLevelEventTypes.TOP_TOUCH_END, 'touchEnd'],
+  [DOMTopLevelEventTypes.TOP_TOUCH_MOVE, 'touchMove'],
+  [DOMTopLevelEventTypes.TOP_TOUCH_START, 'touchStart'],
+  [DOMTopLevelEventTypes.TOP_TRANSITION_END, 'transitionEnd'],
+  [DOMTopLevelEventTypes.TOP_VOLUME_CHANGE, 'volumeChange'],
+  [DOMTopLevelEventTypes.TOP_WAITING, 'waiting'],
+  [DOMTopLevelEventTypes.TOP_WHEEL, 'wheel'],
+].forEach(([topLevelType, eventType]) => {
   /**
    * @param {!Element|ReactDOMComponent} domComponentOrNode
    * @param {?Event} nativeEventData Fake native event to use in SyntheticEvent.
    */
-  ReactTestUtils.SimulateNative[convenienceName] = makeNativeSimulator(
+  ReactTestUtils.SimulateNative[eventType] = makeNativeSimulator(
     eventType,
+    topLevelType,
   );
 });
 
diff --git a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js
index 69bc7a260a..59cd7c8f28 100644
--- a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js
+++ b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js
@@ -12,6 +12,7 @@ import {
   accumulateTwoPhaseDispatches,
   accumulateDirectDispatches,
 } from 'events/EventPropagators';
+import type {TopLevelType} from 'events/TopLevelEventTypes';
 import * as ReactNativeViewConfigRegistry from 'ReactNativeViewConfigRegistry';
 import SyntheticEvent from 'events/SyntheticEvent';
 import invariant from 'fbjs/lib/invariant';
@@ -29,7 +30,7 @@ const ReactNativeBridgeEventPlugin = {
    * @see {EventPluginHub.extractEvents}
    */
   extractEvents: function(
-    topLevelType: string,
+    topLevelType: TopLevelType,
     targetInst: Object,
     nativeEvent: AnyNativeEvent,
     nativeEventTarget: Object,
diff --git a/packages/react-native-renderer/src/ReactNativeEventEmitter.js b/packages/react-native-renderer/src/ReactNativeEventEmitter.js
index e43644a620..6b61de6331 100644
--- a/packages/react-native-renderer/src/ReactNativeEventEmitter.js
+++ b/packages/react-native-renderer/src/ReactNativeEventEmitter.js
@@ -15,6 +15,7 @@ import warning from 'fbjs/lib/warning';
 import {getInstanceFromNode} from './ReactNativeComponentTree';
 
 import type {AnyNativeEvent} from 'events/PluginModuleType';
+import type {TopLevelType} from 'events/TopLevelEventTypes';
 
 export {getListener, registrationNameModules as registrationNames};
 
@@ -88,7 +89,7 @@ const removeTouchesAtIndices = function(
  */
 export function _receiveRootNodeIDEvent(
   rootNodeID: number,
-  topLevelType: string,
+  topLevelType: TopLevelType,
   nativeEventParam: ?AnyNativeEvent,
 ) {
   const nativeEvent = nativeEventParam || EMPTY_NATIVE_EVENT;
@@ -114,7 +115,7 @@ export function _receiveRootNodeIDEvent(
  */
 export function receiveEvent(
   rootNodeID: number,
-  topLevelType: string,
+  topLevelType: TopLevelType,
   nativeEventParam: AnyNativeEvent,
 ) {
   _receiveRootNodeIDEvent(rootNodeID, topLevelType, nativeEventParam);
@@ -145,7 +146,7 @@ export function receiveEvent(
  * identifier 0, also abandoning traditional click handlers.
  */
 export function receiveTouches(
-  eventTopLevelType: string,
+  eventTopLevelType: TopLevelType,
   touches: Array<Object>,
   changedIndices: Array<number>,
 ) {
diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js
index 0a223c59ae..28de8651c1 100644
--- a/scripts/rollup/forks.js
+++ b/scripts/rollup/forks.js
@@ -143,6 +143,14 @@ const forks = Object.freeze({
         return null;
     }
   },
+
+  // React DOM uses different top level event names and supports mouse events.
+  'events/ResponderTopLevelEventTypes': (bundleType, entry) => {
+    if (entry === 'react-dom' || entry.startsWith('react-dom/')) {
+      return 'events/forks/ResponderTopLevelEventTypes.dom.js';
+    }
+    return null;
+  },
 });
 
 module.exports = forks;
diff --git a/yarn.lock b/yarn.lock
index 08eb3a49a2..2488a5f252 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,13 +2,11 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.36.tgz#2349d7ec04b3a06945ae173280ef8579b63728e4"
+"@babel/code-frame@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
   dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
+    "@babel/highlight" "7.0.0-beta.44"
 
 "@babel/code-frame@^7.0.0-beta.35":
   version "7.0.0-beta.38"
@@ -18,45 +16,71 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-"@babel/helper-function-name@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.36.tgz#366e3bc35147721b69009f803907c4d53212e88d"
+"@babel/generator@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
   dependencies:
-    "@babel/helper-get-function-arity" "7.0.0-beta.36"
-    "@babel/template" "7.0.0-beta.36"
-    "@babel/types" "7.0.0-beta.36"
+    "@babel/types" "7.0.0-beta.44"
+    jsesc "^2.5.1"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
 
-"@babel/helper-get-function-arity@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.36.tgz#f5383bac9a96b274828b10d98900e84ee43e32b8"
+"@babel/helper-function-name@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd"
   dependencies:
-    "@babel/types" "7.0.0-beta.36"
+    "@babel/helper-get-function-arity" "7.0.0-beta.44"
+    "@babel/template" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
 
-"@babel/template@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.36.tgz#02e903de5d68bd7899bce3c5b5447e59529abb00"
+"@babel/helper-get-function-arity@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.36"
-    "@babel/types" "7.0.0-beta.36"
-    babylon "7.0.0-beta.36"
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/helper-split-export-declaration@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
+  dependencies:
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/highlight@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/template@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
     lodash "^4.2.0"
 
-"@babel/traverse@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.36.tgz#1dc6f8750e89b6b979de5fe44aa993b1a2192261"
+"@babel/traverse@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.36"
-    "@babel/helper-function-name" "7.0.0-beta.36"
-    "@babel/types" "7.0.0-beta.36"
-    babylon "7.0.0-beta.36"
-    debug "^3.0.1"
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/generator" "7.0.0-beta.44"
+    "@babel/helper-function-name" "7.0.0-beta.44"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
+    debug "^3.1.0"
     globals "^11.1.0"
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-"@babel/types@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.36.tgz#64f2004353de42adb72f9ebb4665fc35b5499d23"
+"@babel/types@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
   dependencies:
     esutils "^2.0.2"
     lodash "^4.2.0"
@@ -78,8 +102,8 @@ abab@^1.0.3:
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
 
 abbrev@1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
 acorn-globals@^4.0.0:
   version "4.1.0"
@@ -123,13 +147,6 @@ ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
 
-ajv@^4.9.1:
-  version "4.11.7"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.7.tgz#8655a5d86d0824985cc471a1d913fb6729a0ec48"
-  dependencies:
-    co "^4.6.0"
-    json-stable-stringify "^1.0.1"
-
 ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
@@ -173,11 +190,11 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.1.0.tgz#09c202d5c917ec23188caa5c9cb9179cd9547750"
+ansi-styles@^3.1.0, ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   dependencies:
-    color-convert "^1.0.0"
+    color-convert "^1.9.0"
 
 ansi-styles@^3.2.0:
   version "3.2.0"
@@ -186,11 +203,11 @@ ansi-styles@^3.2.0:
     color-convert "^1.9.0"
 
 anymatch@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
   dependencies:
-    arrify "^1.0.0"
     micromatch "^2.1.5"
+    normalize-path "^2.0.0"
 
 append-transform@^0.4.0:
   version "0.4.0"
@@ -199,8 +216,8 @@ append-transform@^0.4.0:
     default-require-extensions "^1.0.0"
 
 aproba@^1.0.3:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
 
 are-we-there-yet@~1.1.2:
   version "1.1.4"
@@ -221,9 +238,17 @@ arr-diff@^2.0.0:
   dependencies:
     arr-flatten "^1.0.1"
 
-arr-flatten@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+
+arr-flatten@^1.0.1, arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
 
 array-differ@^1.0.0:
   version "1.0.0"
@@ -247,6 +272,10 @@ array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+
 array.prototype.find@2.0.4, array.prototype.find@^2.0.1:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.4.tgz#556a5c5362c08648323ddaeb9de9d14bc1864c90"
@@ -278,6 +307,10 @@ assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+
 ast-traverse@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ast-traverse/-/ast-traverse-0.1.1.tgz#69cf2b8386f19dcda1bb1e05d68fe359d8897de6"
@@ -312,6 +345,10 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
+atob@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.0.tgz#ab2b150e51d7b122b9efc8d7340c06b6c41076bc"
+
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -320,40 +357,36 @@ aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
-aws4@^1.2.1, aws4@^1.6.0:
+aws4@^1.2.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
+
+aws4@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
 babel-cli@^6.6.5:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.24.1.tgz#207cd705bba61489b2ea41b5312341cf6aca2283"
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1"
   dependencies:
-    babel-core "^6.24.1"
-    babel-polyfill "^6.23.0"
-    babel-register "^6.24.1"
-    babel-runtime "^6.22.0"
-    commander "^2.8.1"
-    convert-source-map "^1.1.0"
+    babel-core "^6.26.0"
+    babel-polyfill "^6.26.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    commander "^2.11.0"
+    convert-source-map "^1.5.0"
     fs-readdir-recursive "^1.0.0"
-    glob "^7.0.0"
-    lodash "^4.2.0"
-    output-file-sync "^1.1.0"
-    path-is-absolute "^1.0.0"
+    glob "^7.1.2"
+    lodash "^4.17.4"
+    output-file-sync "^1.1.2"
+    path-is-absolute "^1.0.1"
     slash "^1.0.0"
-    source-map "^0.5.0"
-    v8flags "^2.0.10"
+    source-map "^0.5.6"
+    v8flags "^2.1.1"
   optionalDependencies:
     chokidar "^1.6.1"
 
-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-code-frame@^6.26.0:
+babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies:
@@ -412,52 +445,52 @@ babel-core@^5.6.21:
     trim-right "^1.0.0"
     try-resolve "^1.0.0"
 
-babel-core@^6.0.0, babel-core@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.1.tgz#8c428564dce1e1f41fb337ec34f4c3b022b5ad83"
+babel-core@^6.0.0, babel-core@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
   dependencies:
-    babel-code-frame "^6.22.0"
-    babel-generator "^6.24.1"
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
     babel-helpers "^6.24.1"
     babel-messages "^6.23.0"
-    babel-register "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-    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"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.0"
+    debug "^2.6.8"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.7"
     slash "^1.0.0"
-    source-map "^0.5.0"
+    source-map "^0.5.6"
 
 babel-eslint@^8.0.0:
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.1.tgz#136888f3c109edc65376c23ebf494f36a3e03951"
+  version "8.2.3"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.3.tgz#1a2e6681cc9bc4473c32899e59915e19cd6733cf"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.36"
-    "@babel/traverse" "7.0.0-beta.36"
-    "@babel/types" "7.0.0-beta.36"
-    babylon "7.0.0-beta.36"
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/traverse" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
     eslint-scope "~3.7.1"
     eslint-visitor-keys "^1.0.0"
 
-babel-generator@^6.18.0, babel-generator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.1.tgz#e715f486c58ded25649d888944d52aa07c5d9497"
+babel-generator@^6.18.0, babel-generator@^6.26.0:
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
   dependencies:
     babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
     detect-indent "^4.0.0"
     jsesc "^1.3.0"
-    lodash "^4.2.0"
-    source-map "^0.5.0"
+    lodash "^4.17.4"
+    source-map "^0.5.7"
     trim-right "^1.0.1"
 
 babel-helper-builder-react-jsx@^6.24.1:
@@ -546,11 +579,11 @@ babel-helpers@^6.24.1:
     babel-template "^6.24.1"
 
 babel-jest@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.0.6.tgz#807a2a5f5fad7789c57174a955cd14b11045299f"
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.4.3.tgz#4b7a0b6041691bbd422ab49b3b73654a49a6627a"
   dependencies:
     babel-plugin-istanbul "^4.1.5"
-    babel-preset-jest "^22.0.6"
+    babel-preset-jest "^22.4.3"
 
 babel-messages@^6.23.0:
   version "6.23.0"
@@ -587,16 +620,17 @@ babel-plugin-inline-environment-variables@^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.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.5.tgz#6760cdd977f411d3e175bb064f2bc327d99b2b6e"
+  version "4.1.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
   dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.13.0"
     find-up "^2.1.0"
-    istanbul-lib-instrument "^1.7.5"
-    test-exclude "^4.1.1"
+    istanbul-lib-instrument "^1.10.1"
+    test-exclude "^4.2.1"
 
-babel-plugin-jest-hoist@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.0.6.tgz#551269ded350a15d6585da35d16d449df30d66c4"
+babel-plugin-jest-hoist@^22.4.3:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.3.tgz#7d8bcccadc2667f96a0dcc6afe1891875ee6c14a"
 
 babel-plugin-jscript@^1.0.4:
   version "1.0.4"
@@ -690,14 +724,14 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.5.0:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-es2015-block-scoping@^6.23.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576"
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
   dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-    lodash "^4.2.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
 
 babel-plugin-transform-es2015-classes@^6.5.2:
   version "6.24.1"
@@ -739,13 +773,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.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz#d3e310b40ef664a36622200097c6d440298f2bfe"
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
   dependencies:
     babel-plugin-transform-strict-mode "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-types "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-types "^6.26.0"
 
 babel-plugin-transform-es2015-object-super@^6.5.0:
   version "6.24.1"
@@ -791,20 +825,13 @@ babel-plugin-transform-flow-strip-types@^6.22.0:
     babel-plugin-syntax-flow "^6.18.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-object-rest-spread@^6.20.2:
+babel-plugin-transform-object-rest-spread@^6.20.2, babel-plugin-transform-object-rest-spread@^6.6.5:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
   dependencies:
     babel-plugin-syntax-object-rest-spread "^6.8.0"
     babel-runtime "^6.26.0"
 
-babel-plugin-transform-object-rest-spread@^6.6.5:
-  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.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"
@@ -856,13 +883,13 @@ 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.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
+babel-polyfill@^6.23.0, babel-polyfill@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
   dependencies:
-    babel-runtime "^6.22.0"
-    core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    regenerator-runtime "^0.10.5"
 
 babel-preset-flow@^6.23.0:
   version "6.23.0"
@@ -870,11 +897,11 @@ babel-preset-flow@^6.23.0:
   dependencies:
     babel-plugin-transform-flow-strip-types "^6.22.0"
 
-babel-preset-jest@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-22.0.6.tgz#d13202533db9495c98663044d9f51b273d3984c8"
+babel-preset-jest@^22.4.3:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-22.4.3.tgz#e92eef9813b7026ab4ca675799f37419b5a44156"
   dependencies:
-    babel-plugin-jest-hoist "^22.0.6"
+    babel-plugin-jest-hoist "^22.4.3"
     babel-plugin-syntax-object-rest-spread "^6.13.0"
 
 babel-preset-react@^6.5.0:
@@ -888,66 +915,57 @@ babel-preset-react@^6.5.0:
     babel-plugin-transform-react-jsx-source "^6.22.0"
     babel-preset-flow "^6.23.0"
 
-babel-register@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.1.tgz#7e10e13a2f71065bdfad5a1787ba45bca6ded75f"
+babel-register@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
   dependencies:
-    babel-core "^6.24.1"
-    babel-runtime "^6.22.0"
-    core-js "^2.4.0"
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
     home-or-tmp "^2.0.0"
-    lodash "^4.2.0"
+    lodash "^4.17.4"
     mkdirp "^0.5.1"
-    source-map-support "^0.4.2"
+    source-map-support "^0.4.15"
 
-babel-runtime@6.23.0, babel-runtime@^6.22.0:
+babel-runtime@6.23.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-runtime@^6.18.0, babel-runtime@^6.26.0:
+babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
 
-babel-template@^6.16.0, babel-template@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
   dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-    babylon "^6.11.0"
-    lodash "^4.2.0"
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
 
-babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.9.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695"
+babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0, babel-traverse@^6.9.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
   dependencies:
-    babel-code-frame "^6.22.0"
+    babel-code-frame "^6.26.0"
     babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-    babylon "^6.15.0"
-    debug "^2.2.0"
-    globals "^9.0.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
 
-babel-types@^6.18.0, babel-types@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975"
-  dependencies:
-    babel-runtime "^6.22.0"
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^1.0.1"
-
-babel-types@^6.19.0:
+babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
   dependencies:
@@ -973,34 +991,34 @@ babel@^5.4.7:
     slash "^1.0.0"
     source-map "^0.5.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"
+babylon@6.18.0, babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
 
-babylon@7.0.0-beta.36:
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.36.tgz#3a3683ba6a9a1e02b0aa507c8e63435e39305b9e"
+babylon@7.0.0-beta.44:
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
 
 babylon@^5.8.38:
   version "5.8.38"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-5.8.38.tgz#ec9b120b11bf6ccd4173a18bf217e60b79859ffd"
 
-babylon@^6.15.0:
-  version "6.17.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.0.tgz#37da948878488b9c4e3c4038893fa3314b3fc932"
-
-babylon@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-
-balanced-match@^0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
 
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
 bcrypt-pbkdf@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
@@ -1012,8 +1030,8 @@ beeper@^1.0.0:
   resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
 
 binary-extensions@^1.0.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
 bl@^1.0.0:
   version "1.2.1"
@@ -1050,10 +1068,10 @@ boom@5.x.x:
     hoek "4.x.x"
 
 brace-expansion@^1.0.0:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
-    balanced-match "^0.4.1"
+    balanced-match "^1.0.0"
     concat-map "0.0.1"
 
 brace-expansion@^1.1.7:
@@ -1071,6 +1089,21 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
+braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
 breakable@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/breakable/-/breakable-1.0.0.tgz#784a797915a38ead27bad456b5572cb4bbaa78c1"
@@ -1129,6 +1162,20 @@ bundle-collapser@^1.1.1:
     minimist "^1.1.1"
     through2 "^2.0.0"
 
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
@@ -1170,7 +1217,7 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@*, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@*, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -1180,13 +1227,13 @@ chalk@*, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
+chalk@^2.0.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.0.tgz#a060a297a6b57e15b61ca63ce84995daa0fe6e52"
   dependencies:
-    ansi-styles "^3.1.0"
+    ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
+    supports-color "^5.3.0"
 
 chalk@^2.0.1:
   version "2.0.1"
@@ -1196,11 +1243,19 @@ chalk@^2.0.1:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
+chalk@^2.1.0, chalk@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
 chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
 
-chokidar@^1.0.0, chokidar@^1.6.1:
+chokidar@^1.0.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"
   dependencies:
@@ -1215,6 +1270,21 @@ chokidar@^1.0.0, chokidar@^1.6.1:
   optionalDependencies:
     fsevents "^1.0.0"
 
+chokidar@^1.6.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+  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"
+
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
@@ -1227,6 +1297,15 @@ circular-json@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
 
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
@@ -1307,15 +1386,22 @@ coffee-script@^1.8.0:
   version "1.12.5"
   resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.5.tgz#809f4585419112bbfe46a073ad7543af18c27346"
 
-color-convert@^1.0.0, color-convert@^1.9.0:
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
   dependencies:
     color-name "^1.1.1"
 
 color-name@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
 colors@1.0.3:
   version "1.0.3"
@@ -1335,16 +1421,20 @@ combine-source-map@~0.6.1:
     source-map "~0.4.2"
 
 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"
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@^2.11.0:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
+
 commander@^2.12.2:
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
 
-commander@^2.5.0, commander@^2.6.0, commander@^2.8.1, commander@^2.9.0:
+commander@^2.5.0, commander@^2.6.0, commander@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
   dependencies:
@@ -1364,6 +1454,10 @@ commoner@~0.10.3:
     q "^1.1.2"
     recast "^0.11.17"
 
+component-emitter@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -1392,7 +1486,11 @@ content-type-parser@^1.0.1:
   version "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, convert-source-map@^1.4.0:
+convert-source-map@^1.1.0, convert-source-map@^1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
+
+convert-source-map@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
 
@@ -1400,15 +1498,23 @@ convert-source-map@~1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
 
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+
 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.2.1, core-js@^2.4.0:
+core-js@^2.2.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
 
-core-util-is@~1.0.0:
+core-js@^2.4.0, core-js@^2.5.0:
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.5.tgz#b14dde936c640c0579a6b50cabcc132dd6127e3b"
+
+core-util-is@1.0.2, 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"
 
@@ -1541,11 +1647,11 @@ 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.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.6.tgz#a9fa6fbe9ca43cf1e79f73b75c0189cbb7d6db5a"
+debug@^2.1.1, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
-    ms "0.7.3"
+    ms "2.0.0"
 
 debug@^2.6.3:
   version "2.6.8"
@@ -1553,7 +1659,7 @@ debug@^2.6.3:
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.1, debug@^3.1.0:
+debug@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
@@ -1563,9 +1669,13 @@ decamelize@^1.0.0, decamelize@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+
 deep-extend@~0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.1.tgz#efe4113d08085f4e6f9687759810f807469e2253"
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
 
 deep-is@~0.1.3:
   version "0.1.3"
@@ -1584,6 +1694,25 @@ define-properties@^1.1.2:
     foreach "^2.0.5"
     object-keys "^1.0.8"
 
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -1651,6 +1780,10 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -1972,20 +2105,15 @@ esquery@^1.0.0:
     estraverse "^4.0.0"
 
 esrecurse@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
   dependencies:
-    estraverse "~4.1.0"
-    object-assign "^4.0.1"
+    estraverse "^4.1.0"
 
-estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.0.0, estraverse@^4.1.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"
 
-estraverse@~4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
-
 estree-walker@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
@@ -2033,6 +2161,18 @@ expand-brackets@^0.1.4:
   dependencies:
     is-posix-bracket "^0.1.0"
 
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
@@ -2062,6 +2202,13 @@ extend-shallow@^2.0.1:
   dependencies:
     is-extendable "^0.1.0"
 
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
 extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
@@ -2080,6 +2227,19 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 extract-banner@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/extract-banner/-/extract-banner-0.1.2.tgz#61d1ed5cce3acdadb35f4323910b420364241a7f"
@@ -2087,9 +2247,13 @@ extract-banner@0.1.2:
     strip-bom-string "^0.1.2"
     strip-use-strict "^0.1.0"
 
-extsprintf@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
 falafel@^1.2.0:
   version "1.2.0"
@@ -2175,8 +2339,8 @@ file-entry-cache@^2.0.0:
     object-assign "^4.0.1"
 
 filename-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
 fileset@^2.0.2:
   version "2.0.3"
@@ -2199,6 +2363,15 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
 find-file-up@^0.1.2:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/find-file-up/-/find-file-up-0.1.3.tgz#cf68091bcf9f300a40da411b37da5cce5a2fbea0"
@@ -2265,7 +2438,7 @@ flow-coverage-report@^0.4.0:
     terminal-table "0.0.12"
     yargs "8.0.1"
 
-for-in@^1.0.1:
+for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
@@ -2299,28 +2472,40 @@ form-data@~2.3.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  dependencies:
+    map-cache "^0.2.2"
+
 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-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  dependencies:
+    minipass "^2.2.1"
+
 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"
 
 fs-readdir-recursive@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
 
 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"
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.2.tgz#4f598f0f69b273188ef4a62ca4e9e08ace314bbf"
   dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.29"
+    nan "^2.9.2"
+    node-pre-gyp "^0.9.0"
 
 fsevents@^1.1.1:
   version "1.1.2"
@@ -2358,7 +2543,7 @@ functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
 
-gauge@~2.7.1:
+gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
   dependencies:
@@ -2397,6 +2582,10 @@ get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -2461,7 +2650,7 @@ glob-stream@^6.1.0:
     to-absolute-glob "^2.0.0"
     unique-stream "^2.0.2"
 
-glob@7.1.1, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1:
+glob@7.1.1, glob@^7.0.3, glob@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
   dependencies:
@@ -2492,7 +2681,7 @@ glob@^6.0.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.2:
+glob@^7.0.5, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -2519,17 +2708,21 @@ global-prefix@^0.1.4:
     is-windows "^0.2.0"
     which "^1.2.12"
 
-globals@^11.0.1, globals@^11.1.0:
+globals@^11.0.1:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4"
 
+globals@^11.1.0:
+  version "11.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.4.0.tgz#b85c793349561c16076a3c13549238a27945f1bc"
+
 globals@^6.4.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/globals/-/globals-6.4.1.tgz#8498032b3b6d1cc81eebc5f79690d8fe29fabf4f"
 
-globals@^9.0.0:
-  version "9.17.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
+globals@^9.18.0:
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
 globby@^5.0.0:
   version "5.0.0"
@@ -2620,10 +2813,6 @@ 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-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -2637,13 +2826,6 @@ 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"
-
 har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
@@ -2665,6 +2847,10 @@ has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
 
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
 has-gulplog@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
@@ -2675,6 +2861,33 @@ has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
 has@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
@@ -2728,8 +2941,8 @@ homedir-polyfill@^1.0.0:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
 
 html-encoding-sniffer@^1.0.1:
   version "1.0.1"
@@ -2772,16 +2985,22 @@ iconv-lite@^0.4.17:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
-iconv-lite@^0.4.5:
-  version "0.4.16"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.16.tgz#65de3beeb39e2960d67f049f1634ffcbcde9014b"
-
-iconv-lite@~0.4.13:
+iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.21"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
   dependencies:
     safer-buffer "^2.1.0"
 
+iconv-lite@^0.4.5:
+  version "0.4.16"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.16.tgz#65de3beeb39e2960d67f049f1634ffcbcde9014b"
+
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  dependencies:
+    minimatch "^3.0.4"
+
 ignore@^3.3.3:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
@@ -2801,14 +3020,10 @@ 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"
 
-ini@^1.3.4:
+ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
-ini@~1.3.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
-
 inline-source-map@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.5.0.tgz#4a4c5dd8e4fb5e9b3cda60c822dfadcaee66e0af"
@@ -2834,9 +3049,9 @@ inquirer@^3.0.6:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
-invariant@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+invariant@^2.2.0, invariant@^2.2.2:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   dependencies:
     loose-envify "^1.0.0"
 
@@ -2851,6 +3066,18 @@ is-absolute@^0.2.5:
     is-relative "^0.2.1"
     is-windows "^0.2.0"
 
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  dependencies:
+    kind-of "^6.0.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -2862,8 +3089,8 @@ is-binary-path@^1.0.0:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
@@ -2881,13 +3108,41 @@ is-ci@^1.0.10:
   dependencies:
     ci-info "^1.0.0"
 
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  dependencies:
+    kind-of "^6.0.0"
+
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
 
-is-dotfile@^1.0.0:
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-dotfile@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
@@ -2899,6 +3154,12 @@ is-extendable@^0.1.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-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  dependencies:
+    is-plain-object "^2.0.4"
+
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
@@ -2958,12 +3219,28 @@ is-negated-glob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
 
-is-number@^2.0.2, is-number@^2.1.0:
+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-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+
+is-odd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
+  dependencies:
+    is-number "^4.0.0"
+
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -2980,6 +3257,12 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  dependencies:
+    isobject "^3.0.1"
+
 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"
@@ -3044,6 +3327,10 @@ is-windows@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
 
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -3062,6 +3349,10 @@ isobject@^2.0.0:
   dependencies:
     isarray "1.0.0"
 
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+
 isomorphic-fetch@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
@@ -3089,9 +3380,9 @@ istanbul-api@^1.1.14:
     mkdirp "^0.5.1"
     once "^1.4.0"
 
-istanbul-lib-coverage@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
+istanbul-lib-coverage@^1.1.1, istanbul-lib-coverage@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
 
 istanbul-lib-hook@^1.1.0:
   version "1.1.0"
@@ -3099,7 +3390,19 @@ istanbul-lib-hook@^1.1.0:
   dependencies:
     append-transform "^0.4.0"
 
-istanbul-lib-instrument@^1.7.5, istanbul-lib-instrument@^1.8.0, istanbul-lib-instrument@^1.9.1:
+istanbul-lib-instrument@^1.10.1:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b"
+  dependencies:
+    babel-generator "^6.18.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.18.0"
+    babel-types "^6.18.0"
+    babylon "^6.18.0"
+    istanbul-lib-coverage "^1.2.0"
+    semver "^5.3.0"
+
+istanbul-lib-instrument@^1.8.0, istanbul-lib-instrument@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz#250b30b3531e5d3251299fdd64b0b2c9db6b558e"
   dependencies:
@@ -3411,12 +3714,6 @@ jest@^22.0.6:
   dependencies:
     jest-cli "^22.0.6"
 
-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@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-1.0.1.tgz#cc435a5c8b94ad15acb7983140fc80182c89aeae"
@@ -3483,6 +3780,10 @@ jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
 
+jsesc@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -3521,7 +3822,7 @@ json5@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.4.0.tgz#054352e4c4c80c86c0923877d449de176a732c8d"
 
-json5@^0.5.0, json5@^0.5.1:
+json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
 
@@ -3538,24 +3839,38 @@ jsonpointer@^4.0.0, jsonpointer@^4.0.1:
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
 jsprim@^1.2.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
   dependencies:
     assert-plus "1.0.0"
-    extsprintf "1.0.2"
+    extsprintf "1.3.0"
     json-schema "0.2.3"
-    verror "1.3.6"
+    verror "1.10.0"
 
 jsx-ast-utils@^1.3.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
 
-kind-of@^3.0.2:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.0.tgz#b58abe4d5c044ad33726a8c1525b48cf891bff07"
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   dependencies:
     is-buffer "^1.1.5"
 
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+
 lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
@@ -3736,10 +4051,14 @@ 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.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
+lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
+lodash@^4.2.0:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
 log-driver@1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056"
@@ -3786,6 +4105,16 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  dependencies:
+    object-visit "^1.0.0"
+
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
@@ -3820,19 +4149,37 @@ micromatch@^2.1.5, micromatch@^2.3.11:
     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"
+micromatch@^3.1.8:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
 
 mime-db@~1.30.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
 
+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+
 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"
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
   dependencies:
-    mime-db "~1.27.0"
+    mime-db "~1.33.0"
 
 mime-types@~2.1.17:
   version "2.1.17"
@@ -3844,13 +4191,13 @@ mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
+"minimatch@2 || 3", 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.4, minimatch@^3.0.4:
+minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -3870,16 +4217,32 @@ 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"
 
+minipass@^2.2.1, minipass@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.4.tgz#03c824d84551ec38a8d1bb5bc350a5a30a354a40"
+  dependencies:
+    safe-buffer "^5.1.1"
+    yallist "^3.0.0"
+
+minizlib@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  dependencies:
+    minipass "^2.2.1"
+
+mixin-deep@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.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"
 
-ms@0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -3894,9 +4257,26 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@^2.3.0:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
+nan@^2.3.0, nan@^2.9.2:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
+nanomatch@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-odd "^2.0.0"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -3906,6 +4286,14 @@ ncp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
 
+needle@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.0.tgz#f14efc69cee1024b72c8b21c7bdf94a731dc12fa"
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 node-cleanup@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz#7ac19abd297e09a7f72a71545d951b517e4dde2c"
@@ -3930,20 +4318,6 @@ node-notifier@^5.1.2:
     shellwords "^0.1.0"
     which "^1.2.12"
 
-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"
-
 node-pre-gyp@^0.6.36:
   version "0.6.36"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786"
@@ -3958,6 +4332,21 @@ node-pre-gyp@^0.6.36:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
+node-pre-gyp@^0.9.0:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz#f11c07516dd92f87199dbc7e1838eab7cd56c9e0"
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.0"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.1.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -3966,20 +4355,31 @@ nopt@^4.0.1:
     osenv "^0.1.4"
 
 normalize-package-data@^2.3.2:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.1:
+normalize-path@^2.0.0, 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"
 
+npm-bundled@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
+
+npm-packlist@^1.1.6:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -3987,12 +4387,12 @@ npm-run-path@^2.0.0:
     path-key "^2.0.0"
 
 npmlog@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f"
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
-    gauge "~2.7.1"
+    gauge "~2.7.3"
     set-blocking "~2.0.0"
 
 number-is-nan@^1.0.0:
@@ -4015,10 +4415,24 @@ 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-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
 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-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  dependencies:
+    isobject "^3.0.0"
+
 object.assign@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
@@ -4041,6 +4455,12 @@ object.omit@^2.0.0:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  dependencies:
+    isobject "^3.0.1"
+
 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"
@@ -4111,13 +4531,13 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~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"
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-output-file-sync@^1.1.0:
+output-file-sync@^1.1.0, output-file-sync@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76"
   dependencies:
@@ -4130,8 +4550,10 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
 p-limit@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
+  dependencies:
+    p-try "^1.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
@@ -4139,6 +4561,10 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+
 parse-diff@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/parse-diff/-/parse-diff-0.4.0.tgz#9ce35bcce8fc0b7c58f46d71113394fc0b4982dd"
@@ -4187,6 +4613,10 @@ parse5@^3.0.2:
   dependencies:
     "@types/node" "*"
 
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
@@ -4205,7 +4635,7 @@ path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
 
-path-is-absolute@^1.0.0:
+path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
@@ -4235,10 +4665,6 @@ path-type@^2.0.0:
   dependencies:
     pify "^2.0.0"
 
-performance-now@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -4273,6 +4699,10 @@ pn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
 
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -4303,7 +4733,11 @@ pretty-format@^22.1.0:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
 
-private@^0.1.6, private@~0.1.5:
+private@^0.1.6, private@^0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+
+private@~0.1.5:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
 
@@ -4311,6 +4745,10 @@ process-nextick-args@^1.0.6, 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-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+
 progress@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
@@ -4383,10 +4821,6 @@ qs@~6.3.0:
   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"
-
 qs@~6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
@@ -4398,15 +4832,15 @@ random-seed@^0.3.0:
     json-stringify-safe "^5.0.1"
 
 randomatic@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
   dependencies:
-    is-number "^2.0.2"
-    kind-of "^3.0.2"
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
 
 rc@^1.1.7:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092"
   dependencies:
     deep-extend "~0.4.0"
     ini "~1.3.0"
@@ -4474,7 +4908,7 @@ read-pkg@^2.0.0:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5:
+readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.1.5:
   version "2.2.9"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
   dependencies:
@@ -4486,6 +4920,18 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable
     string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
+readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
 readable-stream@^2.0.5, readable-stream@^2.2.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
@@ -4550,9 +4996,9 @@ 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.4"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.4.tgz#74cb6598d3ba2eb18694e968a40e2b3b4df9cf93"
+regenerator-runtime@^0.10.0, regenerator-runtime@^0.10.5:
+  version "0.10.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
 
 regenerator-runtime@^0.11.0:
   version "0.11.0"
@@ -4578,11 +5024,17 @@ regenerator@0.8.40:
     through "~2.3.8"
 
 regex-cache@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
   dependencies:
     is-equal-shallow "^0.1.3"
-    is-primitive "^2.0.0"
+
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
 
 regexpu@^1.3.0:
   version "1.3.0"
@@ -4605,14 +5057,14 @@ regjsparser@^0.1.4:
     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"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
 
 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:
+repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
@@ -4676,31 +5128,31 @@ request@2.79.0:
     uuid "^3.0.0"
 
 request@^2.81.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  version "2.85.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
   dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
     caseless "~0.12.0"
     combined-stream "~1.0.5"
-    extend "~3.0.0"
+    extend "~3.0.1"
     forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.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"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
     tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
+    uuid "^3.1.0"
 
 request@^2.83.0:
   version "2.83.0"
@@ -4759,6 +5211,10 @@ resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+
 resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
@@ -4782,6 +5238,10 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+
 rfc6902@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/rfc6902/-/rfc6902-2.2.2.tgz#518a4e9caac1688f3d94c9df2fdcdb6ce21f29be"
@@ -4792,15 +5252,15 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
+rimraf@2, rimraf@^2.5.1, rimraf@^2.5.4:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
     glob "^7.0.5"
 
-rimraf@^2.5.4:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+rimraf@^2.2.8, 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"
 
@@ -4903,14 +5363,16 @@ rxjs@^5.5.6:
   dependencies:
     symbol-observable "1.0.1"
 
-safe-buffer@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
-
-safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  dependencies:
+    ret "~0.1.10"
+
 safer-buffer@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -4933,14 +5395,18 @@ 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:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+sax@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
-semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
+semver@^5.1.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+
 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"
@@ -4949,6 +5415,24 @@ 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"
 
+set-value@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.1"
+    to-object-path "^0.3.0"
+
+set-value@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
 setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
@@ -4989,6 +5473,33 @@ slice-ansi@1.0.0:
   dependencies:
     is-fullwidth-code-point "^2.0.0"
 
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
 sntp@1.x.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
@@ -5001,15 +5512,25 @@ sntp@2.x.x:
   dependencies:
     hoek "4.x.x"
 
+source-map-resolve@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
+  dependencies:
+    atob "^2.0.0"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
 source-map-support@^0.2.10:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.2.10.tgz#ea5a3900a1c1cb25096a0ae8cc5c2b4b10ded3dc"
   dependencies:
     source-map "0.1.32"
 
-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"
+source-map-support@^0.4.15:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
   dependencies:
     source-map "^0.5.6"
 
@@ -5019,6 +5540,10 @@ source-map-support@^0.5.0:
   dependencies:
     source-map "^0.6.0"
 
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+
 source-map@0.1.32:
   version "0.1.32"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266"
@@ -5031,7 +5556,11 @@ 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.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1:
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
+source-map@^0.5.3, source-map@~0.5.0, source-map@~0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
@@ -5054,27 +5583,41 @@ spawn-sync@^1.0.15:
     concat-stream "^1.4.7"
     os-shim "^0.1.2"
 
-spdx-correct@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+spdx-correct@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
   dependencies:
-    spdx-license-ids "^1.0.2"
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
 
-spdx-expression-parse@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+spdx-exceptions@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
 
-spdx-license-ids@^1.0.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+spdx-expression-parse@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  dependencies:
+    extend-shallow "^3.0.0"
 
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
 sshpk@^1.7.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -5083,7 +5626,6 @@ sshpk@^1.7.0:
   optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
     ecc-jsbn "~0.1.1"
-    jodid25519 "^1.0.0"
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
@@ -5095,6 +5637,13 @@ stack-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
 
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
 stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
@@ -5136,18 +5685,18 @@ string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-string_decoder@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667"
-  dependencies:
-    buffer-shims "~1.0.0"
-
-string_decoder@~1.0.3:
+string_decoder@~1.0.0, string_decoder@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
   dependencies:
     safe-buffer "~5.1.0"
 
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  dependencies:
+    safe-buffer "~5.1.0"
+
 stringmap@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/stringmap/-/stringmap-0.2.2.tgz#556c137b258f942b8776f5b2ef582aa069d7d1b1"
@@ -5209,8 +5758,8 @@ supports-color@^3.1.2:
     has-flag "^1.0.0"
 
 supports-color@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.0.tgz#ad986dc7eb2315d009b4d77c8169c2231a684037"
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
   dependencies:
     has-flag "^2.0.0"
 
@@ -5220,6 +5769,12 @@ supports-color@^5.0.0:
   dependencies:
     has-flag "^2.0.0"
 
+supports-color@^5.3.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+  dependencies:
+    has-flag "^3.0.0"
+
 supports-hyperlinks@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-1.0.1.tgz#71daedf36cc1060ac5100c351bb3da48c29c0ef7"
@@ -5256,8 +5811,8 @@ tar-fs@^1.8.1:
     tar-stream "^1.1.2"
 
 tar-pack@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
   dependencies:
     debug "^2.2.0"
     fstream "^1.0.10"
@@ -5285,6 +5840,18 @@ tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
+tar@^4:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.1.tgz#b25d5a8470c976fd7a9a8a350f42c59e9fa81749"
+  dependencies:
+    chownr "^1.0.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.2.4"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.1"
+    yallist "^3.0.2"
+
 targz@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/targz/-/targz-1.0.1.tgz#8f76a523694cdedfbb5d60a4076ff6eeecc5398f"
@@ -5305,12 +5872,12 @@ terminal-table@0.0.12:
     colors "^1.0.3"
     eastasianwidth "^0.1.0"
 
-test-exclude@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.1.1.tgz#4d84964b0966b0087ecc334a2ce002d3d9341e26"
+test-exclude@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa"
   dependencies:
     arrify "^1.0.1"
-    micromatch "^2.3.11"
+    micromatch "^3.1.8"
     object-assign "^4.1.0"
     read-pkg-up "^1.0.1"
     require-main-filename "^1.0.1"
@@ -5380,7 +5947,7 @@ to-absolute-glob@^2.0.0:
     is-absolute "^0.2.5"
     is-negated-glob "^1.0.0"
 
-to-fast-properties@^1.0.0, to-fast-properties@^1.0.1:
+to-fast-properties@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"
 
@@ -5392,6 +5959,28 @@ to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
 
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
 tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
@@ -5399,8 +5988,8 @@ tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.3:
     punycode "^1.4.1"
 
 tough-cookie@~2.3.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
   dependencies:
     punycode "^1.4.1"
 
@@ -5483,6 +6072,15 @@ 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"
 
+union-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^0.4.3"
+
 unique-stream@^2.0.2:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"
@@ -5490,10 +6088,27 @@ unique-stream@^2.0.2:
     json-stable-stringify "^1.0.0"
     through2-filter "^2.0.0"
 
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+
 url-template@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
 
+use@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544"
+  dependencies:
+    kind-of "^6.0.2"
+
 user-home@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
@@ -5510,31 +6125,33 @@ util.promisify@^1.0.0:
     object.getownpropertydescriptors "^2.0.3"
 
 uuid@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
 
 uuid@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
-v8flags@^2.0.10:
+v8flags@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
   dependencies:
     user-home "^1.1.1"
 
 validate-npm-package-license@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
   dependencies:
-    spdx-correct "~1.0.0"
-    spdx-expression-parse "~1.0.0"
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
 
-verror@1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
   dependencies:
-    extsprintf "1.0.2"
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
 
 vinyl-sourcemaps-apply@^0.2.0:
   version "0.2.1"
@@ -5626,10 +6243,10 @@ which@^1.2.9:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.0.tgz#40edde802a71fea1f070da3e62dcda2e7add96ad"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
   dependencies:
-    string-width "^1.0.1"
+    string-width "^1.0.2"
 
 window-size@0.1.0:
   version "0.1.0"
@@ -5696,6 +6313,10 @@ yallist@^2.0.0, yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+
 yargs-parser@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4"

From 7dc1a176b5c50739b200a9d8612a42b110289d22 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 15 May 2018 11:11:19 +0100
Subject: [PATCH 051/277] Skip special nodes when reading TestInstance.parent
 (#12813)

---
 .../src/ReactTestRenderer.js                  | 42 +++++++------------
 .../ReactTestRendererTraversal-test.js        | 39 ++++++++++++++++-
 2 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js
index 5fab9af606..029c260580 100644
--- a/packages/react-test-renderer/src/ReactTestRenderer.js
+++ b/packages/react-test-renderer/src/ReactTestRenderer.js
@@ -245,10 +245,14 @@ class ReactTestInstance {
   }
 
   get parent(): ?ReactTestInstance {
-    const parent = this._fiber.return;
-    return parent === null || parent.tag === HostRoot
-      ? null
-      : wrapFiber(parent);
+    let parent = this._fiber.return;
+    while (parent !== null) {
+      if (validWrapperTypes.has(parent.tag)) {
+        return wrapFiber(parent);
+      }
+      parent = parent.return;
+    }
+    return null;
   }
 
   get children(): Array<ReactTestInstance | string> {
@@ -262,30 +266,12 @@ class ReactTestInstance {
     node = node.child;
     outer: while (true) {
       let descend = false;
-      switch (node.tag) {
-        case FunctionalComponent:
-        case ClassComponent:
-        case HostComponent:
-        case ForwardRef:
-          children.push(wrapFiber(node));
-          break;
-        case HostText:
-          children.push('' + node.memoizedProps);
-          break;
-        case Fragment:
-        case ContextProvider:
-        case ContextConsumer:
-        case Mode:
-        case Profiler:
-          descend = true;
-          break;
-        default:
-          invariant(
-            false,
-            'Unsupported component type %s in test renderer. ' +
-              'This is probably a bug in React.',
-            node.tag,
-          );
+      if (validWrapperTypes.has(node.tag)) {
+        children.push(wrapFiber(node));
+      } else if (node.tag === HostText) {
+        children.push('' + node.memoizedProps);
+      } else {
+        descend = true;
       }
       if (descend && node.child !== null) {
         node.child.return = node;
diff --git a/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js b/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js
index cefef5657c..9fb91e1f35 100644
--- a/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js
@@ -12,6 +12,7 @@
 
 const React = require('react');
 let ReactTestRenderer;
+let Context;
 
 const RCTView = 'RCTView';
 const View = props => <RCTView {...props} />;
@@ -20,6 +21,7 @@ describe('ReactTestRendererTraversal', () => {
   beforeEach(() => {
     jest.resetModules();
     ReactTestRenderer = require('react-test-renderer');
+    Context = React.createContext(null);
   });
 
   class Example extends React.Component {
@@ -40,6 +42,17 @@ describe('ReactTestRendererTraversal', () => {
             <React.unstable_Profiler id="test" onRender={() => {}}>
               <ExampleForwardRef qux="qux" />
             </React.unstable_Profiler>
+            <React.Fragment>
+              <React.Fragment>
+                <Context.Provider value={null}>
+                  <Context.Consumer>
+                    {() => <View nested={true} />}
+                  </Context.Consumer>
+                </Context.Provider>
+              </React.Fragment>
+              <View nested={true} />
+              <View nested={true} />
+            </React.Fragment>
           </View>
         </View>
       );
@@ -61,7 +74,7 @@ describe('ReactTestRendererTraversal', () => {
 
     // assert .props, .type and .parent attributes
     const foo = render.root.find(hasFooProp);
-    expect(foo.props.children).toHaveLength(8);
+    expect(foo.props.children).toHaveLength(9);
     expect(foo.type).toBe(View);
     expect(render.root.parent).toBe(null);
     expect(foo.children[0].parent).toBe(foo);
@@ -76,6 +89,7 @@ describe('ReactTestRendererTraversal', () => {
     const hasNullProp = node => node.props.hasOwnProperty('null');
     const hasVoidProp = node => node.props.hasOwnProperty('void');
     const hasItselfProp = node => node.props.hasOwnProperty('itself');
+    const hasNestedProp = node => node.props.hasOwnProperty('nested');
 
     expect(() => render.root.find(hasFooProp)).not.toThrow(); // 1 match
     expect(() => render.root.find(hasBarProp)).toThrow(); // >1 matches
@@ -83,6 +97,7 @@ describe('ReactTestRendererTraversal', () => {
     expect(() => render.root.find(hasBingProp)).not.toThrow(); // 1 match
     expect(() => render.root.find(hasNullProp)).not.toThrow(); // 1 match
     expect(() => render.root.find(hasVoidProp)).toThrow(); // 0 matches
+    expect(() => render.root.find(hasNestedProp)).toThrow(); // >1 matches
 
     // same assertion as .find(), but confirm length
     expect(render.root.findAll(hasFooProp, {deep: false})).toHaveLength(1);
@@ -91,6 +106,7 @@ describe('ReactTestRendererTraversal', () => {
     expect(render.root.findAll(hasBingProp, {deep: false})).toHaveLength(1);
     expect(render.root.findAll(hasNullProp, {deep: false})).toHaveLength(1);
     expect(render.root.findAll(hasVoidProp, {deep: false})).toHaveLength(0);
+    expect(render.root.findAll(hasNestedProp, {deep: false})).toHaveLength(3);
 
     // note: with {deep: true}, .findAll() will continue to
     //       search children, even after finding a match
@@ -100,6 +116,7 @@ describe('ReactTestRendererTraversal', () => {
     expect(render.root.findAll(hasBingProp)).toHaveLength(1); // no spread
     expect(render.root.findAll(hasNullProp)).toHaveLength(1); // no spread
     expect(render.root.findAll(hasVoidProp)).toHaveLength(0);
+    expect(render.root.findAll(hasNestedProp, {deep: false})).toHaveLength(3);
 
     const bing = render.root.find(hasBingProp);
     expect(bing.find(hasBarProp)).toBe(bing);
@@ -130,7 +147,7 @@ describe('ReactTestRendererTraversal', () => {
 
     expect(render.root.findAllByType(ExampleFn)).toHaveLength(1);
     expect(render.root.findAllByType(View, {deep: false})).toHaveLength(1);
-    expect(render.root.findAllByType(View)).toHaveLength(8);
+    expect(render.root.findAllByType(View)).toHaveLength(11);
     expect(render.root.findAllByType(ExampleNull)).toHaveLength(2);
     expect(render.root.findAllByType(ExampleForwardRef)).toHaveLength(1);
 
@@ -164,4 +181,22 @@ describe('ReactTestRendererTraversal', () => {
     expect(render.root.findAllByProps({baz})).toHaveLength(4);
     expect(render.root.findAllByProps({qux})).toHaveLength(3);
   });
+
+  it('skips special nodes', () => {
+    const render = ReactTestRenderer.create(<Example />);
+    expect(render.root.findAllByType(React.Fragment)).toHaveLength(0);
+    expect(render.root.findAllByType(Context.Consumer)).toHaveLength(0);
+    expect(render.root.findAllByType(Context.Provider)).toHaveLength(0);
+
+    const expectedParent = render.root.findByProps({foo: 'foo'}, {deep: false})
+      .children[0];
+    const nestedViews = render.root.findAllByProps(
+      {nested: true},
+      {deep: false},
+    );
+    expect(nestedViews.length).toBe(3);
+    expect(nestedViews[0].parent).toBe(expectedParent);
+    expect(nestedViews[1].parent).toBe(expectedParent);
+    expect(nestedViews[2].parent).toBe(expectedParent);
+  });
 });

From bb44feb05dd258c4b4868f6c3f11bf0a2f491564 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 15 May 2018 13:55:01 +0100
Subject: [PATCH 052/277] Try to fix Flow circular dependency

---
 .../src/events/DOMTopLevelEventTypes.js       | 147 +++++++++---------
 .../src/events/ReactDOMEventListener.js       |  15 +-
 .../react-dom/src/events/SimpleEventPlugin.js |   5 +-
 3 files changed, 84 insertions(+), 83 deletions(-)

diff --git a/packages/react-dom/src/events/DOMTopLevelEventTypes.js b/packages/react-dom/src/events/DOMTopLevelEventTypes.js
index 79f13057f9..aac82dbbe7 100644
--- a/packages/react-dom/src/events/DOMTopLevelEventTypes.js
+++ b/packages/react-dom/src/events/DOMTopLevelEventTypes.js
@@ -7,7 +7,6 @@
  * @flow
  */
 
-import type {TopLevelType} from 'events/TopLevelEventTypes';
 import getVendorPrefixedEventName from './getVendorPrefixedEventName';
 
 /**
@@ -94,87 +93,87 @@ export opaque type DOMTopLevelEventType =
   | 'waiting'
   | 'wheel';
 
-export const TOP_ABORT: TopLevelType = 'abort';
-export const TOP_ANIMATION_END: TopLevelType = getVendorPrefixedEventName(
+export const TOP_ABORT: DOMTopLevelEventType = 'abort';
+export const TOP_ANIMATION_END: DOMTopLevelEventType = getVendorPrefixedEventName(
   'animationend',
 );
-export const TOP_ANIMATION_ITERATION: TopLevelType = getVendorPrefixedEventName(
+export const TOP_ANIMATION_ITERATION: DOMTopLevelEventType = getVendorPrefixedEventName(
   'animationiteration',
 );
-export const TOP_ANIMATION_START: TopLevelType = getVendorPrefixedEventName(
+export const TOP_ANIMATION_START: DOMTopLevelEventType = getVendorPrefixedEventName(
   'animationstart',
 );
-export const TOP_BLUR: TopLevelType = 'blur';
-export const TOP_CAN_PLAY: TopLevelType = 'canplay';
-export const TOP_CAN_PLAY_THROUGH: TopLevelType = 'canplaythrough';
-export const TOP_CANCEL: TopLevelType = 'cancel';
-export const TOP_CHANGE: TopLevelType = 'change';
-export const TOP_CLICK: TopLevelType = 'click';
-export const TOP_CLOSE: TopLevelType = 'close';
-export const TOP_COMPOSITION_END: TopLevelType = 'compositionend';
-export const TOP_COMPOSITION_START: TopLevelType = 'compositionstart';
-export const TOP_COMPOSITION_UPDATE: TopLevelType = 'compositionupdate';
-export const TOP_CONTEXT_MENU: TopLevelType = 'contextmenu';
-export const TOP_COPY: TopLevelType = 'copy';
-export const TOP_CUT: TopLevelType = 'cut';
-export const TOP_DOUBLE_CLICK: TopLevelType = 'dblclick';
-export const TOP_DRAG: TopLevelType = 'drag';
-export const TOP_DRAG_END: TopLevelType = 'dragend';
-export const TOP_DRAG_ENTER: TopLevelType = 'dragenter';
-export const TOP_DRAG_EXIT: TopLevelType = 'dragexit';
-export const TOP_DRAG_LEAVE: TopLevelType = 'dragleave';
-export const TOP_DRAG_OVER: TopLevelType = 'dragover';
-export const TOP_DRAG_START: TopLevelType = 'dragstart';
-export const TOP_DROP: TopLevelType = 'drop';
-export const TOP_DURATION_CHANGE: TopLevelType = 'durationchange';
-export const TOP_EMPTIED: TopLevelType = 'emptied';
-export const TOP_ENCRYPTED: TopLevelType = 'encrypted';
-export const TOP_ENDED: TopLevelType = 'ended';
-export const TOP_ERROR: TopLevelType = 'error';
-export const TOP_FOCUS: TopLevelType = 'focus';
-export const TOP_INPUT: TopLevelType = 'input';
-export const TOP_INVALID: TopLevelType = 'invalid';
-export const TOP_KEY_DOWN: TopLevelType = 'keydown';
-export const TOP_KEY_PRESS: TopLevelType = 'keypress';
-export const TOP_KEY_UP: TopLevelType = 'keyup';
-export const TOP_LOAD: TopLevelType = 'load';
-export const TOP_LOAD_START: TopLevelType = 'loadstart';
-export const TOP_LOADED_DATA: TopLevelType = 'loadeddata';
-export const TOP_LOADED_METADATA: TopLevelType = 'loadedmetadata';
-export const TOP_MOUSE_DOWN: TopLevelType = 'mousedown';
-export const TOP_MOUSE_MOVE: TopLevelType = 'mousemove';
-export const TOP_MOUSE_OUT: TopLevelType = 'mouseout';
-export const TOP_MOUSE_OVER: TopLevelType = 'mouseover';
-export const TOP_MOUSE_UP: TopLevelType = 'mouseup';
-export const TOP_PASTE: TopLevelType = 'paste';
-export const TOP_PAUSE: TopLevelType = 'pause';
-export const TOP_PLAY: TopLevelType = 'play';
-export const TOP_PLAYING: TopLevelType = 'playing';
-export const TOP_PROGRESS: TopLevelType = 'progress';
-export const TOP_RATE_CHANGE: TopLevelType = 'ratechange';
-export const TOP_RESET: TopLevelType = 'reset';
-export const TOP_SCROLL: TopLevelType = 'scroll';
-export const TOP_SEEKED: TopLevelType = 'seeked';
-export const TOP_SEEKING: TopLevelType = 'seeking';
-export const TOP_SELECTION_CHANGE: TopLevelType = 'selectionchange';
-export const TOP_STALLED: TopLevelType = 'stalled';
-export const TOP_SUBMIT: TopLevelType = 'submit';
-export const TOP_SUSPEND: TopLevelType = 'suspend';
-export const TOP_TEXT_INPUT: TopLevelType = 'textInput';
-export const TOP_TIME_UPDATE: TopLevelType = 'timeupdate';
-export const TOP_TOGGLE: TopLevelType = 'toggle';
-export const TOP_TOUCH_CANCEL: TopLevelType = 'touchcancel';
-export const TOP_TOUCH_END: TopLevelType = 'touchend';
-export const TOP_TOUCH_MOVE: TopLevelType = 'touchmove';
-export const TOP_TOUCH_START: TopLevelType = 'touchstart';
-export const TOP_TRANSITION_END: TopLevelType = getVendorPrefixedEventName(
+export const TOP_BLUR: DOMTopLevelEventType = 'blur';
+export const TOP_CAN_PLAY: DOMTopLevelEventType = 'canplay';
+export const TOP_CAN_PLAY_THROUGH: DOMTopLevelEventType = 'canplaythrough';
+export const TOP_CANCEL: DOMTopLevelEventType = 'cancel';
+export const TOP_CHANGE: DOMTopLevelEventType = 'change';
+export const TOP_CLICK: DOMTopLevelEventType = 'click';
+export const TOP_CLOSE: DOMTopLevelEventType = 'close';
+export const TOP_COMPOSITION_END: DOMTopLevelEventType = 'compositionend';
+export const TOP_COMPOSITION_START: DOMTopLevelEventType = 'compositionstart';
+export const TOP_COMPOSITION_UPDATE: DOMTopLevelEventType = 'compositionupdate';
+export const TOP_CONTEXT_MENU: DOMTopLevelEventType = 'contextmenu';
+export const TOP_COPY: DOMTopLevelEventType = 'copy';
+export const TOP_CUT: DOMTopLevelEventType = 'cut';
+export const TOP_DOUBLE_CLICK: DOMTopLevelEventType = 'dblclick';
+export const TOP_DRAG: DOMTopLevelEventType = 'drag';
+export const TOP_DRAG_END: DOMTopLevelEventType = 'dragend';
+export const TOP_DRAG_ENTER: DOMTopLevelEventType = 'dragenter';
+export const TOP_DRAG_EXIT: DOMTopLevelEventType = 'dragexit';
+export const TOP_DRAG_LEAVE: DOMTopLevelEventType = 'dragleave';
+export const TOP_DRAG_OVER: DOMTopLevelEventType = 'dragover';
+export const TOP_DRAG_START: DOMTopLevelEventType = 'dragstart';
+export const TOP_DROP: DOMTopLevelEventType = 'drop';
+export const TOP_DURATION_CHANGE: DOMTopLevelEventType = 'durationchange';
+export const TOP_EMPTIED: DOMTopLevelEventType = 'emptied';
+export const TOP_ENCRYPTED: DOMTopLevelEventType = 'encrypted';
+export const TOP_ENDED: DOMTopLevelEventType = 'ended';
+export const TOP_ERROR: DOMTopLevelEventType = 'error';
+export const TOP_FOCUS: DOMTopLevelEventType = 'focus';
+export const TOP_INPUT: DOMTopLevelEventType = 'input';
+export const TOP_INVALID: DOMTopLevelEventType = 'invalid';
+export const TOP_KEY_DOWN: DOMTopLevelEventType = 'keydown';
+export const TOP_KEY_PRESS: DOMTopLevelEventType = 'keypress';
+export const TOP_KEY_UP: DOMTopLevelEventType = 'keyup';
+export const TOP_LOAD: DOMTopLevelEventType = 'load';
+export const TOP_LOAD_START: DOMTopLevelEventType = 'loadstart';
+export const TOP_LOADED_DATA: DOMTopLevelEventType = 'loadeddata';
+export const TOP_LOADED_METADATA: DOMTopLevelEventType = 'loadedmetadata';
+export const TOP_MOUSE_DOWN: DOMTopLevelEventType = 'mousedown';
+export const TOP_MOUSE_MOVE: DOMTopLevelEventType = 'mousemove';
+export const TOP_MOUSE_OUT: DOMTopLevelEventType = 'mouseout';
+export const TOP_MOUSE_OVER: DOMTopLevelEventType = 'mouseover';
+export const TOP_MOUSE_UP: DOMTopLevelEventType = 'mouseup';
+export const TOP_PASTE: DOMTopLevelEventType = 'paste';
+export const TOP_PAUSE: DOMTopLevelEventType = 'pause';
+export const TOP_PLAY: DOMTopLevelEventType = 'play';
+export const TOP_PLAYING: DOMTopLevelEventType = 'playing';
+export const TOP_PROGRESS: DOMTopLevelEventType = 'progress';
+export const TOP_RATE_CHANGE: DOMTopLevelEventType = 'ratechange';
+export const TOP_RESET: DOMTopLevelEventType = 'reset';
+export const TOP_SCROLL: DOMTopLevelEventType = 'scroll';
+export const TOP_SEEKED: DOMTopLevelEventType = 'seeked';
+export const TOP_SEEKING: DOMTopLevelEventType = 'seeking';
+export const TOP_SELECTION_CHANGE: DOMTopLevelEventType = 'selectionchange';
+export const TOP_STALLED: DOMTopLevelEventType = 'stalled';
+export const TOP_SUBMIT: DOMTopLevelEventType = 'submit';
+export const TOP_SUSPEND: DOMTopLevelEventType = 'suspend';
+export const TOP_TEXT_INPUT: DOMTopLevelEventType = 'textInput';
+export const TOP_TIME_UPDATE: DOMTopLevelEventType = 'timeupdate';
+export const TOP_TOGGLE: DOMTopLevelEventType = 'toggle';
+export const TOP_TOUCH_CANCEL: DOMTopLevelEventType = 'touchcancel';
+export const TOP_TOUCH_END: DOMTopLevelEventType = 'touchend';
+export const TOP_TOUCH_MOVE: DOMTopLevelEventType = 'touchmove';
+export const TOP_TOUCH_START: DOMTopLevelEventType = 'touchstart';
+export const TOP_TRANSITION_END: DOMTopLevelEventType = getVendorPrefixedEventName(
   'transitionend',
 );
-export const TOP_VOLUME_CHANGE: TopLevelType = 'volumechange';
-export const TOP_WAITING: TopLevelType = 'waiting';
-export const TOP_WHEEL: TopLevelType = 'wheel';
+export const TOP_VOLUME_CHANGE: DOMTopLevelEventType = 'volumechange';
+export const TOP_WAITING: DOMTopLevelEventType = 'waiting';
+export const TOP_WHEEL: DOMTopLevelEventType = 'wheel';
 
-export const mediaEventTypes: Array<TopLevelType> = [
+export const mediaEventTypes: Array<DOMTopLevelEventType> = [
   TOP_ABORT,
   TOP_CAN_PLAY,
   TOP_CAN_PLAY_THROUGH,
@@ -200,6 +199,6 @@ export const mediaEventTypes: Array<TopLevelType> = [
   TOP_WAITING,
 ];
 
-export function getRawEventName(topLevelType: TopLevelType): string {
+export function getRawEventName(topLevelType: DOMTopLevelEventType): string {
   return topLevelType;
 }
diff --git a/packages/react-dom/src/events/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js
index 0125a8437b..8878d447d2 100644
--- a/packages/react-dom/src/events/ReactDOMEventListener.js
+++ b/packages/react-dom/src/events/ReactDOMEventListener.js
@@ -7,13 +7,14 @@
  * @flow
  */
 
+import type {AnyNativeEvent} from 'events/PluginModuleType';
+import type {Fiber} from 'react-reconciler/src/ReactFiber';
+import type {DOMTopLevelEventType} from './DOMTopLevelEventTypes';
+
 import {batchedUpdates, interactiveUpdates} from 'events/ReactGenericBatching';
 import {runExtractedEventsInBatch} from 'events/EventPluginHub';
 import {isFiberMounted} from 'react-reconciler/reflection';
 import {HostRoot} from 'shared/ReactTypeOfWork';
-import type {AnyNativeEvent} from 'events/PluginModuleType';
-import type {TopLevelType} from 'events/TopLevelEventTypes';
-import type {Fiber} from 'react-reconciler/src/ReactFiber';
 
 import {addEventBubbleListener, addEventCaptureListener} from './EventListener';
 import getEventTarget from './getEventTarget';
@@ -51,7 +52,7 @@ function getTopLevelCallbackBookKeeping(
   nativeEvent,
   targetInst,
 ): {
-  topLevelType: ?TopLevelType,
+  topLevelType: ?DOMTopLevelEventType,
   nativeEvent: ?AnyNativeEvent,
   targetInst: Fiber,
   ancestors: Array<Fiber>,
@@ -134,7 +135,7 @@ export function isEnabled() {
  * @internal
  */
 export function trapBubbledEvent(
-  topLevelType: TopLevelType,
+  topLevelType: DOMTopLevelEventType,
   element: Document | Element,
 ) {
   if (!element) {
@@ -162,7 +163,7 @@ export function trapBubbledEvent(
  * @internal
  */
 export function trapCapturedEvent(
-  topLevelType: TopLevelType,
+  topLevelType: DOMTopLevelEventType,
   element: Document | Element,
 ) {
   if (!element) {
@@ -185,7 +186,7 @@ function dispatchInteractiveEvent(topLevelType, nativeEvent) {
 }
 
 export function dispatchEvent(
-  topLevelType: TopLevelType,
+  topLevelType: DOMTopLevelEventType,
   nativeEvent: AnyNativeEvent,
 ) {
   if (!_enabled) {
diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js
index 6da1d244c9..8c9a4bad1c 100644
--- a/packages/react-dom/src/events/SimpleEventPlugin.js
+++ b/packages/react-dom/src/events/SimpleEventPlugin.js
@@ -8,6 +8,7 @@
  */
 
 import type {TopLevelType} from 'events/TopLevelEventTypes';
+import type {DOMTopLevelEventType} from './DOMTopLevelEventTypes';
 import type {
   DispatchConfig,
   ReactSyntheticEvent,
@@ -51,7 +52,7 @@ import getEventCharCode from './getEventCharCode';
  *   [TOP_ABORT, { sameConfig }],
  * ]);
  */
-type EventTuple = [TopLevelType, string];
+type EventTuple = [DOMTopLevelEventType, string];
 const interactiveEventTypeNames: Array<EventTuple> = [
   [DOMTopLevelEventTypes.TOP_BLUR, 'blur'],
   [DOMTopLevelEventTypes.TOP_CANCEL, 'cancel'],
@@ -154,7 +155,7 @@ nonInteractiveEventTypeNames.forEach(eventTuple => {
 });
 
 // Only used in DEV for exhaustiveness validation.
-const knownHTMLTopLevelTypes: Array<TopLevelType> = [
+const knownHTMLTopLevelTypes: Array<DOMTopLevelEventType> = [
   DOMTopLevelEventTypes.TOP_ABORT,
   DOMTopLevelEventTypes.TOP_CANCEL,
   DOMTopLevelEventTypes.TOP_CAN_PLAY,

From 7631024722eae7b03599ba0eeaf9abcd505da13f Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 15 May 2018 14:07:01 +0100
Subject: [PATCH 053/277] Try to fix Flow issue on Windows

---
 packages/react-dom/src/events/SimpleEventPlugin.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js
index 8c9a4bad1c..6da1d244c9 100644
--- a/packages/react-dom/src/events/SimpleEventPlugin.js
+++ b/packages/react-dom/src/events/SimpleEventPlugin.js
@@ -8,7 +8,6 @@
  */
 
 import type {TopLevelType} from 'events/TopLevelEventTypes';
-import type {DOMTopLevelEventType} from './DOMTopLevelEventTypes';
 import type {
   DispatchConfig,
   ReactSyntheticEvent,
@@ -52,7 +51,7 @@ import getEventCharCode from './getEventCharCode';
  *   [TOP_ABORT, { sameConfig }],
  * ]);
  */
-type EventTuple = [DOMTopLevelEventType, string];
+type EventTuple = [TopLevelType, string];
 const interactiveEventTypeNames: Array<EventTuple> = [
   [DOMTopLevelEventTypes.TOP_BLUR, 'blur'],
   [DOMTopLevelEventTypes.TOP_CANCEL, 'cancel'],
@@ -155,7 +154,7 @@ nonInteractiveEventTypeNames.forEach(eventTuple => {
 });
 
 // Only used in DEV for exhaustiveness validation.
-const knownHTMLTopLevelTypes: Array<DOMTopLevelEventType> = [
+const knownHTMLTopLevelTypes: Array<TopLevelType> = [
   DOMTopLevelEventTypes.TOP_ABORT,
   DOMTopLevelEventTypes.TOP_CANCEL,
   DOMTopLevelEventTypes.TOP_CAN_PLAY,

From b998357f9d1a4d933758dd10412e9ff99def36df Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 15 May 2018 14:26:32 +0100
Subject: [PATCH 054/277] Try to fix Flow issue on Windows (part 3)

---
 packages/events/TopLevelEventTypes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/events/TopLevelEventTypes.js b/packages/events/TopLevelEventTypes.js
index f9d4722abb..a2e322babd 100644
--- a/packages/events/TopLevelEventTypes.js
+++ b/packages/events/TopLevelEventTypes.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {DOMTopLevelEventType} from 'react-dom/src/events/DOMTopLevelEventTypes';
+import type {DOMTopLevelEventType} from '../react-dom/src/events/DOMTopLevelEventTypes';
 
 type RNTopLevelEventType =
   | 'topMouseDown'

From f2252a2ad4e47d5bdc1d7778c7d6eb2d318fed0d Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 15 May 2018 14:46:58 +0100
Subject: [PATCH 055/277] Try to fix Flow issue on Windows (part 4)

---
 packages/events/PluginModuleType.js                | 2 +-
 packages/events/TopLevelEventTypes.js              | 2 +-
 packages/react-dom/src/events/SimpleEventPlugin.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/events/PluginModuleType.js b/packages/events/PluginModuleType.js
index 22d53b1ccb..4b5b9b67a3 100644
--- a/packages/events/PluginModuleType.js
+++ b/packages/events/PluginModuleType.js
@@ -12,7 +12,7 @@ import type {
   DispatchConfig,
   ReactSyntheticEvent,
 } from './ReactSyntheticEventType';
-import type {TopLevelType} from './TopLevelEventTypes';
+import type {TopLevelType} from 'events/TopLevelEventTypes';
 
 export type EventTypes = {[key: string]: DispatchConfig};
 
diff --git a/packages/events/TopLevelEventTypes.js b/packages/events/TopLevelEventTypes.js
index a2e322babd..f9d4722abb 100644
--- a/packages/events/TopLevelEventTypes.js
+++ b/packages/events/TopLevelEventTypes.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {DOMTopLevelEventType} from '../react-dom/src/events/DOMTopLevelEventTypes';
+import type {DOMTopLevelEventType} from 'react-dom/src/events/DOMTopLevelEventTypes';
 
 type RNTopLevelEventType =
   | 'topMouseDown'
diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js
index 6da1d244c9..b087c0788e 100644
--- a/packages/react-dom/src/events/SimpleEventPlugin.js
+++ b/packages/react-dom/src/events/SimpleEventPlugin.js
@@ -18,7 +18,7 @@ import type {EventTypes, PluginModule} from 'events/PluginModuleType';
 import {accumulateTwoPhaseDispatches} from 'events/EventPropagators';
 import SyntheticEvent from 'events/SyntheticEvent';
 
-import * as DOMTopLevelEventTypes from './DOMTopLevelEventTypes';
+import * as DOMTopLevelEventTypes from 'react-dom/src/events/DOMTopLevelEventTypes';
 import warning from 'fbjs/lib/warning';
 
 import SyntheticAnimationEvent from './SyntheticAnimationEvent';

From 7ba1abecaa7a1a9a7a5456a66521f2869ba83c1f Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 15 May 2018 14:55:38 +0100
Subject: [PATCH 056/277] Try to fix Flow issue on Windows (part 5)

---
 packages/react-dom/src/events/ReactDOMEventListener.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-dom/src/events/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js
index 8878d447d2..f14b420e70 100644
--- a/packages/react-dom/src/events/ReactDOMEventListener.js
+++ b/packages/react-dom/src/events/ReactDOMEventListener.js
@@ -9,7 +9,7 @@
 
 import type {AnyNativeEvent} from 'events/PluginModuleType';
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
-import type {DOMTopLevelEventType} from './DOMTopLevelEventTypes';
+import type {DOMTopLevelEventType} from 'react-dom/src/events/DOMTopLevelEventTypes';
 
 import {batchedUpdates, interactiveUpdates} from 'events/ReactGenericBatching';
 import {runExtractedEventsInBatch} from 'events/EventPluginHub';
@@ -20,7 +20,7 @@ import {addEventBubbleListener, addEventCaptureListener} from './EventListener';
 import getEventTarget from './getEventTarget';
 import {getClosestInstanceFromNode} from '../client/ReactDOMComponentTree';
 import SimpleEventPlugin from './SimpleEventPlugin';
-import {getRawEventName} from './DOMTopLevelEventTypes';
+import {getRawEventName} from 'react-dom/src/events/DOMTopLevelEventTypes';
 
 const {isInteractiveTopLevelEventType} = SimpleEventPlugin;
 

From fe7890d569c5aa94c371bdb27c5db7bde4ec385a Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 15 May 2018 15:03:07 +0100
Subject: [PATCH 057/277] Revert recent Flow changes

---
 packages/events/PluginModuleType.js                    | 2 +-
 packages/react-dom/src/events/ReactDOMEventListener.js | 4 ++--
 packages/react-dom/src/events/SimpleEventPlugin.js     | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/events/PluginModuleType.js b/packages/events/PluginModuleType.js
index 4b5b9b67a3..22d53b1ccb 100644
--- a/packages/events/PluginModuleType.js
+++ b/packages/events/PluginModuleType.js
@@ -12,7 +12,7 @@ import type {
   DispatchConfig,
   ReactSyntheticEvent,
 } from './ReactSyntheticEventType';
-import type {TopLevelType} from 'events/TopLevelEventTypes';
+import type {TopLevelType} from './TopLevelEventTypes';
 
 export type EventTypes = {[key: string]: DispatchConfig};
 
diff --git a/packages/react-dom/src/events/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js
index f14b420e70..8878d447d2 100644
--- a/packages/react-dom/src/events/ReactDOMEventListener.js
+++ b/packages/react-dom/src/events/ReactDOMEventListener.js
@@ -9,7 +9,7 @@
 
 import type {AnyNativeEvent} from 'events/PluginModuleType';
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
-import type {DOMTopLevelEventType} from 'react-dom/src/events/DOMTopLevelEventTypes';
+import type {DOMTopLevelEventType} from './DOMTopLevelEventTypes';
 
 import {batchedUpdates, interactiveUpdates} from 'events/ReactGenericBatching';
 import {runExtractedEventsInBatch} from 'events/EventPluginHub';
@@ -20,7 +20,7 @@ import {addEventBubbleListener, addEventCaptureListener} from './EventListener';
 import getEventTarget from './getEventTarget';
 import {getClosestInstanceFromNode} from '../client/ReactDOMComponentTree';
 import SimpleEventPlugin from './SimpleEventPlugin';
-import {getRawEventName} from 'react-dom/src/events/DOMTopLevelEventTypes';
+import {getRawEventName} from './DOMTopLevelEventTypes';
 
 const {isInteractiveTopLevelEventType} = SimpleEventPlugin;
 
diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js
index b087c0788e..8c9a4bad1c 100644
--- a/packages/react-dom/src/events/SimpleEventPlugin.js
+++ b/packages/react-dom/src/events/SimpleEventPlugin.js
@@ -8,6 +8,7 @@
  */
 
 import type {TopLevelType} from 'events/TopLevelEventTypes';
+import type {DOMTopLevelEventType} from './DOMTopLevelEventTypes';
 import type {
   DispatchConfig,
   ReactSyntheticEvent,
@@ -18,7 +19,7 @@ import type {EventTypes, PluginModule} from 'events/PluginModuleType';
 import {accumulateTwoPhaseDispatches} from 'events/EventPropagators';
 import SyntheticEvent from 'events/SyntheticEvent';
 
-import * as DOMTopLevelEventTypes from 'react-dom/src/events/DOMTopLevelEventTypes';
+import * as DOMTopLevelEventTypes from './DOMTopLevelEventTypes';
 import warning from 'fbjs/lib/warning';
 
 import SyntheticAnimationEvent from './SyntheticAnimationEvent';
@@ -51,7 +52,7 @@ import getEventCharCode from './getEventCharCode';
  *   [TOP_ABORT, { sameConfig }],
  * ]);
  */
-type EventTuple = [TopLevelType, string];
+type EventTuple = [DOMTopLevelEventType, string];
 const interactiveEventTypeNames: Array<EventTuple> = [
   [DOMTopLevelEventTypes.TOP_BLUR, 'blur'],
   [DOMTopLevelEventTypes.TOP_CANCEL, 'cancel'],
@@ -154,7 +155,7 @@ nonInteractiveEventTypeNames.forEach(eventTuple => {
 });
 
 // Only used in DEV for exhaustiveness validation.
-const knownHTMLTopLevelTypes: Array<TopLevelType> = [
+const knownHTMLTopLevelTypes: Array<DOMTopLevelEventType> = [
   DOMTopLevelEventTypes.TOP_ABORT,
   DOMTopLevelEventTypes.TOP_CANCEL,
   DOMTopLevelEventTypes.TOP_CAN_PLAY,

From 025d867dceccfa54cfa12122a982ad3c3eff995a Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 15 May 2018 15:20:15 +0100
Subject: [PATCH 058/277] Try another approach at fixing Windows Flow issues

---
 packages/events/TopLevelEventTypes.js         |  16 +-
 .../src/events/DOMTopLevelEventTypes.js       | 262 +++++++-----------
 .../src/events/ReactDOMEventListener.js       |   2 +-
 .../react-dom/src/events/SimpleEventPlugin.js |   6 +-
 4 files changed, 126 insertions(+), 160 deletions(-)

diff --git a/packages/events/TopLevelEventTypes.js b/packages/events/TopLevelEventTypes.js
index f9d4722abb..e53ba71e4d 100644
--- a/packages/events/TopLevelEventTypes.js
+++ b/packages/events/TopLevelEventTypes.js
@@ -7,8 +7,6 @@
  * @flow
  */
 
-import type {DOMTopLevelEventType} from 'react-dom/src/events/DOMTopLevelEventTypes';
-
 type RNTopLevelEventType =
   | 'topMouseDown'
   | 'topMouseMove'
@@ -20,4 +18,18 @@ type RNTopLevelEventType =
   | 'topTouchMove'
   | 'topTouchStart';
 
+export opaque type DOMTopLevelEventType = string;
+
+export function unsafeCastStringToDOMTopLevelType(
+  topLevelType: string,
+): DOMTopLevelEventType {
+  return topLevelType;
+}
+
+export function unsafeCastDOMTopLevelTypeToString(
+  topLevelType: DOMTopLevelEventType,
+): string {
+  return topLevelType;
+}
+
 export type TopLevelType = DOMTopLevelEventType | RNTopLevelEventType;
diff --git a/packages/react-dom/src/events/DOMTopLevelEventTypes.js b/packages/react-dom/src/events/DOMTopLevelEventTypes.js
index aac82dbbe7..e6d09ee990 100644
--- a/packages/react-dom/src/events/DOMTopLevelEventTypes.js
+++ b/packages/react-dom/src/events/DOMTopLevelEventTypes.js
@@ -7,6 +7,12 @@
  * @flow
  */
 
+import type {DOMTopLevelEventType} from 'events/TopLevelEventTypes';
+
+import {
+  unsafeCastStringToDOMTopLevelType,
+  unsafeCastDOMTopLevelTypeToString,
+} from 'events/TopLevelEventTypes';
 import getVendorPrefixedEventName from './getVendorPrefixedEventName';
 
 /**
@@ -19,161 +25,107 @@ import getVendorPrefixedEventName from './getVendorPrefixedEventName';
  * of a constant in this module.
  */
 
-// eslint-disable-next-line no-undef
-export opaque type DOMTopLevelEventType =
-  | 'abort'
-  | 'animationend'
-  | 'animationiteration'
-  | 'animationstart'
-  | 'blur'
-  | 'canplay'
-  | 'canplaythrough'
-  | 'cancel'
-  | 'change'
-  | 'click'
-  | 'close'
-  | 'compositionend'
-  | 'compositionstart'
-  | 'compositionupdate'
-  | 'contextmenu'
-  | 'copy'
-  | 'cut'
-  | 'dblclick'
-  | 'drag'
-  | 'dragend'
-  | 'dragenter'
-  | 'dragexit'
-  | 'dragleave'
-  | 'dragover'
-  | 'dragstart'
-  | 'drop'
-  | 'durationchange'
-  | 'emptied'
-  | 'encrypted'
-  | 'ended'
-  | 'error'
-  | 'focus'
-  | 'input'
-  | 'invalid'
-  | 'keydown'
-  | 'keypress'
-  | 'keyup'
-  | 'load'
-  | 'loadstart'
-  | 'loadeddata'
-  | 'loadedmetadata'
-  | 'mousedown'
-  | 'mousemove'
-  | 'mouseout'
-  | 'mouseover'
-  | 'mouseup'
-  | 'paste'
-  | 'pause'
-  | 'play'
-  | 'playing'
-  | 'progress'
-  | 'ratechange'
-  | 'reset'
-  | 'scroll'
-  | 'seeked'
-  | 'seeking'
-  | 'selectionchange'
-  | 'stalled'
-  | 'submit'
-  | 'suspend'
-  | 'textInput'
-  | 'timeupdate'
-  | 'toggle'
-  | 'touchcancel'
-  | 'touchend'
-  | 'touchmove'
-  | 'touchstart'
-  | 'transitionend'
-  | 'volumechange'
-  | 'waiting'
-  | 'wheel';
+export const TOP_ABORT = unsafeCastStringToDOMTopLevelType('abort');
+export const TOP_ANIMATION_END = unsafeCastStringToDOMTopLevelType(
+  getVendorPrefixedEventName('animationend'),
+);
+export const TOP_ANIMATION_ITERATION = unsafeCastStringToDOMTopLevelType(
+  getVendorPrefixedEventName('animationiteration'),
+);
+export const TOP_ANIMATION_START = unsafeCastStringToDOMTopLevelType(
+  getVendorPrefixedEventName('animationstart'),
+);
+export const TOP_BLUR = unsafeCastStringToDOMTopLevelType('blur');
+export const TOP_CAN_PLAY = unsafeCastStringToDOMTopLevelType('canplay');
+export const TOP_CAN_PLAY_THROUGH = unsafeCastStringToDOMTopLevelType(
+  'canplaythrough',
+);
+export const TOP_CANCEL = unsafeCastStringToDOMTopLevelType('cancel');
+export const TOP_CHANGE = unsafeCastStringToDOMTopLevelType('change');
+export const TOP_CLICK = unsafeCastStringToDOMTopLevelType('click');
+export const TOP_CLOSE = unsafeCastStringToDOMTopLevelType('close');
+export const TOP_COMPOSITION_END = unsafeCastStringToDOMTopLevelType(
+  'compositionend',
+);
+export const TOP_COMPOSITION_START = unsafeCastStringToDOMTopLevelType(
+  'compositionstart',
+);
+export const TOP_COMPOSITION_UPDATE = unsafeCastStringToDOMTopLevelType(
+  'compositionupdate',
+);
+export const TOP_CONTEXT_MENU = unsafeCastStringToDOMTopLevelType(
+  'contextmenu',
+);
+export const TOP_COPY = unsafeCastStringToDOMTopLevelType('copy');
+export const TOP_CUT = unsafeCastStringToDOMTopLevelType('cut');
+export const TOP_DOUBLE_CLICK = unsafeCastStringToDOMTopLevelType('dblclick');
+export const TOP_DRAG = unsafeCastStringToDOMTopLevelType('drag');
+export const TOP_DRAG_END = unsafeCastStringToDOMTopLevelType('dragend');
+export const TOP_DRAG_ENTER = unsafeCastStringToDOMTopLevelType('dragenter');
+export const TOP_DRAG_EXIT = unsafeCastStringToDOMTopLevelType('dragexit');
+export const TOP_DRAG_LEAVE = unsafeCastStringToDOMTopLevelType('dragleave');
+export const TOP_DRAG_OVER = unsafeCastStringToDOMTopLevelType('dragover');
+export const TOP_DRAG_START = unsafeCastStringToDOMTopLevelType('dragstart');
+export const TOP_DROP = unsafeCastStringToDOMTopLevelType('drop');
+export const TOP_DURATION_CHANGE = unsafeCastStringToDOMTopLevelType(
+  'durationchange',
+);
+export const TOP_EMPTIED = unsafeCastStringToDOMTopLevelType('emptied');
+export const TOP_ENCRYPTED = unsafeCastStringToDOMTopLevelType('encrypted');
+export const TOP_ENDED = unsafeCastStringToDOMTopLevelType('ended');
+export const TOP_ERROR = unsafeCastStringToDOMTopLevelType('error');
+export const TOP_FOCUS = unsafeCastStringToDOMTopLevelType('focus');
+export const TOP_INPUT = unsafeCastStringToDOMTopLevelType('input');
+export const TOP_INVALID = unsafeCastStringToDOMTopLevelType('invalid');
+export const TOP_KEY_DOWN = unsafeCastStringToDOMTopLevelType('keydown');
+export const TOP_KEY_PRESS = unsafeCastStringToDOMTopLevelType('keypress');
+export const TOP_KEY_UP = unsafeCastStringToDOMTopLevelType('keyup');
+export const TOP_LOAD = unsafeCastStringToDOMTopLevelType('load');
+export const TOP_LOAD_START = unsafeCastStringToDOMTopLevelType('loadstart');
+export const TOP_LOADED_DATA = unsafeCastStringToDOMTopLevelType('loadeddata');
+export const TOP_LOADED_METADATA = unsafeCastStringToDOMTopLevelType(
+  'loadedmetadata',
+);
+export const TOP_MOUSE_DOWN = unsafeCastStringToDOMTopLevelType('mousedown');
+export const TOP_MOUSE_MOVE = unsafeCastStringToDOMTopLevelType('mousemove');
+export const TOP_MOUSE_OUT = unsafeCastStringToDOMTopLevelType('mouseout');
+export const TOP_MOUSE_OVER = unsafeCastStringToDOMTopLevelType('mouseover');
+export const TOP_MOUSE_UP = unsafeCastStringToDOMTopLevelType('mouseup');
+export const TOP_PASTE = unsafeCastStringToDOMTopLevelType('paste');
+export const TOP_PAUSE = unsafeCastStringToDOMTopLevelType('pause');
+export const TOP_PLAY = unsafeCastStringToDOMTopLevelType('play');
+export const TOP_PLAYING = unsafeCastStringToDOMTopLevelType('playing');
+export const TOP_PROGRESS = unsafeCastStringToDOMTopLevelType('progress');
+export const TOP_RATE_CHANGE = unsafeCastStringToDOMTopLevelType('ratechange');
+export const TOP_RESET = unsafeCastStringToDOMTopLevelType('reset');
+export const TOP_SCROLL = unsafeCastStringToDOMTopLevelType('scroll');
+export const TOP_SEEKED = unsafeCastStringToDOMTopLevelType('seeked');
+export const TOP_SEEKING = unsafeCastStringToDOMTopLevelType('seeking');
+export const TOP_SELECTION_CHANGE = unsafeCastStringToDOMTopLevelType(
+  'selectionchange',
+);
+export const TOP_STALLED = unsafeCastStringToDOMTopLevelType('stalled');
+export const TOP_SUBMIT = unsafeCastStringToDOMTopLevelType('submit');
+export const TOP_SUSPEND = unsafeCastStringToDOMTopLevelType('suspend');
+export const TOP_TEXT_INPUT = unsafeCastStringToDOMTopLevelType('textInput');
+export const TOP_TIME_UPDATE = unsafeCastStringToDOMTopLevelType('timeupdate');
+export const TOP_TOGGLE = unsafeCastStringToDOMTopLevelType('toggle');
+export const TOP_TOUCH_CANCEL = unsafeCastStringToDOMTopLevelType(
+  'touchcancel',
+);
+export const TOP_TOUCH_END = unsafeCastStringToDOMTopLevelType('touchend');
+export const TOP_TOUCH_MOVE = unsafeCastStringToDOMTopLevelType('touchmove');
+export const TOP_TOUCH_START = unsafeCastStringToDOMTopLevelType('touchstart');
+export const TOP_TRANSITION_END = unsafeCastStringToDOMTopLevelType(
+  getVendorPrefixedEventName('transitionend'),
+);
+export const TOP_VOLUME_CHANGE = unsafeCastStringToDOMTopLevelType(
+  'volumechange',
+);
+export const TOP_WAITING = unsafeCastStringToDOMTopLevelType('waiting');
+export const TOP_WHEEL = unsafeCastStringToDOMTopLevelType('wheel');
 
-export const TOP_ABORT: DOMTopLevelEventType = 'abort';
-export const TOP_ANIMATION_END: DOMTopLevelEventType = getVendorPrefixedEventName(
-  'animationend',
-);
-export const TOP_ANIMATION_ITERATION: DOMTopLevelEventType = getVendorPrefixedEventName(
-  'animationiteration',
-);
-export const TOP_ANIMATION_START: DOMTopLevelEventType = getVendorPrefixedEventName(
-  'animationstart',
-);
-export const TOP_BLUR: DOMTopLevelEventType = 'blur';
-export const TOP_CAN_PLAY: DOMTopLevelEventType = 'canplay';
-export const TOP_CAN_PLAY_THROUGH: DOMTopLevelEventType = 'canplaythrough';
-export const TOP_CANCEL: DOMTopLevelEventType = 'cancel';
-export const TOP_CHANGE: DOMTopLevelEventType = 'change';
-export const TOP_CLICK: DOMTopLevelEventType = 'click';
-export const TOP_CLOSE: DOMTopLevelEventType = 'close';
-export const TOP_COMPOSITION_END: DOMTopLevelEventType = 'compositionend';
-export const TOP_COMPOSITION_START: DOMTopLevelEventType = 'compositionstart';
-export const TOP_COMPOSITION_UPDATE: DOMTopLevelEventType = 'compositionupdate';
-export const TOP_CONTEXT_MENU: DOMTopLevelEventType = 'contextmenu';
-export const TOP_COPY: DOMTopLevelEventType = 'copy';
-export const TOP_CUT: DOMTopLevelEventType = 'cut';
-export const TOP_DOUBLE_CLICK: DOMTopLevelEventType = 'dblclick';
-export const TOP_DRAG: DOMTopLevelEventType = 'drag';
-export const TOP_DRAG_END: DOMTopLevelEventType = 'dragend';
-export const TOP_DRAG_ENTER: DOMTopLevelEventType = 'dragenter';
-export const TOP_DRAG_EXIT: DOMTopLevelEventType = 'dragexit';
-export const TOP_DRAG_LEAVE: DOMTopLevelEventType = 'dragleave';
-export const TOP_DRAG_OVER: DOMTopLevelEventType = 'dragover';
-export const TOP_DRAG_START: DOMTopLevelEventType = 'dragstart';
-export const TOP_DROP: DOMTopLevelEventType = 'drop';
-export const TOP_DURATION_CHANGE: DOMTopLevelEventType = 'durationchange';
-export const TOP_EMPTIED: DOMTopLevelEventType = 'emptied';
-export const TOP_ENCRYPTED: DOMTopLevelEventType = 'encrypted';
-export const TOP_ENDED: DOMTopLevelEventType = 'ended';
-export const TOP_ERROR: DOMTopLevelEventType = 'error';
-export const TOP_FOCUS: DOMTopLevelEventType = 'focus';
-export const TOP_INPUT: DOMTopLevelEventType = 'input';
-export const TOP_INVALID: DOMTopLevelEventType = 'invalid';
-export const TOP_KEY_DOWN: DOMTopLevelEventType = 'keydown';
-export const TOP_KEY_PRESS: DOMTopLevelEventType = 'keypress';
-export const TOP_KEY_UP: DOMTopLevelEventType = 'keyup';
-export const TOP_LOAD: DOMTopLevelEventType = 'load';
-export const TOP_LOAD_START: DOMTopLevelEventType = 'loadstart';
-export const TOP_LOADED_DATA: DOMTopLevelEventType = 'loadeddata';
-export const TOP_LOADED_METADATA: DOMTopLevelEventType = 'loadedmetadata';
-export const TOP_MOUSE_DOWN: DOMTopLevelEventType = 'mousedown';
-export const TOP_MOUSE_MOVE: DOMTopLevelEventType = 'mousemove';
-export const TOP_MOUSE_OUT: DOMTopLevelEventType = 'mouseout';
-export const TOP_MOUSE_OVER: DOMTopLevelEventType = 'mouseover';
-export const TOP_MOUSE_UP: DOMTopLevelEventType = 'mouseup';
-export const TOP_PASTE: DOMTopLevelEventType = 'paste';
-export const TOP_PAUSE: DOMTopLevelEventType = 'pause';
-export const TOP_PLAY: DOMTopLevelEventType = 'play';
-export const TOP_PLAYING: DOMTopLevelEventType = 'playing';
-export const TOP_PROGRESS: DOMTopLevelEventType = 'progress';
-export const TOP_RATE_CHANGE: DOMTopLevelEventType = 'ratechange';
-export const TOP_RESET: DOMTopLevelEventType = 'reset';
-export const TOP_SCROLL: DOMTopLevelEventType = 'scroll';
-export const TOP_SEEKED: DOMTopLevelEventType = 'seeked';
-export const TOP_SEEKING: DOMTopLevelEventType = 'seeking';
-export const TOP_SELECTION_CHANGE: DOMTopLevelEventType = 'selectionchange';
-export const TOP_STALLED: DOMTopLevelEventType = 'stalled';
-export const TOP_SUBMIT: DOMTopLevelEventType = 'submit';
-export const TOP_SUSPEND: DOMTopLevelEventType = 'suspend';
-export const TOP_TEXT_INPUT: DOMTopLevelEventType = 'textInput';
-export const TOP_TIME_UPDATE: DOMTopLevelEventType = 'timeupdate';
-export const TOP_TOGGLE: DOMTopLevelEventType = 'toggle';
-export const TOP_TOUCH_CANCEL: DOMTopLevelEventType = 'touchcancel';
-export const TOP_TOUCH_END: DOMTopLevelEventType = 'touchend';
-export const TOP_TOUCH_MOVE: DOMTopLevelEventType = 'touchmove';
-export const TOP_TOUCH_START: DOMTopLevelEventType = 'touchstart';
-export const TOP_TRANSITION_END: DOMTopLevelEventType = getVendorPrefixedEventName(
-  'transitionend',
-);
-export const TOP_VOLUME_CHANGE: DOMTopLevelEventType = 'volumechange';
-export const TOP_WAITING: DOMTopLevelEventType = 'waiting';
-export const TOP_WHEEL: DOMTopLevelEventType = 'wheel';
-
-export const mediaEventTypes: Array<DOMTopLevelEventType> = [
+export const mediaEventTypes = [
   TOP_ABORT,
   TOP_CAN_PLAY,
   TOP_CAN_PLAY_THROUGH,
@@ -200,5 +152,5 @@ export const mediaEventTypes: Array<DOMTopLevelEventType> = [
 ];
 
 export function getRawEventName(topLevelType: DOMTopLevelEventType): string {
-  return topLevelType;
+  return unsafeCastDOMTopLevelTypeToString(topLevelType);
 }
diff --git a/packages/react-dom/src/events/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js
index 8878d447d2..b7bd8a46e3 100644
--- a/packages/react-dom/src/events/ReactDOMEventListener.js
+++ b/packages/react-dom/src/events/ReactDOMEventListener.js
@@ -9,7 +9,7 @@
 
 import type {AnyNativeEvent} from 'events/PluginModuleType';
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
-import type {DOMTopLevelEventType} from './DOMTopLevelEventTypes';
+import type {DOMTopLevelEventType} from 'events/TopLevelEventTypes';
 
 import {batchedUpdates, interactiveUpdates} from 'events/ReactGenericBatching';
 import {runExtractedEventsInBatch} from 'events/EventPluginHub';
diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js
index 8c9a4bad1c..193aff57b5 100644
--- a/packages/react-dom/src/events/SimpleEventPlugin.js
+++ b/packages/react-dom/src/events/SimpleEventPlugin.js
@@ -7,8 +7,10 @@
  * @flow
  */
 
-import type {TopLevelType} from 'events/TopLevelEventTypes';
-import type {DOMTopLevelEventType} from './DOMTopLevelEventTypes';
+import type {
+  TopLevelType,
+  DOMTopLevelEventType,
+} from 'events/TopLevelEventTypes';
 import type {
   DispatchConfig,
   ReactSyntheticEvent,

From d758960116b3ea3a3bd3dfe2f297d5e680fe9ff5 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 15 May 2018 15:42:43 +0100
Subject: [PATCH 059/277] Tweak comments

---
 packages/events/TopLevelEventTypes.js               |  4 ++++
 .../react-dom/src/events/DOMTopLevelEventTypes.js   | 13 +++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/events/TopLevelEventTypes.js b/packages/events/TopLevelEventTypes.js
index e53ba71e4d..3f9b8ab7e9 100644
--- a/packages/events/TopLevelEventTypes.js
+++ b/packages/events/TopLevelEventTypes.js
@@ -20,6 +20,10 @@ type RNTopLevelEventType =
 
 export opaque type DOMTopLevelEventType = string;
 
+// Do not uses the below two methods directly!
+// Instead use constants exported from DOMTopLevelEventTypes in ReactDOM.
+// (It is the only module that is allowed to access these methods.)
+
 export function unsafeCastStringToDOMTopLevelType(
   topLevelType: string,
 ): DOMTopLevelEventType {
diff --git a/packages/react-dom/src/events/DOMTopLevelEventTypes.js b/packages/react-dom/src/events/DOMTopLevelEventTypes.js
index e6d09ee990..1898b0f965 100644
--- a/packages/react-dom/src/events/DOMTopLevelEventTypes.js
+++ b/packages/react-dom/src/events/DOMTopLevelEventTypes.js
@@ -16,15 +16,12 @@ import {
 import getVendorPrefixedEventName from './getVendorPrefixedEventName';
 
 /**
- * To identify top level events in react-dom, we use constants defined by this
- * module. Those are completely opaque to every other module but we rely on them
- * being the raw DOM event names inside this module. This allows us to build a
- * very efficient mapping from top level identifiers to the raw event type.
- *
- * The use of an `opaque` flow type makes sure that we can only access the value
- * of a constant in this module.
+ * To identify top level events in ReactDOM, we use constants defined by this
+ * module. This is the only module that uses the unsafe* methods to express
+ * that the constants actually correspond to the browser event names. This lets
+ * us save some bundle size by avoiding a top level type -> event name map.
+ * The rest of ReactDOM code should import top level types from this file.
  */
-
 export const TOP_ABORT = unsafeCastStringToDOMTopLevelType('abort');
 export const TOP_ANIMATION_END = unsafeCastStringToDOMTopLevelType(
   getVendorPrefixedEventName('animationend'),

From 9097f3cdf089a34d873f3d349e3bfbed90852fad Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 15 May 2018 19:16:29 +0100
Subject: [PATCH 060/277] Delete React Call/Return experiment (#12820)

---
 packages/react-call-return/README.md          |  32 --
 packages/react-call-return/index.js           |  12 -
 packages/react-call-return/npm/index.js       |   7 -
 packages/react-call-return/package.json       |  19 -
 .../react-call-return/src/ReactCallReturn.js  |  95 -----
 .../ReactCallReturn-test.internal.js          | 326 ------------------
 .../ReactServerRendering-test.internal.js     |  21 --
 .../src/server/ReactPartialRenderer.js        |   9 -
 .../src/ReactDebugFiberPerf.js                |   4 -
 packages/react-reconciler/src/ReactFiber.js   |  10 -
 .../src/ReactFiberBeginWork.js                |  55 ---
 .../src/ReactFiberCommitWork.js               |   5 -
 .../src/ReactFiberCompleteWork.js             |  87 -----
 .../ReactIncrementalPerf-test.internal.js     |  49 ---
 ...ReactIncrementalPerf-test.internal.js.snap |  19 -
 .../react/src/__tests__/ReactChildren-test.js |  51 ---
 packages/shared/ReactSymbols.js               |   4 -
 packages/shared/ReactTypeOfWork.js            |   6 +-
 packages/shared/getComponentName.js           |   6 -
 scripts/rollup/bundles.js                     |  10 -
 20 files changed, 3 insertions(+), 824 deletions(-)
 delete mode 100644 packages/react-call-return/README.md
 delete mode 100644 packages/react-call-return/index.js
 delete mode 100644 packages/react-call-return/npm/index.js
 delete mode 100644 packages/react-call-return/package.json
 delete mode 100644 packages/react-call-return/src/ReactCallReturn.js
 delete mode 100644 packages/react-call-return/src/__tests__/ReactCallReturn-test.internal.js

diff --git a/packages/react-call-return/README.md b/packages/react-call-return/README.md
deleted file mode 100644
index 6cfd1265aa..0000000000
--- a/packages/react-call-return/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# react-call-return
-
-This is an experimental package for multi-pass rendering in React.
-
-**Its API is not as stable as that of React, React Native, or React DOM, and does not follow the common versioning scheme.**
-
-**Use it at your own risk.**
-
-# No, Really, It Is Unstable
-
-This is **an experiment**.
-
-We **will** replace this with a different API in the future.  
-It can break between patch versions of React.
-
-We also know that **it has bugs**.
-
-Don't rely on this for anything except experiments.  
-Even in experiments, make sure to lock the versions so that an update doesn't break your app.
-
-Don't publish third party components relying on this unless you clearly mark them as experimental too.  
-They will break.
-
-Have fun! Let us know if you find interesting use cases for it.
-
-# API
-
-See the test case in `src/__tests__/ReactCallReturn.js` for an example.
-
-# What and Why
-
-The API is not very intuitive right now, but [this is a good overview](https://cdb.reacttraining.com/react-call-return-what-and-why-7e7761f81843) of why it might be useful in some cases. We are very open to better API ideas for this concept.
diff --git a/packages/react-call-return/index.js b/packages/react-call-return/index.js
deleted file mode 100644
index 8d3798337c..0000000000
--- a/packages/react-call-return/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow
- */
-
-'use strict';
-
-module.exports = require('./src/ReactCallReturn');
diff --git a/packages/react-call-return/npm/index.js b/packages/react-call-return/npm/index.js
deleted file mode 100644
index 0856ded523..0000000000
--- a/packages/react-call-return/npm/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-call-return.production.min.js');
-} else {
-  module.exports = require('./cjs/react-call-return.development.js');
-}
diff --git a/packages/react-call-return/package.json b/packages/react-call-return/package.json
deleted file mode 100644
index 52256ef0f9..0000000000
--- a/packages/react-call-return/package.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "react-call-return",
-  "description": "Experimental APIs for multi-pass rendering in React.",
-  "version": "0.8.0",
-  "repository": "facebook/react",
-  "files": [
-    "LICENSE",
-    "README.md",
-    "index.js",
-    "cjs/"
-  ],
-  "dependencies": {
-    "fbjs": "^0.8.16",
-    "object-assign": "^4.1.1"
-  },
-  "peerDependencies": {
-    "react": "^16.0.0"
-  }
-}
diff --git a/packages/react-call-return/src/ReactCallReturn.js b/packages/react-call-return/src/ReactCallReturn.js
deleted file mode 100644
index 432ff8f192..0000000000
--- a/packages/react-call-return/src/ReactCallReturn.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow
- */
-
-import {
-  REACT_CALL_TYPE,
-  REACT_RETURN_TYPE,
-  REACT_ELEMENT_TYPE,
-} from 'shared/ReactSymbols';
-
-import type {ReactCall, ReactNodeList, ReactReturn} from 'shared/ReactTypes';
-
-type CallHandler<T, V> = (props: T, returns: Array<V>) => ReactNodeList;
-
-export function unstable_createCall<T, V>(
-  children: ReactNodeList,
-  handler: CallHandler<T, V>,
-  props: T,
-  key: ?string = null,
-): ReactCall<V> {
-  const call = {
-    // This tag allow us to uniquely identify this as a React Call
-    $$typeof: REACT_ELEMENT_TYPE,
-    type: REACT_CALL_TYPE,
-    key: key == null ? null : '' + key,
-    ref: null,
-    props: {
-      props,
-      handler,
-      children: children,
-    },
-  };
-
-  if (__DEV__) {
-    // TODO: Add _store property for marking this as validated.
-    if (Object.freeze) {
-      Object.freeze(call.props);
-      Object.freeze(call);
-    }
-  }
-
-  return call;
-}
-
-export function unstable_createReturn<V>(value: V): ReactReturn<V> {
-  const returnNode = {
-    // This tag allow us to uniquely identify this as a React Call
-    $$typeof: REACT_ELEMENT_TYPE,
-    type: REACT_RETURN_TYPE,
-    key: null,
-    ref: null,
-    props: {
-      value,
-    },
-  };
-
-  if (__DEV__) {
-    // TODO: Add _store property for marking this as validated.
-    if (Object.freeze) {
-      Object.freeze(returnNode);
-    }
-  }
-
-  return returnNode;
-}
-
-/**
- * Verifies the object is a call object.
- */
-export function unstable_isCall(object: mixed): boolean {
-  return (
-    typeof object === 'object' &&
-    object !== null &&
-    object.type === REACT_CALL_TYPE
-  );
-}
-
-/**
- * Verifies the object is a return object.
- */
-export function unstable_isReturn(object: mixed): boolean {
-  return (
-    typeof object === 'object' &&
-    object !== null &&
-    object.type === REACT_RETURN_TYPE
-  );
-}
-
-export const unstable_REACT_RETURN_TYPE = REACT_RETURN_TYPE;
-export const unstable_REACT_CALL_TYPE = REACT_CALL_TYPE;
diff --git a/packages/react-call-return/src/__tests__/ReactCallReturn-test.internal.js b/packages/react-call-return/src/__tests__/ReactCallReturn-test.internal.js
deleted file mode 100644
index 84018bac30..0000000000
--- a/packages/react-call-return/src/__tests__/ReactCallReturn-test.internal.js
+++ /dev/null
@@ -1,326 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @emails react-core
- */
-
-'use strict';
-
-let React;
-let ReactFeatureFlags;
-let ReactNoop;
-let ReactCallReturn;
-
-describe('ReactCallReturn', () => {
-  beforeEach(() => {
-    jest.resetModules();
-    ReactFeatureFlags = require('shared/ReactFeatureFlags');
-    ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
-    React = require('react');
-    ReactNoop = require('react-noop-renderer');
-    ReactCallReturn = require('react-call-return');
-  });
-
-  function div(...children) {
-    children = children.map(c => (typeof c === 'string' ? {text: c} : c));
-    return {type: 'div', children, prop: undefined};
-  }
-
-  function span(prop) {
-    return {type: 'span', children: [], prop};
-  }
-
-  it('should render a call', () => {
-    const ops = [];
-
-    function Continuation({isSame}) {
-      ops.push(['Continuation', isSame]);
-      return <span prop={isSame ? 'foo==bar' : 'foo!=bar'} />;
-    }
-
-    // An alternative API could mark Continuation as something that needs
-    // returning. E.g. Continuation.returnType = 123;
-    function Child({bar}) {
-      ops.push(['Child', bar]);
-      return ReactCallReturn.unstable_createReturn({
-        props: {
-          bar: bar,
-        },
-        continuation: Continuation,
-      });
-    }
-
-    function Indirection() {
-      ops.push('Indirection');
-      return [<Child key="a" bar={true} />, <Child key="b" bar={false} />];
-    }
-
-    function HandleReturns(props, returns) {
-      ops.push('HandleReturns');
-      return returns.map((y, i) => (
-        <y.continuation key={i} isSame={props.foo === y.props.bar} />
-      ));
-    }
-
-    // An alternative API could mark Parent as something that needs
-    // returning. E.g. Parent.handler = HandleReturns;
-    function Parent(props) {
-      ops.push('Parent');
-      return ReactCallReturn.unstable_createCall(
-        props.children,
-        HandleReturns,
-        props,
-      );
-    }
-
-    function App() {
-      return (
-        <div>
-          <Parent foo={true}>
-            <Indirection />
-          </Parent>
-        </div>
-      );
-    }
-
-    ReactNoop.render(<App />);
-    ReactNoop.flush();
-
-    expect(ops).toEqual([
-      'Parent',
-      'Indirection',
-      ['Child', true],
-      // Return
-      ['Child', false],
-      // Return
-      'HandleReturns',
-      // Call continuations
-      ['Continuation', true],
-      ['Continuation', false],
-    ]);
-    expect(ReactNoop.getChildren()).toEqual([
-      div(span('foo==bar'), span('foo!=bar')),
-    ]);
-  });
-
-  it('should update a call', () => {
-    function Continuation({isSame}) {
-      return <span prop={isSame ? 'foo==bar' : 'foo!=bar'} />;
-    }
-
-    function Child({bar}) {
-      return ReactCallReturn.unstable_createReturn({
-        props: {
-          bar: bar,
-        },
-        continuation: Continuation,
-      });
-    }
-
-    function Indirection() {
-      return [<Child key="a" bar={true} />, <Child key="b" bar={false} />];
-    }
-
-    function HandleReturns(props, returns) {
-      return returns.map((y, i) => (
-        <y.continuation key={i} isSame={props.foo === y.props.bar} />
-      ));
-    }
-
-    function Parent(props) {
-      return ReactCallReturn.unstable_createCall(
-        props.children,
-        HandleReturns,
-        props,
-      );
-    }
-
-    function App(props) {
-      return (
-        <div>
-          <Parent foo={props.foo}>
-            <Indirection />
-          </Parent>
-        </div>
-      );
-    }
-
-    ReactNoop.render(<App foo={true} />);
-    ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div(span('foo==bar'), span('foo!=bar')),
-    ]);
-
-    ReactNoop.render(<App foo={false} />);
-    ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div(span('foo!=bar'), span('foo==bar')),
-    ]);
-  });
-
-  it('should unmount a composite in a call', () => {
-    let ops = [];
-
-    class Continuation extends React.Component {
-      render() {
-        ops.push('Continuation');
-        return <div />;
-      }
-      componentWillUnmount() {
-        ops.push('Unmount Continuation');
-      }
-    }
-
-    class Child extends React.Component {
-      render() {
-        ops.push('Child');
-        return ReactCallReturn.unstable_createReturn(Continuation);
-      }
-      componentWillUnmount() {
-        ops.push('Unmount Child');
-      }
-    }
-
-    function HandleReturns(props, returns) {
-      ops.push('HandleReturns');
-      return returns.map((ContinuationComponent, i) => (
-        <ContinuationComponent key={i} />
-      ));
-    }
-
-    class Parent extends React.Component {
-      render() {
-        ops.push('Parent');
-        return ReactCallReturn.unstable_createCall(
-          this.props.children,
-          HandleReturns,
-          this.props,
-        );
-      }
-      componentWillUnmount() {
-        ops.push('Unmount Parent');
-      }
-    }
-
-    ReactNoop.render(
-      <Parent>
-        <Child />
-      </Parent>,
-    );
-    ReactNoop.flush();
-
-    expect(ops).toEqual(['Parent', 'Child', 'HandleReturns', 'Continuation']);
-
-    ops = [];
-
-    ReactNoop.render(<div />);
-    ReactNoop.flush();
-
-    expect(ops).toEqual([
-      'Unmount Parent',
-      'Unmount Child',
-      'Unmount Continuation',
-    ]);
-  });
-
-  it('should handle deep updates in call', () => {
-    let instances = {};
-
-    class Counter extends React.Component {
-      state = {value: 5};
-      render() {
-        instances[this.props.id] = this;
-        return ReactCallReturn.unstable_createReturn(this.state.value);
-      }
-    }
-
-    function App(props) {
-      return ReactCallReturn.unstable_createCall(
-        [
-          <Counter key="a" id="a" />,
-          <Counter key="b" id="b" />,
-          <Counter key="c" id="c" />,
-        ],
-        (p, returns) => returns.map((y, i) => <span key={i} prop={y * 100} />),
-        {},
-      );
-    }
-
-    ReactNoop.render(<App />);
-    ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([span(500), span(500), span(500)]);
-
-    instances.a.setState({value: 1});
-    instances.b.setState({value: 2});
-    ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([span(100), span(200), span(500)]);
-  });
-
-  it('should unmount and remount children', () => {
-    let ops = [];
-
-    class Call extends React.Component {
-      render() {
-        return ReactCallReturn.unstable_createCall(
-          this.props.children,
-          (p, returns) => returns,
-          {},
-        );
-      }
-    }
-
-    class Return extends React.Component {
-      render() {
-        ops.push(`Return ${this.props.value}`);
-        return ReactCallReturn.unstable_createReturn(this.props.children);
-      }
-
-      UNSAFE_componentWillMount() {
-        ops.push(`Mount Return ${this.props.value}`);
-      }
-
-      componentWillUnmount() {
-        ops.push(`Unmount Return ${this.props.value}`);
-      }
-    }
-
-    ReactNoop.render(
-      <Call>
-        <Return value={1} />
-        <Return value={2} />
-      </Call>,
-    );
-    expect(ReactNoop.flush).toWarnDev(
-      'componentWillMount: Please update the following components ' +
-        'to use componentDidMount instead: Return',
-    );
-
-    expect(ops).toEqual([
-      'Mount Return 1',
-      'Return 1',
-      'Mount Return 2',
-      'Return 2',
-    ]);
-
-    ops = [];
-
-    ReactNoop.render(<Call />);
-    ReactNoop.flush();
-
-    expect(ops).toEqual(['Unmount Return 1', 'Unmount Return 2']);
-
-    ops = [];
-
-    ReactNoop.render(
-      <Call>
-        <Return value={3} />
-      </Call>,
-    );
-    ReactNoop.flush();
-
-    expect(ops).toEqual(['Mount Return 3', 'Return 3']);
-  });
-});
diff --git a/packages/react-dom/src/__tests__/ReactServerRendering-test.internal.js b/packages/react-dom/src/__tests__/ReactServerRendering-test.internal.js
index 05eb32ba03..b7c6eca3de 100644
--- a/packages/react-dom/src/__tests__/ReactServerRendering-test.internal.js
+++ b/packages/react-dom/src/__tests__/ReactServerRendering-test.internal.js
@@ -11,7 +11,6 @@
 'use strict';
 
 let React;
-let ReactCallReturn;
 let ReactDOMServer;
 let PropTypes;
 
@@ -23,7 +22,6 @@ describe('ReactDOMServer', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
-    ReactCallReturn = require('react-call-return');
     PropTypes = require('prop-types');
     ReactDOMServer = require('react-dom/server');
   });
@@ -623,25 +621,6 @@ describe('ReactDOMServer', () => {
     );
   });
 
-  it('should throw rendering call/return on the server', () => {
-    expect(() => {
-      ReactDOMServer.renderToString(
-        <div>{ReactCallReturn.unstable_createReturn(42)}</div>,
-      );
-    }).toThrow(
-      'The experimental Call and Return types are not currently supported by the server renderer.',
-    );
-    expect(() => {
-      ReactDOMServer.renderToString(
-        <div>
-          {ReactCallReturn.unstable_createCall(null, function() {}, {})}
-        </div>,
-      );
-    }).toThrow(
-      'The experimental Call and Return types are not currently supported by the server renderer.',
-    );
-  });
-
   it('should warn when server rendering a class with a render method that does not extend React.Component', () => {
     class ClassWithRenderNotExtended {
       render() {
diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index d0cef9c60a..59ea170b93 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -31,8 +31,6 @@ import {
   REACT_FRAGMENT_TYPE,
   REACT_STRICT_MODE_TYPE,
   REACT_ASYNC_MODE_TYPE,
-  REACT_CALL_TYPE,
-  REACT_RETURN_TYPE,
   REACT_PORTAL_TYPE,
   REACT_PROFILER_TYPE,
   REACT_PROVIDER_TYPE,
@@ -831,13 +829,6 @@ class ReactDOMServerRenderer {
           this.stack.push(frame);
           return '';
         }
-        case REACT_CALL_TYPE:
-        case REACT_RETURN_TYPE:
-          invariant(
-            false,
-            'The experimental Call and Return types are not currently ' +
-              'supported by the server renderer.',
-          );
         // eslint-disable-next-line-no-fallthrough
         default:
           break;
diff --git a/packages/react-reconciler/src/ReactDebugFiberPerf.js b/packages/react-reconciler/src/ReactDebugFiberPerf.js
index c2889986bf..7c2226f9a8 100644
--- a/packages/react-reconciler/src/ReactDebugFiberPerf.js
+++ b/packages/react-reconciler/src/ReactDebugFiberPerf.js
@@ -16,8 +16,6 @@ import {
   HostComponent,
   HostText,
   HostPortal,
-  CallComponent,
-  ReturnComponent,
   Fragment,
   ContextProvider,
   ContextConsumer,
@@ -171,8 +169,6 @@ const shouldIgnoreFiber = (fiber: Fiber): boolean => {
     case HostComponent:
     case HostText:
     case HostPortal:
-    case CallComponent:
-    case ReturnComponent:
     case Fragment:
     case ContextProvider:
     case ContextConsumer:
diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js
index 720fb9ffe1..acfedb266c 100644
--- a/packages/react-reconciler/src/ReactFiber.js
+++ b/packages/react-reconciler/src/ReactFiber.js
@@ -24,8 +24,6 @@ import {
   HostComponent,
   HostText,
   HostPortal,
-  CallComponent,
-  ReturnComponent,
   ForwardRef,
   Fragment,
   Mode,
@@ -41,8 +39,6 @@ import {NoContext, AsyncMode, ProfileMode, StrictMode} from './ReactTypeOfMode';
 import {
   REACT_FORWARD_REF_TYPE,
   REACT_FRAGMENT_TYPE,
-  REACT_RETURN_TYPE,
-  REACT_CALL_TYPE,
   REACT_STRICT_MODE_TYPE,
   REACT_PROFILER_TYPE,
   REACT_PROVIDER_TYPE,
@@ -364,12 +360,6 @@ export function createFiberFromElement(
         break;
       case REACT_PROFILER_TYPE:
         return createFiberFromProfiler(pendingProps, mode, expirationTime, key);
-      case REACT_CALL_TYPE:
-        fiberTag = CallComponent;
-        break;
-      case REACT_RETURN_TYPE:
-        fiberTag = ReturnComponent;
-        break;
       case REACT_TIMEOUT_TYPE:
         fiberTag = TimeoutComponent;
         // Suspense does not require async, but its children should be strict
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index d08ebd1330..d344ce0998 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -27,9 +27,6 @@ import {
   HostComponent,
   HostText,
   HostPortal,
-  CallComponent,
-  CallHandlerPhase,
-  ReturnComponent,
   ForwardRef,
   Fragment,
   Mode,
@@ -741,44 +738,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     }
   }
 
-  function updateCallComponent(current, workInProgress, renderExpirationTime) {
-    let nextProps = workInProgress.pendingProps;
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (workInProgress.memoizedProps === nextProps) {
-      nextProps = workInProgress.memoizedProps;
-      // TODO: When bailing out, we might need to return the stateNode instead
-      // of the child. To check it for work.
-      // return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-
-    const nextChildren = nextProps.children;
-
-    // The following is a fork of reconcileChildrenAtExpirationTime but using
-    // stateNode to store the child.
-    if (current === null) {
-      workInProgress.stateNode = mountChildFibers(
-        workInProgress,
-        workInProgress.stateNode,
-        nextChildren,
-        renderExpirationTime,
-      );
-    } else {
-      workInProgress.stateNode = reconcileChildFibers(
-        workInProgress,
-        current.stateNode,
-        nextChildren,
-        renderExpirationTime,
-      );
-    }
-
-    memoizeProps(workInProgress, nextProps);
-    // This doesn't take arbitrary time so we could synchronously just begin
-    // eagerly do the work of workInProgress.child as an optimization.
-    return workInProgress.stateNode;
-  }
-
   function updateTimeoutComponent(
     current,
     workInProgress,
@@ -1260,20 +1219,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         );
       case HostText:
         return updateHostText(current, workInProgress);
-      case CallHandlerPhase:
-        // This is a restart. Reset the tag to the initial phase.
-        workInProgress.tag = CallComponent;
-      // Intentionally fall through since this is now the same.
-      case CallComponent:
-        return updateCallComponent(
-          current,
-          workInProgress,
-          renderExpirationTime,
-        );
-      case ReturnComponent:
-        // A return component is just a placeholder, we can just run through the
-        // next one immediately.
-        return null;
       case TimeoutComponent:
         return updateTimeoutComponent(
           current,
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index f3184ced83..ebe37ef5a0 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -25,7 +25,6 @@ import {
   HostComponent,
   HostText,
   HostPortal,
-  CallComponent,
   Profiler,
   TimeoutComponent,
 } from 'shared/ReactTypeOfWork';
@@ -393,10 +392,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         safelyDetachRef(current);
         return;
       }
-      case CallComponent: {
-        commitNestedUnmounts(current.stateNode);
-        return;
-      }
       case HostPortal: {
         // TODO: this is recursive.
         // We are also not using this parent because
diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js
index ab55061b12..9d2cec1f35 100644
--- a/packages/react-reconciler/src/ReactFiberCompleteWork.js
+++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js
@@ -31,9 +31,6 @@ import {
   HostComponent,
   HostText,
   HostPortal,
-  CallComponent,
-  CallHandlerPhase,
-  ReturnComponent,
   ContextProvider,
   ContextConsumer,
   ForwardRef,
@@ -45,8 +42,6 @@ import {
 import {Placement, Ref, Update} from 'shared/ReactTypeOfSideEffect';
 import invariant from 'fbjs/lib/invariant';
 
-import {reconcileChildFibers} from './ReactChildFiber';
-
 export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
   config: HostConfig<T, P, I, TI, HI, PI, C, CC, CX, PL>,
   hostContext: HostContext<C, CX>,
@@ -97,75 +92,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     workInProgress.effectTag |= Ref;
   }
 
-  function appendAllReturns(returns: Array<mixed>, workInProgress: Fiber) {
-    let node = workInProgress.stateNode;
-    if (node) {
-      node.return = workInProgress;
-    }
-    while (node !== null) {
-      if (
-        node.tag === HostComponent ||
-        node.tag === HostText ||
-        node.tag === HostPortal
-      ) {
-        invariant(false, 'A call cannot have host component children.');
-      } else if (node.tag === ReturnComponent) {
-        returns.push(node.pendingProps.value);
-      } else if (node.child !== null) {
-        node.child.return = node;
-        node = node.child;
-        continue;
-      }
-      while (node.sibling === null) {
-        if (node.return === null || node.return === workInProgress) {
-          return;
-        }
-        node = node.return;
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }
-
-  function moveCallToHandlerPhase(
-    current: Fiber | null,
-    workInProgress: Fiber,
-    renderExpirationTime: ExpirationTime,
-  ) {
-    const props = workInProgress.memoizedProps;
-    invariant(
-      props,
-      'Should be resolved by now. This error is likely caused by a bug in ' +
-        'React. Please file an issue.',
-    );
-
-    // First step of the call has completed. Now we need to do the second.
-    // TODO: It would be nice to have a multi stage call represented by a
-    // single component, or at least tail call optimize nested ones. Currently
-    // that requires additional fields that we don't want to add to the fiber.
-    // So this requires nested handlers.
-    // Note: This doesn't mutate the alternate node. I don't think it needs to
-    // since this stage is reset for every pass.
-    workInProgress.tag = CallHandlerPhase;
-
-    // Build up the returns.
-    // TODO: Compare this to a generator or opaque helpers like Children.
-    const returns: Array<mixed> = [];
-    appendAllReturns(returns, workInProgress);
-    const fn = props.handler;
-    const childProps = props.props;
-    const nextChildren = fn(childProps, returns);
-
-    const currentFirstChild = current !== null ? current.child : null;
-    workInProgress.child = reconcileChildFibers(
-      workInProgress,
-      currentFirstChild,
-      nextChildren,
-      renderExpirationTime,
-    );
-    return workInProgress.child;
-  }
-
   function appendAllChildren(parent: I, workInProgress: Fiber) {
     // We only have the top Fiber that was created but we need recurse down its
     // children to find all the terminal nodes.
@@ -579,19 +505,6 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         }
         return null;
       }
-      case CallComponent:
-        return moveCallToHandlerPhase(
-          current,
-          workInProgress,
-          renderExpirationTime,
-        );
-      case CallHandlerPhase:
-        // Reset the tag to now be a first phase call.
-        workInProgress.tag = CallComponent;
-        return null;
-      case ReturnComponent:
-        // Does nothing.
-        return null;
       case ForwardRef:
         return null;
       case TimeoutComponent:
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
index 1e33804d12..cf89594aaf 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
@@ -12,7 +12,6 @@
 
 describe('ReactDebugFiberPerf', () => {
   let React;
-  let ReactCallReturn;
   let ReactNoop;
   let PropTypes;
 
@@ -121,7 +120,6 @@ describe('ReactDebugFiberPerf', () => {
     // Import after the polyfill is set up:
     React = require('react');
     ReactNoop = require('react-noop-renderer');
-    ReactCallReturn = require('react-call-return');
     PropTypes = require('prop-types');
   });
 
@@ -535,53 +533,6 @@ describe('ReactDebugFiberPerf', () => {
     expect(getFlameChart()).toMatchSnapshot();
   });
 
-  it('supports returns', () => {
-    function Continuation({isSame}) {
-      return <span prop={isSame ? 'foo==bar' : 'foo!=bar'} />;
-    }
-
-    function CoChild({bar}) {
-      return ReactCallReturn.unstable_createReturn({
-        props: {
-          bar: bar,
-        },
-        continuation: Continuation,
-      });
-    }
-
-    function Indirection() {
-      return [<CoChild key="a" bar={true} />, <CoChild key="b" bar={false} />];
-    }
-
-    function HandleReturns(props, returns) {
-      return returns.map((y, i) => (
-        <y.continuation key={i} isSame={props.foo === y.props.bar} />
-      ));
-    }
-
-    function CoParent(props) {
-      return ReactCallReturn.unstable_createCall(
-        props.children,
-        HandleReturns,
-        props,
-      );
-    }
-
-    function App() {
-      return (
-        <div>
-          <CoParent foo={true}>
-            <Indirection />
-          </CoParent>
-        </div>
-      );
-    }
-
-    ReactNoop.render(<App />);
-    ReactNoop.flush();
-    expect(getFlameChart()).toMatchSnapshot();
-  });
-
   it('supports portals', () => {
     const noopContainer = {children: []};
     ReactNoop.render(
diff --git a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
index 4ef5ab8201..a1e4a1cd83 100644
--- a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
+++ b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
@@ -370,25 +370,6 @@ exports[`ReactDebugFiberPerf supports portals 1`] = `
 "
 `;
 
-exports[`ReactDebugFiberPerf supports returns 1`] = `
-"⚛ (Waiting for async callback... will force flush in 5250 ms)
-
-⚛ (React Tree Reconciliation: Completed Root)
-  ⚛ App [mount]
-    ⚛ CoParent [mount]
-      ⚛ Indirection [mount]
-        ⚛ CoChild [mount]
-        ⚛ CoChild [mount]
-      ⚛ Continuation [mount]
-      ⚛ Continuation [mount]
-
-⚛ (Committing Changes)
-  ⚛ (Committing Snapshot Effects: 0 Total)
-  ⚛ (Committing Host Effects: 3 Total)
-  ⚛ (Calling Lifecycle Methods: 0 Total)
-"
-`;
-
 exports[`ReactDebugFiberPerf warns if an in-progress update is interrupted 1`] = `
 "⚛ (Waiting for async callback... will force flush in 5250 ms)
 
diff --git a/packages/react/src/__tests__/ReactChildren-test.js b/packages/react/src/__tests__/ReactChildren-test.js
index ce63925434..cf5edb52bd 100644
--- a/packages/react/src/__tests__/ReactChildren-test.js
+++ b/packages/react/src/__tests__/ReactChildren-test.js
@@ -69,57 +69,6 @@ describe('ReactChildren', () => {
     expect(mappedChildren[0]).toEqual(reactPortal);
   });
 
-  it('should support Call components', () => {
-    const context = {};
-    const callback = jasmine.createSpy().and.callFake(function(kid, index) {
-      expect(this).toBe(context);
-      return kid;
-    });
-    const ReactCallReturn = require('react-call-return');
-    const reactCall = ReactCallReturn.unstable_createCall(
-      <span key="simple" />,
-      () => {},
-    );
-
-    const parentInstance = <div>{reactCall}</div>;
-    React.Children.forEach(parentInstance.props.children, callback, context);
-    expect(callback).toHaveBeenCalledWith(reactCall, 0);
-    callback.calls.reset();
-    const mappedChildren = React.Children.map(
-      parentInstance.props.children,
-      callback,
-      context,
-    );
-    expect(callback).toHaveBeenCalledWith(reactCall, 0);
-    expect(mappedChildren[0].type).toEqual(reactCall.type);
-    expect(mappedChildren[0].props).toEqual(reactCall.props);
-  });
-
-  it('should support Return components', () => {
-    const context = {};
-    const callback = jasmine.createSpy().and.callFake(function(kid, index) {
-      expect(this).toBe(context);
-      return kid;
-    });
-    const ReactCallReturn = require('react-call-return');
-    const reactReturn = ReactCallReturn.unstable_createReturn(
-      <span key="simple" />,
-    );
-
-    const parentInstance = <div>{reactReturn}</div>;
-    React.Children.forEach(parentInstance.props.children, callback, context);
-    expect(callback).toHaveBeenCalledWith(reactReturn, 0);
-    callback.calls.reset();
-    const mappedChildren = React.Children.map(
-      parentInstance.props.children,
-      callback,
-      context,
-    );
-    expect(callback).toHaveBeenCalledWith(reactReturn, 0);
-    expect(mappedChildren[0].props).toEqual(reactReturn.props);
-    expect(mappedChildren[0].type).toEqual(reactReturn.type);
-  });
-
   it('should treat single arrayless child as being in array', () => {
     const context = {};
     const callback = jasmine.createSpy().and.callFake(function(kid, index) {
diff --git a/packages/shared/ReactSymbols.js b/packages/shared/ReactSymbols.js
index 9dc1d3627a..bd3af4a903 100644
--- a/packages/shared/ReactSymbols.js
+++ b/packages/shared/ReactSymbols.js
@@ -14,10 +14,6 @@ const hasSymbol = typeof Symbol === 'function' && Symbol.for;
 export const REACT_ELEMENT_TYPE = hasSymbol
   ? Symbol.for('react.element')
   : 0xeac7;
-export const REACT_CALL_TYPE = hasSymbol ? Symbol.for('react.call') : 0xeac8;
-export const REACT_RETURN_TYPE = hasSymbol
-  ? Symbol.for('react.return')
-  : 0xeac9;
 export const REACT_PORTAL_TYPE = hasSymbol
   ? Symbol.for('react.portal')
   : 0xeaca;
diff --git a/packages/shared/ReactTypeOfWork.js b/packages/shared/ReactTypeOfWork.js
index e6c1ace1d9..5ac284818a 100644
--- a/packages/shared/ReactTypeOfWork.js
+++ b/packages/shared/ReactTypeOfWork.js
@@ -33,9 +33,9 @@ export const HostRoot = 3; // Root of a host tree. Could be nested inside anothe
 export const HostPortal = 4; // A subtree. Could be an entry point to a different renderer.
 export const HostComponent = 5;
 export const HostText = 6;
-export const CallComponent = 7;
-export const CallHandlerPhase = 8;
-export const ReturnComponent = 9;
+export const CallComponent_UNUSED = 7;
+export const CallHandlerPhase_UNUSED = 8;
+export const ReturnComponent_UNUSED = 9;
 export const Fragment = 10;
 export const Mode = 11;
 export const ContextConsumer = 12;
diff --git a/packages/shared/getComponentName.js b/packages/shared/getComponentName.js
index a5f61c5efc..b79a2d1c9b 100644
--- a/packages/shared/getComponentName.js
+++ b/packages/shared/getComponentName.js
@@ -11,14 +11,12 @@ import type {Fiber} from 'react-reconciler/src/ReactFiber';
 
 import {
   REACT_ASYNC_MODE_TYPE,
-  REACT_CALL_TYPE,
   REACT_CONTEXT_TYPE,
   REACT_FORWARD_REF_TYPE,
   REACT_FRAGMENT_TYPE,
   REACT_PORTAL_TYPE,
   REACT_PROFILER_TYPE,
   REACT_PROVIDER_TYPE,
-  REACT_RETURN_TYPE,
   REACT_STRICT_MODE_TYPE,
 } from 'shared/ReactSymbols';
 
@@ -33,8 +31,6 @@ function getComponentName(fiber: Fiber): string | null {
   switch (type) {
     case REACT_ASYNC_MODE_TYPE:
       return 'AsyncMode';
-    case REACT_CALL_TYPE:
-      return 'ReactCall';
     case REACT_CONTEXT_TYPE:
       return 'Context.Consumer';
     case REACT_FRAGMENT_TYPE:
@@ -45,8 +41,6 @@ function getComponentName(fiber: Fiber): string | null {
       return `Profiler(${fiber.pendingProps.id})`;
     case REACT_PROVIDER_TYPE:
       return 'Context.Provider';
-    case REACT_RETURN_TYPE:
-      return 'ReactReturn';
     case REACT_STRICT_MODE_TYPE:
       return 'StrictMode';
   }
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index e9f54a11de..ae5729a748 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -328,16 +328,6 @@ const bundles = [
     externals: [],
   },
 
-  /******* React Call Return (experimental) *******/
-  {
-    label: 'react-call-return',
-    bundleTypes: [NODE_DEV, NODE_PROD],
-    moduleType: ISOMORPHIC,
-    entry: 'react-call-return',
-    global: 'ReactCallReturn',
-    externals: [],
-  },
-
   /******* React Is *******/
   {
     label: 'react-is',

From 103503eb69d899de4ed127b2473201db1c30d027 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Tue, 15 May 2018 12:43:42 -0700
Subject: [PATCH 061/277] Only measure "base" times within ProfileMode (#12821)

* Conditionally start/stop base timer only within Profile mode tree
* Added test to ensure ProfilerTimer not called outside of Profiler root
---
 .../src/ReactFiberScheduler.js                | 13 ++++++++----
 .../__tests__/ReactProfiler-test.internal.js  | 20 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 562039393d..225c66c827 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -962,12 +962,17 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
 
     let next;
     if (enableProfilerTimer) {
-      startBaseRenderTimer();
+      if (workInProgress.mode & ProfileMode) {
+        startBaseRenderTimer();
+      }
+
       next = beginWork(current, workInProgress, nextRenderExpirationTime);
 
-      // Update "base" time if the render wasn't bailed out on.
-      recordElapsedBaseRenderTimeIfRunning(workInProgress);
-      stopBaseRenderTimerIfRunning();
+      if (workInProgress.mode & ProfileMode) {
+        // Update "base" time if the render wasn't bailed out on.
+        recordElapsedBaseRenderTimeIfRunning(workInProgress);
+        stopBaseRenderTimerIfRunning();
+      }
     } else {
       next = beginWork(current, workInProgress, nextRenderExpirationTime);
     }
diff --git a/packages/react/src/__tests__/ReactProfiler-test.internal.js b/packages/react/src/__tests__/ReactProfiler-test.internal.js
index e97d8eeef9..f3b12109b6 100644
--- a/packages/react/src/__tests__/ReactProfiler-test.internal.js
+++ b/packages/react/src/__tests__/ReactProfiler-test.internal.js
@@ -108,10 +108,14 @@ describe('Profiler', () => {
   describe('onRender callback', () => {
     let AdvanceTime;
     let advanceTimeBy;
+    let mockNow;
 
     const mockNowForTests = () => {
       let currentTime = 0;
-      ReactTestRenderer.unstable_setNowImplementation(() => currentTime);
+
+      mockNow = jest.fn().mockImplementation(() => currentTime);
+
+      ReactTestRenderer.unstable_setNowImplementation(mockNow);
       advanceTimeBy = amount => {
         currentTime += amount;
       };
@@ -164,6 +168,20 @@ describe('Profiler', () => {
       expect(callback).toHaveBeenCalledTimes(1);
     });
 
+    it('does not record times for components outside of Profiler tree', () => {
+      ReactTestRenderer.create(
+        <div>
+          <AdvanceTime />
+          <AdvanceTime />
+          <AdvanceTime />
+        </div>,
+      );
+
+      // Should only be called twice, for normal expiration time purposes.
+      // No additional calls from ProfilerTimer are expected.
+      expect(mockNow).toHaveBeenCalledTimes(2);
+    });
+
     it('logs render times for both mount and update', () => {
       const callback = jest.fn();
 

From a5184b215daeb7004025dfef223eda9236457358 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Tue, 15 May 2018 13:21:07 -0700
Subject: [PATCH 062/277] Add FB www build of simple-cache-provider (#12822)

---
 scripts/rollup/bundles.js   |  2 +-
 scripts/rollup/results.json | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index ae5729a748..baad2fd0b0 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -348,7 +348,7 @@ const bundles = [
   /******* Simple Cache Provider (experimental) *******/
   {
     label: 'simple-cache-provider',
-    bundleTypes: [NODE_DEV, NODE_PROD],
+    bundleTypes: [FB_WWW_DEV, FB_WWW_PROD, NODE_DEV, NODE_PROD],
     moduleType: ISOMORPHIC,
     entry: 'simple-cache-provider',
     global: 'SimpleCacheProvider',
diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index 01863fae3d..afe398d959 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -685,6 +685,20 @@
       "packageName": "react-scheduler",
       "size": 2068,
       "gzip": 1051
+    },
+    {
+      "filename": "SimpleCacheProvider-dev.js",
+      "bundleType": "FB_WWW_DEV",
+      "packageName": "simple-cache-provider",
+      "size": 6227,
+      "gzip": 1926
+    },
+    {
+      "filename": "SimpleCacheProvider-prod.js",
+      "bundleType": "FB_WWW_PROD",
+      "packageName": "simple-cache-provider",
+      "size": 2752,
+      "gzip": 854
     }
   ]
 }
\ No newline at end of file

From f79227597202336b5a6e62642dc42646d9639cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= <sebastian@calyptus.eu>
Date: Tue, 15 May 2018 14:35:13 -0700
Subject: [PATCH 063/277] Pass instance handle to all Fabric clone methods
 (#12824)

We might need this in the future if we want to ensure event handler
consistency when an event handler target has been removed before it is
called.
---
 .../src/ReactFabricHostConfig.js              | 41 +++++++++++++------
 .../src/__mocks__/FabricUIManager.js          | 14 +++++--
 .../__tests__/ReactFabric-test.internal.js    |  6 ++-
 scripts/flow/react-native-host-hooks.js       |  9 +++-
 4 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/packages/react-native-renderer/src/ReactFabricHostConfig.js b/packages/react-native-renderer/src/ReactFabricHostConfig.js
index 921067e516..d6d55186a0 100644
--- a/packages/react-native-renderer/src/ReactFabricHostConfig.js
+++ b/packages/react-native-renderer/src/ReactFabricHostConfig.js
@@ -25,7 +25,17 @@ import invariant from 'fbjs/lib/invariant';
 
 // Modules provided by RN:
 import TextInputState from 'TextInputState';
-import FabricUIManager from 'FabricUIManager';
+import {
+  createNode,
+  cloneNode,
+  cloneNodeWithNewChildren,
+  cloneNodeWithNewChildrenAndProps,
+  cloneNodeWithNewProps,
+  createChildSet,
+  appendChild,
+  appendChildToSet,
+  completeRoot,
+} from 'FabricUIManager';
 import UIManager from 'UIManager';
 
 // Counter for uniquely identifying views.
@@ -126,12 +136,12 @@ type TextInstance = {
   node: Node,
 };
 
-const ReacFabricHostConfig = {
+const ReactFabricHostConfig = {
   appendInitialChild(
     parentInstance: Instance,
     child: Instance | TextInstance,
   ): void {
-    FabricUIManager.appendChild(parentInstance.node, child.node);
+    appendChild(parentInstance.node, child.node);
   },
 
   createInstance(
@@ -164,7 +174,7 @@ const ReacFabricHostConfig = {
       viewConfig.validAttributes,
     );
 
-    const node = FabricUIManager.createNode(
+    const node = createNode(
       tag, // reactTag
       viewConfig.uiViewClassName, // viewName
       rootContainerInstance, // rootTag
@@ -194,7 +204,7 @@ const ReacFabricHostConfig = {
     const tag = nextReactTag;
     nextReactTag += 2;
 
-    const node = FabricUIManager.createNode(
+    const node = createNode(
       tag, // reactTag
       'RCTRawText', // viewName
       rootContainerInstance, // rootTag
@@ -307,18 +317,23 @@ const ReacFabricHostConfig = {
       let clone;
       if (keepChildren) {
         if (updatePayload !== null) {
-          clone = FabricUIManager.cloneNodeWithNewProps(node, updatePayload);
+          clone = cloneNodeWithNewProps(
+            node,
+            updatePayload,
+            internalInstanceHandle,
+          );
         } else {
-          clone = FabricUIManager.cloneNode(node);
+          clone = cloneNode(node, internalInstanceHandle);
         }
       } else {
         if (updatePayload !== null) {
-          clone = FabricUIManager.cloneNodeWithNewChildrenAndProps(
+          clone = cloneNodeWithNewChildrenAndProps(
             node,
             updatePayload,
+            internalInstanceHandle,
           );
         } else {
-          clone = FabricUIManager.cloneNodeWithNewChildren(node);
+          clone = cloneNodeWithNewChildren(node, internalInstanceHandle);
         }
       }
       return {
@@ -328,21 +343,21 @@ const ReacFabricHostConfig = {
     },
 
     createContainerChildSet(container: Container): ChildSet {
-      return FabricUIManager.createChildSet(container);
+      return createChildSet(container);
     },
 
     appendChildToContainerChildSet(
       childSet: ChildSet,
       child: Instance | TextInstance,
     ): void {
-      FabricUIManager.appendChildToSet(childSet, child.node);
+      appendChildToSet(childSet, child.node);
     },
 
     finalizeContainerChildren(
       container: Container,
       newChildren: ChildSet,
     ): void {
-      FabricUIManager.completeRoot(container, newChildren);
+      completeRoot(container, newChildren);
     },
 
     replaceContainerChildren(
@@ -352,4 +367,4 @@ const ReacFabricHostConfig = {
   },
 };
 
-export default ReacFabricHostConfig;
+export default ReactFabricHostConfig;
diff --git a/packages/react-native-renderer/src/__mocks__/FabricUIManager.js b/packages/react-native-renderer/src/__mocks__/FabricUIManager.js
index 4e39e95848..41bb928034 100644
--- a/packages/react-native-renderer/src/__mocks__/FabricUIManager.js
+++ b/packages/react-native-renderer/src/__mocks__/FabricUIManager.js
@@ -65,7 +65,7 @@ const RCTFabricUIManager = {
       children: [],
     };
   }),
-  cloneNode: jest.fn(function cloneNode(node) {
+  cloneNode: jest.fn(function cloneNode(node, instanceHandle) {
     return {
       reactTag: node.reactTag,
       viewName: node.viewName,
@@ -73,7 +73,10 @@ const RCTFabricUIManager = {
       children: node.children,
     };
   }),
-  cloneNodeWithNewChildren: jest.fn(function cloneNodeWithNewChildren(node) {
+  cloneNodeWithNewChildren: jest.fn(function cloneNodeWithNewChildren(
+    node,
+    instanceHandle,
+  ) {
     return {
       reactTag: node.reactTag,
       viewName: node.viewName,
@@ -84,6 +87,7 @@ const RCTFabricUIManager = {
   cloneNodeWithNewProps: jest.fn(function cloneNodeWithNewProps(
     node,
     newPropsDiff,
+    instanceHandle,
   ) {
     return {
       reactTag: node.reactTag,
@@ -93,7 +97,11 @@ const RCTFabricUIManager = {
     };
   }),
   cloneNodeWithNewChildrenAndProps: jest.fn(
-    function cloneNodeWithNewChildrenAndProps(node, newPropsDiff) {
+    function cloneNodeWithNewChildrenAndProps(
+      node,
+      newPropsDiff,
+      instanceHandle,
+    ) {
       return {
         reactTag: node.reactTag,
         viewName: node.viewName,
diff --git a/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js b/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js
index cc697f4ddb..5c4da3a4f8 100644
--- a/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js
+++ b/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js
@@ -61,7 +61,11 @@ describe('ReactFabric', () => {
     ReactFabric.render(<View foo="bar" />, 11);
 
     expect(FabricUIManager.createNode.mock.calls.length).toBe(1);
-    expect(FabricUIManager.cloneNodeWithNewProps).toBeCalledWith(firstNode, {
+    expect(FabricUIManager.cloneNodeWithNewProps.mock.calls.length).toBe(1);
+    expect(FabricUIManager.cloneNodeWithNewProps.mock.calls[0][0]).toBe(
+      firstNode,
+    );
+    expect(FabricUIManager.cloneNodeWithNewProps.mock.calls[0][1]).toEqual({
       foo: 'bar',
     });
   });
diff --git a/scripts/flow/react-native-host-hooks.js b/scripts/flow/react-native-host-hooks.js
index de0bdbf012..5d3971b1c3 100644
--- a/scripts/flow/react-native-host-hooks.js
+++ b/scripts/flow/react-native-host-hooks.js
@@ -101,15 +101,20 @@ declare module 'FabricUIManager' {
     props: ?Object,
     instanceHandle: Object,
   ): Object;
-  declare function cloneNode(node: Object): Object;
-  declare function cloneNodeWithNewChildren(node: Object): Object;
+  declare function cloneNode(node: Object, instanceHandle: Object): Object;
+  declare function cloneNodeWithNewChildren(
+    node: Object,
+    instanceHandle: Object,
+  ): Object;
   declare function cloneNodeWithNewProps(
     node: Object,
     newProps: ?Object,
+    instanceHandle: Object,
   ): Object;
   declare function cloneNodeWithNewChildrenAndProps(
     node: Object,
     newProps: ?Object,
+    instanceHandle: Object,
   ): Object;
   declare function appendChild(node: Object, childNode: Object): void;
 

From de84d5c1079b12455058ee177fb3ff97cc0fb8d0 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Tue, 15 May 2018 15:26:46 -0700
Subject: [PATCH 064/277] Enable Profiler timing for DOM and RN dev bundles
 (#12823)

* Enable Profiler timing for DOM and RN dev bundles
* Disable enableProfilerTimer feature flag for ReactIncrementalPerf-test
---
 .../src/__tests__/ReactIncrementalPerf-test.internal.js         | 1 +
 packages/shared/ReactFeatureFlags.js                            | 2 +-
 packages/shared/forks/ReactFeatureFlags.native-oss.js           | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
index cf89594aaf..ef4631a81d 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
@@ -115,6 +115,7 @@ describe('ReactDebugFiberPerf', () => {
     global.performance = createUserTimingPolyfill();
 
     require('shared/ReactFeatureFlags').enableUserTimingAPI = true;
+    require('shared/ReactFeatureFlags').enableProfilerTimer = false;
     require('shared/ReactFeatureFlags').replayFailedUnitOfWorkWithInvokeGuardedCallback = false;
 
     // Import after the polyfill is set up:
diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
index beefc20c0e..e5863ab9a7 100644
--- a/packages/shared/ReactFeatureFlags.js
+++ b/packages/shared/ReactFeatureFlags.js
@@ -40,7 +40,7 @@ export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const warnAboutDeprecatedLifecycles = false;
 
 // Gather advanced timing metrics for Profiler subtrees.
-export const enableProfilerTimer = false;
+export const enableProfilerTimer = __DEV__;
 
 // Fires getDerivedStateFromProps for state *or* props changes
 export const fireGetDerivedStateFromPropsOnStateUpdates = true;
diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js
index 0b93bcbd3a..425709c924 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js
@@ -22,7 +22,7 @@ export const enablePersistentReconciler = false;
 export const enableUserTimingAPI = __DEV__;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const warnAboutDeprecatedLifecycles = false;
-export const enableProfilerTimer = false;
+export const enableProfilerTimer = __DEV__;
 export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
 // Only used in www builds.

From 49979bbf521102d0fb55c77323bcec6fd6871a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Spie=C3=9F?= <hello@philippspiess.com>
Date: Wed, 16 May 2018 15:34:33 +0200
Subject: [PATCH 065/277] Support Pointer Events (#12507)

* Support Pointer Events

* Add Pointer Events DOM Fixture
---
 fixtures/dom/src/components/Header.js         |  1 +
 fixtures/dom/src/components/fixtures/index.js |  3 +
 .../fixtures/pointer-events/drag-box.js       | 90 +++++++++++++++++++
 .../fixtures/pointer-events/drag.js           | 25 ++++++
 .../fixtures/pointer-events/hover-box.js      | 34 +++++++
 .../fixtures/pointer-events/hover.js          | 51 +++++++++++
 .../fixtures/pointer-events/index.js          | 20 +++++
 .../__snapshots__/ReactTestUtils-test.js.snap | 10 +++
 .../src/events/DOMTopLevelEventTypes.js       | 26 ++++++
 .../src/events/EnterLeaveEventPlugin.js       | 62 ++++++++++---
 .../react-dom/src/events/SimpleEventPlugin.js | 19 ++++
 .../src/events/SyntheticPointerEvent.js       | 25 ++++++
 .../react-dom/src/events/TapEventPlugin.js    | 24 ++++-
 13 files changed, 373 insertions(+), 17 deletions(-)
 create mode 100644 fixtures/dom/src/components/fixtures/pointer-events/drag-box.js
 create mode 100644 fixtures/dom/src/components/fixtures/pointer-events/drag.js
 create mode 100644 fixtures/dom/src/components/fixtures/pointer-events/hover-box.js
 create mode 100644 fixtures/dom/src/components/fixtures/pointer-events/hover.js
 create mode 100644 fixtures/dom/src/components/fixtures/pointer-events/index.js
 create mode 100644 packages/react-dom/src/events/SyntheticPointerEvent.js

diff --git a/fixtures/dom/src/components/Header.js b/fixtures/dom/src/components/Header.js
index fbb2e6e505..4a7b1513e6 100644
--- a/fixtures/dom/src/components/Header.js
+++ b/fixtures/dom/src/components/Header.js
@@ -64,6 +64,7 @@ class Header extends React.Component {
                 <option value="/event-pooling">Event Pooling</option>
                 <option value="/custom-elements">Custom Elements</option>
                 <option value="/media-events">Media Events</option>
+                <option value="/pointer-events">Pointer Events</option>
               </select>
             </label>
             <label htmlFor="react_version">
diff --git a/fixtures/dom/src/components/fixtures/index.js b/fixtures/dom/src/components/fixtures/index.js
index 9b40eb9b1f..d43a94df34 100644
--- a/fixtures/dom/src/components/fixtures/index.js
+++ b/fixtures/dom/src/components/fixtures/index.js
@@ -11,6 +11,7 @@ import ErrorHandling from './error-handling';
 import EventPooling from './event-pooling';
 import CustomElementFixtures from './custom-elements';
 import MediaEventsFixtures from './media-events';
+import PointerEventsFixtures from './pointer-events';
 
 const React = window.React;
 
@@ -46,6 +47,8 @@ function FixturesPage() {
       return <CustomElementFixtures />;
     case '/media-events':
       return <MediaEventsFixtures />;
+    case '/pointer-events':
+      return <PointerEventsFixtures />;
     default:
       return <p>Please select a test fixture.</p>;
   }
diff --git a/fixtures/dom/src/components/fixtures/pointer-events/drag-box.js b/fixtures/dom/src/components/fixtures/pointer-events/drag-box.js
new file mode 100644
index 0000000000..0bbc894ccc
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/pointer-events/drag-box.js
@@ -0,0 +1,90 @@
+const React = window.React;
+
+const CIRCLE_SIZE = 80;
+
+class DragBox extends React.Component {
+  state = {
+    hasCapture: false,
+    circleLeft: 80,
+    circleTop: 80,
+  };
+  isDragging = false;
+  previousLeft = 0;
+  previousTop = 0;
+
+  onDown = event => {
+    this.isDragging = true;
+    event.target.setPointerCapture(event.pointerId);
+
+    // We store the initial coordinates to be able to calculate the changes
+    // later on.
+    this.extractPositionDelta(event);
+  };
+
+  onMove = event => {
+    if (!this.isDragging) {
+      return;
+    }
+    const {left, top} = this.extractPositionDelta(event);
+
+    this.setState(({circleLeft, circleTop}) => ({
+      circleLeft: circleLeft + left,
+      circleTop: circleTop + top,
+    }));
+  };
+
+  onUp = event => (this.isDragging = false);
+  onGotCapture = event => this.setState({hasCapture: true});
+  onLostCapture = event => this.setState({hasCapture: false});
+
+  extractPositionDelta = event => {
+    const left = event.pageX;
+    const top = event.pageY;
+    const delta = {
+      left: left - this.previousLeft,
+      top: top - this.previousTop,
+    };
+    this.previousLeft = left;
+    this.previousTop = top;
+    return delta;
+  };
+
+  render() {
+    const {hasCapture, circleLeft, circleTop} = this.state;
+
+    const boxStyle = {
+      border: '1px solid #d9d9d9',
+      margin: '10px 0 20px',
+      minHeight: 400,
+      width: '100%',
+      position: 'relative',
+    };
+
+    const circleStyle = {
+      width: CIRCLE_SIZE,
+      height: CIRCLE_SIZE,
+      borderRadius: CIRCLE_SIZE / 2,
+      position: 'absolute',
+      left: circleLeft,
+      top: circleTop,
+      backgroundColor: hasCapture ? 'blue' : 'green',
+      touchAction: 'none',
+    };
+
+    return (
+      <div style={boxStyle}>
+        <div
+          style={circleStyle}
+          onPointerDown={this.onDown}
+          onPointerMove={this.onMove}
+          onPointerUp={this.onUp}
+          onPointerCancel={this.onUp}
+          onGotPointerCapture={this.onGotCapture}
+          onLostPointerCapture={this.onLostCapture}
+        />
+      </div>
+    );
+  }
+}
+
+export default DragBox;
diff --git a/fixtures/dom/src/components/fixtures/pointer-events/drag.js b/fixtures/dom/src/components/fixtures/pointer-events/drag.js
new file mode 100644
index 0000000000..3c829cc657
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/pointer-events/drag.js
@@ -0,0 +1,25 @@
+import TestCase from '../../TestCase';
+import DragBox from './drag-box';
+
+const React = window.React;
+
+class Drag extends React.Component {
+  render() {
+    return (
+      <TestCase title="Drag" description="">
+        <TestCase.Steps>
+          <li>Drag the circle below with any pointer tool</li>
+        </TestCase.Steps>
+
+        <TestCase.ExpectedResult>
+          While dragging, the circle must have turn blue to indicate that a
+          pointer capture was received.
+        </TestCase.ExpectedResult>
+
+        <DragBox />
+      </TestCase>
+    );
+  }
+}
+
+export default Drag;
diff --git a/fixtures/dom/src/components/fixtures/pointer-events/hover-box.js b/fixtures/dom/src/components/fixtures/pointer-events/hover-box.js
new file mode 100644
index 0000000000..4fa4a07e65
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/pointer-events/hover-box.js
@@ -0,0 +1,34 @@
+const React = window.React;
+
+class DrawBox extends React.Component {
+  render() {
+    const boxStyle = {
+      border: '1px solid #d9d9d9',
+      margin: '10px 0 20px',
+      padding: '20px 20px',
+      touchAction: 'none',
+    };
+
+    const obstacleStyle = {
+      border: '1px solid #d9d9d9',
+      width: '25%',
+      height: '200px',
+      margin: '12.5%',
+      display: 'inline-block',
+    };
+
+    return (
+      <div
+        style={boxStyle}
+        onPointerOver={this.props.onOver}
+        onPointerOut={this.props.onOut}
+        onPointerEnter={this.props.onEnter}
+        onPointerLeave={this.props.onLeave}>
+        <div style={obstacleStyle} />
+        <div style={obstacleStyle} />
+      </div>
+    );
+  }
+}
+
+export default DrawBox;
diff --git a/fixtures/dom/src/components/fixtures/pointer-events/hover.js b/fixtures/dom/src/components/fixtures/pointer-events/hover.js
new file mode 100644
index 0000000000..f64eff82e3
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/pointer-events/hover.js
@@ -0,0 +1,51 @@
+import TestCase from '../../TestCase';
+import HoverBox from './hover-box';
+
+const React = window.React;
+
+class Hover extends React.Component {
+  state = {
+    overs: 0,
+    outs: 0,
+    enters: 0,
+    leaves: 0,
+  };
+
+  onOver = () => this.setState({overs: this.state.overs + 1});
+  onOut = () => this.setState({outs: this.state.outs + 1});
+  onEnter = () => this.setState({enters: this.state.enters + 1});
+  onLeave = () => this.setState({leaves: this.state.leaves + 1});
+
+  render() {
+    const {overs, outs, enters, leaves} = this.state;
+
+    return (
+      <TestCase title="Hover" description="">
+        <TestCase.Steps>
+          <li>Hover over the above box and the obstacles</li>
+        </TestCase.Steps>
+
+        <TestCase.ExpectedResult>
+          Overs and outs should increase when moving over the obstacles but
+          enters and leaves should not.
+        </TestCase.ExpectedResult>
+
+        <HoverBox
+          onOver={this.onOver}
+          onOut={this.onOut}
+          onEnter={this.onEnter}
+          onLeave={this.onLeave}
+        />
+
+        <p>
+          Pointer Overs: <b>{overs}</b> <br />
+          Pointer Outs: <b>{outs}</b> <br />
+          Pointer Enters: <b>{enters}</b> <br />
+          Pointer Leaves: <b>{leaves}</b> <br />
+        </p>
+      </TestCase>
+    );
+  }
+}
+
+export default Hover;
diff --git a/fixtures/dom/src/components/fixtures/pointer-events/index.js b/fixtures/dom/src/components/fixtures/pointer-events/index.js
new file mode 100644
index 0000000000..cad6cdfef1
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/pointer-events/index.js
@@ -0,0 +1,20 @@
+import FixtureSet from '../../FixtureSet';
+import Drag from './drag';
+import Hover from './hover';
+
+const React = window.React;
+
+class PointerEvents extends React.Component {
+  render() {
+    return (
+      <FixtureSet
+        title="Pointer Events"
+        description="Pointer Events are not supported in every browser. The examples below might not work in every browser. To test pointer events, make sure to use Google Chrome, Firefox, Internet Explorer, or Edge.">
+        <Drag />
+        <Hover />
+      </FixtureSet>
+    );
+  }
+}
+
+export default PointerEvents;
diff --git a/packages/react-dom/src/__tests__/__snapshots__/ReactTestUtils-test.js.snap b/packages/react-dom/src/__tests__/__snapshots__/ReactTestUtils-test.js.snap
index 95d2593f75..ff776881ef 100644
--- a/packages/react-dom/src/__tests__/__snapshots__/ReactTestUtils-test.js.snap
+++ b/packages/react-dom/src/__tests__/__snapshots__/ReactTestUtils-test.js.snap
@@ -35,6 +35,7 @@ Array [
   "ended",
   "error",
   "focus",
+  "gotPointerCapture",
   "input",
   "invalid",
   "keyDown",
@@ -44,6 +45,7 @@ Array [
   "loadStart",
   "loadedData",
   "loadedMetadata",
+  "lostPointerCapture",
   "mouseDown",
   "mouseEnter",
   "mouseLeave",
@@ -55,6 +57,14 @@ Array [
   "pause",
   "play",
   "playing",
+  "pointerCancel",
+  "pointerDown",
+  "pointerEnter",
+  "pointerLeave",
+  "pointerMove",
+  "pointerOut",
+  "pointerOver",
+  "pointerUp",
   "progress",
   "rateChange",
   "reset",
diff --git a/packages/react-dom/src/events/DOMTopLevelEventTypes.js b/packages/react-dom/src/events/DOMTopLevelEventTypes.js
index 1898b0f965..298afec9c9 100644
--- a/packages/react-dom/src/events/DOMTopLevelEventTypes.js
+++ b/packages/react-dom/src/events/DOMTopLevelEventTypes.js
@@ -72,6 +72,9 @@ export const TOP_ENCRYPTED = unsafeCastStringToDOMTopLevelType('encrypted');
 export const TOP_ENDED = unsafeCastStringToDOMTopLevelType('ended');
 export const TOP_ERROR = unsafeCastStringToDOMTopLevelType('error');
 export const TOP_FOCUS = unsafeCastStringToDOMTopLevelType('focus');
+export const TOP_GOT_POINTER_CAPTURE = unsafeCastStringToDOMTopLevelType(
+  'gotpointercapture',
+);
 export const TOP_INPUT = unsafeCastStringToDOMTopLevelType('input');
 export const TOP_INVALID = unsafeCastStringToDOMTopLevelType('invalid');
 export const TOP_KEY_DOWN = unsafeCastStringToDOMTopLevelType('keydown');
@@ -83,6 +86,9 @@ export const TOP_LOADED_DATA = unsafeCastStringToDOMTopLevelType('loadeddata');
 export const TOP_LOADED_METADATA = unsafeCastStringToDOMTopLevelType(
   'loadedmetadata',
 );
+export const TOP_LOST_POINTER_CAPTURE = unsafeCastStringToDOMTopLevelType(
+  'lostpointercapture',
+);
 export const TOP_MOUSE_DOWN = unsafeCastStringToDOMTopLevelType('mousedown');
 export const TOP_MOUSE_MOVE = unsafeCastStringToDOMTopLevelType('mousemove');
 export const TOP_MOUSE_OUT = unsafeCastStringToDOMTopLevelType('mouseout');
@@ -92,6 +98,26 @@ export const TOP_PASTE = unsafeCastStringToDOMTopLevelType('paste');
 export const TOP_PAUSE = unsafeCastStringToDOMTopLevelType('pause');
 export const TOP_PLAY = unsafeCastStringToDOMTopLevelType('play');
 export const TOP_PLAYING = unsafeCastStringToDOMTopLevelType('playing');
+export const TOP_POINTER_CANCEL = unsafeCastStringToDOMTopLevelType(
+  'pointercancel',
+);
+export const TOP_POINTER_DOWN = unsafeCastStringToDOMTopLevelType(
+  'pointerdown',
+);
+export const TOP_POINTER_ENTER = unsafeCastStringToDOMTopLevelType(
+  'pointerenter',
+);
+export const TOP_POINTER_LEAVE = unsafeCastStringToDOMTopLevelType(
+  'pointerleave',
+);
+export const TOP_POINTER_MOVE = unsafeCastStringToDOMTopLevelType(
+  'pointermove',
+);
+export const TOP_POINTER_OUT = unsafeCastStringToDOMTopLevelType('pointerout');
+export const TOP_POINTER_OVER = unsafeCastStringToDOMTopLevelType(
+  'pointerover',
+);
+export const TOP_POINTER_UP = unsafeCastStringToDOMTopLevelType('pointerup');
 export const TOP_PROGRESS = unsafeCastStringToDOMTopLevelType('progress');
 export const TOP_RATE_CHANGE = unsafeCastStringToDOMTopLevelType('ratechange');
 export const TOP_RESET = unsafeCastStringToDOMTopLevelType('reset');
diff --git a/packages/react-dom/src/events/EnterLeaveEventPlugin.js b/packages/react-dom/src/events/EnterLeaveEventPlugin.js
index 3e15dd8a90..d0ca03e6a3 100644
--- a/packages/react-dom/src/events/EnterLeaveEventPlugin.js
+++ b/packages/react-dom/src/events/EnterLeaveEventPlugin.js
@@ -7,8 +7,14 @@
 
 import {accumulateEnterLeaveDispatches} from 'events/EventPropagators';
 
-import {TOP_MOUSE_OUT, TOP_MOUSE_OVER} from './DOMTopLevelEventTypes';
+import {
+  TOP_MOUSE_OUT,
+  TOP_MOUSE_OVER,
+  TOP_POINTER_OUT,
+  TOP_POINTER_OVER,
+} from './DOMTopLevelEventTypes';
 import SyntheticMouseEvent from './SyntheticMouseEvent';
+import SyntheticPointerEvent from './SyntheticPointerEvent';
 import {
   getClosestInstanceFromNode,
   getNodeFromInstance,
@@ -23,6 +29,14 @@ const eventTypes = {
     registrationName: 'onMouseLeave',
     dependencies: [TOP_MOUSE_OUT, TOP_MOUSE_OVER],
   },
+  pointerEnter: {
+    registrationName: 'onPointerEnter',
+    dependencies: [TOP_POINTER_OUT, TOP_POINTER_OVER],
+  },
+  pointerLeave: {
+    registrationName: 'onPointerLeave',
+    dependencies: [TOP_POINTER_OUT, TOP_POINTER_OVER],
+  },
 };
 
 const EnterLeaveEventPlugin = {
@@ -41,14 +55,17 @@ const EnterLeaveEventPlugin = {
     nativeEvent,
     nativeEventTarget,
   ) {
-    if (
-      topLevelType === TOP_MOUSE_OVER &&
-      (nativeEvent.relatedTarget || nativeEvent.fromElement)
-    ) {
+    const isOverEvent =
+      topLevelType === TOP_MOUSE_OVER || topLevelType === TOP_POINTER_OVER;
+    const isOutEvent =
+      topLevelType === TOP_MOUSE_OUT || topLevelType === TOP_POINTER_OUT;
+
+    if (isOverEvent && (nativeEvent.relatedTarget || nativeEvent.fromElement)) {
       return null;
     }
-    if (topLevelType !== TOP_MOUSE_OUT && topLevelType !== TOP_MOUSE_OVER) {
-      // Must not be a mouse in or mouse out - ignoring.
+
+    if (!isOutEvent && !isOverEvent) {
+      // Must not be a mouse or pointer in or out - ignoring.
       return null;
     }
 
@@ -68,7 +85,7 @@ const EnterLeaveEventPlugin = {
 
     let from;
     let to;
-    if (topLevelType === TOP_MOUSE_OUT) {
+    if (isOutEvent) {
       from = targetInst;
       const related = nativeEvent.relatedTarget || nativeEvent.toElement;
       to = related ? getClosestInstanceFromNode(related) : null;
@@ -83,26 +100,43 @@ const EnterLeaveEventPlugin = {
       return null;
     }
 
+    let eventInterface, leaveEventType, enterEventType, eventTypePrefix;
+
+    if (topLevelType === TOP_MOUSE_OUT || topLevelType === TOP_MOUSE_OVER) {
+      eventInterface = SyntheticMouseEvent;
+      leaveEventType = eventTypes.mouseLeave;
+      enterEventType = eventTypes.mouseEnter;
+      eventTypePrefix = 'mouse';
+    } else if (
+      topLevelType === TOP_POINTER_OUT ||
+      topLevelType === TOP_POINTER_OVER
+    ) {
+      eventInterface = SyntheticPointerEvent;
+      leaveEventType = eventTypes.pointerLeave;
+      enterEventType = eventTypes.pointerEnter;
+      eventTypePrefix = 'pointer';
+    }
+
     const fromNode = from == null ? win : getNodeFromInstance(from);
     const toNode = to == null ? win : getNodeFromInstance(to);
 
-    const leave = SyntheticMouseEvent.getPooled(
-      eventTypes.mouseLeave,
+    const leave = eventInterface.getPooled(
+      leaveEventType,
       from,
       nativeEvent,
       nativeEventTarget,
     );
-    leave.type = 'mouseleave';
+    leave.type = eventTypePrefix + 'leave';
     leave.target = fromNode;
     leave.relatedTarget = toNode;
 
-    const enter = SyntheticMouseEvent.getPooled(
-      eventTypes.mouseEnter,
+    const enter = eventInterface.getPooled(
+      enterEventType,
       to,
       nativeEvent,
       nativeEventTarget,
     );
-    enter.type = 'mouseenter';
+    enter.type = eventTypePrefix + 'enter';
     enter.target = toNode;
     enter.relatedTarget = fromNode;
 
diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js
index 193aff57b5..8473b546fb 100644
--- a/packages/react-dom/src/events/SimpleEventPlugin.js
+++ b/packages/react-dom/src/events/SimpleEventPlugin.js
@@ -29,6 +29,7 @@ import SyntheticClipboardEvent from './SyntheticClipboardEvent';
 import SyntheticFocusEvent from './SyntheticFocusEvent';
 import SyntheticKeyboardEvent from './SyntheticKeyboardEvent';
 import SyntheticMouseEvent from './SyntheticMouseEvent';
+import SyntheticPointerEvent from './SyntheticPointerEvent';
 import SyntheticDragEvent from './SyntheticDragEvent';
 import SyntheticTouchEvent from './SyntheticTouchEvent';
 import SyntheticTransitionEvent from './SyntheticTransitionEvent';
@@ -78,6 +79,9 @@ const interactiveEventTypeNames: Array<EventTuple> = [
   [DOMTopLevelEventTypes.TOP_PASTE, 'paste'],
   [DOMTopLevelEventTypes.TOP_PAUSE, 'pause'],
   [DOMTopLevelEventTypes.TOP_PLAY, 'play'],
+  [DOMTopLevelEventTypes.TOP_POINTER_CANCEL, 'pointerCancel'],
+  [DOMTopLevelEventTypes.TOP_POINTER_DOWN, 'pointerDown'],
+  [DOMTopLevelEventTypes.TOP_POINTER_UP, 'pointerUp'],
   [DOMTopLevelEventTypes.TOP_RATE_CHANGE, 'rateChange'],
   [DOMTopLevelEventTypes.TOP_RESET, 'reset'],
   [DOMTopLevelEventTypes.TOP_SEEKED, 'seeked'],
@@ -104,14 +108,19 @@ const nonInteractiveEventTypeNames: Array<EventTuple> = [
   [DOMTopLevelEventTypes.TOP_ENCRYPTED, 'encrypted'],
   [DOMTopLevelEventTypes.TOP_ENDED, 'ended'],
   [DOMTopLevelEventTypes.TOP_ERROR, 'error'],
+  [DOMTopLevelEventTypes.TOP_GOT_POINTER_CAPTURE, 'gotPointerCapture'],
   [DOMTopLevelEventTypes.TOP_LOAD, 'load'],
   [DOMTopLevelEventTypes.TOP_LOADED_DATA, 'loadedData'],
   [DOMTopLevelEventTypes.TOP_LOADED_METADATA, 'loadedMetadata'],
   [DOMTopLevelEventTypes.TOP_LOAD_START, 'loadStart'],
+  [DOMTopLevelEventTypes.TOP_LOST_POINTER_CAPTURE, 'lostPointerCapture'],
   [DOMTopLevelEventTypes.TOP_MOUSE_MOVE, 'mouseMove'],
   [DOMTopLevelEventTypes.TOP_MOUSE_OUT, 'mouseOut'],
   [DOMTopLevelEventTypes.TOP_MOUSE_OVER, 'mouseOver'],
   [DOMTopLevelEventTypes.TOP_PLAYING, 'playing'],
+  [DOMTopLevelEventTypes.TOP_POINTER_MOVE, 'pointerMove'],
+  [DOMTopLevelEventTypes.TOP_POINTER_OUT, 'pointerOut'],
+  [DOMTopLevelEventTypes.TOP_POINTER_OVER, 'pointerOver'],
   [DOMTopLevelEventTypes.TOP_PROGRESS, 'progress'],
   [DOMTopLevelEventTypes.TOP_SCROLL, 'scroll'],
   [DOMTopLevelEventTypes.TOP_SEEKING, 'seeking'],
@@ -282,6 +291,16 @@ const SimpleEventPlugin: PluginModule<MouseEvent> & {
       case DOMTopLevelEventTypes.TOP_PASTE:
         EventConstructor = SyntheticClipboardEvent;
         break;
+      case DOMTopLevelEventTypes.TOP_GOT_POINTER_CAPTURE:
+      case DOMTopLevelEventTypes.TOP_LOST_POINTER_CAPTURE:
+      case DOMTopLevelEventTypes.TOP_POINTER_CANCEL:
+      case DOMTopLevelEventTypes.TOP_POINTER_DOWN:
+      case DOMTopLevelEventTypes.TOP_POINTER_MOVE:
+      case DOMTopLevelEventTypes.TOP_POINTER_OUT:
+      case DOMTopLevelEventTypes.TOP_POINTER_OVER:
+      case DOMTopLevelEventTypes.TOP_POINTER_UP:
+        EventConstructor = SyntheticPointerEvent;
+        break;
       default:
         if (__DEV__) {
           if (knownHTMLTopLevelTypes.indexOf(topLevelType) === -1) {
diff --git a/packages/react-dom/src/events/SyntheticPointerEvent.js b/packages/react-dom/src/events/SyntheticPointerEvent.js
new file mode 100644
index 0000000000..96a488f186
--- /dev/null
+++ b/packages/react-dom/src/events/SyntheticPointerEvent.js
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import SyntheticMouseEvent from './SyntheticMouseEvent';
+
+/**
+ * @interface PointerEvent
+ * @see http://www.w3.org/TR/pointerevents/
+ */
+const SyntheticPointerEvent = SyntheticMouseEvent.extend({
+  pointerId: null,
+  width: null,
+  height: null,
+  pressure: null,
+  tiltX: null,
+  tiltY: null,
+  pointerType: null,
+  isPrimary: null,
+});
+
+export default SyntheticPointerEvent;
diff --git a/packages/react-dom/src/events/TapEventPlugin.js b/packages/react-dom/src/events/TapEventPlugin.js
index 772e5d405f..e1baab05ea 100644
--- a/packages/react-dom/src/events/TapEventPlugin.js
+++ b/packages/react-dom/src/events/TapEventPlugin.js
@@ -15,6 +15,10 @@ import {
   TOP_MOUSE_DOWN,
   TOP_MOUSE_MOVE,
   TOP_MOUSE_UP,
+  TOP_POINTER_CANCEL,
+  TOP_POINTER_DOWN,
+  TOP_POINTER_UP,
+  TOP_POINTER_MOVE,
   TOP_TOUCH_CANCEL,
   TOP_TOUCH_END,
   TOP_TOUCH_MOVE,
@@ -23,14 +27,20 @@ import {
 import SyntheticUIEvent from './SyntheticUIEvent';
 
 function isStartish(topLevelType) {
-  return topLevelType === TOP_MOUSE_DOWN || topLevelType === TOP_TOUCH_START;
+  return (
+    topLevelType === TOP_MOUSE_DOWN ||
+    topLevelType === TOP_TOUCH_START ||
+    topLevelType === TOP_POINTER_DOWN
+  );
 }
 
 function isEndish(topLevelType) {
   return (
     topLevelType === TOP_MOUSE_UP ||
-    topLevelType === TOP_TOUCH_END ||
-    topLevelType === TOP_TOUCH_CANCEL
+    topLevelType === TOP_POINTER_CANCEL ||
+    topLevelType === TOP_POINTER_UP ||
+    topLevelType === TOP_TOUCH_CANCEL ||
+    topLevelType === TOP_TOUCH_END
   );
 }
 
@@ -102,8 +112,16 @@ const touchEvents = [
   TOP_TOUCH_MOVE,
 ];
 
+const pointerEvents = [
+  TOP_POINTER_CANCEL,
+  TOP_POINTER_DOWN,
+  TOP_POINTER_MOVE,
+  TOP_POINTER_UP,
+];
+
 const dependencies = [TOP_MOUSE_DOWN, TOP_MOUSE_MOVE, TOP_MOUSE_UP].concat(
   touchEvents,
+  pointerEvents,
 );
 
 const eventTypes = {

From ef294ed6fcb7378ba25525e58e0588e3e8e85c48 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Wed, 16 May 2018 06:36:06 -0700
Subject: [PATCH 066/277] Rename Scheduler methods more accurately (#12770)

* Rename Scheduler methods more accurately

**what is the change?:**
```
rIC -> scheduleCallback
```
We will later expose a second method for different priority level, name
TBD. Since we only have one priority right now we can delay the
bikeshedding about the priority names.

cIC -> cancelScheduledCallback
This method can be used to cancel callbacks scheduled at any priority
level, and will remain named this way.

why make this change?:
Originally this module contained a polyfill for requestIdleCallback
and cancelIdleCallback but we are changing the behavior so it's no
longer just a polyfill. The new names are more semantic and distinguish
this from the original polyfill functionality.

**test plan:**
Ran the tests

**why make this change?:**
Getting this out of the way so things are more clear.

**Coming Up Next:**
- Switching from a Map of ids and an array to a linked list for storing
callbacks.
- Error handling

* callback -> work

* update callsites in new places after rebase

* fix typo
---
 packages/react-art/src/ReactARTHostConfig.js  |  2 +-
 .../src/client/ReactDOMHostConfig.js          |  4 +-
 .../react-scheduler/src/ReactScheduler.js     | 22 +++----
 .../src/__tests__/ReactScheduler-test.js      | 62 +++++++++----------
 4 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/packages/react-art/src/ReactARTHostConfig.js b/packages/react-art/src/ReactARTHostConfig.js
index cd059537cc..8fa175e1ae 100644
--- a/packages/react-art/src/ReactARTHostConfig.js
+++ b/packages/react-art/src/ReactARTHostConfig.js
@@ -319,7 +319,7 @@ const ReactARTHostConfig = {
     return emptyObject;
   },
 
-  scheduleDeferredCallback: ReactScheduler.rIC,
+  scheduleDeferredCallback: ReactScheduler.scheduleWork,
 
   shouldSetTextContent(type, props) {
     return (
diff --git a/packages/react-dom/src/client/ReactDOMHostConfig.js b/packages/react-dom/src/client/ReactDOMHostConfig.js
index 95471f2279..72072debd5 100644
--- a/packages/react-dom/src/client/ReactDOMHostConfig.js
+++ b/packages/react-dom/src/client/ReactDOMHostConfig.js
@@ -561,8 +561,8 @@ const ReactDOMHostConfig = {
     },
   },
 
-  scheduleDeferredCallback: ReactScheduler.rIC,
-  cancelDeferredCallback: ReactScheduler.cIC,
+  scheduleDeferredCallback: ReactScheduler.scheduleWork,
+  cancelDeferredCallback: ReactScheduler.cancelScheduledWork,
 };
 
 export default ReactDOMHostConfig;
diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index 2b0fa9f171..023a81a635 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -13,7 +13,7 @@
  * A scheduling library to allow scheduling work with more granular priority and
  * control than requestAnimationFrame and requestIdleCallback.
  * Current TODO items:
- * X- Pull out the rIC polyfill built into React
+ * X- Pull out the scheduleWork polyfill built into React
  * X- Initial test coverage
  * X- Support for multiple callbacks
  * - Support for two priorities; serial and deferred
@@ -68,13 +68,13 @@ if (hasNativePerformanceNow) {
 }
 
 // TODO: There's no way to cancel, because Fiber doesn't atm.
-let rIC: (
+let scheduleWork: (
   callback: (deadline: Deadline, options?: {timeout: number}) => void,
 ) => number;
-let cIC: (callbackID: number) => void;
+let cancelScheduledWork: (callbackID: number) => void;
 
 if (!ExecutionEnvironment.canUseDOM) {
-  rIC = function(
+  scheduleWork = function(
     frameCallback: (deadline: Deadline, options?: {timeout: number}) => void,
   ): number {
     return setTimeout(() => {
@@ -86,12 +86,12 @@ if (!ExecutionEnvironment.canUseDOM) {
       });
     });
   };
-  cIC = function(timeoutID: number) {
+  cancelScheduledWork = function(timeoutID: number) {
     clearTimeout(timeoutID);
   };
 } else {
   // We keep callbacks in a queue.
-  // Calling rIC will push in a new callback at the end of the queue.
+  // Calling scheduleWork will push in a new callback at the end of the queue.
   // When we get idle time, callbacks are removed from the front of the queue
   // and called.
   const pendingCallbacks: Array<CallbackConfigType> = [];
@@ -104,7 +104,7 @@ if (!ExecutionEnvironment.canUseDOM) {
 
   // When a callback is scheduled, we register it by adding it's id to this
   // object.
-  // If the user calls 'cIC' with the id of that callback, it will be
+  // If the user calls 'cancelScheduledWork' with the id of that callback, it will be
   // unregistered by removing the id from this object.
   // Then we skip calling any callback which is not registered.
   // This means cancelling is an O(1) time complexity instead of O(n).
@@ -265,7 +265,7 @@ if (!ExecutionEnvironment.canUseDOM) {
     }
   };
 
-  rIC = function(
+  scheduleWork = function(
     callback: (deadline: Deadline) => void,
     options?: {timeout: number},
   ): number {
@@ -289,7 +289,7 @@ if (!ExecutionEnvironment.canUseDOM) {
     if (!isAnimationFrameScheduled) {
       // If rAF didn't already schedule one, we need to schedule a frame.
       // TODO: If this rAF doesn't materialize because the browser throttles, we
-      // might want to still have setTimeout trigger rIC as a backup to ensure
+      // might want to still have setTimeout trigger scheduleWork as a backup to ensure
       // that we keep performing work.
       isAnimationFrameScheduled = true;
       requestAnimationFrame(animationTick);
@@ -297,9 +297,9 @@ if (!ExecutionEnvironment.canUseDOM) {
     return newCallbackId;
   };
 
-  cIC = function(callbackId: number) {
+  cancelScheduledWork = function(callbackId: number) {
     delete registeredCallbackIds[callbackId];
   };
 }
 
-export {now, rIC, cIC};
+export {now, scheduleWork, cancelScheduledWork};
diff --git a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
index 41bbd4d496..c5274fe90b 100644
--- a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
+++ b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
@@ -41,11 +41,11 @@ describe('ReactScheduler', () => {
     ReactScheduler = require('react-scheduler');
   });
 
-  describe('rIC', () => {
+  describe('scheduleWork', () => {
     it('calls the callback within the frame when not blocked', () => {
-      const {rIC} = ReactScheduler;
+      const {scheduleWork} = ReactScheduler;
       const cb = jest.fn();
-      rIC(cb);
+      scheduleWork(cb);
       jest.runAllTimers();
       expect(cb.mock.calls.length).toBe(1);
       // should not have timed out and should include a timeRemaining method
@@ -55,15 +55,15 @@ describe('ReactScheduler', () => {
 
     describe('with multiple callbacks', () => {
       it('accepts multiple callbacks and calls within frame when not blocked', () => {
-        const {rIC} = ReactScheduler;
+        const {scheduleWork} = ReactScheduler;
         const callbackLog = [];
         const callbackA = jest.fn(() => callbackLog.push('A'));
         const callbackB = jest.fn(() => callbackLog.push('B'));
-        rIC(callbackA);
+        scheduleWork(callbackA);
         // initially waits to call the callback
         expect(callbackLog).toEqual([]);
         // waits while second callback is passed
-        rIC(callbackB);
+        scheduleWork(callbackB);
         expect(callbackLog).toEqual([]);
         // after a delay, calls as many callbacks as it has time for
         jest.runAllTimers();
@@ -84,11 +84,11 @@ describe('ReactScheduler', () => {
         'schedules callbacks in correct order and' +
           'keeps calling them if there is time',
         () => {
-          const {rIC} = ReactScheduler;
+          const {scheduleWork} = ReactScheduler;
           const callbackLog = [];
           const callbackA = jest.fn(() => {
             callbackLog.push('A');
-            rIC(callbackC);
+            scheduleWork(callbackC);
           });
           const callbackB = jest.fn(() => {
             callbackLog.push('B');
@@ -97,11 +97,11 @@ describe('ReactScheduler', () => {
             callbackLog.push('C');
           });
 
-          rIC(callbackA);
+          scheduleWork(callbackA);
           // initially waits to call the callback
           expect(callbackLog).toEqual([]);
           // continues waiting while B is scheduled
-          rIC(callbackB);
+          scheduleWork(callbackB);
           expect(callbackLog).toEqual([]);
           // after a delay, calls the scheduled callbacks,
           // and also calls new callbacks scheduled by current callbacks
@@ -110,18 +110,18 @@ describe('ReactScheduler', () => {
         },
       );
 
-      it('schedules callbacks in correct order when callbacks have many nested rIC calls', () => {
-        const {rIC} = ReactScheduler;
+      it('schedules callbacks in correct order when callbacks have many nested scheduleWork calls', () => {
+        const {scheduleWork} = ReactScheduler;
         const callbackLog = [];
         const callbackA = jest.fn(() => {
           callbackLog.push('A');
-          rIC(callbackC);
-          rIC(callbackD);
+          scheduleWork(callbackC);
+          scheduleWork(callbackD);
         });
         const callbackB = jest.fn(() => {
           callbackLog.push('B');
-          rIC(callbackE);
-          rIC(callbackF);
+          scheduleWork(callbackE);
+          scheduleWork(callbackF);
         });
         const callbackC = jest.fn(() => {
           callbackLog.push('C');
@@ -136,8 +136,8 @@ describe('ReactScheduler', () => {
           callbackLog.push('F');
         });
 
-        rIC(callbackA);
-        rIC(callbackB);
+        scheduleWork(callbackA);
+        scheduleWork(callbackB);
         // initially waits to call the callback
         expect(callbackLog).toEqual([]);
         // while flushing callbacks, calls as many as it has time for
@@ -145,23 +145,23 @@ describe('ReactScheduler', () => {
         expect(callbackLog).toEqual(['A', 'B', 'C', 'D', 'E', 'F']);
       });
 
-      it('schedules callbacks in correct order when they use rIC to schedule themselves', () => {
-        const {rIC} = ReactScheduler;
+      it('schedules callbacks in correct order when they use scheduleWork to schedule themselves', () => {
+        const {scheduleWork} = ReactScheduler;
         const callbackLog = [];
         let callbackAIterations = 0;
         const callbackA = jest.fn(() => {
           if (callbackAIterations < 1) {
-            rIC(callbackA);
+            scheduleWork(callbackA);
           }
           callbackLog.push('A' + callbackAIterations);
           callbackAIterations++;
         });
         const callbackB = jest.fn(() => callbackLog.push('B'));
 
-        rIC(callbackA);
+        scheduleWork(callbackA);
         // initially waits to call the callback
         expect(callbackLog).toEqual([]);
-        rIC(callbackB);
+        scheduleWork(callbackB);
         expect(callbackLog).toEqual([]);
         // after a delay, calls the latest callback passed
         jest.runAllTimers();
@@ -170,29 +170,29 @@ describe('ReactScheduler', () => {
     });
   });
 
-  describe('cIC', () => {
+  describe('cancelScheduledWork', () => {
     it('cancels the scheduled callback', () => {
-      const {rIC, cIC} = ReactScheduler;
+      const {scheduleWork, cancelScheduledWork} = ReactScheduler;
       const cb = jest.fn();
-      const callbackId = rIC(cb);
+      const callbackId = scheduleWork(cb);
       expect(cb.mock.calls.length).toBe(0);
-      cIC(callbackId);
+      cancelScheduledWork(callbackId);
       jest.runAllTimers();
       expect(cb.mock.calls.length).toBe(0);
     });
 
     describe('with multiple callbacks', () => {
       it('when one callback cancels the next one', () => {
-        const {rIC, cIC} = ReactScheduler;
+        const {scheduleWork, cancelScheduledWork} = ReactScheduler;
         const callbackLog = [];
         let callbackBId;
         const callbackA = jest.fn(() => {
           callbackLog.push('A');
-          cIC(callbackBId);
+          cancelScheduledWork(callbackBId);
         });
         const callbackB = jest.fn(() => callbackLog.push('B'));
-        rIC(callbackA);
-        callbackBId = rIC(callbackB);
+        scheduleWork(callbackA);
+        callbackBId = scheduleWork(callbackB);
         // Initially doesn't call anything
         expect(callbackLog).toEqual([]);
         jest.runAllTimers();

From 8227e54ccf32f47e4c6bf5f30d08f84b8fed455d Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Wed, 16 May 2018 08:07:42 -0700
Subject: [PATCH 067/277] Quick fix for ReactScheduler type inconsistency
 (#12828)

**what is the change?:**
In some cases we had defined the 'callback' as taking two arguments,
when really we meant to indicate the second argument passed to
'scheduleWork'.

**why make this change?:**
For correctness and to unblock something @gaearon is working on. A bit
surprised Flow didn't catch this in the first place.

**test plan:**
Ran tests, flow, lint.
---
 packages/react-scheduler/src/ReactScheduler.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index 023a81a635..3d60a64e06 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -31,8 +31,9 @@
 // The frame rate is dynamically adjusted.
 
 import type {Deadline} from 'react-reconciler';
+type FrameCallbackType = Deadline => void;
 type CallbackConfigType = {|
-  scheduledCallback: Deadline => void,
+  scheduledCallback: FrameCallbackType,
   timeoutTime: number,
   callbackId: number, // used for cancelling
 |};
@@ -69,16 +70,18 @@ if (hasNativePerformanceNow) {
 
 // TODO: There's no way to cancel, because Fiber doesn't atm.
 let scheduleWork: (
-  callback: (deadline: Deadline, options?: {timeout: number}) => void,
+  callback: FrameCallbackType,
+  options?: {timeout: number},
 ) => number;
 let cancelScheduledWork: (callbackID: number) => void;
 
 if (!ExecutionEnvironment.canUseDOM) {
   scheduleWork = function(
-    frameCallback: (deadline: Deadline, options?: {timeout: number}) => void,
+    callback: FrameCallbackType,
+    options?: {timeout: number},
   ): number {
     return setTimeout(() => {
-      frameCallback({
+      callback({
         timeRemaining() {
           return Infinity;
         },
@@ -132,7 +135,10 @@ if (!ExecutionEnvironment.canUseDOM) {
     },
   };
 
-  const safelyCallScheduledCallback = function(callback, callbackId) {
+  const safelyCallScheduledCallback = function(
+    callback: FrameCallbackType,
+    callbackId: number,
+  ) {
     if (!registeredCallbackIds[callbackId]) {
       // ignore cancelled callbacks
       return;
@@ -266,7 +272,7 @@ if (!ExecutionEnvironment.canUseDOM) {
   };
 
   scheduleWork = function(
-    callback: (deadline: Deadline) => void,
+    callback: FrameCallbackType,
     options?: {timeout: number},
   ): number {
     let timeoutTime = -1;

From d6f304e88952b895a9e1c69483081d2d9ef56979 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Wed, 16 May 2018 14:02:34 -0700
Subject: [PATCH 068/277] Remove Timeout export on React object unless
 enableSuspense flag (#12833)

---
 packages/react/src/React.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/react/src/React.js b/packages/react/src/React.js
index 2f6221a23e..50ce68dc3c 100644
--- a/packages/react/src/React.js
+++ b/packages/react/src/React.js
@@ -55,7 +55,6 @@ const React = {
   StrictMode: REACT_STRICT_MODE_TYPE,
   unstable_AsyncMode: REACT_ASYNC_MODE_TYPE,
   unstable_Profiler: REACT_PROFILER_TYPE,
-  Timeout: REACT_TIMEOUT_TYPE,
 
   createElement: __DEV__ ? createElementWithValidation : createElement,
   cloneElement: __DEV__ ? cloneElementWithValidation : cloneElement,

From 2da155a4c317e097f4490c74d173e5a902003572 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Wed, 16 May 2018 14:18:22 -0700
Subject: [PATCH 069/277] Quick fix for minor typo in ReactScheduler (#12834)

**what is the change?:**
We were setting a flag after some early returns, should have set it
right away.

To be fair, it's not clear how you can hit a problem with the current
state of things. Even if a callback is cancelled, it's still in the
'pendingCallbacks' queue until the rAF runs, and we only schedule a rAF
when there are pendingCallbacks in the queue.

But since this is obviously wrong, going to fix it.

We will be adding a regression test in a follow-up PR.

**why make this change?:**
To fix a random bug which was popping up.

**test plan:**
Adding a regression unit test in a follow-up PR.
---
 packages/react-scheduler/src/ReactScheduler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index 3d60a64e06..045612bceb 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -209,11 +209,11 @@ if (!ExecutionEnvironment.canUseDOM) {
     if (event.source !== window || event.data !== messageKey) {
       return;
     }
+    isIdleScheduled = false;
 
     if (pendingCallbacks.length === 0) {
       return;
     }
-    isIdleScheduled = false;
 
     // First call anything which has timed out, until we have caught up.
     callTimedOutCallbacks();

From 2ace49362adc63bc0bedd5df363bf471adb71b94 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Wed, 16 May 2018 15:39:32 -0700
Subject: [PATCH 070/277] Removed duplicate feature flag in test (#12836)

---
 .../src/events/__tests__/ChangeEventPlugin-test.internal.js      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.internal.js b/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.internal.js
index 51eb86eedb..23f494172c 100644
--- a/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.internal.js
+++ b/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.internal.js
@@ -476,7 +476,6 @@ describe('ChangeEventPlugin', () => {
       jest.resetModules();
       ReactFeatureFlags = require('shared/ReactFeatureFlags');
       ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
-      ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
       ReactDOM = require('react-dom');
     });
     it('text input', () => {

From d4123b4784c75af0bfb5f6505e6c567e354b4155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= <sebastian@calyptus.eu>
Date: Wed, 16 May 2018 17:31:56 -0700
Subject: [PATCH 071/277] Relax current renderer warning (#12838)

If you use an older version of `react` this won't get initialized to null. We don't really need it to be initialized to work.
---
 packages/react-reconciler/src/ReactFiberNewContext.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberNewContext.js b/packages/react-reconciler/src/ReactFiberNewContext.js
index 3aaf553ec5..74e1c73390 100644
--- a/packages/react-reconciler/src/ReactFiberNewContext.js
+++ b/packages/react-reconciler/src/ReactFiberNewContext.js
@@ -45,7 +45,8 @@ export default function(stack: Stack, isPrimaryRenderer: boolean) {
       context._changedBits = providerFiber.stateNode;
       if (__DEV__) {
         warning(
-          context._currentRenderer === null ||
+          context._currentRenderer === undefined ||
+            context._currentRenderer === null ||
             context._currentRenderer === rendererSigil,
           'Detected multiple renderers concurrently rendering the ' +
             'same context provider. This is currently unsupported.',
@@ -61,7 +62,8 @@ export default function(stack: Stack, isPrimaryRenderer: boolean) {
       context._changedBits2 = providerFiber.stateNode;
       if (__DEV__) {
         warning(
-          context._currentRenderer2 === null ||
+          context._currentRenderer2 === undefined ||
+            context._currentRenderer2 === null ||
             context._currentRenderer2 === rendererSigil,
           'Detected multiple renderers concurrently rendering the ' +
             'same context provider. This is currently unsupported.',

From 2d20dc47a399873fd7ac2118e75bd75696cc7b3b Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 17 May 2018 14:29:37 +0100
Subject: [PATCH 072/277] Separate `yarn flow` and `yarn flow-ci` (#12841)

---
 package.json                                  |  1 +
 scripts/circleci/test_entry_point.sh          |  2 +-
 .../build-commands/run-automated-tests.js     |  2 +-
 scripts/tasks/flow-ci.js                      | 29 +++++++++++++++++++
 scripts/tasks/flow.js                         |  5 +++-
 5 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 scripts/tasks/flow-ci.js

diff --git a/package.json b/package.json
index b8eb946ea7..0d70a61bb1 100644
--- a/package.json
+++ b/package.json
@@ -118,6 +118,7 @@
     "test-build": "cross-env NODE_ENV=development jest --config ./scripts/jest/config.build.js",
     "test-build-prod": "cross-env NODE_ENV=production jest --config ./scripts/jest/config.build.js",
     "flow": "node ./scripts/tasks/flow.js",
+    "flow-ci": "node ./scripts/tasks/flow-ci.js",
     "prettier": "node ./scripts/prettier/index.js write-changed",
     "prettier-all": "node ./scripts/prettier/index.js write",
     "version-check": "node ./scripts/tasks/version-check.js"
diff --git a/scripts/circleci/test_entry_point.sh b/scripts/circleci/test_entry_point.sh
index 249b09142c..182d07c94d 100755
--- a/scripts/circleci/test_entry_point.sh
+++ b/scripts/circleci/test_entry_point.sh
@@ -8,7 +8,7 @@ COMMANDS_TO_RUN=()
 
 if [ $((0 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
   COMMANDS_TO_RUN+=('node ./scripts/prettier/index')
-  COMMANDS_TO_RUN+=('node ./scripts/tasks/flow')
+  COMMANDS_TO_RUN+=('node ./scripts/tasks/flow-ci')
   COMMANDS_TO_RUN+=('node ./scripts/tasks/eslint')
   COMMANDS_TO_RUN+=('yarn test --maxWorkers=2')
   COMMANDS_TO_RUN+=('./scripts/circleci/check_license.sh')
diff --git a/scripts/release/build-commands/run-automated-tests.js b/scripts/release/build-commands/run-automated-tests.js
index 676034ba6e..da1f6ad08b 100644
--- a/scripts/release/build-commands/run-automated-tests.js
+++ b/scripts/release/build-commands/run-automated-tests.js
@@ -7,7 +7,7 @@ const {logPromise, runYarnTask} = require('../utils');
 module.exports = async ({cwd}) => {
   await logPromise(runYarnTask(cwd, 'lint', 'Lint failed'), 'Running ESLint');
   await logPromise(
-    runYarnTask(cwd, 'flow', 'Flow failed'),
+    runYarnTask(cwd, 'flow-ci', 'Flow failed'),
     'Running Flow checks'
   );
   await logPromise(
diff --git a/scripts/tasks/flow-ci.js b/scripts/tasks/flow-ci.js
new file mode 100644
index 0000000000..d3881e0369
--- /dev/null
+++ b/scripts/tasks/flow-ci.js
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+const path = require('path');
+const spawn = require('child_process').spawn;
+
+const extension = process.platform === 'win32' ? '.cmd' : '';
+
+// This script forces a complete check.
+// Use it for the CI.
+
+spawn(path.join('node_modules', '.bin', 'flow' + extension), ['check', '.'], {
+  // Allow colors to pass through
+  stdio: 'inherit',
+}).on('close', function(code) {
+  if (code !== 0) {
+    console.error('Flow failed');
+  } else {
+    console.log('Flow passed');
+  }
+
+  process.exit(code);
+});
diff --git a/scripts/tasks/flow.js b/scripts/tasks/flow.js
index 30ef8a3f23..a7b643712b 100644
--- a/scripts/tasks/flow.js
+++ b/scripts/tasks/flow.js
@@ -12,7 +12,10 @@ const spawn = require('child_process').spawn;
 
 const extension = process.platform === 'win32' ? '.cmd' : '';
 
-spawn(path.join('node_modules', '.bin', 'flow' + extension), ['check', '.'], {
+// This script is using `flow status` for a quick check with a server.
+// Use it for local development.
+
+spawn(path.join('node_modules', '.bin', 'flow' + extension), ['status', '.'], {
   // Allow colors to pass through
   stdio: 'inherit',
 }).on('close', function(code) {

From 4b8510be0faca665b53cdabba56f5334cace7ac0 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Thu, 17 May 2018 08:55:41 -0700
Subject: [PATCH 073/277] Make REACT_PROFILER_TYPE numeric value unique
 (#12843)

---
 packages/shared/ReactSymbols.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/shared/ReactSymbols.js b/packages/shared/ReactSymbols.js
index bd3af4a903..339c7372ca 100644
--- a/packages/shared/ReactSymbols.js
+++ b/packages/shared/ReactSymbols.js
@@ -24,8 +24,8 @@ export const REACT_STRICT_MODE_TYPE = hasSymbol
   ? Symbol.for('react.strict_mode')
   : 0xeacc;
 export const REACT_PROFILER_TYPE = hasSymbol
-  ? Symbol.for('react.profile_root')
-  : 0xeacc;
+  ? Symbol.for('react.profiler')
+  : 0xead2;
 export const REACT_PROVIDER_TYPE = hasSymbol
   ? Symbol.for('react.provider')
   : 0xeacd;

From 7ccb37161ffcbea33d6ede1397098faa567751f3 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Thu, 17 May 2018 08:57:45 -0700
Subject: [PATCH 074/277] Temporary fix for grabbing wrong rAF polyfill in
 ReactScheduler (#12837)

* Temporary fix for grabbing wrong rAF polyfill in ReactScheduler

**what is the change?:**
For now...
We need to grab a slightly different implementation of rAF internally at
FB than in Open Source. Making rAF a dependency of the ReactScheduler
module allows us to fork the dependency at FB.

NOTE: After this lands we have an alternative plan to make this module
separate from React and require it before our Facebook timer polyfills
are applied. But want to land this now to keep master in a working state
and fix bugs folks are seeing at Facebook.

Thanks @sebmarkbage @acdlite and @sophiebits for discussing the options
and trade-offs for solving this issue.

**why make this change?:**
This fixes a problem we're running into when experimenting with
ReactScheduler internally at Facebook, **and* it's part of our long term
plan to use dependency injection with the scheduler to make it easier to
test and adjust.

**test plan:**
Ran tests, lint, flow, and will manually test when syncing into
Facebook's codebase.

**issue:**
See internal task T29442940

* ran prettier
---
 .../react-scheduler/src/ReactScheduler.js     | 19 ++-----------
 .../requestAnimationFrameForReact.www.js      | 10 +++++++
 .../shared/requestAnimationFrameForReact.js   | 28 +++++++++++++++++++
 scripts/rollup/forks.js                       | 11 ++++++++
 4 files changed, 52 insertions(+), 16 deletions(-)
 create mode 100644 packages/shared/forks/requestAnimationFrameForReact.www.js
 create mode 100644 packages/shared/requestAnimationFrameForReact.js

diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index 045612bceb..942d69de9c 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -39,20 +39,7 @@ type CallbackConfigType = {|
 |};
 
 import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
-import warning from 'fbjs/lib/warning';
-
-if (__DEV__) {
-  if (
-    ExecutionEnvironment.canUseDOM &&
-    typeof requestAnimationFrame !== 'function'
-  ) {
-    warning(
-      false,
-      'React depends on requestAnimationFrame. Make sure that you load a ' +
-        'polyfill in older browsers. https://fb.me/react-polyfills',
-    );
-  }
-}
+import requestAnimationFrameForReact from 'shared/requestAnimationFrameForReact';
 
 const hasNativePerformanceNow =
   typeof performance === 'object' && typeof performance.now === 'function';
@@ -232,7 +219,7 @@ if (!ExecutionEnvironment.canUseDOM) {
       if (!isAnimationFrameScheduled) {
         // Schedule another animation callback so we retry later.
         isAnimationFrameScheduled = true;
-        requestAnimationFrame(animationTick);
+        requestAnimationFrameForReact(animationTick);
       }
     }
   };
@@ -298,7 +285,7 @@ if (!ExecutionEnvironment.canUseDOM) {
       // might want to still have setTimeout trigger scheduleWork as a backup to ensure
       // that we keep performing work.
       isAnimationFrameScheduled = true;
-      requestAnimationFrame(animationTick);
+      requestAnimationFrameForReact(animationTick);
     }
     return newCallbackId;
   };
diff --git a/packages/shared/forks/requestAnimationFrameForReact.www.js b/packages/shared/forks/requestAnimationFrameForReact.www.js
new file mode 100644
index 0000000000..f082644eca
--- /dev/null
+++ b/packages/shared/forks/requestAnimationFrameForReact.www.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+export default require('requestAnimationFrameForReact');
diff --git a/packages/shared/requestAnimationFrameForReact.js b/packages/shared/requestAnimationFrameForReact.js
new file mode 100644
index 0000000000..aa59610322
--- /dev/null
+++ b/packages/shared/requestAnimationFrameForReact.js
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+'use strict';
+
+import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
+import warning from 'fbjs/lib/warning';
+
+if (__DEV__) {
+  if (
+    ExecutionEnvironment.canUseDOM &&
+    typeof requestAnimationFrame !== 'function'
+  ) {
+    warning(
+      false,
+      'React depends on requestAnimationFrame. Make sure that you load a ' +
+        'polyfill in older browsers. https://fb.me/react-polyfills',
+    );
+  }
+}
+
+export default requestAnimationFrame;
diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js
index 28de8651c1..7df244733f 100644
--- a/scripts/rollup/forks.js
+++ b/scripts/rollup/forks.js
@@ -74,6 +74,17 @@ const forks = Object.freeze({
     return null;
   },
 
+  // This logic is forked on www to use the 'acrossTransitions' version.
+  'shared/requestAnimationFrameForReact': (bundleType, entry) => {
+    switch (bundleType) {
+      case FB_WWW_DEV:
+      case FB_WWW_PROD:
+        return 'shared/forks/requestAnimationFrameForReact.www.js';
+      default:
+        return null;
+    }
+  },
+
   // This logic is forked on www to blacklist warnings.
   'shared/lowPriorityWarning': (bundleType, entry) => {
     switch (bundleType) {

From b245795de373ca8f4a6c4962b59773e2f1bb2f1d Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 17 May 2018 17:14:12 +0100
Subject: [PATCH 075/277] Re-enable Flow for ReactFiber and fix Flow issues
 (#12842)

* Lint for untyped imports and enable Flow typing in ReactFiber

* Re-enable Flow for ReactFiber and fix Flow issues

* Avoid an invariant in DEV-only code

I just introduced it, but on a second thought, it's better to keep it as a warning.

* Address review
---
 .flowconfig                                   |   3 +
 .../src/events/ReactDOMEventListener.js       |   2 +-
 .../src/ReactCapturedValue.js                 |   2 +-
 packages/react-reconciler/src/ReactFiber.js   | 108 ++++++++----------
 .../src/ReactFiberCommitWork.js               |   6 +-
 .../src/ReactFiberScheduler.js                |  85 ++++++++------
 .../src/ReactStrictModeWarnings.js            |  22 ++--
 7 files changed, 120 insertions(+), 108 deletions(-)

diff --git a/.flowconfig b/.flowconfig
index 473e96a77f..634625671f 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -21,6 +21,9 @@
 ./node_modules/fbjs/flow/lib/dev.js
 ./scripts/flow
 
+[lints]
+untyped-type-import=error
+
 [options]
 esproposal.class_static_fields=enable
 esproposal.class_instance_fields=enable
diff --git a/packages/react-dom/src/events/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js
index b7bd8a46e3..43c5cb4e9f 100644
--- a/packages/react-dom/src/events/ReactDOMEventListener.js
+++ b/packages/react-dom/src/events/ReactDOMEventListener.js
@@ -54,7 +54,7 @@ function getTopLevelCallbackBookKeeping(
 ): {
   topLevelType: ?DOMTopLevelEventType,
   nativeEvent: ?AnyNativeEvent,
-  targetInst: Fiber,
+  targetInst: Fiber | null,
   ancestors: Array<Fiber>,
 } {
   if (callbackBookkeepingPool.length) {
diff --git a/packages/react-reconciler/src/ReactCapturedValue.js b/packages/react-reconciler/src/ReactCapturedValue.js
index 5f7ca2fcc7..1f6543b246 100644
--- a/packages/react-reconciler/src/ReactCapturedValue.js
+++ b/packages/react-reconciler/src/ReactCapturedValue.js
@@ -29,7 +29,7 @@ export type CapturedError = {
 
 export function createCapturedValue<T>(
   value: T,
-  source: Fiber | null,
+  source: Fiber,
 ): CapturedValue<T> {
   // If the value is an error, call this function immediately after it is thrown
   // so the stack is accurate.
diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js
index acfedb266c..93371c60d1 100644
--- a/packages/react-reconciler/src/ReactFiber.js
+++ b/packages/react-reconciler/src/ReactFiber.js
@@ -4,10 +4,11 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ * @flow
  */
 
 import type {ReactElement, Source} from 'shared/ReactElementType';
-import type {ReactPortal, RefObject} from 'shared/ReactTypes';
+import type {ReactFragment, ReactPortal, RefObject} from 'shared/ReactTypes';
 import type {TypeOfWork} from 'shared/ReactTypeOfWork';
 import type {TypeOfMode} from './ReactTypeOfMode';
 import type {TypeOfSideEffect} from 'shared/ReactTypeOfSideEffect';
@@ -316,7 +317,7 @@ export function createWorkInProgress(
   return workInProgress;
 }
 
-export function createHostRootFiber(isAsync): Fiber {
+export function createHostRootFiber(isAsync: boolean): Fiber {
   const mode = isAsync ? AsyncMode | StrictMode : NoContext;
   return createFiber(HostRoot, null, null, mode);
 }
@@ -366,42 +367,9 @@ export function createFiberFromElement(
         // mode compatible.
         mode |= StrictMode;
         break;
-      default: {
-        if (typeof type === 'object' && type !== null) {
-          switch (type.$$typeof) {
-            case REACT_PROVIDER_TYPE:
-              fiberTag = ContextProvider;
-              break;
-            case REACT_CONTEXT_TYPE:
-              // This is a consumer
-              fiberTag = ContextConsumer;
-              break;
-            case REACT_FORWARD_REF_TYPE:
-              fiberTag = ForwardRef;
-              break;
-            default:
-              if (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. The reified yield stores a fiber, but we don't
-                // know which fiber that is; the current or a workInProgress?
-                // When the continuation gets rendered here we don't know if we
-                // can reuse that fiber or if we need to clone it. There is
-                // probably a clever way to restructure this.
-                fiber = ((type: any): Fiber);
-                fiber.pendingProps = pendingProps;
-                fiber.expirationTime = expirationTime;
-                return fiber;
-              } else {
-                throwOnInvalidElementType(type, owner);
-              }
-              break;
-          }
-        } else {
-          throwOnInvalidElementType(type, owner);
-        }
-      }
+      default:
+        fiberTag = getFiberTagFromObjectType(type, owner);
+        break;
     }
   }
 
@@ -417,33 +385,47 @@ export function createFiberFromElement(
   return fiber;
 }
 
-function throwOnInvalidElementType(type, owner) {
-  let info = '';
-  if (__DEV__) {
-    if (
-      type === undefined ||
-      (typeof type === 'object' &&
-        type !== null &&
-        Object.keys(type).length === 0)
-    ) {
-      info +=
-        ' You likely forgot to export your component from the file ' +
-        "it's defined in, or you might have mixed up default and " +
-        'named imports.';
-    }
-    const ownerName = owner ? getComponentName(owner) : null;
-    if (ownerName) {
-      info += '\n\nCheck the render method of `' + ownerName + '`.';
+function getFiberTagFromObjectType(type, owner): TypeOfWork {
+  const $$typeof =
+    typeof type === 'object' && type !== null ? type.$$typeof : null;
+
+  switch ($$typeof) {
+    case REACT_PROVIDER_TYPE:
+      return ContextProvider;
+    case REACT_CONTEXT_TYPE:
+      // This is a consumer
+      return ContextConsumer;
+    case REACT_FORWARD_REF_TYPE:
+      return ForwardRef;
+    default: {
+      let info = '';
+      if (__DEV__) {
+        if (
+          type === undefined ||
+          (typeof type === 'object' &&
+            type !== null &&
+            Object.keys(type).length === 0)
+        ) {
+          info +=
+            ' You likely forgot to export your component from the file ' +
+            "it's defined in, or you might have mixed up default and " +
+            'named imports.';
+        }
+        const ownerName = owner ? getComponentName(owner) : null;
+        if (ownerName) {
+          info += '\n\nCheck the render method of `' + ownerName + '`.';
+        }
+      }
+      invariant(
+        false,
+        'Element type is invalid: expected a string (for built-in ' +
+          'components) or a class/function (for composite components) ' +
+          'but got: %s.%s',
+        type == null ? type : typeof type,
+        info,
+      );
     }
   }
-  invariant(
-    false,
-    'Element type is invalid: expected a string (for built-in ' +
-      'components) or a class/function (for composite components) ' +
-      'but got: %s.%s',
-    type == null ? type : typeof type,
-    info,
-  );
 }
 
 export function createFiberFromFragment(
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index ebe37ef5a0..e5e2f26402 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -9,7 +9,7 @@
 
 import type {HostConfig} from 'react-reconciler';
 import type {Fiber} from './ReactFiber';
-import type {FiberRoot} from './ReactFiber';
+import type {FiberRoot} from './ReactFiberRoot';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 import type {CapturedValue, CapturedError} from './ReactCapturedValue';
 
@@ -59,7 +59,7 @@ if (__DEV__) {
 export function logError(boundary: Fiber, errorInfo: CapturedValue<mixed>) {
   const source = errorInfo.source;
   let stack = errorInfo.stack;
-  if (stack === null) {
+  if (stack === null && source !== null) {
     stack = getStackAddendumByWorkInProgressFiber(source);
   }
 
@@ -94,7 +94,7 @@ export function logError(boundary: Fiber, errorInfo: CapturedValue<mixed>) {
 
 export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
   config: HostConfig<T, P, I, TI, HI, PI, C, CC, CX, PL>,
-  captureError: (failedFiber: Fiber, error: mixed) => Fiber | null,
+  captureError: (failedFiber: Fiber, error: mixed) => void,
   scheduleWork: (
     fiber: Fiber,
     startTime: ExpirationTime,
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 225c66c827..b2102a5e85 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -321,10 +321,20 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       }
 
       // Restore the original state of the work-in-progress
+      if (stashedWorkInProgressProperties === null) {
+        // This should never happen. Don't throw because this code is DEV-only.
+        warning(
+          false,
+          'Could not replay rendering after an error. This is likely a bug in React. ' +
+            'Please file an issue.',
+        );
+        return;
+      }
       assignFiberPropertiesInDEV(
         failedUnitOfWork,
         stashedWorkInProgressProperties,
       );
+
       switch (failedUnitOfWork.tag) {
         case HostRoot:
           popHostContainer(failedUnitOfWork);
@@ -1073,43 +1083,52 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
           // This is a fatal error.
           didFatal = true;
           onUncaughtError(thrownValue);
-          break;
-        }
+        } else {
+          if (__DEV__) {
+            // Reset global debug state
+            // We assume this is defined in DEV
+            (resetCurrentlyProcessingQueue: any)();
+          }
 
-        if (__DEV__) {
-          // Reset global debug state
-          // We assume this is defined in DEV
-          (resetCurrentlyProcessingQueue: any)();
-        }
+          const failedUnitOfWork: Fiber = nextUnitOfWork;
+          if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+            replayUnitOfWork(failedUnitOfWork, thrownValue, isAsync);
+          }
 
-        if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
-          const failedUnitOfWork = nextUnitOfWork;
-          replayUnitOfWork(failedUnitOfWork, thrownValue, isAsync);
-        }
+          // TODO: we already know this isn't true in some cases.
+          // At least this shows a nicer error message until we figure out the cause.
+          // https://github.com/facebook/react/issues/12449#issuecomment-386727431
+          invariant(
+            nextUnitOfWork !== null,
+            'Failed to replay rendering after an error. This ' +
+              'is likely caused by a bug in React. Please file an issue ' +
+              'with a reproducing case to help us find it.',
+          );
 
-        const sourceFiber: Fiber = nextUnitOfWork;
-        let returnFiber = sourceFiber.return;
-        if (returnFiber === null) {
-          // This is the root. The root could capture its own errors. However,
-          // we don't know if it errors before or after we pushed the host
-          // context. This information is needed to avoid a stack mismatch.
-          // Because we're not sure, treat this as a fatal error. We could track
-          // which phase it fails in, but doesn't seem worth it. At least
-          // for now.
-          didFatal = true;
-          onUncaughtError(thrownValue);
-          break;
+          const sourceFiber: Fiber = nextUnitOfWork;
+          let returnFiber = sourceFiber.return;
+          if (returnFiber === null) {
+            // This is the root. The root could capture its own errors. However,
+            // we don't know if it errors before or after we pushed the host
+            // context. This information is needed to avoid a stack mismatch.
+            // Because we're not sure, treat this as a fatal error. We could track
+            // which phase it fails in, but doesn't seem worth it. At least
+            // for now.
+            didFatal = true;
+            onUncaughtError(thrownValue);
+            break;
+          }
+          throwException(
+            root,
+            returnFiber,
+            sourceFiber,
+            thrownValue,
+            nextRenderIsExpired,
+            nextRenderExpirationTime,
+            mostRecentCurrentTimeMs,
+          );
+          nextUnitOfWork = completeUnitOfWork(sourceFiber);
         }
-        throwException(
-          root,
-          returnFiber,
-          sourceFiber,
-          thrownValue,
-          nextRenderIsExpired,
-          nextRenderExpirationTime,
-          mostRecentCurrentTimeMs,
-        );
-        nextUnitOfWork = completeUnitOfWork(sourceFiber);
       }
       break;
     } while (true);
diff --git a/packages/react-reconciler/src/ReactStrictModeWarnings.js b/packages/react-reconciler/src/ReactStrictModeWarnings.js
index 0f39b09371..8887bec3c9 100644
--- a/packages/react-reconciler/src/ReactStrictModeWarnings.js
+++ b/packages/react-reconciler/src/ReactStrictModeWarnings.js
@@ -107,15 +107,15 @@ if (__DEV__) {
     pendingUnsafeLifecycleWarnings = new Map();
   };
 
-  const getStrictRoot = (fiber: Fiber): Fiber => {
+  const findStrictRoot = (fiber: Fiber): Fiber | null => {
     let maybeStrictRoot = null;
 
-    while (fiber !== null) {
-      if (fiber.mode & StrictMode) {
-        maybeStrictRoot = fiber;
+    let node = fiber;
+    while (node !== null) {
+      if (node.mode & StrictMode) {
+        maybeStrictRoot = node;
       }
-
-      fiber = fiber.return;
+      node = node.return;
     }
 
     return maybeStrictRoot;
@@ -225,7 +225,15 @@ if (__DEV__) {
     fiber: Fiber,
     instance: any,
   ) => {
-    const strictRoot = getStrictRoot(fiber);
+    const strictRoot = findStrictRoot(fiber);
+    if (strictRoot === null) {
+      warning(
+        false,
+        'Expected to find a StrictMode component in a strict mode tree. ' +
+          'This error is likely caused by a bug in React. Please file an issue.',
+      );
+      return;
+    }
 
     // Dedup strategy: Warn once per component.
     // This is difficult to track any other way since component names

From 1a0afed771228667f26e74430f5d5825c06bc42d Mon Sep 17 00:00:00 2001
From: Gary Wang <webyom@gmail.com>
Date: Fri, 18 May 2018 00:16:03 +0800
Subject: [PATCH 076/277] getPeerGlobals should check bundleType instead of
 moduleType (#12839)

---
 scripts/rollup/build.js   | 5 +----
 scripts/rollup/modules.js | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index 3f736b87c6..fec233d9c2 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -352,10 +352,7 @@ async function createBundle(bundle, bundleType) {
 
   const shouldBundleDependencies =
     bundleType === UMD_DEV || bundleType === UMD_PROD;
-  const peerGlobals = Modules.getPeerGlobals(
-    bundle.externals,
-    bundle.moduleType
-  );
+  const peerGlobals = Modules.getPeerGlobals(bundle.externals, bundleType);
   let externals = Object.keys(peerGlobals);
   if (!shouldBundleDependencies) {
     const deps = Modules.getDependencies(bundleType, bundle.entry);
diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js
index 5daeaed9c1..afba71e68d 100644
--- a/scripts/rollup/modules.js
+++ b/scripts/rollup/modules.js
@@ -27,12 +27,12 @@ const knownGlobals = Object.freeze({
 });
 
 // Given ['react'] in bundle externals, returns { 'react': 'React' }.
-function getPeerGlobals(externals, moduleType) {
+function getPeerGlobals(externals, bundleType) {
   const peerGlobals = {};
   externals.forEach(name => {
     if (
       !knownGlobals[name] &&
-      (moduleType === UMD_DEV || moduleType === UMD_PROD)
+      (bundleType === UMD_DEV || bundleType === UMD_PROD)
     ) {
       throw new Error('Cannot build UMD without a global name for: ' + name);
     }

From 9d71ef26c3602d4292c070fcbb75fe721537f573 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 17 May 2018 19:18:47 +0100
Subject: [PATCH 077/277] Run the CI script on Windows

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6437f33d3d..f82fb5c7d9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,7 +30,7 @@ install:
 test_script:
   - node --version
   - yarn lint
-  - yarn flow
+  - yarn flow-ci
   - yarn build
   - yarn test
   - yarn prettier

From c5a8dae025812adebdebfa1e96e80c923dd527ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= <sebastian@calyptus.eu>
Date: Thu, 17 May 2018 12:38:50 -0700
Subject: [PATCH 078/277] [Fabric] Wire up event emitters (#12847)

I'm exposing a new native method to wire up the event emitter. This will
use a straight fiber pointer instead of react tags to do the dispatching.
---
 packages/events/TopLevelEventTypes.js         |  2 +-
 .../src/ReactFabricEventEmitter.js            | 44 +++++++++++++++++++
 .../src/ReactFabricHostConfig.js              | 11 +++++
 .../src/__mocks__/FabricUIManager.js          |  2 +
 scripts/flow/react-native-host-hooks.js       |  8 ++++
 5 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 packages/react-native-renderer/src/ReactFabricEventEmitter.js

diff --git a/packages/events/TopLevelEventTypes.js b/packages/events/TopLevelEventTypes.js
index 3f9b8ab7e9..48eee6b954 100644
--- a/packages/events/TopLevelEventTypes.js
+++ b/packages/events/TopLevelEventTypes.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-type RNTopLevelEventType =
+export type RNTopLevelEventType =
   | 'topMouseDown'
   | 'topMouseMove'
   | 'topMouseUp'
diff --git a/packages/react-native-renderer/src/ReactFabricEventEmitter.js b/packages/react-native-renderer/src/ReactFabricEventEmitter.js
new file mode 100644
index 0000000000..94c454ac07
--- /dev/null
+++ b/packages/react-native-renderer/src/ReactFabricEventEmitter.js
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import type {Fiber} from 'react-reconciler/src/ReactFiber';
+
+import {getListener, runExtractedEventsInBatch} from 'events/EventPluginHub';
+import {registrationNameModules} from 'events/EventPluginRegistry';
+import {batchedUpdates} from 'events/ReactGenericBatching';
+
+import type {AnyNativeEvent} from 'events/PluginModuleType';
+import type {TopLevelType} from 'events/TopLevelEventTypes';
+
+export {getListener, registrationNameModules as registrationNames};
+
+/**
+ * Publicly exposed method on module for native objc to invoke when a top
+ * level event is extracted.
+ * @param {rootNodeID} rootNodeID React root node ID that event occurred on.
+ * @param {TopLevelType} topLevelType Top level type of event.
+ * @param {object} nativeEventParam Object passed from native.
+ */
+export function dispatchEvent(
+  target: Object,
+  topLevelType: TopLevelType,
+  nativeEvent: AnyNativeEvent,
+) {
+  const targetFiber = (target: Fiber);
+  batchedUpdates(function() {
+    runExtractedEventsInBatch(
+      topLevelType,
+      targetFiber,
+      nativeEvent,
+      nativeEvent.target,
+    );
+  });
+  // React Native doesn't use ReactControlledComponent but if it did, here's
+  // where it would do it.
+}
diff --git a/packages/react-native-renderer/src/ReactFabricHostConfig.js b/packages/react-native-renderer/src/ReactFabricHostConfig.js
index d6d55186a0..7601062f54 100644
--- a/packages/react-native-renderer/src/ReactFabricHostConfig.js
+++ b/packages/react-native-renderer/src/ReactFabricHostConfig.js
@@ -23,6 +23,8 @@ import * as ReactNativeViewConfigRegistry from 'ReactNativeViewConfigRegistry';
 import deepFreezeAndThrowOnMutationInDev from 'deepFreezeAndThrowOnMutationInDev';
 import invariant from 'fbjs/lib/invariant';
 
+import {dispatchEvent} from './ReactFabricEventEmitter';
+
 // Modules provided by RN:
 import TextInputState from 'TextInputState';
 import {
@@ -35,6 +37,7 @@ import {
   appendChild,
   appendChildToSet,
   completeRoot,
+  registerEventHandler,
 } from 'FabricUIManager';
 import UIManager from 'UIManager';
 
@@ -48,6 +51,14 @@ type HostContext = $ReadOnly<{|
   isInAParentText: boolean,
 |}>;
 
+// TODO: Remove this conditional once all changes have propagated.
+if (registerEventHandler) {
+  /**
+   * Register the event emitter with the native bridge
+   */
+  registerEventHandler(dispatchEvent);
+}
+
 /**
  * This is used for refs on host components.
  */
diff --git a/packages/react-native-renderer/src/__mocks__/FabricUIManager.js b/packages/react-native-renderer/src/__mocks__/FabricUIManager.js
index 41bb928034..3fcf573ab8 100644
--- a/packages/react-native-renderer/src/__mocks__/FabricUIManager.js
+++ b/packages/react-native-renderer/src/__mocks__/FabricUIManager.js
@@ -125,6 +125,8 @@ const RCTFabricUIManager = {
   completeRoot: jest.fn(function completeRoot(rootTag, newChildSet) {
     roots.set(rootTag, newChildSet);
   }),
+
+  registerEventHandler: jest.fn(function registerEventHandler(callback) {}),
 };
 
 module.exports = RCTFabricUIManager;
diff --git a/scripts/flow/react-native-host-hooks.js b/scripts/flow/react-native-host-hooks.js
index 5d3971b1c3..d10f4d06b9 100644
--- a/scripts/flow/react-native-host-hooks.js
+++ b/scripts/flow/react-native-host-hooks.js
@@ -13,6 +13,7 @@ import type {
   ReactNativeBaseComponentViewConfig,
   ViewConfigGetter,
 } from 'react-native-renderer/src/ReactNativeTypes';
+import type {RNTopLevelEventType} from 'events/TopLevelEventTypes';
 
 declare module 'deepDiffer' {
   declare module.exports: (one: any, two: any) => boolean;
@@ -121,6 +122,13 @@ declare module 'FabricUIManager' {
   declare function createChildSet(rootTag: number): Object;
   declare function appendChildToSet(childSet: Object, childNode: Object): void;
   declare function completeRoot(rootTag: number, childSet: Object): void;
+  declare function registerEventHandler(
+    callback: (
+      instanceHandle: Object,
+      type: RNTopLevelEventType,
+      payload: Object,
+    ) => void,
+  ): void;
 }
 
 declare module 'View' {

From 40ea053bac8c5ecfd51deef592a397004c4569c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= <sebastian@calyptus.eu>
Date: Thu, 17 May 2018 15:47:10 -0700
Subject: [PATCH 079/277] Remove incorrect comment

Better to not have it than it being wrong.
---
 .../react-native-renderer/src/ReactFabricEventEmitter.js   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/react-native-renderer/src/ReactFabricEventEmitter.js b/packages/react-native-renderer/src/ReactFabricEventEmitter.js
index 94c454ac07..9de89055ce 100644
--- a/packages/react-native-renderer/src/ReactFabricEventEmitter.js
+++ b/packages/react-native-renderer/src/ReactFabricEventEmitter.js
@@ -18,13 +18,6 @@ import type {TopLevelType} from 'events/TopLevelEventTypes';
 
 export {getListener, registrationNameModules as registrationNames};
 
-/**
- * Publicly exposed method on module for native objc to invoke when a top
- * level event is extracted.
- * @param {rootNodeID} rootNodeID React root node ID that event occurred on.
- * @param {TopLevelType} topLevelType Top level type of event.
- * @param {object} nativeEventParam Object passed from native.
- */
 export function dispatchEvent(
   target: Object,
   topLevelType: TopLevelType,

From 40addbd110335c8e900d30657fa82b06f2c89808 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 18 May 2018 02:05:19 +0100
Subject: [PATCH 080/277] Run Flow for each renderer separately (#12846)

* Generate Flow config on install

We'll need to do pre-renderer Flow passes with different configs.
This is the first step to get it working. We only want the original version checked in.

* Create multiple Flow configs from a template

* Run Flow per renderer

* Lint

* Revert the environment consolidation

I thought this would be a bit cleaner at first because we now have non-environment files in this directory.
But Sebastian is changing these files at the same time so I want to avoid conflicts and keep the PR more tightly scoped. Undo.

* Misc
---
 .gitignore                                    |  3 +-
 package.json                                  |  2 +-
 .flowconfig => scripts/flow/config/flowconfig | 31 ++++++------
 scripts/flow/createFlowConfigs.js             | 44 +++++++++++++++++
 scripts/flow/runFlow.js                       | 37 +++++++++++++++
 scripts/flow/typedRenderers.js                |  3 ++
 scripts/tasks/flow-ci.js                      | 33 ++++++-------
 scripts/tasks/flow.js                         | 47 +++++++++++++------
 8 files changed, 150 insertions(+), 50 deletions(-)
 rename .flowconfig => scripts/flow/config/flowconfig (53%)
 create mode 100644 scripts/flow/createFlowConfigs.js
 create mode 100644 scripts/flow/runFlow.js
 create mode 100644 scripts/flow/typedRenderers.js

diff --git a/.gitignore b/.gitignore
index 53fe182d97..bf3af85e9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .DS_STORE
 node_modules
+scripts/flow/*/.flowconfig
 *~
 *.pyc
 .grunt
@@ -21,4 +22,4 @@ chrome-user-data
 *.iml
 .vscode
 *.swp
-*.swo
\ No newline at end of file
+*.swo
diff --git a/package.json b/package.json
index 0d70a61bb1..520222adcf 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "linc": "node ./scripts/tasks/linc.js",
     "lint": "node ./scripts/tasks/eslint.js",
     "lint-build": "node ./scripts/rollup/validate/index.js",
-    "postinstall": "node node_modules/fbjs-scripts/node/check-dev-engines.js package.json",
+    "postinstall": "node node_modules/fbjs-scripts/node/check-dev-engines.js package.json && node ./scripts/flow/createFlowConfigs.js",
     "debug-test": "cross-env NODE_ENV=development node --inspect-brk node_modules/.bin/jest --config ./scripts/jest/config.source.js --runInBand",
     "test": "cross-env NODE_ENV=development jest --config ./scripts/jest/config.source.js",
     "test-prod": "cross-env NODE_ENV=production jest --config ./scripts/jest/config.source.js",
diff --git a/.flowconfig b/scripts/flow/config/flowconfig
similarity index 53%
rename from .flowconfig
rename to scripts/flow/config/flowconfig
index 634625671f..6484737582 100644
--- a/.flowconfig
+++ b/scripts/flow/config/flowconfig
@@ -1,25 +1,26 @@
 [ignore]
-
-<PROJECT_ROOT>/fixtures/.*
-<PROJECT_ROOT>/build/.*
-<PROJECT_ROOT>/scripts/bench/.*
+.*/scripts/bench/.*
 
 # These shims are copied into external projects:
-<PROJECT_ROOT>/scripts/rollup/shims/facebook-www/.*
-<PROJECT_ROOT>/scripts/rollup/shims/react-native/.*
+.*/rollup/shims/facebook-www/.*
+.*/rollup/shims/react-native/.*
 
-<PROJECT_ROOT>/.*/node_modules/y18n/.*
-<PROJECT_ROOT>/node_modules/chrome-devtools-frontend/.*
-<PROJECT_ROOT>/node_modules/devtools-timeline-model/.*
-<PROJECT_ROOT>/node_modules/create-react-class/.*
-<PROJECT_ROOT>/.*/__mocks__/.*
-<PROJECT_ROOT>/.*/__tests__/.*
+.*/node_modules/y18n/.*
+.*/node_modules/chrome-devtools-frontend/.*
+.*/node_modules/devtools-timeline-model/.*
+.*/node_modules/create-react-class/.*
+.*/__mocks__/.*
+.*/__tests__/.*
 
 [include]
+../../../node_modules/
+../../../packages/
+../../../scripts/
 
 [libs]
-./node_modules/fbjs/flow/lib/dev.js
-./scripts/flow
+../../../node_modules/fbjs/flow/lib/dev.js
+../environment.js
+../react-native-host-hooks.js
 
 [lints]
 untyped-type-import=error
@@ -42,4 +43,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.61.0
+^0.61.0
\ No newline at end of file
diff --git a/scripts/flow/createFlowConfigs.js b/scripts/flow/createFlowConfigs.js
new file mode 100644
index 0000000000..ab31dc4cbb
--- /dev/null
+++ b/scripts/flow/createFlowConfigs.js
@@ -0,0 +1,44 @@
+'use strict';
+
+const chalk = require('chalk');
+const fs = require('fs');
+const mkdirp = require('mkdirp');
+const {typedRenderers} = require('./typedRenderers');
+
+const config = fs.readFileSync(__dirname + '/config/flowconfig');
+
+function writeConfig(folder) {
+  mkdirp.sync(folder);
+
+  const disclaimer = `
+# ---------------------------------------------------------------#
+# NOTE: this file is generated.                                  #
+# If you want to edit it, open ./scripts/flow/config/flowconfig. #
+# Then run Yarn for changes to take effect.                      #
+# ---------------------------------------------------------------#
+  `.trim();
+
+  const configFile = folder + '/.flowconfig';
+  let oldConfig;
+  try {
+    oldConfig = fs.readFileSync(configFile).toString();
+  } catch (err) {
+    oldConfig = null;
+  }
+  const newConfig = `
+${disclaimer}
+${config}
+${disclaimer}
+`.trim();
+
+  if (newConfig !== oldConfig) {
+    fs.writeFileSync(configFile, newConfig);
+    console.log(chalk.dim('Wrote a Flow config to ' + configFile));
+  }
+}
+
+// Write multiple configs in different folders
+// so that we can run those checks in parallel if we want.
+typedRenderers.forEach(renderer => {
+  writeConfig(__dirname + '/' + renderer);
+});
diff --git a/scripts/flow/runFlow.js b/scripts/flow/runFlow.js
new file mode 100644
index 0000000000..92c8f20f17
--- /dev/null
+++ b/scripts/flow/runFlow.js
@@ -0,0 +1,37 @@
+'use strict';
+
+const chalk = require('chalk');
+const spawn = require('child_process').spawn;
+const extension = process.platform === 'win32' ? '.cmd' : '';
+
+require('./createFlowConfigs');
+
+async function runFlow(renderer, args) {
+  return new Promise(resolve => {
+    console.log(
+      'Running Flow for the ' + chalk.cyan(renderer) + ' renderer...',
+    );
+    spawn('../../../node_modules/.bin/flow' + extension, args, {
+      // Allow colors to pass through:
+      stdio: 'inherit',
+      // Use a specific renderer config:
+      cwd: process.cwd() + '/scripts/flow/' + renderer + '/',
+    }).on('close', function(code) {
+      if (code !== 0) {
+        console.error(
+          'Flow failed for the ' + chalk.red(renderer) + ' renderer',
+        );
+        console.log();
+        process.exit(code);
+      } else {
+        console.log(
+          'Flow passed for the ' + chalk.green(renderer) + ' renderer',
+        );
+        console.log();
+        resolve();
+      }
+    });
+  });
+}
+
+module.exports = runFlow;
diff --git a/scripts/flow/typedRenderers.js b/scripts/flow/typedRenderers.js
new file mode 100644
index 0000000000..ded6a1200d
--- /dev/null
+++ b/scripts/flow/typedRenderers.js
@@ -0,0 +1,3 @@
+'use strict';
+
+exports.typedRenderers = ['dom', 'fabric', 'native', 'test'];
diff --git a/scripts/tasks/flow-ci.js b/scripts/tasks/flow-ci.js
index d3881e0369..1d7444eb7a 100644
--- a/scripts/tasks/flow-ci.js
+++ b/scripts/tasks/flow-ci.js
@@ -7,23 +7,18 @@
 
 'use strict';
 
-const path = require('path');
-const spawn = require('child_process').spawn;
-
-const extension = process.platform === 'win32' ? '.cmd' : '';
-
-// This script forces a complete check.
-// Use it for the CI.
-
-spawn(path.join('node_modules', '.bin', 'flow' + extension), ['check', '.'], {
-  // Allow colors to pass through
-  stdio: 'inherit',
-}).on('close', function(code) {
-  if (code !== 0) {
-    console.error('Flow failed');
-  } else {
-    console.log('Flow passed');
-  }
-
-  process.exit(code);
+process.on('unhandledRejection', err => {
+  throw err;
 });
+
+const runFlow = require('../flow/runFlow');
+const {typedRenderers} = require('../flow/typedRenderers');
+
+async function checkAll() {
+  // eslint-disable-next-line no-for-of-loops/no-for-of-loops
+  for (let renderer of typedRenderers) {
+    await runFlow(renderer, ['check']);
+  }
+}
+
+checkAll();
diff --git a/scripts/tasks/flow.js b/scripts/tasks/flow.js
index a7b643712b..4c587432c1 100644
--- a/scripts/tasks/flow.js
+++ b/scripts/tasks/flow.js
@@ -7,23 +7,42 @@
 
 'use strict';
 
-const path = require('path');
-const spawn = require('child_process').spawn;
+process.on('unhandledRejection', err => {
+  throw err;
+});
 
-const extension = process.platform === 'win32' ? '.cmd' : '';
+const chalk = require('chalk');
+const runFlow = require('../flow/runFlow');
+const {typedRenderers} = require('../flow/typedRenderers');
 
 // This script is using `flow status` for a quick check with a server.
 // Use it for local development.
 
-spawn(path.join('node_modules', '.bin', 'flow' + extension), ['status', '.'], {
-  // Allow colors to pass through
-  stdio: 'inherit',
-}).on('close', function(code) {
-  if (code !== 0) {
-    console.error('Flow failed');
-  } else {
-    console.log('Flow passed');
-  }
+const primaryRenderer = process.argv[2];
+if (typedRenderers.indexOf(primaryRenderer) === -1) {
+  console.log(
+    'The ' +
+      chalk.red('yarn flow') +
+      ' command now requires you to pick a primary renderer:'
+  );
+  console.log();
+  typedRenderers.forEach(renderer => {
+    console.log('  * ' + chalk.cyan('yarn flow ' + renderer));
+  });
+  console.log();
+  console.log('If you are not sure, run ' + chalk.green('yarn flow dom') + '.');
+  console.log(
+    'This will still typecheck non-DOM packages, although less precisely.'
+  );
+  console.log();
+  console.log('Note that checks for all renderers will run on CI.');
+  console.log(
+    'You can also do this locally with ' +
+      chalk.cyan('yarn flow-ci') +
+      ' but it will be slow.'
+  );
+  console.log();
+  process.exit(1);
+}
 
-  process.exit(code);
-});
+runFlow(primaryRenderer, ['status']);

From 972d209dcc9edf020b3d144716211c295d1b0cc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pete=20Nyk=C3=A4nen?= <pete.a.nykanen@gmail.com>
Date: Fri, 18 May 2018 11:18:35 +0300
Subject: [PATCH 081/277] Fix sample command in scripts/bench/README.md
 (#12853)

---
 scripts/bench/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bench/README.md b/scripts/bench/README.md
index f8235dd23f..8345552b03 100644
--- a/scripts/bench/README.md
+++ b/scripts/bench/README.md
@@ -5,7 +5,7 @@
 In most cases, the only two commands you might want to use are:
 
 - `yarn start`
-- `yarn build core,dom-client --type=UMD_PROD && yarn start --skip-build`
+- `yarn --cwd=../../ build core,dom-client --type=UMD_PROD && yarn start --skip-build`
 
 The first command will run benchmarks with all the default settings. A local and remote build will occur on React and ReactDOM UMD bundles, both local and remote repos will be run against all benchmarks.
 
@@ -38,4 +38,4 @@ yarn start --headless
 
 # runs only specific string matching benchmarks
 yarn start --benchmark=hacker
-```
\ No newline at end of file
+```

From 96992f2a6ce6174e5f4dcf1572ee519950da485c Mon Sep 17 00:00:00 2001
From: Dan <dan.abramov@gmail.com>
Date: Fri, 18 May 2018 09:25:50 +0100
Subject: [PATCH 082/277] Try to fix Windows CI

---
 scripts/flow/runFlow.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/flow/runFlow.js b/scripts/flow/runFlow.js
index 92c8f20f17..61a2cb85db 100644
--- a/scripts/flow/runFlow.js
+++ b/scripts/flow/runFlow.js
@@ -2,7 +2,6 @@
 
 const chalk = require('chalk');
 const spawn = require('child_process').spawn;
-const extension = process.platform === 'win32' ? '.cmd' : '';
 
 require('./createFlowConfigs');
 
@@ -11,7 +10,11 @@ async function runFlow(renderer, args) {
     console.log(
       'Running Flow for the ' + chalk.cyan(renderer) + ' renderer...',
     );
-    spawn('../../../node_modules/.bin/flow' + extension, args, {
+    let cmd = '../../../node_modules/.bin/flow';
+    if (process.platform === 'win32') {
+      cmd = cmd.replace(/\//g, '\\') + '.cmd';
+    }
+    spawn(cmd, args, {
       // Allow colors to pass through:
       stdio: 'inherit',
       // Use a specific renderer config:

From 17908c8ac92333b32596378267e09b014af65cff Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Fri, 18 May 2018 07:57:25 -0700
Subject: [PATCH 083/277] Add test to ensure no duplicate values in
 ReactSymbols (#12845)

---
 .../__tests__/ReactSymbols-test.internal.js   | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 packages/shared/__tests__/ReactSymbols-test.internal.js

diff --git a/packages/shared/__tests__/ReactSymbols-test.internal.js b/packages/shared/__tests__/ReactSymbols-test.internal.js
new file mode 100644
index 0000000000..12f12a5d41
--- /dev/null
+++ b/packages/shared/__tests__/ReactSymbols-test.internal.js
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react-core
+ */
+'use strict';
+
+describe('ReactSymbols', () => {
+  beforeEach(() => jest.resetModules());
+
+  const expectToBeUnique = keyValuePairs => {
+    const map = new Map();
+    keyValuePairs.forEach(([key, value]) => {
+      if (map.has(value)) {
+        throw Error(
+          `${key} value ${value.toString()} is the same as ${map.get(value)}.`,
+        );
+      }
+      map.set(value, key);
+    });
+  };
+
+  it('Symbol values should be unique', () => {
+    expectToBeUnique(Object.entries(require('shared/ReactSymbols')));
+  });
+
+  it('numeric values should be unique', () => {
+    const originalSymbolFor = global.Symbol.for;
+    global.Symbol.for = null;
+    try {
+      expectToBeUnique(Object.entries(require('shared/ReactSymbols')));
+    } finally {
+      global.Symbol.for = originalSymbolFor;
+    }
+  });
+});

From 5e80d81f37789944dc578f02ffc3e6f9cf277440 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Fri, 18 May 2018 10:05:49 -0700
Subject: [PATCH 084/277] High pri - ensure we call timed out callbacks in
 schedule (#12857)

**what is the change?:**
Fix a typo which caused timed out callbacks to not be called.

**why make this change?:**
This is a bug caught by tests I'm in the process of writing, and we
should fix it asap.

**test plan:**
Tests in a WIP PR - will push and share the WIP test in comments on this
PR.
---
 packages/react-scheduler/src/ReactScheduler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index 942d69de9c..9e20c6048a 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -173,7 +173,7 @@ if (!ExecutionEnvironment.canUseDOM) {
         // it has timed out!
         // call it
         const callback = currentCallbackConfig.scheduledCallback;
-        safelyCallScheduledCallback(callback, timeoutTime);
+        safelyCallScheduledCallback(callback, currentCallbackConfig.callbackId);
       } else {
         if (
           timeoutTime !== -1 &&

From c0fe8d6f6942f5cbc93c09825e803ba8cf950522 Mon Sep 17 00:00:00 2001
From: Royi Hagigi <rhagigi@gmail.com>
Date: Fri, 18 May 2018 15:05:21 -0700
Subject: [PATCH 085/277] Adds ReactScheduler red->green unit test for bug
 fixed in #12834 (#12861)

* Scheduler red->green unit test for bug

* fix lint issue

* ran prettier
---
 .../src/__tests__/ReactScheduler-test.js      | 62 +++++++++++++++----
 1 file changed, 51 insertions(+), 11 deletions(-)

diff --git a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
index c5274fe90b..d178336c3d 100644
--- a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
+++ b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
@@ -12,6 +12,20 @@
 let ReactScheduler;
 
 describe('ReactScheduler', () => {
+  let postMessageCallback;
+  let postMessageEvents = [];
+
+  function drainPostMessageQueue() {
+    if (postMessageCallback) {
+      while (postMessageEvents.length) {
+        postMessageCallback(postMessageEvents.shift());
+      }
+    }
+  }
+  function advanceAll() {
+    jest.runAllTimers();
+    drainPostMessageQueue();
+  }
   beforeEach(() => {
     // TODO pull this into helper method, reduce repetition.
     // mock the browser APIs which are used in react-scheduler:
@@ -23,7 +37,8 @@ describe('ReactScheduler', () => {
       });
     };
     const originalAddEventListener = global.addEventListener;
-    let postMessageCallback;
+    postMessageCallback = null;
+    postMessageEvents = [];
     global.addEventListener = function(eventName, callback, useCapture) {
       if (eventName === 'message') {
         postMessageCallback = callback;
@@ -33,9 +48,7 @@ describe('ReactScheduler', () => {
     };
     global.postMessage = function(messageKey, targetOrigin) {
       const postMessageEvent = {source: window, data: messageKey};
-      if (postMessageCallback) {
-        postMessageCallback(postMessageEvent);
-      }
+      postMessageEvents.push(postMessageEvent);
     };
     jest.resetModules();
     ReactScheduler = require('react-scheduler');
@@ -46,7 +59,7 @@ describe('ReactScheduler', () => {
       const {scheduleWork} = ReactScheduler;
       const cb = jest.fn();
       scheduleWork(cb);
-      jest.runAllTimers();
+      advanceAll();
       expect(cb.mock.calls.length).toBe(1);
       // should not have timed out and should include a timeRemaining method
       expect(cb.mock.calls[0][0].didTimeout).toBe(false);
@@ -66,7 +79,7 @@ describe('ReactScheduler', () => {
         scheduleWork(callbackB);
         expect(callbackLog).toEqual([]);
         // after a delay, calls as many callbacks as it has time for
-        jest.runAllTimers();
+        advanceAll();
         expect(callbackLog).toEqual(['A', 'B']);
         // callbackA should not have timed out and should include a timeRemaining method
         expect(callbackA.mock.calls[0][0].didTimeout).toBe(false);
@@ -80,6 +93,33 @@ describe('ReactScheduler', () => {
         );
       });
 
+      it("accepts callbacks betweeen animationFrame and postMessage and doesn't stall", () => {
+        const {scheduleWork} = ReactScheduler;
+        const callbackLog = [];
+        const callbackA = jest.fn(() => callbackLog.push('A'));
+        const callbackB = jest.fn(() => callbackLog.push('B'));
+        const callbackC = jest.fn(() => callbackLog.push('C'));
+        scheduleWork(callbackA);
+        // initially waits to call the callback
+        expect(callbackLog).toEqual([]);
+        jest.runAllTimers();
+        // this should schedule work *after* the requestAnimationFrame but before the message handler
+        scheduleWork(callbackB);
+        expect(callbackLog).toEqual([]);
+        // now it should drain the message queue and do all scheduled work
+        drainPostMessageQueue();
+        expect(callbackLog).toEqual(['A', 'B']);
+
+        // advances timers, now with an empty queue of work (to ensure they don't deadlock)
+        advanceAll();
+
+        // see if more work can be done now.
+        scheduleWork(callbackC);
+        expect(callbackLog).toEqual(['A', 'B']);
+        advanceAll();
+        expect(callbackLog).toEqual(['A', 'B', 'C']);
+      });
+
       it(
         'schedules callbacks in correct order and' +
           'keeps calling them if there is time',
@@ -105,7 +145,7 @@ describe('ReactScheduler', () => {
           expect(callbackLog).toEqual([]);
           // after a delay, calls the scheduled callbacks,
           // and also calls new callbacks scheduled by current callbacks
-          jest.runAllTimers();
+          advanceAll();
           expect(callbackLog).toEqual(['A', 'B', 'C']);
         },
       );
@@ -141,7 +181,7 @@ describe('ReactScheduler', () => {
         // initially waits to call the callback
         expect(callbackLog).toEqual([]);
         // while flushing callbacks, calls as many as it has time for
-        jest.runAllTimers();
+        advanceAll();
         expect(callbackLog).toEqual(['A', 'B', 'C', 'D', 'E', 'F']);
       });
 
@@ -164,7 +204,7 @@ describe('ReactScheduler', () => {
         scheduleWork(callbackB);
         expect(callbackLog).toEqual([]);
         // after a delay, calls the latest callback passed
-        jest.runAllTimers();
+        advanceAll();
         expect(callbackLog).toEqual(['A0', 'B', 'A1']);
       });
     });
@@ -177,7 +217,7 @@ describe('ReactScheduler', () => {
       const callbackId = scheduleWork(cb);
       expect(cb.mock.calls.length).toBe(0);
       cancelScheduledWork(callbackId);
-      jest.runAllTimers();
+      advanceAll();
       expect(cb.mock.calls.length).toBe(0);
     });
 
@@ -195,7 +235,7 @@ describe('ReactScheduler', () => {
         callbackBId = scheduleWork(callbackB);
         // Initially doesn't call anything
         expect(callbackLog).toEqual([]);
-        jest.runAllTimers();
+        advanceAll();
         // B should not get called because A cancelled B
         expect(callbackLog).toEqual(['A']);
         expect(callbackB.mock.calls.length).toBe(0);

From 47b003a828fe98e12947ba98e819ec4e617deef1 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Sat, 19 May 2018 11:29:11 +0100
Subject: [PATCH 086/277] Resolve host configs at build time (#12792)

* Extract base Jest config

This makes it easier to change the source config without affecting the build test config.

* Statically import the host config

This changes react-reconciler to import HostConfig instead of getting it through a function argument.

Rather than start with packages like ReactDOM that want to inline it, I started with React Noop and ensured that *custom* renderers using react-reconciler package still work. To do this, I'm making HostConfig module in the reconciler look at a global variable by default (which, in case of the react-reconciler npm package, ends up being the host config argument in the top-level scope).

This is still very broken.

* Add scaffolding for importing an inlined renderer

* Fix the build

* ES exports for renderer methods

* ES modules for host configs

* Remove closures from the reconciler

* Check each renderer's config with Flow

* Fix uncovered Flow issue

We know nextHydratableInstance doesn't get mutated inside this function, but Flow doesn't so it thinks it may be null.
Help Flow.

* Prettier

* Get rid of enable*Reconciler flags

They are not as useful anymore because for almost all cases (except third party renderers) we *know* whether it supports mutation or persistence.

This refactoring means react-reconciler and react-reconciler/persistent third-party packages now ship the same thing.
Not ideal, but this seems worth how simpler the code becomes. We can later look into addressing it by having a single toggle instead.

* Prettier again

* Fix Flow config creation issue

* Fix imprecise Flow typing

* Revert accidental changes
---
 packages/react-art/src/ReactART.js            |    7 +-
 packages/react-art/src/ReactARTHostConfig.js  |  294 +-
 .../react-art/src/__tests__/ReactART-test.js  |   40 +-
 packages/react-dom/src/client/ReactDOM.js     |    5 +-
 .../src/client/ReactDOMHostConfig.js          |  960 ++---
 .../react-native-renderer/src/ReactFabric.js  |    5 +-
 .../src/ReactFabricHostConfig.js              |  456 +--
 .../src/ReactFabricRenderer.js                |   15 -
 .../src/ReactNativeFrameScheduling.js         |    7 +-
 .../src/ReactNativeHostConfig.js              |  703 ++--
 .../src/ReactNativeRenderer.js                |    7 +-
 packages/react-noop-renderer/src/ReactNoop.js |    2 +
 .../src/ReactNoopPersistent.js                |    2 +
 .../src/createReactNoop.js                    |  161 +-
 packages/react-reconciler/index.js            |   21 +-
 packages/react-reconciler/inline-typed.js     |   24 +
 packages/react-reconciler/inline.art.js       |   11 +
 packages/react-reconciler/inline.dom.js       |   11 +
 packages/react-reconciler/inline.fabric.js    |   11 +
 packages/react-reconciler/inline.native.js    |   11 +
 packages/react-reconciler/inline.test.js      |   11 +
 packages/react-reconciler/persistent.js       |    2 -
 .../src/ReactFiberBeginWork.js                | 2076 +++++-----
 .../src/ReactFiberClassComponent.js           | 1536 ++++----
 .../src/ReactFiberCommitWork.js               | 1425 ++++---
 .../src/ReactFiberCompleteWork.js             |  896 ++---
 .../react-reconciler/src/ReactFiberContext.js |  579 ++-
 .../src/ReactFiberHostConfig.js               |   20 +
 .../src/ReactFiberHostContext.js              |  200 +-
 .../src/ReactFiberHydrationContext.js         |  657 ++--
 .../src/ReactFiberNewContext.js               |  168 +-
 .../src/ReactFiberReconciler.js               |  698 ++--
 .../src/ReactFiberScheduler.js                | 3481 ++++++++---------
 .../react-reconciler/src/ReactFiberStack.js   |  168 +-
 .../src/ReactFiberUnwindWork.js               |  662 ++--
 .../src/ReactProfilerTimer.js                 |  214 +-
 .../__tests__/ReactFiberHostContext-test.js   |   14 +-
 ...st.internal.js => ReactPersistent-test.js} |   30 +-
 .../src/forks/ReactFiberHostConfig.art.js     |   10 +
 .../src/forks/ReactFiberHostConfig.custom.js  |  110 +
 .../src/forks/ReactFiberHostConfig.dom.js     |   10 +
 .../src/forks/ReactFiberHostConfig.fabric.js  |   10 +
 .../src/forks/ReactFiberHostConfig.native.js  |   10 +
 .../src/forks/ReactFiberHostConfig.test.js    |   10 +
 .../react-scheduler/src/ReactScheduler.js     |    2 +-
 .../src/ReactTestHostConfig.js                |  274 +-
 .../src/ReactTestRenderer.js                  |    6 +-
 .../src/ReactTestRendererScheduling.js        |    2 +-
 packages/shared/HostConfigWithNoHydration.js  |   39 +
 packages/shared/HostConfigWithNoMutation.js   |   35 +
 .../shared/HostConfigWithNoPersistence.js     |   30 +
 packages/shared/ReactFeatureFlags.js          |    6 -
 .../ReactFeatureFlags.native-fabric-fb.js     |    5 -
 .../ReactFeatureFlags.native-fabric-oss.js    |    5 -
 .../forks/ReactFeatureFlags.native-fb.js      |    3 -
 .../forks/ReactFeatureFlags.native-oss.js     |    3 -
 .../forks/ReactFeatureFlags.persistent.js     |    6 -
 .../forks/ReactFeatureFlags.test-renderer.js  |    3 -
 .../shared/forks/ReactFeatureFlags.www.js     |    5 -
 scripts/flow/config/flowconfig                |    3 +
 scripts/flow/createFlowConfigs.js             |   32 +-
 scripts/flow/runFlow.js                       |   12 +-
 scripts/flow/typedRenderers.js                |    3 -
 scripts/jest/config.base.js                   |   23 +
 scripts/jest/config.build.js                  |    4 +-
 scripts/jest/config.source.js                 |   27 +-
 scripts/jest/setupEnvironment.js              |    6 +
 scripts/jest/setupHostConfigs.js              |   39 +
 scripts/rollup/build.js                       |    2 +-
 scripts/rollup/bundles.js                     |    9 +-
 scripts/rollup/forks.js                       |   31 +
 scripts/rollup/modules.js                     |    9 +-
 scripts/rollup/wrappers.js                    |   24 +-
 scripts/shared/inlinedHostConfigs.js          |   40 +
 scripts/tasks/flow-ci.js                      |    9 +-
 scripts/tasks/flow.js                         |   16 +-
 76 files changed, 8239 insertions(+), 8224 deletions(-)
 delete mode 100644 packages/react-native-renderer/src/ReactFabricRenderer.js
 create mode 100644 packages/react-reconciler/inline-typed.js
 create mode 100644 packages/react-reconciler/inline.art.js
 create mode 100644 packages/react-reconciler/inline.dom.js
 create mode 100644 packages/react-reconciler/inline.fabric.js
 create mode 100644 packages/react-reconciler/inline.native.js
 create mode 100644 packages/react-reconciler/inline.test.js
 create mode 100644 packages/react-reconciler/src/ReactFiberHostConfig.js
 rename packages/react-reconciler/src/__tests__/{ReactPersistent-test.internal.js => ReactPersistent-test.js} (90%)
 create mode 100644 packages/react-reconciler/src/forks/ReactFiberHostConfig.art.js
 create mode 100644 packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js
 create mode 100644 packages/react-reconciler/src/forks/ReactFiberHostConfig.dom.js
 create mode 100644 packages/react-reconciler/src/forks/ReactFiberHostConfig.fabric.js
 create mode 100644 packages/react-reconciler/src/forks/ReactFiberHostConfig.native.js
 create mode 100644 packages/react-reconciler/src/forks/ReactFiberHostConfig.test.js
 create mode 100644 packages/shared/HostConfigWithNoHydration.js
 create mode 100644 packages/shared/HostConfigWithNoMutation.js
 create mode 100644 packages/shared/HostConfigWithNoPersistence.js
 delete mode 100644 scripts/flow/typedRenderers.js
 create mode 100644 scripts/jest/config.base.js
 create mode 100644 scripts/jest/setupHostConfigs.js
 create mode 100644 scripts/shared/inlinedHostConfigs.js

diff --git a/packages/react-art/src/ReactART.js b/packages/react-art/src/ReactART.js
index d24395c462..7ee384707f 100644
--- a/packages/react-art/src/ReactART.js
+++ b/packages/react-art/src/ReactART.js
@@ -6,12 +6,11 @@
  */
 
 import React from 'react';
-import ReactFiberReconciler from 'react-reconciler';
+import * as ARTRenderer from 'react-reconciler/inline.art';
 import Transform from 'art/core/transform';
 import Mode from 'art/modes/current';
 import FastNoSideEffects from 'art/modes/fast-noSideEffects';
 
-import ReactARTHostConfig from './ReactARTHostConfig';
 import {TYPES, childrenAsString} from './ReactARTInternals';
 
 Mode.setCurrent(
@@ -132,10 +131,6 @@ class Text extends React.Component {
   }
 }
 
-/** ART Renderer */
-
-const ARTRenderer = ReactFiberReconciler(ReactARTHostConfig);
-
 /** API */
 
 export const ClippingRectangle = TYPES.CLIPPING_RECTANGLE;
diff --git a/packages/react-art/src/ReactARTHostConfig.js b/packages/react-art/src/ReactARTHostConfig.js
index 8fa175e1ae..eae266eb49 100644
--- a/packages/react-art/src/ReactARTHostConfig.js
+++ b/packages/react-art/src/ReactARTHostConfig.js
@@ -234,157 +234,167 @@ function applyTextProps(instance, props, prevProps = {}) {
   }
 }
 
-const ReactARTHostConfig = {
-  appendInitialChild(parentInstance, child) {
-    if (typeof child === 'string') {
-      // Noop for string children of Text (eg <Text>{'foo'}{'bar'}</Text>)
-      invariant(false, 'Text children should already be flattened.');
-      return;
-    }
+export * from 'shared/HostConfigWithNoPersistence';
+export * from 'shared/HostConfigWithNoHydration';
 
-    child.inject(parentInstance);
-  },
+export function appendInitialChild(parentInstance, child) {
+  if (typeof child === 'string') {
+    // Noop for string children of Text (eg <Text>{'foo'}{'bar'}</Text>)
+    invariant(false, 'Text children should already be flattened.');
+    return;
+  }
 
-  createInstance(type, props, internalInstanceHandle) {
-    let instance;
+  child.inject(parentInstance);
+}
 
-    switch (type) {
-      case TYPES.CLIPPING_RECTANGLE:
-        instance = Mode.ClippingRectangle();
-        instance._applyProps = applyClippingRectangleProps;
-        break;
-      case TYPES.GROUP:
-        instance = Mode.Group();
-        instance._applyProps = applyGroupProps;
-        break;
-      case TYPES.SHAPE:
-        instance = Mode.Shape();
-        instance._applyProps = applyShapeProps;
-        break;
-      case TYPES.TEXT:
-        instance = Mode.Text(
-          props.children,
-          props.font,
-          props.alignment,
-          props.path,
-        );
-        instance._applyProps = applyTextProps;
-        break;
-    }
+export function createInstance(type, props, internalInstanceHandle) {
+  let instance;
 
-    invariant(instance, 'ReactART does not support the type "%s"', type);
-
-    instance._applyProps(instance, props);
-
-    return instance;
-  },
-
-  createTextInstance(text, rootContainerInstance, internalInstanceHandle) {
-    return text;
-  },
-
-  finalizeInitialChildren(domElement, type, props) {
-    return false;
-  },
-
-  getPublicInstance(instance) {
-    return instance;
-  },
-
-  prepareForCommit() {
-    // Noop
-  },
-
-  prepareUpdate(domElement, type, oldProps, newProps) {
-    return UPDATE_SIGNAL;
-  },
-
-  resetAfterCommit() {
-    // Noop
-  },
-
-  resetTextContent(domElement) {
-    // Noop
-  },
-
-  shouldDeprioritizeSubtree(type, props) {
-    return false;
-  },
-
-  getRootHostContext() {
-    return emptyObject;
-  },
-
-  getChildHostContext() {
-    return emptyObject;
-  },
-
-  scheduleDeferredCallback: ReactScheduler.scheduleWork,
-
-  shouldSetTextContent(type, props) {
-    return (
-      typeof props.children === 'string' || typeof props.children === 'number'
-    );
-  },
-
-  now: ReactScheduler.now,
-
-  // The ART renderer is secondary to the React DOM renderer.
-  isPrimaryRenderer: false,
-
-  mutation: {
-    appendChild(parentInstance, child) {
-      if (child.parentNode === parentInstance) {
-        child.eject();
-      }
-      child.inject(parentInstance);
-    },
-
-    appendChildToContainer(parentInstance, child) {
-      if (child.parentNode === parentInstance) {
-        child.eject();
-      }
-      child.inject(parentInstance);
-    },
-
-    insertBefore(parentInstance, child, beforeChild) {
-      invariant(
-        child !== beforeChild,
-        'ReactART: Can not insert node before itself',
+  switch (type) {
+    case TYPES.CLIPPING_RECTANGLE:
+      instance = Mode.ClippingRectangle();
+      instance._applyProps = applyClippingRectangleProps;
+      break;
+    case TYPES.GROUP:
+      instance = Mode.Group();
+      instance._applyProps = applyGroupProps;
+      break;
+    case TYPES.SHAPE:
+      instance = Mode.Shape();
+      instance._applyProps = applyShapeProps;
+      break;
+    case TYPES.TEXT:
+      instance = Mode.Text(
+        props.children,
+        props.font,
+        props.alignment,
+        props.path,
       );
-      child.injectBefore(beforeChild);
-    },
+      instance._applyProps = applyTextProps;
+      break;
+  }
 
-    insertInContainerBefore(parentInstance, child, beforeChild) {
-      invariant(
-        child !== beforeChild,
-        'ReactART: Can not insert node before itself',
-      );
-      child.injectBefore(beforeChild);
-    },
+  invariant(instance, 'ReactART does not support the type "%s"', type);
 
-    removeChild(parentInstance, child) {
-      destroyEventListeners(child);
-      child.eject();
-    },
+  instance._applyProps(instance, props);
 
-    removeChildFromContainer(parentInstance, child) {
-      destroyEventListeners(child);
-      child.eject();
-    },
+  return instance;
+}
 
-    commitTextUpdate(textInstance, oldText, newText) {
-      // Noop
-    },
+export function createTextInstance(
+  text,
+  rootContainerInstance,
+  internalInstanceHandle,
+) {
+  return text;
+}
 
-    commitMount(instance, type, newProps) {
-      // Noop
-    },
+export function finalizeInitialChildren(domElement, type, props) {
+  return false;
+}
 
-    commitUpdate(instance, updatePayload, type, oldProps, newProps) {
-      instance._applyProps(instance, newProps, oldProps);
-    },
-  },
-};
+export function getPublicInstance(instance) {
+  return instance;
+}
 
-export default ReactARTHostConfig;
+export function prepareForCommit() {
+  // Noop
+}
+
+export function prepareUpdate(domElement, type, oldProps, newProps) {
+  return UPDATE_SIGNAL;
+}
+
+export function resetAfterCommit() {
+  // Noop
+}
+
+export function resetTextContent(domElement) {
+  // Noop
+}
+
+export function shouldDeprioritizeSubtree(type, props) {
+  return false;
+}
+
+export function getRootHostContext() {
+  return emptyObject;
+}
+
+export function getChildHostContext() {
+  return emptyObject;
+}
+
+export const scheduleDeferredCallback = ReactScheduler.scheduleWork;
+export const cancelDeferredCallback = ReactScheduler.cancelScheduledWork;
+
+export function shouldSetTextContent(type, props) {
+  return (
+    typeof props.children === 'string' || typeof props.children === 'number'
+  );
+}
+
+export const now = ReactScheduler.now;
+
+// The ART renderer is secondary to the React DOM renderer.
+export const isPrimaryRenderer = false;
+
+export const supportsMutation = true;
+
+export function appendChild(parentInstance, child) {
+  if (child.parentNode === parentInstance) {
+    child.eject();
+  }
+  child.inject(parentInstance);
+}
+
+export function appendChildToContainer(parentInstance, child) {
+  if (child.parentNode === parentInstance) {
+    child.eject();
+  }
+  child.inject(parentInstance);
+}
+
+export function insertBefore(parentInstance, child, beforeChild) {
+  invariant(
+    child !== beforeChild,
+    'ReactART: Can not insert node before itself',
+  );
+  child.injectBefore(beforeChild);
+}
+
+export function insertInContainerBefore(parentInstance, child, beforeChild) {
+  invariant(
+    child !== beforeChild,
+    'ReactART: Can not insert node before itself',
+  );
+  child.injectBefore(beforeChild);
+}
+
+export function removeChild(parentInstance, child) {
+  destroyEventListeners(child);
+  child.eject();
+}
+
+export function removeChildFromContainer(parentInstance, child) {
+  destroyEventListeners(child);
+  child.eject();
+}
+
+export function commitTextUpdate(textInstance, oldText, newText) {
+  // Noop
+}
+
+export function commitMount(instance, type, newProps) {
+  // Noop
+}
+
+export function commitUpdate(
+  instance,
+  updatePayload,
+  type,
+  oldProps,
+  newProps,
+) {
+  instance._applyProps(instance, newProps, oldProps);
+}
diff --git a/packages/react-art/src/__tests__/ReactART-test.js b/packages/react-art/src/__tests__/ReactART-test.js
index ace737e526..d948e84c5e 100644
--- a/packages/react-art/src/__tests__/ReactART-test.js
+++ b/packages/react-art/src/__tests__/ReactART-test.js
@@ -15,6 +15,19 @@ const React = require('react');
 const ReactDOM = require('react-dom');
 const ReactTestUtils = require('react-dom/test-utils');
 
+// Isolate test renderer.
+jest.resetModules();
+const ReactTestRenderer = require('react-test-renderer');
+
+// Isolate ART renderer.
+jest.resetModules();
+const ReactART = require('react-art');
+const ARTSVGMode = require('art/modes/svg');
+const ARTCurrentMode = require('art/modes/current');
+const Circle = require('react-art/Circle');
+const Rectangle = require('react-art/Rectangle');
+const Wedge = require('react-art/Wedge');
+
 let Group;
 let Shape;
 let Surface;
@@ -22,15 +35,6 @@ let TestComponent;
 
 const Missing = {};
 
-const ReactART = require('react-art');
-const ARTSVGMode = require('art/modes/svg');
-const ARTCurrentMode = require('art/modes/current');
-
-const renderer = require('react-test-renderer');
-const Circle = require('react-art/Circle');
-const Rectangle = require('react-art/Rectangle');
-const Wedge = require('react-art/Wedge');
-
 function testDOMNodeStructure(domNode, expectedStructure) {
   expect(domNode).toBeDefined();
   expect(domNode.nodeName).toBe(expectedStructure.nodeName);
@@ -362,7 +366,7 @@ describe('ReactART', () => {
 
     // Using test renderer instead of the DOM renderer here because async
     // testing APIs for the DOM renderer don't exist.
-    const testRenderer = renderer.create(
+    const testRenderer = ReactTestRenderer.create(
       <CurrentRendererContext.Provider value="Test">
         <Yield value="A" />
         <Yield value="B" />
@@ -397,7 +401,7 @@ describe('ReactART', () => {
 
 describe('ReactARTComponents', () => {
   it('should generate a <Shape> with props for drawing the Circle', () => {
-    const circle = renderer.create(
+    const circle = ReactTestRenderer.create(
       <Circle radius={10} stroke="green" strokeWidth={3} fill="blue" />,
     );
     expect(circle.toJSON()).toMatchSnapshot();
@@ -405,7 +409,9 @@ describe('ReactARTComponents', () => {
 
   it('should warn if radius is missing on a Circle component', () => {
     expect(() =>
-      renderer.create(<Circle stroke="green" strokeWidth={3} fill="blue" />),
+      ReactTestRenderer.create(
+        <Circle stroke="green" strokeWidth={3} fill="blue" />,
+      ),
     ).toWarnDev(
       'Warning: Failed prop type: The prop `radius` is marked as required in `Circle`, ' +
         'but its value is `undefined`.' +
@@ -414,7 +420,7 @@ describe('ReactARTComponents', () => {
   });
 
   it('should generate a <Shape> with props for drawing the Rectangle', () => {
-    const rectangle = renderer.create(
+    const rectangle = ReactTestRenderer.create(
       <Rectangle width={50} height={50} stroke="green" fill="blue" />,
     );
     expect(rectangle.toJSON()).toMatchSnapshot();
@@ -422,7 +428,7 @@ describe('ReactARTComponents', () => {
 
   it('should warn if width/height is missing on a Rectangle component', () => {
     expect(() =>
-      renderer.create(<Rectangle stroke="green" fill="blue" />),
+      ReactTestRenderer.create(<Rectangle stroke="green" fill="blue" />),
     ).toWarnDev([
       'Warning: Failed prop type: The prop `width` is marked as required in `Rectangle`, ' +
         'but its value is `undefined`.' +
@@ -434,21 +440,21 @@ describe('ReactARTComponents', () => {
   });
 
   it('should generate a <Shape> with props for drawing the Wedge', () => {
-    const wedge = renderer.create(
+    const wedge = ReactTestRenderer.create(
       <Wedge outerRadius={50} startAngle={0} endAngle={360} fill="blue" />,
     );
     expect(wedge.toJSON()).toMatchSnapshot();
   });
 
   it('should return null if startAngle equals to endAngle on Wedge', () => {
-    const wedge = renderer.create(
+    const wedge = ReactTestRenderer.create(
       <Wedge outerRadius={50} startAngle={0} endAngle={0} fill="blue" />,
     );
     expect(wedge.toJSON()).toBeNull();
   });
 
   it('should warn if outerRadius/startAngle/endAngle is missing on a Wedge component', () => {
-    expect(() => renderer.create(<Wedge fill="blue" />)).toWarnDev([
+    expect(() => ReactTestRenderer.create(<Wedge fill="blue" />)).toWarnDev([
       'Warning: Failed prop type: The prop `outerRadius` is marked as required in `Wedge`, ' +
         'but its value is `undefined`.' +
         '\n    in Wedge (at **)',
diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js
index 40450e5f5e..4526bcf316 100644
--- a/packages/react-dom/src/client/ReactDOM.js
+++ b/packages/react-dom/src/client/ReactDOM.js
@@ -19,7 +19,7 @@ import type {Container} from './ReactDOMHostConfig';
 import '../shared/checkReact';
 import './ReactDOMClientInjection';
 
-import ReactFiberReconciler from 'react-reconciler';
+import * as DOMRenderer from 'react-reconciler/inline.dom';
 import * as ReactPortal from 'shared/ReactPortal';
 import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
 import * as ReactGenericBatching from 'events/ReactGenericBatching';
@@ -35,7 +35,6 @@ import invariant from 'fbjs/lib/invariant';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
 import warning from 'fbjs/lib/warning';
 
-import ReactDOMHostConfig from './ReactDOMHostConfig';
 import * as ReactDOMComponentTree from './ReactDOMComponentTree';
 import * as ReactDOMFiberComponent from './ReactDOMFiberComponent';
 import * as ReactDOMEventListener from '../events/ReactDOMEventListener';
@@ -447,8 +446,6 @@ function shouldHydrateDueToLegacyHeuristic(container) {
   );
 }
 
-const DOMRenderer = ReactFiberReconciler(ReactDOMHostConfig);
-
 ReactGenericBatching.injection.injectRenderer(DOMRenderer);
 
 let warnedAboutHydrateAPI = false;
diff --git a/packages/react-dom/src/client/ReactDOMHostConfig.js b/packages/react-dom/src/client/ReactDOMHostConfig.js
index 72072debd5..15385db2ee 100644
--- a/packages/react-dom/src/client/ReactDOMHostConfig.js
+++ b/packages/react-dom/src/client/ReactDOMHostConfig.js
@@ -24,22 +24,26 @@ import {
   DOCUMENT_FRAGMENT_NODE,
 } from '../shared/HTMLNodeType';
 
-export type Container = Element | Document;
-type Props = {
+export type Type = string;
+export type Props = {
   autoFocus?: boolean,
   children?: mixed,
   hidden?: boolean,
   suppressHydrationWarning?: boolean,
 };
-type Instance = Element;
-type TextInstance = Text;
-
+export type Container = Element | Document;
+export type Instance = Element;
+export type TextInstance = Text;
+export type HydratableInstance = Element | Text;
+export type PublicInstance = Element | Text;
 type HostContextDev = {
   namespace: string,
   ancestorInfo: mixed,
 };
 type HostContextProd = string;
-type HostContext = HostContextDev | HostContextProd;
+export type HostContext = HostContextDev | HostContextProd;
+export type UpdatePayload = Array<mixed>;
+export type ChildSet = void; // Unused
 
 const {
   createElement,
@@ -77,492 +81,500 @@ function shouldAutoFocusHostComponent(type: string, props: Props): boolean {
   return false;
 }
 
-const ReactDOMHostConfig = {
-  getRootHostContext(rootContainerInstance: Container): HostContext {
-    let type;
-    let namespace;
-    const nodeType = rootContainerInstance.nodeType;
-    switch (nodeType) {
-      case DOCUMENT_NODE:
-      case DOCUMENT_FRAGMENT_NODE: {
-        type = nodeType === DOCUMENT_NODE ? '#document' : '#fragment';
-        let root = (rootContainerInstance: any).documentElement;
-        namespace = root ? root.namespaceURI : getChildNamespace(null, '');
-        break;
-      }
-      default: {
-        const container: any =
-          nodeType === COMMENT_NODE
-            ? rootContainerInstance.parentNode
-            : rootContainerInstance;
-        const ownNamespace = container.namespaceURI || null;
-        type = container.tagName;
-        namespace = getChildNamespace(ownNamespace, type);
-        break;
-      }
-    }
-    if (__DEV__) {
-      const validatedTag = type.toLowerCase();
-      const ancestorInfo = updatedAncestorInfo(null, validatedTag, null);
-      return {namespace, ancestorInfo};
-    }
-    return namespace;
-  },
+export * from 'shared/HostConfigWithNoPersistence';
 
-  getChildHostContext(
-    parentHostContext: HostContext,
-    type: string,
-  ): HostContext {
-    if (__DEV__) {
-      const parentHostContextDev = ((parentHostContext: any): HostContextDev);
-      const namespace = getChildNamespace(parentHostContextDev.namespace, type);
-      const ancestorInfo = updatedAncestorInfo(
-        parentHostContextDev.ancestorInfo,
+export function getRootHostContext(
+  rootContainerInstance: Container,
+): HostContext {
+  let type;
+  let namespace;
+  const nodeType = rootContainerInstance.nodeType;
+  switch (nodeType) {
+    case DOCUMENT_NODE:
+    case DOCUMENT_FRAGMENT_NODE: {
+      type = nodeType === DOCUMENT_NODE ? '#document' : '#fragment';
+      let root = (rootContainerInstance: any).documentElement;
+      namespace = root ? root.namespaceURI : getChildNamespace(null, '');
+      break;
+    }
+    default: {
+      const container: any =
+        nodeType === COMMENT_NODE
+          ? rootContainerInstance.parentNode
+          : rootContainerInstance;
+      const ownNamespace = container.namespaceURI || null;
+      type = container.tagName;
+      namespace = getChildNamespace(ownNamespace, type);
+      break;
+    }
+  }
+  if (__DEV__) {
+    const validatedTag = type.toLowerCase();
+    const ancestorInfo = updatedAncestorInfo(null, validatedTag, null);
+    return {namespace, ancestorInfo};
+  }
+  return namespace;
+}
+
+export function getChildHostContext(
+  parentHostContext: HostContext,
+  type: string,
+  rootContainerInstance: Container,
+): HostContext {
+  if (__DEV__) {
+    const parentHostContextDev = ((parentHostContext: any): HostContextDev);
+    const namespace = getChildNamespace(parentHostContextDev.namespace, type);
+    const ancestorInfo = updatedAncestorInfo(
+      parentHostContextDev.ancestorInfo,
+      type,
+      null,
+    );
+    return {namespace, ancestorInfo};
+  }
+  const parentNamespace = ((parentHostContext: any): HostContextProd);
+  return getChildNamespace(parentNamespace, type);
+}
+
+export function getPublicInstance(instance: Instance): * {
+  return instance;
+}
+
+export function prepareForCommit(containerInfo: Container): void {
+  eventsEnabled = ReactBrowserEventEmitter.isEnabled();
+  selectionInformation = ReactInputSelection.getSelectionInformation();
+  ReactBrowserEventEmitter.setEnabled(false);
+}
+
+export function resetAfterCommit(containerInfo: Container): void {
+  ReactInputSelection.restoreSelection(selectionInformation);
+  selectionInformation = null;
+  ReactBrowserEventEmitter.setEnabled(eventsEnabled);
+  eventsEnabled = null;
+}
+
+export function createInstance(
+  type: string,
+  props: Props,
+  rootContainerInstance: Container,
+  hostContext: HostContext,
+  internalInstanceHandle: Object,
+): Instance {
+  let parentNamespace: string;
+  if (__DEV__) {
+    // TODO: take namespace into account when validating.
+    const hostContextDev = ((hostContext: any): HostContextDev);
+    validateDOMNesting(type, null, hostContextDev.ancestorInfo);
+    if (
+      typeof props.children === 'string' ||
+      typeof props.children === 'number'
+    ) {
+      const string = '' + props.children;
+      const ownAncestorInfo = updatedAncestorInfo(
+        hostContextDev.ancestorInfo,
         type,
         null,
       );
-      return {namespace, ancestorInfo};
+      validateDOMNesting(null, string, ownAncestorInfo);
     }
-    const parentNamespace = ((parentHostContext: any): HostContextProd);
-    return getChildNamespace(parentNamespace, type);
-  },
+    parentNamespace = hostContextDev.namespace;
+  } else {
+    parentNamespace = ((hostContext: any): HostContextProd);
+  }
+  const domElement: Instance = createElement(
+    type,
+    props,
+    rootContainerInstance,
+    parentNamespace,
+  );
+  precacheFiberNode(internalInstanceHandle, domElement);
+  updateFiberProps(domElement, props);
+  return domElement;
+}
 
-  getPublicInstance(instance: Instance | TextInstance): * {
-    return instance;
-  },
+export function appendInitialChild(
+  parentInstance: Instance,
+  child: Instance | TextInstance,
+): void {
+  parentInstance.appendChild(child);
+}
 
-  prepareForCommit(): void {
-    eventsEnabled = ReactBrowserEventEmitter.isEnabled();
-    selectionInformation = ReactInputSelection.getSelectionInformation();
-    ReactBrowserEventEmitter.setEnabled(false);
-  },
+export function finalizeInitialChildren(
+  domElement: Instance,
+  type: string,
+  props: Props,
+  rootContainerInstance: Container,
+  hostContext: HostContext,
+): boolean {
+  setInitialProperties(domElement, type, props, rootContainerInstance);
+  return shouldAutoFocusHostComponent(type, props);
+}
 
-  resetAfterCommit(): void {
-    ReactInputSelection.restoreSelection(selectionInformation);
-    selectionInformation = null;
-    ReactBrowserEventEmitter.setEnabled(eventsEnabled);
-    eventsEnabled = null;
-  },
-
-  createInstance(
-    type: string,
-    props: Props,
-    rootContainerInstance: Container,
-    hostContext: HostContext,
-    internalInstanceHandle: Object,
-  ): Instance {
-    let parentNamespace: string;
-    if (__DEV__) {
-      // TODO: take namespace into account when validating.
-      const hostContextDev = ((hostContext: any): HostContextDev);
-      validateDOMNesting(type, null, hostContextDev.ancestorInfo);
-      if (
-        typeof props.children === 'string' ||
-        typeof props.children === 'number'
-      ) {
-        const string = '' + props.children;
-        const ownAncestorInfo = updatedAncestorInfo(
-          hostContextDev.ancestorInfo,
-          type,
-          null,
-        );
-        validateDOMNesting(null, string, ownAncestorInfo);
-      }
-      parentNamespace = hostContextDev.namespace;
-    } else {
-      parentNamespace = ((hostContext: any): HostContextProd);
-    }
-    const domElement: Instance = createElement(
-      type,
-      props,
-      rootContainerInstance,
-      parentNamespace,
-    );
-    precacheFiberNode(internalInstanceHandle, domElement);
-    updateFiberProps(domElement, props);
-    return domElement;
-  },
-
-  appendInitialChild(
-    parentInstance: Instance,
-    child: Instance | TextInstance,
-  ): void {
-    parentInstance.appendChild(child);
-  },
-
-  finalizeInitialChildren(
-    domElement: Instance,
-    type: string,
-    props: Props,
-    rootContainerInstance: Container,
-  ): boolean {
-    setInitialProperties(domElement, type, props, rootContainerInstance);
-    return shouldAutoFocusHostComponent(type, props);
-  },
-
-  prepareUpdate(
-    domElement: Instance,
-    type: string,
-    oldProps: Props,
-    newProps: Props,
-    rootContainerInstance: Container,
-    hostContext: HostContext,
-  ): null | Array<mixed> {
-    if (__DEV__) {
-      const hostContextDev = ((hostContext: any): HostContextDev);
-      if (
-        typeof newProps.children !== typeof oldProps.children &&
-        (typeof newProps.children === 'string' ||
-          typeof newProps.children === 'number')
-      ) {
-        const string = '' + newProps.children;
-        const ownAncestorInfo = updatedAncestorInfo(
-          hostContextDev.ancestorInfo,
-          type,
-          null,
-        );
-        validateDOMNesting(null, string, ownAncestorInfo);
-      }
-    }
-    return diffProperties(
-      domElement,
-      type,
-      oldProps,
-      newProps,
-      rootContainerInstance,
-    );
-  },
-
-  shouldSetTextContent(type: string, props: Props): boolean {
-    return (
-      type === 'textarea' ||
-      typeof props.children === 'string' ||
-      typeof props.children === 'number' ||
-      (typeof props.dangerouslySetInnerHTML === 'object' &&
-        props.dangerouslySetInnerHTML !== null &&
-        typeof props.dangerouslySetInnerHTML.__html === 'string')
-    );
-  },
-
-  shouldDeprioritizeSubtree(type: string, props: Props): boolean {
-    return !!props.hidden;
-  },
-
-  createTextInstance(
-    text: string,
-    rootContainerInstance: Container,
-    hostContext: HostContext,
-    internalInstanceHandle: Object,
-  ): TextInstance {
-    if (__DEV__) {
-      const hostContextDev = ((hostContext: any): HostContextDev);
-      validateDOMNesting(null, text, hostContextDev.ancestorInfo);
-    }
-    const textNode: TextInstance = createTextNode(text, rootContainerInstance);
-    precacheFiberNode(internalInstanceHandle, textNode);
-    return textNode;
-  },
-
-  now: ReactScheduler.now,
-
-  isPrimaryRenderer: true,
-
-  mutation: {
-    commitMount(
-      domElement: Instance,
-      type: string,
-      newProps: Props,
-      internalInstanceHandle: Object,
-    ): void {
-      // Despite the naming that might imply otherwise, this method only
-      // fires if there is an `Update` effect scheduled during mounting.
-      // This happens if `finalizeInitialChildren` returns `true` (which it
-      // does to implement the `autoFocus` attribute on the client). But
-      // there are also other cases when this might happen (such as patching
-      // up text content during hydration mismatch). So we'll check this again.
-      if (shouldAutoFocusHostComponent(type, newProps)) {
-        ((domElement: any):
-          | HTMLButtonElement
-          | HTMLInputElement
-          | HTMLSelectElement
-          | HTMLTextAreaElement).focus();
-      }
-    },
-
-    commitUpdate(
-      domElement: Instance,
-      updatePayload: Array<mixed>,
-      type: string,
-      oldProps: Props,
-      newProps: Props,
-      internalInstanceHandle: Object,
-    ): void {
-      // Update the props handle so that we know which props are the ones with
-      // with current event handlers.
-      updateFiberProps(domElement, newProps);
-      // Apply the diff to the DOM node.
-      updateProperties(domElement, updatePayload, type, oldProps, newProps);
-    },
-
-    resetTextContent(domElement: Instance): void {
-      setTextContent(domElement, '');
-    },
-
-    commitTextUpdate(
-      textInstance: TextInstance,
-      oldText: string,
-      newText: string,
-    ): void {
-      textInstance.nodeValue = newText;
-    },
-
-    appendChild(
-      parentInstance: Instance,
-      child: Instance | TextInstance,
-    ): void {
-      parentInstance.appendChild(child);
-    },
-
-    appendChildToContainer(
-      container: Container,
-      child: Instance | TextInstance,
-    ): void {
-      if (container.nodeType === COMMENT_NODE) {
-        (container.parentNode: any).insertBefore(child, container);
-      } else {
-        container.appendChild(child);
-      }
-    },
-
-    insertBefore(
-      parentInstance: Instance,
-      child: Instance | TextInstance,
-      beforeChild: Instance | TextInstance,
-    ): void {
-      parentInstance.insertBefore(child, beforeChild);
-    },
-
-    insertInContainerBefore(
-      container: Container,
-      child: Instance | TextInstance,
-      beforeChild: Instance | TextInstance,
-    ): void {
-      if (container.nodeType === COMMENT_NODE) {
-        (container.parentNode: any).insertBefore(child, beforeChild);
-      } else {
-        container.insertBefore(child, beforeChild);
-      }
-    },
-
-    removeChild(
-      parentInstance: Instance,
-      child: Instance | TextInstance,
-    ): void {
-      parentInstance.removeChild(child);
-    },
-
-    removeChildFromContainer(
-      container: Container,
-      child: Instance | TextInstance,
-    ): void {
-      if (container.nodeType === COMMENT_NODE) {
-        (container.parentNode: any).removeChild(child);
-      } else {
-        container.removeChild(child);
-      }
-    },
-  },
-
-  hydration: {
-    canHydrateInstance(
-      instance: Instance | TextInstance,
-      type: string,
-      props: Props,
-    ): null | Instance {
-      if (
-        instance.nodeType !== ELEMENT_NODE ||
-        type.toLowerCase() !== instance.nodeName.toLowerCase()
-      ) {
-        return null;
-      }
-      // This has now been refined to an element node.
-      return ((instance: any): Instance);
-    },
-
-    canHydrateTextInstance(
-      instance: Instance | TextInstance,
-      text: string,
-    ): null | TextInstance {
-      if (text === '' || instance.nodeType !== TEXT_NODE) {
-        // Empty strings are not parsed by HTML so there won't be a correct match here.
-        return null;
-      }
-      // This has now been refined to a text node.
-      return ((instance: any): TextInstance);
-    },
-
-    getNextHydratableSibling(
-      instance: Instance | TextInstance,
-    ): null | Instance | TextInstance {
-      let node = instance.nextSibling;
-      // Skip non-hydratable nodes.
-      while (
-        node &&
-        node.nodeType !== ELEMENT_NODE &&
-        node.nodeType !== TEXT_NODE
-      ) {
-        node = node.nextSibling;
-      }
-      return (node: any);
-    },
-
-    getFirstHydratableChild(
-      parentInstance: Container | Instance,
-    ): null | Instance | TextInstance {
-      let next = parentInstance.firstChild;
-      // Skip non-hydratable nodes.
-      while (
-        next &&
-        next.nodeType !== ELEMENT_NODE &&
-        next.nodeType !== TEXT_NODE
-      ) {
-        next = next.nextSibling;
-      }
-      return (next: any);
-    },
-
-    hydrateInstance(
-      instance: Instance,
-      type: string,
-      props: Props,
-      rootContainerInstance: Container,
-      hostContext: HostContext,
-      internalInstanceHandle: Object,
-    ): null | Array<mixed> {
-      precacheFiberNode(internalInstanceHandle, instance);
-      // TODO: Possibly defer this until the commit phase where all the events
-      // get attached.
-      updateFiberProps(instance, props);
-      let parentNamespace: string;
-      if (__DEV__) {
-        const hostContextDev = ((hostContext: any): HostContextDev);
-        parentNamespace = hostContextDev.namespace;
-      } else {
-        parentNamespace = ((hostContext: any): HostContextProd);
-      }
-      return diffHydratedProperties(
-        instance,
+export function prepareUpdate(
+  domElement: Instance,
+  type: string,
+  oldProps: Props,
+  newProps: Props,
+  rootContainerInstance: Container,
+  hostContext: HostContext,
+): null | Array<mixed> {
+  if (__DEV__) {
+    const hostContextDev = ((hostContext: any): HostContextDev);
+    if (
+      typeof newProps.children !== typeof oldProps.children &&
+      (typeof newProps.children === 'string' ||
+        typeof newProps.children === 'number')
+    ) {
+      const string = '' + newProps.children;
+      const ownAncestorInfo = updatedAncestorInfo(
+        hostContextDev.ancestorInfo,
         type,
-        props,
-        parentNamespace,
-        rootContainerInstance,
+        null,
       );
-    },
+      validateDOMNesting(null, string, ownAncestorInfo);
+    }
+  }
+  return diffProperties(
+    domElement,
+    type,
+    oldProps,
+    newProps,
+    rootContainerInstance,
+  );
+}
 
-    hydrateTextInstance(
-      textInstance: TextInstance,
-      text: string,
-      internalInstanceHandle: Object,
-    ): boolean {
-      precacheFiberNode(internalInstanceHandle, textInstance);
-      return diffHydratedText(textInstance, text);
-    },
+export function shouldSetTextContent(type: string, props: Props): boolean {
+  return (
+    type === 'textarea' ||
+    typeof props.children === 'string' ||
+    typeof props.children === 'number' ||
+    (typeof props.dangerouslySetInnerHTML === 'object' &&
+      props.dangerouslySetInnerHTML !== null &&
+      typeof props.dangerouslySetInnerHTML.__html === 'string')
+  );
+}
 
-    didNotMatchHydratedContainerTextInstance(
-      parentContainer: Container,
-      textInstance: TextInstance,
-      text: string,
-    ) {
-      if (__DEV__) {
-        warnForUnmatchedText(textInstance, text);
-      }
-    },
+export function shouldDeprioritizeSubtree(type: string, props: Props): boolean {
+  return !!props.hidden;
+}
 
-    didNotMatchHydratedTextInstance(
-      parentType: string,
-      parentProps: Props,
-      parentInstance: Instance,
-      textInstance: TextInstance,
-      text: string,
-    ) {
-      if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
-        warnForUnmatchedText(textInstance, text);
-      }
-    },
+export function createTextInstance(
+  text: string,
+  rootContainerInstance: Container,
+  hostContext: HostContext,
+  internalInstanceHandle: Object,
+): TextInstance {
+  if (__DEV__) {
+    const hostContextDev = ((hostContext: any): HostContextDev);
+    validateDOMNesting(null, text, hostContextDev.ancestorInfo);
+  }
+  const textNode: TextInstance = createTextNode(text, rootContainerInstance);
+  precacheFiberNode(internalInstanceHandle, textNode);
+  return textNode;
+}
 
-    didNotHydrateContainerInstance(
-      parentContainer: Container,
-      instance: Instance | TextInstance,
-    ) {
-      if (__DEV__) {
-        if (instance.nodeType === 1) {
-          warnForDeletedHydratableElement(parentContainer, (instance: any));
-        } else {
-          warnForDeletedHydratableText(parentContainer, (instance: any));
-        }
-      }
-    },
+export const now = ReactScheduler.now;
+export const isPrimaryRenderer = true;
+export const scheduleDeferredCallback = ReactScheduler.scheduleWork;
+export const cancelDeferredCallback = ReactScheduler.cancelScheduledWork;
 
-    didNotHydrateInstance(
-      parentType: string,
-      parentProps: Props,
-      parentInstance: Instance,
-      instance: Instance | TextInstance,
-    ) {
-      if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
-        if (instance.nodeType === 1) {
-          warnForDeletedHydratableElement(parentInstance, (instance: any));
-        } else {
-          warnForDeletedHydratableText(parentInstance, (instance: any));
-        }
-      }
-    },
+// -------------------
+//     Mutation
+// -------------------
 
-    didNotFindHydratableContainerInstance(
-      parentContainer: Container,
-      type: string,
-      props: Props,
-    ) {
-      if (__DEV__) {
-        warnForInsertedHydratedElement(parentContainer, type, props);
-      }
-    },
+export const supportsMutation = true;
 
-    didNotFindHydratableContainerTextInstance(
-      parentContainer: Container,
-      text: string,
-    ) {
-      if (__DEV__) {
-        warnForInsertedHydratedText(parentContainer, text);
-      }
-    },
+export function commitMount(
+  domElement: Instance,
+  type: string,
+  newProps: Props,
+  internalInstanceHandle: Object,
+): void {
+  // Despite the naming that might imply otherwise, this method only
+  // fires if there is an `Update` effect scheduled during mounting.
+  // This happens if `finalizeInitialChildren` returns `true` (which it
+  // does to implement the `autoFocus` attribute on the client). But
+  // there are also other cases when this might happen (such as patching
+  // up text content during hydration mismatch). So we'll check this again.
+  if (shouldAutoFocusHostComponent(type, newProps)) {
+    ((domElement: any):
+      | HTMLButtonElement
+      | HTMLInputElement
+      | HTMLSelectElement
+      | HTMLTextAreaElement).focus();
+  }
+}
 
-    didNotFindHydratableInstance(
-      parentType: string,
-      parentProps: Props,
-      parentInstance: Instance,
-      type: string,
-      props: Props,
-    ) {
-      if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
-        warnForInsertedHydratedElement(parentInstance, type, props);
-      }
-    },
+export function commitUpdate(
+  domElement: Instance,
+  updatePayload: Array<mixed>,
+  type: string,
+  oldProps: Props,
+  newProps: Props,
+  internalInstanceHandle: Object,
+): void {
+  // Update the props handle so that we know which props are the ones with
+  // with current event handlers.
+  updateFiberProps(domElement, newProps);
+  // Apply the diff to the DOM node.
+  updateProperties(domElement, updatePayload, type, oldProps, newProps);
+}
 
-    didNotFindHydratableTextInstance(
-      parentType: string,
-      parentProps: Props,
-      parentInstance: Instance,
-      text: string,
-    ) {
-      if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
-        warnForInsertedHydratedText(parentInstance, text);
-      }
-    },
-  },
+export function resetTextContent(domElement: Instance): void {
+  setTextContent(domElement, '');
+}
 
-  scheduleDeferredCallback: ReactScheduler.scheduleWork,
-  cancelDeferredCallback: ReactScheduler.cancelScheduledWork,
-};
+export function commitTextUpdate(
+  textInstance: TextInstance,
+  oldText: string,
+  newText: string,
+): void {
+  textInstance.nodeValue = newText;
+}
 
-export default ReactDOMHostConfig;
+export function appendChild(
+  parentInstance: Instance,
+  child: Instance | TextInstance,
+): void {
+  parentInstance.appendChild(child);
+}
+
+export function appendChildToContainer(
+  container: Container,
+  child: Instance | TextInstance,
+): void {
+  if (container.nodeType === COMMENT_NODE) {
+    (container.parentNode: any).insertBefore(child, container);
+  } else {
+    container.appendChild(child);
+  }
+}
+
+export function insertBefore(
+  parentInstance: Instance,
+  child: Instance | TextInstance,
+  beforeChild: Instance | TextInstance,
+): void {
+  parentInstance.insertBefore(child, beforeChild);
+}
+
+export function insertInContainerBefore(
+  container: Container,
+  child: Instance | TextInstance,
+  beforeChild: Instance | TextInstance,
+): void {
+  if (container.nodeType === COMMENT_NODE) {
+    (container.parentNode: any).insertBefore(child, beforeChild);
+  } else {
+    container.insertBefore(child, beforeChild);
+  }
+}
+
+export function removeChild(
+  parentInstance: Instance,
+  child: Instance | TextInstance,
+): void {
+  parentInstance.removeChild(child);
+}
+
+export function removeChildFromContainer(
+  container: Container,
+  child: Instance | TextInstance,
+): void {
+  if (container.nodeType === COMMENT_NODE) {
+    (container.parentNode: any).removeChild(child);
+  } else {
+    container.removeChild(child);
+  }
+}
+
+// -------------------
+//     Hydration
+// -------------------
+
+export const supportsHydration = true;
+
+export function canHydrateInstance(
+  instance: Instance | TextInstance,
+  type: string,
+  props: Props,
+): null | Instance {
+  if (
+    instance.nodeType !== ELEMENT_NODE ||
+    type.toLowerCase() !== instance.nodeName.toLowerCase()
+  ) {
+    return null;
+  }
+  // This has now been refined to an element node.
+  return ((instance: any): Instance);
+}
+
+export function canHydrateTextInstance(
+  instance: Instance | TextInstance,
+  text: string,
+): null | TextInstance {
+  if (text === '' || instance.nodeType !== TEXT_NODE) {
+    // Empty strings are not parsed by HTML so there won't be a correct match here.
+    return null;
+  }
+  // This has now been refined to a text node.
+  return ((instance: any): TextInstance);
+}
+
+export function getNextHydratableSibling(
+  instance: Instance | TextInstance,
+): null | Instance | TextInstance {
+  let node = instance.nextSibling;
+  // Skip non-hydratable nodes.
+  while (
+    node &&
+    node.nodeType !== ELEMENT_NODE &&
+    node.nodeType !== TEXT_NODE
+  ) {
+    node = node.nextSibling;
+  }
+  return (node: any);
+}
+
+export function getFirstHydratableChild(
+  parentInstance: Container | Instance,
+): null | Instance | TextInstance {
+  let next = parentInstance.firstChild;
+  // Skip non-hydratable nodes.
+  while (
+    next &&
+    next.nodeType !== ELEMENT_NODE &&
+    next.nodeType !== TEXT_NODE
+  ) {
+    next = next.nextSibling;
+  }
+  return (next: any);
+}
+
+export function hydrateInstance(
+  instance: Instance,
+  type: string,
+  props: Props,
+  rootContainerInstance: Container,
+  hostContext: HostContext,
+  internalInstanceHandle: Object,
+): null | Array<mixed> {
+  precacheFiberNode(internalInstanceHandle, instance);
+  // TODO: Possibly defer this until the commit phase where all the events
+  // get attached.
+  updateFiberProps(instance, props);
+  let parentNamespace: string;
+  if (__DEV__) {
+    const hostContextDev = ((hostContext: any): HostContextDev);
+    parentNamespace = hostContextDev.namespace;
+  } else {
+    parentNamespace = ((hostContext: any): HostContextProd);
+  }
+  return diffHydratedProperties(
+    instance,
+    type,
+    props,
+    parentNamespace,
+    rootContainerInstance,
+  );
+}
+
+export function hydrateTextInstance(
+  textInstance: TextInstance,
+  text: string,
+  internalInstanceHandle: Object,
+): boolean {
+  precacheFiberNode(internalInstanceHandle, textInstance);
+  return diffHydratedText(textInstance, text);
+}
+
+export function didNotMatchHydratedContainerTextInstance(
+  parentContainer: Container,
+  textInstance: TextInstance,
+  text: string,
+) {
+  if (__DEV__) {
+    warnForUnmatchedText(textInstance, text);
+  }
+}
+
+export function didNotMatchHydratedTextInstance(
+  parentType: string,
+  parentProps: Props,
+  parentInstance: Instance,
+  textInstance: TextInstance,
+  text: string,
+) {
+  if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
+    warnForUnmatchedText(textInstance, text);
+  }
+}
+
+export function didNotHydrateContainerInstance(
+  parentContainer: Container,
+  instance: Instance | TextInstance,
+) {
+  if (__DEV__) {
+    if (instance.nodeType === 1) {
+      warnForDeletedHydratableElement(parentContainer, (instance: any));
+    } else {
+      warnForDeletedHydratableText(parentContainer, (instance: any));
+    }
+  }
+}
+
+export function didNotHydrateInstance(
+  parentType: string,
+  parentProps: Props,
+  parentInstance: Instance,
+  instance: Instance | TextInstance,
+) {
+  if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
+    if (instance.nodeType === 1) {
+      warnForDeletedHydratableElement(parentInstance, (instance: any));
+    } else {
+      warnForDeletedHydratableText(parentInstance, (instance: any));
+    }
+  }
+}
+
+export function didNotFindHydratableContainerInstance(
+  parentContainer: Container,
+  type: string,
+  props: Props,
+) {
+  if (__DEV__) {
+    warnForInsertedHydratedElement(parentContainer, type, props);
+  }
+}
+
+export function didNotFindHydratableContainerTextInstance(
+  parentContainer: Container,
+  text: string,
+) {
+  if (__DEV__) {
+    warnForInsertedHydratedText(parentContainer, text);
+  }
+}
+
+export function didNotFindHydratableInstance(
+  parentType: string,
+  parentProps: Props,
+  parentInstance: Instance,
+  type: string,
+  props: Props,
+) {
+  if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
+    warnForInsertedHydratedElement(parentInstance, type, props);
+  }
+}
+
+export function didNotFindHydratableTextInstance(
+  parentType: string,
+  parentProps: Props,
+  parentInstance: Instance,
+  text: string,
+) {
+  if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
+    warnForInsertedHydratedText(parentInstance, text);
+  }
+}
diff --git a/packages/react-native-renderer/src/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js
index 130b199580..757212fe20 100644
--- a/packages/react-native-renderer/src/ReactFabric.js
+++ b/packages/react-native-renderer/src/ReactFabric.js
@@ -12,6 +12,8 @@ import type {ReactNodeList} from 'shared/ReactTypes';
 
 import './ReactFabricInjection';
 
+import * as ReactFabricRenderer from 'react-reconciler/inline.fabric';
+
 import * as ReactPortal from 'shared/ReactPortal';
 import * as ReactGenericBatching from 'events/ReactGenericBatching';
 import ReactVersion from 'shared/ReactVersion';
@@ -19,7 +21,6 @@ import ReactVersion from 'shared/ReactVersion';
 import NativeMethodsMixin from './NativeMethodsMixin';
 import ReactNativeComponent from './ReactNativeComponent';
 import * as ReactNativeComponentTree from './ReactNativeComponentTree';
-import ReactFabricRenderer from './ReactFabricRenderer';
 import {getInspectorDataForViewTag} from './ReactNativeFiberInspector';
 
 import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
@@ -64,7 +65,7 @@ function findNodeHandle(componentOrHandle: any): ?number {
   }
   if (hostInstance.canonical) {
     // Fabric
-    return hostInstance.canonical._nativeTag;
+    return (hostInstance.canonical: any)._nativeTag;
   }
   return hostInstance._nativeTag;
 }
diff --git a/packages/react-native-renderer/src/ReactFabricHostConfig.js b/packages/react-native-renderer/src/ReactFabricHostConfig.js
index 7601062f54..321b86753e 100644
--- a/packages/react-native-renderer/src/ReactFabricHostConfig.js
+++ b/packages/react-native-renderer/src/ReactFabricHostConfig.js
@@ -33,9 +33,9 @@ import {
   cloneNodeWithNewChildren,
   cloneNodeWithNewChildrenAndProps,
   cloneNodeWithNewProps,
-  createChildSet,
-  appendChild,
-  appendChildToSet,
+  createChildSet as createChildNodeSet,
+  appendChild as appendChildNode,
+  appendChildToSet as appendChildNodeToSet,
   completeRoot,
   registerEventHandler,
 } from 'FabricUIManager';
@@ -47,9 +47,24 @@ import UIManager from 'UIManager';
 // This means that they never overlap.
 let nextReactTag = 2;
 
-type HostContext = $ReadOnly<{|
+type Node = Object;
+export type Type = string;
+export type Props = Object;
+export type Instance = {
+  node: Node,
+  canonical: ReactFabricHostComponent,
+};
+export type TextInstance = {
+  node: Node,
+};
+export type HydratableInstance = Instance | TextInstance;
+export type PublicInstance = ReactFabricHostComponent;
+export type Container = number;
+export type ChildSet = Object;
+export type HostContext = $ReadOnly<{|
   isInAParentText: boolean,
 |}>;
+export type UpdatePayload = Object;
 
 // TODO: Remove this conditional once all changes have propagated.
 if (registerEventHandler) {
@@ -135,247 +150,242 @@ class ReactFabricHostComponent {
 // eslint-disable-next-line no-unused-expressions
 (ReactFabricHostComponent.prototype: NativeMethodsMixinType);
 
-type Node = Object;
-type ChildSet = Object;
-type Container = number;
-type Instance = {
-  node: Node,
-  canonical: ReactFabricHostComponent,
-};
-type Props = Object;
-type TextInstance = {
-  node: Node,
-};
+export * from 'shared/HostConfigWithNoMutation';
+export * from 'shared/HostConfigWithNoHydration';
 
-const ReactFabricHostConfig = {
-  appendInitialChild(
-    parentInstance: Instance,
-    child: Instance | TextInstance,
-  ): void {
-    appendChild(parentInstance.node, child.node);
-  },
+export function appendInitialChild(
+  parentInstance: Instance,
+  child: Instance | TextInstance,
+): void {
+  appendChildNode(parentInstance.node, child.node);
+}
 
-  createInstance(
-    type: string,
-    props: Props,
-    rootContainerInstance: Container,
-    hostContext: HostContext,
-    internalInstanceHandle: Object,
-  ): Instance {
-    const tag = nextReactTag;
-    nextReactTag += 2;
+export function createInstance(
+  type: string,
+  props: Props,
+  rootContainerInstance: Container,
+  hostContext: HostContext,
+  internalInstanceHandle: Object,
+): Instance {
+  const tag = nextReactTag;
+  nextReactTag += 2;
 
-    const viewConfig = ReactNativeViewConfigRegistry.get(type);
+  const viewConfig = ReactNativeViewConfigRegistry.get(type);
 
-    if (__DEV__) {
-      for (const key in viewConfig.validAttributes) {
-        if (props.hasOwnProperty(key)) {
-          deepFreezeAndThrowOnMutationInDev(props[key]);
-        }
+  if (__DEV__) {
+    for (const key in viewConfig.validAttributes) {
+      if (props.hasOwnProperty(key)) {
+        deepFreezeAndThrowOnMutationInDev(props[key]);
       }
     }
+  }
 
-    invariant(
-      type !== 'RCTView' || !hostContext.isInAParentText,
-      'Nesting of <View> within <Text> is not currently supported.',
-    );
+  invariant(
+    type !== 'RCTView' || !hostContext.isInAParentText,
+    'Nesting of <View> within <Text> is not currently supported.',
+  );
 
-    const updatePayload = ReactNativeAttributePayload.create(
-      props,
-      viewConfig.validAttributes,
-    );
+  const updatePayload = ReactNativeAttributePayload.create(
+    props,
+    viewConfig.validAttributes,
+  );
 
-    const node = createNode(
-      tag, // reactTag
-      viewConfig.uiViewClassName, // viewName
-      rootContainerInstance, // rootTag
-      updatePayload, // props
-      internalInstanceHandle, // internalInstanceHandle
-    );
+  const node = createNode(
+    tag, // reactTag
+    viewConfig.uiViewClassName, // viewName
+    rootContainerInstance, // rootTag
+    updatePayload, // props
+    internalInstanceHandle, // internalInstanceHandle
+  );
 
-    const component = new ReactFabricHostComponent(tag, viewConfig, props);
+  const component = new ReactFabricHostComponent(tag, viewConfig, props);
 
-    return {
-      node: node,
-      canonical: component,
-    };
-  },
+  return {
+    node: node,
+    canonical: component,
+  };
+}
 
-  createTextInstance(
-    text: string,
-    rootContainerInstance: Container,
-    hostContext: HostContext,
-    internalInstanceHandle: Object,
-  ): TextInstance {
-    invariant(
-      hostContext.isInAParentText,
-      'Text strings must be rendered within a <Text> component.',
-    );
+export function createTextInstance(
+  text: string,
+  rootContainerInstance: Container,
+  hostContext: HostContext,
+  internalInstanceHandle: Object,
+): TextInstance {
+  invariant(
+    hostContext.isInAParentText,
+    'Text strings must be rendered within a <Text> component.',
+  );
 
-    const tag = nextReactTag;
-    nextReactTag += 2;
+  const tag = nextReactTag;
+  nextReactTag += 2;
 
-    const node = createNode(
-      tag, // reactTag
-      'RCTRawText', // viewName
-      rootContainerInstance, // rootTag
-      {text: text}, // props
-      internalInstanceHandle, // instance handle
-    );
+  const node = createNode(
+    tag, // reactTag
+    'RCTRawText', // viewName
+    rootContainerInstance, // rootTag
+    {text: text}, // props
+    internalInstanceHandle, // instance handle
+  );
 
-    return {
-      node: node,
-    };
-  },
+  return {
+    node: node,
+  };
+}
 
-  finalizeInitialChildren(
-    parentInstance: Instance,
-    type: string,
-    props: Props,
-    rootContainerInstance: Container,
-  ): boolean {
-    return false;
-  },
+export function finalizeInitialChildren(
+  parentInstance: Instance,
+  type: string,
+  props: Props,
+  rootContainerInstance: Container,
+  hostContext: HostContext,
+): boolean {
+  return false;
+}
 
-  getRootHostContext(rootContainerInstance: Container): HostContext {
-    return {isInAParentText: false};
-  },
+export function getRootHostContext(
+  rootContainerInstance: Container,
+): HostContext {
+  return {isInAParentText: false};
+}
 
-  getChildHostContext(
-    parentHostContext: HostContext,
-    type: string,
-  ): HostContext {
-    const prevIsInAParentText = parentHostContext.isInAParentText;
-    const isInAParentText =
-      type === 'AndroidTextInput' || // Android
-      type === 'RCTMultilineTextInputView' || // iOS
-      type === 'RCTSinglelineTextInputView' || // iOS
-      type === 'RCTText' ||
-      type === 'RCTVirtualText';
+export function getChildHostContext(
+  parentHostContext: HostContext,
+  type: string,
+  rootContainerInstance: Container,
+): HostContext {
+  const prevIsInAParentText = parentHostContext.isInAParentText;
+  const isInAParentText =
+    type === 'AndroidTextInput' || // Android
+    type === 'RCTMultilineTextInputView' || // iOS
+    type === 'RCTSinglelineTextInputView' || // iOS
+    type === 'RCTText' ||
+    type === 'RCTVirtualText';
 
-    if (prevIsInAParentText !== isInAParentText) {
-      return {isInAParentText};
+  if (prevIsInAParentText !== isInAParentText) {
+    return {isInAParentText};
+  } else {
+    return parentHostContext;
+  }
+}
+
+export function getPublicInstance(instance: Instance): * {
+  return instance.canonical;
+}
+
+export function prepareForCommit(containerInfo: Container): void {
+  // Noop
+}
+
+export function prepareUpdate(
+  instance: Instance,
+  type: string,
+  oldProps: Props,
+  newProps: Props,
+  rootContainerInstance: Container,
+  hostContext: HostContext,
+): null | Object {
+  const viewConfig = instance.canonical.viewConfig;
+  const updatePayload = ReactNativeAttributePayload.diff(
+    oldProps,
+    newProps,
+    viewConfig.validAttributes,
+  );
+  // TODO: If the event handlers have changed, we need to update the current props
+  // in the commit phase but there is no host config hook to do it yet.
+  return updatePayload;
+}
+
+export function resetAfterCommit(containerInfo: Container): void {
+  // Noop
+}
+
+export function shouldDeprioritizeSubtree(type: string, props: Props): boolean {
+  return false;
+}
+
+export function shouldSetTextContent(type: string, props: Props): boolean {
+  // TODO (bvaughn) Revisit this decision.
+  // Always returning false simplifies the createInstance() implementation,
+  // But creates an additional child Fiber for raw text children.
+  // No additional native views are created though.
+  // It's not clear to me which is better so I'm deferring for now.
+  // More context @ github.com/facebook/react/pull/8560#discussion_r92111303
+  return false;
+}
+
+// The Fabric renderer is secondary to the existing React Native renderer.
+export const isPrimaryRenderer = false;
+export const now = ReactNativeFrameScheduling.now;
+export const scheduleDeferredCallback =
+  ReactNativeFrameScheduling.scheduleDeferredCallback;
+export const cancelDeferredCallback =
+  ReactNativeFrameScheduling.cancelDeferredCallback;
+
+// -------------------
+//     Persistence
+// -------------------
+
+export const supportsPersistence = true;
+
+export function cloneInstance(
+  instance: Instance,
+  updatePayload: null | Object,
+  type: string,
+  oldProps: Props,
+  newProps: Props,
+  internalInstanceHandle: Object,
+  keepChildren: boolean,
+  recyclableInstance: null | Instance,
+): Instance {
+  const node = instance.node;
+  let clone;
+  if (keepChildren) {
+    if (updatePayload !== null) {
+      clone = cloneNodeWithNewProps(
+        node,
+        updatePayload,
+        internalInstanceHandle,
+      );
     } else {
-      return parentHostContext;
+      clone = cloneNode(node, internalInstanceHandle);
     }
-  },
+  } else {
+    if (updatePayload !== null) {
+      clone = cloneNodeWithNewChildrenAndProps(
+        node,
+        updatePayload,
+        internalInstanceHandle,
+      );
+    } else {
+      clone = cloneNodeWithNewChildren(node, internalInstanceHandle);
+    }
+  }
+  return {
+    node: clone,
+    canonical: instance.canonical,
+  };
+}
 
-  getPublicInstance(instance: Instance): * {
-    return instance.canonical;
-  },
+export function createContainerChildSet(container: Container): ChildSet {
+  return createChildNodeSet(container);
+}
 
-  now: ReactNativeFrameScheduling.now,
+export function appendChildToContainerChildSet(
+  childSet: ChildSet,
+  child: Instance | TextInstance,
+): void {
+  appendChildNodeToSet(childSet, child.node);
+}
 
-  // The Fabric renderer is secondary to the existing React Native renderer.
-  isPrimaryRenderer: false,
+export function finalizeContainerChildren(
+  container: Container,
+  newChildren: ChildSet,
+): void {
+  completeRoot(container, newChildren);
+}
 
-  prepareForCommit(): void {
-    // Noop
-  },
-
-  prepareUpdate(
-    instance: Instance,
-    type: string,
-    oldProps: Props,
-    newProps: Props,
-    rootContainerInstance: Container,
-    hostContext: HostContext,
-  ): null | Object {
-    const viewConfig = instance.canonical.viewConfig;
-    const updatePayload = ReactNativeAttributePayload.diff(
-      oldProps,
-      newProps,
-      viewConfig.validAttributes,
-    );
-    // TODO: If the event handlers have changed, we need to update the current props
-    // in the commit phase but there is no host config hook to do it yet.
-    return updatePayload;
-  },
-
-  resetAfterCommit(): void {
-    // Noop
-  },
-
-  scheduleDeferredCallback: ReactNativeFrameScheduling.scheduleDeferredCallback,
-  cancelDeferredCallback: ReactNativeFrameScheduling.cancelDeferredCallback,
-
-  shouldDeprioritizeSubtree(type: string, props: Props): boolean {
-    return false;
-  },
-
-  shouldSetTextContent(type: string, props: Props): boolean {
-    // TODO (bvaughn) Revisit this decision.
-    // Always returning false simplifies the createInstance() implementation,
-    // But creates an additional child Fiber for raw text children.
-    // No additional native views are created though.
-    // It's not clear to me which is better so I'm deferring for now.
-    // More context @ github.com/facebook/react/pull/8560#discussion_r92111303
-    return false;
-  },
-
-  persistence: {
-    cloneInstance(
-      instance: Instance,
-      updatePayload: null | Object,
-      type: string,
-      oldProps: Props,
-      newProps: Props,
-      internalInstanceHandle: Object,
-      keepChildren: boolean,
-      recyclableInstance: null | Instance,
-    ): Instance {
-      const node = instance.node;
-      let clone;
-      if (keepChildren) {
-        if (updatePayload !== null) {
-          clone = cloneNodeWithNewProps(
-            node,
-            updatePayload,
-            internalInstanceHandle,
-          );
-        } else {
-          clone = cloneNode(node, internalInstanceHandle);
-        }
-      } else {
-        if (updatePayload !== null) {
-          clone = cloneNodeWithNewChildrenAndProps(
-            node,
-            updatePayload,
-            internalInstanceHandle,
-          );
-        } else {
-          clone = cloneNodeWithNewChildren(node, internalInstanceHandle);
-        }
-      }
-      return {
-        node: clone,
-        canonical: instance.canonical,
-      };
-    },
-
-    createContainerChildSet(container: Container): ChildSet {
-      return createChildSet(container);
-    },
-
-    appendChildToContainerChildSet(
-      childSet: ChildSet,
-      child: Instance | TextInstance,
-    ): void {
-      appendChildToSet(childSet, child.node);
-    },
-
-    finalizeContainerChildren(
-      container: Container,
-      newChildren: ChildSet,
-    ): void {
-      completeRoot(container, newChildren);
-    },
-
-    replaceContainerChildren(
-      container: Container,
-      newChildren: ChildSet,
-    ): void {},
-  },
-};
-
-export default ReactFabricHostConfig;
+export function replaceContainerChildren(
+  container: Container,
+  newChildren: ChildSet,
+): void {}
diff --git a/packages/react-native-renderer/src/ReactFabricRenderer.js b/packages/react-native-renderer/src/ReactFabricRenderer.js
deleted file mode 100644
index 8f77d283c9..0000000000
--- a/packages/react-native-renderer/src/ReactFabricRenderer.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow
- */
-
-import ReactFiberReconciler from 'react-reconciler';
-import ReactFabricHostConfig from './ReactFabricHostConfig';
-
-const ReactFabricRenderer = ReactFiberReconciler(ReactFabricHostConfig);
-
-export default ReactFabricRenderer;
diff --git a/packages/react-native-renderer/src/ReactNativeFrameScheduling.js b/packages/react-native-renderer/src/ReactNativeFrameScheduling.js
index 3f7e7e8818..ee88fcf5fa 100644
--- a/packages/react-native-renderer/src/ReactNativeFrameScheduling.js
+++ b/packages/react-native-renderer/src/ReactNativeFrameScheduling.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {Deadline} from 'react-reconciler';
+import type {Deadline} from 'react-reconciler/src/ReactFiberScheduler';
 
 const hasNativePerformanceNow =
   typeof performance === 'object' && typeof performance.now === 'function';
@@ -43,7 +43,10 @@ function setTimeoutCallback() {
 // RN has a poor polyfill for requestIdleCallback so we aren't using it.
 // This implementation is only intended for short-term use anyway.
 // We also don't implement cancel functionality b'c Fiber doesn't currently need it.
-function scheduleDeferredCallback(callback: Callback): number {
+function scheduleDeferredCallback(
+  callback: Callback,
+  options?: {timeout: number},
+): number {
   // We assume only one callback is scheduled at a time b'c that's how Fiber works.
   scheduledCallback = callback;
   return setTimeout(setTimeoutCallback, 1);
diff --git a/packages/react-native-renderer/src/ReactNativeHostConfig.js b/packages/react-native-renderer/src/ReactNativeHostConfig.js
index b766d1e655..dcfeb8d90f 100644
--- a/packages/react-native-renderer/src/ReactNativeHostConfig.js
+++ b/packages/react-native-renderer/src/ReactNativeHostConfig.js
@@ -26,18 +26,22 @@ import {
 import ReactNativeFiberHostComponent from './ReactNativeFiberHostComponent';
 import * as ReactNativeFrameScheduling from './ReactNativeFrameScheduling';
 
-type Container = number;
+export type Type = string;
+export type Props = Object;
+export type Container = number;
 export type Instance = {
   _children: Array<Instance | number>,
   _nativeTag: number,
   viewConfig: ReactNativeBaseComponentViewConfig,
 };
-type Props = Object;
-type TextInstance = number;
-
-type HostContext = $ReadOnly<{|
+export type TextInstance = number;
+export type HydratableInstance = Instance | TextInstance;
+export type PublicInstance = Instance;
+export type HostContext = $ReadOnly<{|
   isInAParentText: boolean,
 |}>;
+export type UpdatePayload = Object; // Unused
+export type ChildSet = void; // Unused
 
 // Counter for uniquely identifying views.
 // % 10 === 1 means it is a rootTag.
@@ -63,369 +67,376 @@ function recursivelyUncacheFiberNode(node: Instance | TextInstance) {
   }
 }
 
-const ReactNativeHostConfig = {
-  appendInitialChild(
-    parentInstance: Instance,
-    child: Instance | TextInstance,
-  ): void {
-    parentInstance._children.push(child);
-  },
+export * from 'shared/HostConfigWithNoPersistence';
+export * from 'shared/HostConfigWithNoHydration';
 
-  createInstance(
-    type: string,
-    props: Props,
-    rootContainerInstance: Container,
-    hostContext: HostContext,
-    internalInstanceHandle: Object,
-  ): Instance {
-    const tag = allocateTag();
-    const viewConfig = ReactNativeViewConfigRegistry.get(type);
+export function appendInitialChild(
+  parentInstance: Instance,
+  child: Instance | TextInstance,
+): void {
+  parentInstance._children.push(child);
+}
 
-    if (__DEV__) {
-      for (const key in viewConfig.validAttributes) {
-        if (props.hasOwnProperty(key)) {
-          deepFreezeAndThrowOnMutationInDev(props[key]);
-        }
+export function createInstance(
+  type: string,
+  props: Props,
+  rootContainerInstance: Container,
+  hostContext: HostContext,
+  internalInstanceHandle: Object,
+): Instance {
+  const tag = allocateTag();
+  const viewConfig = ReactNativeViewConfigRegistry.get(type);
+
+  if (__DEV__) {
+    for (const key in viewConfig.validAttributes) {
+      if (props.hasOwnProperty(key)) {
+        deepFreezeAndThrowOnMutationInDev(props[key]);
       }
     }
+  }
 
-    invariant(
-      type !== 'RCTView' || !hostContext.isInAParentText,
-      'Nesting of <View> within <Text> is not currently supported.',
+  invariant(
+    type !== 'RCTView' || !hostContext.isInAParentText,
+    'Nesting of <View> within <Text> is not currently supported.',
+  );
+
+  const updatePayload = ReactNativeAttributePayload.create(
+    props,
+    viewConfig.validAttributes,
+  );
+
+  UIManager.createView(
+    tag, // reactTag
+    viewConfig.uiViewClassName, // viewName
+    rootContainerInstance, // rootTag
+    updatePayload, // props
+  );
+
+  const component = new ReactNativeFiberHostComponent(tag, viewConfig);
+
+  precacheFiberNode(internalInstanceHandle, tag);
+  updateFiberProps(tag, props);
+
+  // Not sure how to avoid this cast. Flow is okay if the component is defined
+  // in the same file but if it's external it can't see the types.
+  return ((component: any): Instance);
+}
+
+export function createTextInstance(
+  text: string,
+  rootContainerInstance: Container,
+  hostContext: HostContext,
+  internalInstanceHandle: Object,
+): TextInstance {
+  invariant(
+    hostContext.isInAParentText,
+    'Text strings must be rendered within a <Text> component.',
+  );
+
+  const tag = allocateTag();
+
+  UIManager.createView(
+    tag, // reactTag
+    'RCTRawText', // viewName
+    rootContainerInstance, // rootTag
+    {text: text}, // props
+  );
+
+  precacheFiberNode(internalInstanceHandle, tag);
+
+  return tag;
+}
+
+export function finalizeInitialChildren(
+  parentInstance: Instance,
+  type: string,
+  props: Props,
+  rootContainerInstance: Container,
+  hostContext: HostContext,
+): boolean {
+  // Don't send a no-op message over the bridge.
+  if (parentInstance._children.length === 0) {
+    return false;
+  }
+
+  // Map from child objects to native tags.
+  // 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'
+        ? child // Leaf node (eg text)
+        : child._nativeTag,
+  );
+
+  UIManager.setChildren(
+    parentInstance._nativeTag, // containerTag
+    nativeTags, // reactTags
+  );
+
+  return false;
+}
+
+export function getRootHostContext(
+  rootContainerInstance: Container,
+): HostContext {
+  return {isInAParentText: false};
+}
+
+export function getChildHostContext(
+  parentHostContext: HostContext,
+  type: string,
+  rootContainerInstance: Container,
+): HostContext {
+  const prevIsInAParentText = parentHostContext.isInAParentText;
+  const isInAParentText =
+    type === 'AndroidTextInput' || // Android
+    type === 'RCTMultilineTextInputView' || // iOS
+    type === 'RCTSinglelineTextInputView' || // iOS
+    type === 'RCTText' ||
+    type === 'RCTVirtualText';
+
+  if (prevIsInAParentText !== isInAParentText) {
+    return {isInAParentText};
+  } else {
+    return parentHostContext;
+  }
+}
+
+export function getPublicInstance(instance: Instance): * {
+  return instance;
+}
+
+export function prepareForCommit(containerInfo: Container): void {
+  // Noop
+}
+
+export function prepareUpdate(
+  instance: Instance,
+  type: string,
+  oldProps: Props,
+  newProps: Props,
+  rootContainerInstance: Container,
+  hostContext: HostContext,
+): null | Object {
+  return emptyObject;
+}
+
+export function resetAfterCommit(containerInfo: Container): void {
+  // Noop
+}
+
+export const now = ReactNativeFrameScheduling.now;
+export const isPrimaryRenderer = true;
+export const scheduleDeferredCallback =
+  ReactNativeFrameScheduling.scheduleDeferredCallback;
+export const cancelDeferredCallback =
+  ReactNativeFrameScheduling.cancelDeferredCallback;
+
+export function shouldDeprioritizeSubtree(type: string, props: Props): boolean {
+  return false;
+}
+
+export function shouldSetTextContent(type: string, props: Props): boolean {
+  // TODO (bvaughn) Revisit this decision.
+  // Always returning false simplifies the createInstance() implementation,
+  // But creates an additional child Fiber for raw text children.
+  // No additional native views are created though.
+  // It's not clear to me which is better so I'm deferring for now.
+  // More context @ github.com/facebook/react/pull/8560#discussion_r92111303
+  return false;
+}
+
+// -------------------
+//     Mutation
+// -------------------
+
+export const supportsMutation = true;
+
+export function appendChild(
+  parentInstance: Instance,
+  child: Instance | TextInstance,
+): void {
+  const childTag = typeof child === 'number' ? child : child._nativeTag;
+  const children = parentInstance._children;
+  const index = children.indexOf(child);
+
+  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);
 
-    const updatePayload = ReactNativeAttributePayload.create(
-      props,
-      viewConfig.validAttributes,
+    UIManager.manageChildren(
+      parentInstance._nativeTag, // containerTag
+      [], // moveFromIndices
+      [], // moveToIndices
+      [childTag], // addChildReactTags
+      [children.length - 1], // addAtIndices
+      [], // removeAtIndices
     );
+  }
+}
 
-    UIManager.createView(
-      tag, // reactTag
+export function appendChildToContainer(
+  parentInstance: Container,
+  child: Instance | TextInstance,
+): void {
+  const childTag = typeof child === 'number' ? child : child._nativeTag;
+  UIManager.setChildren(
+    parentInstance, // containerTag
+    [childTag], // reactTags
+  );
+}
+
+export function commitTextUpdate(
+  textInstance: TextInstance,
+  oldText: string,
+  newText: string,
+): void {
+  UIManager.updateView(
+    textInstance, // reactTag
+    'RCTRawText', // viewName
+    {text: newText}, // props
+  );
+}
+
+export function commitMount(
+  instance: Instance,
+  type: string,
+  newProps: Props,
+  internalInstanceHandle: Object,
+): void {
+  // Noop
+}
+
+export function commitUpdate(
+  instance: Instance,
+  updatePayloadTODO: Object,
+  type: string,
+  oldProps: Props,
+  newProps: Props,
+  internalInstanceHandle: Object,
+): void {
+  const viewConfig = instance.viewConfig;
+
+  updateFiberProps(instance._nativeTag, newProps);
+
+  const updatePayload = ReactNativeAttributePayload.diff(
+    oldProps,
+    newProps,
+    viewConfig.validAttributes,
+  );
+
+  // Avoid the overhead of bridge calls if there's no update.
+  // This is an expensive no-op for Android, and causes an unnecessary
+  // view invalidation for certain components (eg RCTTextInput) on iOS.
+  if (updatePayload != null) {
+    UIManager.updateView(
+      instance._nativeTag, // reactTag
       viewConfig.uiViewClassName, // viewName
-      rootContainerInstance, // rootTag
       updatePayload, // props
     );
+  }
+}
 
-    const component = new ReactNativeFiberHostComponent(tag, viewConfig);
+export function insertBefore(
+  parentInstance: Instance,
+  child: Instance | TextInstance,
+  beforeChild: Instance | TextInstance,
+): void {
+  const children = (parentInstance: any)._children;
+  const index = children.indexOf(child);
 
-    precacheFiberNode(internalInstanceHandle, tag);
-    updateFiberProps(tag, props);
+  // Move existing child or add new child?
+  if (index >= 0) {
+    children.splice(index, 1);
+    const beforeChildIndex = children.indexOf(beforeChild);
+    children.splice(beforeChildIndex, 0, child);
 
-    // Not sure how to avoid this cast. Flow is okay if the component is defined
-    // in the same file but if it's external it can't see the types.
-    return ((component: any): Instance);
-  },
-
-  createTextInstance(
-    text: string,
-    rootContainerInstance: Container,
-    hostContext: HostContext,
-    internalInstanceHandle: Object,
-  ): TextInstance {
-    invariant(
-      hostContext.isInAParentText,
-      'Text strings must be rendered within a <Text> component.',
+    UIManager.manageChildren(
+      (parentInstance: any)._nativeTag, // containerID
+      [index], // moveFromIndices
+      [beforeChildIndex], // moveToIndices
+      [], // addChildReactTags
+      [], // addAtIndices
+      [], // removeAtIndices
     );
+  } else {
+    const beforeChildIndex = children.indexOf(beforeChild);
+    children.splice(beforeChildIndex, 0, child);
 
-    const tag = allocateTag();
+    const childTag = typeof child === 'number' ? child : child._nativeTag;
 
-    UIManager.createView(
-      tag, // reactTag
-      'RCTRawText', // viewName
-      rootContainerInstance, // rootTag
-      {text: text}, // props
+    UIManager.manageChildren(
+      (parentInstance: any)._nativeTag, // containerID
+      [], // moveFromIndices
+      [], // moveToIndices
+      [childTag], // addChildReactTags
+      [beforeChildIndex], // addAtIndices
+      [], // removeAtIndices
     );
+  }
+}
 
-    precacheFiberNode(internalInstanceHandle, tag);
+export function insertInContainerBefore(
+  parentInstance: Container,
+  child: Instance | TextInstance,
+  beforeChild: Instance | TextInstance,
+): void {
+  // TODO (bvaughn): Remove this check when...
+  // We create a wrapper object for the container in ReactNative render()
+  // Or we refactor to remove wrapper objects entirely.
+  // For more info on pros/cons see PR #8560 description.
+  invariant(
+    typeof parentInstance !== 'number',
+    'Container does not support insertBefore operation',
+  );
+}
 
-    return tag;
-  },
+export function removeChild(
+  parentInstance: Instance,
+  child: Instance | TextInstance,
+): void {
+  recursivelyUncacheFiberNode(child);
+  const children = parentInstance._children;
+  const index = children.indexOf(child);
 
-  finalizeInitialChildren(
-    parentInstance: Instance,
-    type: string,
-    props: Props,
-    rootContainerInstance: Container,
-  ): boolean {
-    // Don't send a no-op message over the bridge.
-    if (parentInstance._children.length === 0) {
-      return false;
-    }
+  children.splice(index, 1);
 
-    // Map from child objects to native tags.
-    // 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'
-          ? child // Leaf node (eg text)
-          : child._nativeTag,
-    );
+  UIManager.manageChildren(
+    parentInstance._nativeTag, // containerID
+    [], // moveFromIndices
+    [], // moveToIndices
+    [], // addChildReactTags
+    [], // addAtIndices
+    [index], // removeAtIndices
+  );
+}
 
-    UIManager.setChildren(
-      parentInstance._nativeTag, // containerTag
-      nativeTags, // reactTags
-    );
+export function removeChildFromContainer(
+  parentInstance: Container,
+  child: Instance | TextInstance,
+): void {
+  recursivelyUncacheFiberNode(child);
+  UIManager.manageChildren(
+    parentInstance, // containerID
+    [], // moveFromIndices
+    [], // moveToIndices
+    [], // addChildReactTags
+    [], // addAtIndices
+    [0], // removeAtIndices
+  );
+}
 
-    return false;
-  },
-
-  getRootHostContext(rootContainerInstance: Container): HostContext {
-    return {isInAParentText: false};
-  },
-
-  getChildHostContext(
-    parentHostContext: HostContext,
-    type: string,
-  ): HostContext {
-    const prevIsInAParentText = parentHostContext.isInAParentText;
-    const isInAParentText =
-      type === 'AndroidTextInput' || // Android
-      type === 'RCTMultilineTextInputView' || // iOS
-      type === 'RCTSinglelineTextInputView' || // iOS
-      type === 'RCTText' ||
-      type === 'RCTVirtualText';
-
-    if (prevIsInAParentText !== isInAParentText) {
-      return {isInAParentText};
-    } else {
-      return parentHostContext;
-    }
-  },
-
-  getPublicInstance(instance: Instance): * {
-    return instance;
-  },
-
-  now: ReactNativeFrameScheduling.now,
-
-  isPrimaryRenderer: true,
-
-  prepareForCommit(): void {
-    // Noop
-  },
-
-  prepareUpdate(
-    instance: Instance,
-    type: string,
-    oldProps: Props,
-    newProps: Props,
-    rootContainerInstance: Container,
-    hostContext: HostContext,
-  ): null | Object {
-    return emptyObject;
-  },
-
-  resetAfterCommit(): void {
-    // Noop
-  },
-
-  scheduleDeferredCallback: ReactNativeFrameScheduling.scheduleDeferredCallback,
-  cancelDeferredCallback: ReactNativeFrameScheduling.cancelDeferredCallback,
-
-  shouldDeprioritizeSubtree(type: string, props: Props): boolean {
-    return false;
-  },
-
-  shouldSetTextContent(type: string, props: Props): boolean {
-    // TODO (bvaughn) Revisit this decision.
-    // Always returning false simplifies the createInstance() implementation,
-    // But creates an additional child Fiber for raw text children.
-    // No additional native views are created though.
-    // It's not clear to me which is better so I'm deferring for now.
-    // More context @ github.com/facebook/react/pull/8560#discussion_r92111303
-    return false;
-  },
-
-  mutation: {
-    appendChild(
-      parentInstance: Instance,
-      child: Instance | TextInstance,
-    ): void {
-      const childTag = typeof child === 'number' ? child : child._nativeTag;
-      const children = parentInstance._children;
-      const index = children.indexOf(child);
-
-      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
-        );
-      }
-    },
-
-    appendChildToContainer(
-      parentInstance: Container,
-      child: Instance | TextInstance,
-    ): void {
-      const childTag = typeof child === 'number' ? child : child._nativeTag;
-      UIManager.setChildren(
-        parentInstance, // containerTag
-        [childTag], // reactTags
-      );
-    },
-
-    commitTextUpdate(
-      textInstance: TextInstance,
-      oldText: string,
-      newText: string,
-    ): void {
-      UIManager.updateView(
-        textInstance, // reactTag
-        'RCTRawText', // viewName
-        {text: newText}, // props
-      );
-    },
-
-    commitMount(
-      instance: Instance,
-      type: string,
-      newProps: Props,
-      internalInstanceHandle: Object,
-    ): void {
-      // Noop
-    },
-
-    commitUpdate(
-      instance: Instance,
-      updatePayloadTODO: Object,
-      type: string,
-      oldProps: Props,
-      newProps: Props,
-      internalInstanceHandle: Object,
-    ): void {
-      const viewConfig = instance.viewConfig;
-
-      updateFiberProps(instance._nativeTag, newProps);
-
-      const updatePayload = ReactNativeAttributePayload.diff(
-        oldProps,
-        newProps,
-        viewConfig.validAttributes,
-      );
-
-      // Avoid the overhead of bridge calls if there's no update.
-      // This is an expensive no-op for Android, and causes an unnecessary
-      // view invalidation for certain components (eg RCTTextInput) on iOS.
-      if (updatePayload != null) {
-        UIManager.updateView(
-          instance._nativeTag, // reactTag
-          viewConfig.uiViewClassName, // viewName
-          updatePayload, // props
-        );
-      }
-    },
-
-    insertBefore(
-      parentInstance: Instance,
-      child: Instance | TextInstance,
-      beforeChild: Instance | TextInstance,
-    ): void {
-      const children = (parentInstance: any)._children;
-      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(
-          (parentInstance: any)._nativeTag, // containerID
-          [index], // moveFromIndices
-          [beforeChildIndex], // moveToIndices
-          [], // addChildReactTags
-          [], // addAtIndices
-          [], // removeAtIndices
-        );
-      } else {
-        const beforeChildIndex = children.indexOf(beforeChild);
-        children.splice(beforeChildIndex, 0, child);
-
-        const childTag = typeof child === 'number' ? child : child._nativeTag;
-
-        UIManager.manageChildren(
-          (parentInstance: any)._nativeTag, // containerID
-          [], // moveFromIndices
-          [], // moveToIndices
-          [childTag], // addChildReactTags
-          [beforeChildIndex], // addAtIndices
-          [], // removeAtIndices
-        );
-      }
-    },
-
-    insertInContainerBefore(
-      parentInstance: Container,
-      child: Instance | TextInstance,
-      beforeChild: Instance | TextInstance,
-    ): void {
-      // TODO (bvaughn): Remove this check when...
-      // We create a wrapper object for the container in ReactNative render()
-      // Or we refactor to remove wrapper objects entirely.
-      // For more info on pros/cons see PR #8560 description.
-      invariant(
-        typeof parentInstance !== 'number',
-        'Container does not support insertBefore operation',
-      );
-    },
-
-    removeChild(
-      parentInstance: Instance,
-      child: Instance | TextInstance,
-    ): void {
-      recursivelyUncacheFiberNode(child);
-      const children = parentInstance._children;
-      const index = children.indexOf(child);
-
-      children.splice(index, 1);
-
-      UIManager.manageChildren(
-        parentInstance._nativeTag, // containerID
-        [], // moveFromIndices
-        [], // moveToIndices
-        [], // addChildReactTags
-        [], // addAtIndices
-        [index], // removeAtIndices
-      );
-    },
-
-    removeChildFromContainer(
-      parentInstance: Container,
-      child: Instance | TextInstance,
-    ): void {
-      recursivelyUncacheFiberNode(child);
-      UIManager.manageChildren(
-        parentInstance, // containerID
-        [], // moveFromIndices
-        [], // moveToIndices
-        [], // addChildReactTags
-        [], // addAtIndices
-        [0], // removeAtIndices
-      );
-    },
-
-    resetTextContent(instance: Instance): void {
-      // Noop
-    },
-  },
-};
-
-export default ReactNativeHostConfig;
+export function resetTextContent(instance: Instance): void {
+  // Noop
+}
diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js
index 7b5f3c7805..a66548fdc9 100644
--- a/packages/react-native-renderer/src/ReactNativeRenderer.js
+++ b/packages/react-native-renderer/src/ReactNativeRenderer.js
@@ -12,7 +12,7 @@ import type {ReactNodeList} from 'shared/ReactTypes';
 
 import './ReactNativeInjection';
 
-import ReactFiberReconciler from 'react-reconciler';
+import * as ReactNativeFiberRenderer from 'react-reconciler/inline.native';
 import * as ReactPortal from 'shared/ReactPortal';
 import * as ReactGenericBatching from 'events/ReactGenericBatching';
 import ReactVersion from 'shared/ReactVersion';
@@ -21,7 +21,6 @@ import UIManager from 'UIManager';
 
 import {getStackAddendumByWorkInProgressFiber} from 'shared/ReactFiberComponentTreeHook';
 
-import ReactNativeHostConfig from './ReactNativeHostConfig';
 import NativeMethodsMixin from './NativeMethodsMixin';
 import ReactNativeComponent from './ReactNativeComponent';
 import * as ReactNativeComponentTree from './ReactNativeComponentTree';
@@ -31,8 +30,6 @@ import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
 import getComponentName from 'shared/getComponentName';
 import warning from 'fbjs/lib/warning';
 
-const ReactNativeFiberRenderer = ReactFiberReconciler(ReactNativeHostConfig);
-
 const findHostInstance = ReactNativeFiberRenderer.findHostInstance;
 
 function findNodeHandle(componentOrHandle: any): ?number {
@@ -71,7 +68,7 @@ function findNodeHandle(componentOrHandle: any): ?number {
   }
   if (hostInstance.canonical) {
     // Fabric
-    return hostInstance.canonical._nativeTag;
+    return (hostInstance.canonical: any)._nativeTag;
   }
   return hostInstance._nativeTag;
 }
diff --git a/packages/react-noop-renderer/src/ReactNoop.js b/packages/react-noop-renderer/src/ReactNoop.js
index 91ae6ca749..765a6887bc 100644
--- a/packages/react-noop-renderer/src/ReactNoop.js
+++ b/packages/react-noop-renderer/src/ReactNoop.js
@@ -14,9 +14,11 @@
  * environment.
  */
 
+import ReactFiberReconciler from 'react-reconciler';
 import createReactNoop from './createReactNoop';
 
 const ReactNoop = createReactNoop(
+  ReactFiberReconciler, // reconciler
   true, // useMutation
 );
 
diff --git a/packages/react-noop-renderer/src/ReactNoopPersistent.js b/packages/react-noop-renderer/src/ReactNoopPersistent.js
index 32c6dcebcb..8e096f71bf 100644
--- a/packages/react-noop-renderer/src/ReactNoopPersistent.js
+++ b/packages/react-noop-renderer/src/ReactNoopPersistent.js
@@ -14,9 +14,11 @@
  * environment.
  */
 
+import ReactFiberPersistentReconciler from 'react-reconciler/persistent';
 import createReactNoop from './createReactNoop';
 
 const ReactNoopPersistent = createReactNoop(
+  ReactFiberPersistentReconciler, // reconciler
   false, // useMutation
 );
 
diff --git a/packages/react-noop-renderer/src/createReactNoop.js b/packages/react-noop-renderer/src/createReactNoop.js
index 2667122928..950f0deec2 100644
--- a/packages/react-noop-renderer/src/createReactNoop.js
+++ b/packages/react-noop-renderer/src/createReactNoop.js
@@ -18,7 +18,6 @@ import type {Fiber} from 'react-reconciler/src/ReactFiber';
 import type {UpdateQueue} from 'react-reconciler/src/ReactUpdateQueue';
 import type {ReactNodeList} from 'shared/ReactTypes';
 
-import ReactFiberReconciler from 'react-reconciler';
 import * as ReactPortal from 'shared/ReactPortal';
 import emptyObject from 'fbjs/lib/emptyObject';
 import expect from 'expect';
@@ -33,7 +32,7 @@ type Instance = {|
 |};
 type TextInstance = {|text: string, id: number|};
 
-function createReactNoop(useMutation: boolean) {
+function createReactNoop(reconciler: Function, useMutation: boolean) {
   const UPDATE_SIGNAL = {};
   let scheduledCallback = null;
 
@@ -187,101 +186,105 @@ function createReactNoop(useMutation: boolean) {
     },
 
     isPrimaryRenderer: true,
+    supportsHydration: false,
   };
 
   const hostConfig = useMutation
     ? {
         ...sharedHostConfig,
-        mutation: {
-          commitMount(instance: Instance, type: string, newProps: Props): void {
-            // Noop
-          },
 
-          commitUpdate(
-            instance: Instance,
-            updatePayload: Object,
-            type: string,
-            oldProps: Props,
-            newProps: Props,
-          ): void {
-            if (oldProps === null) {
-              throw new Error('Should have old props');
-            }
-            instance.prop = newProps.prop;
-          },
+        supportsMutation: true,
+        supportsPersistence: false,
 
-          commitTextUpdate(
-            textInstance: TextInstance,
-            oldText: string,
-            newText: string,
-          ): void {
-            textInstance.text = newText;
-          },
-
-          appendChild: appendChild,
-          appendChildToContainer: appendChild,
-          insertBefore: insertBefore,
-          insertInContainerBefore: insertBefore,
-          removeChild: removeChild,
-          removeChildFromContainer: removeChild,
-
-          resetTextContent(instance: Instance): void {},
+        commitMount(instance: Instance, type: string, newProps: Props): void {
+          // Noop
         },
+
+        commitUpdate(
+          instance: Instance,
+          updatePayload: Object,
+          type: string,
+          oldProps: Props,
+          newProps: Props,
+        ): void {
+          if (oldProps === null) {
+            throw new Error('Should have old props');
+          }
+          instance.prop = newProps.prop;
+        },
+
+        commitTextUpdate(
+          textInstance: TextInstance,
+          oldText: string,
+          newText: string,
+        ): void {
+          textInstance.text = newText;
+        },
+
+        appendChild: appendChild,
+        appendChildToContainer: appendChild,
+        insertBefore: insertBefore,
+        insertInContainerBefore: insertBefore,
+        removeChild: removeChild,
+        removeChildFromContainer: removeChild,
+
+        resetTextContent(instance: Instance): void {},
       }
     : {
         ...sharedHostConfig,
-        persistence: {
-          cloneInstance(
-            instance: Instance,
-            updatePayload: null | Object,
-            type: string,
-            oldProps: Props,
-            newProps: Props,
-            internalInstanceHandle: Object,
-            keepChildren: boolean,
-            recyclableInstance: null | Instance,
-          ): Instance {
-            const clone = {
-              id: instance.id,
-              type: type,
-              children: keepChildren ? instance.children : [],
-              prop: newProps.prop,
-            };
-            Object.defineProperty(clone, 'id', {
-              value: clone.id,
-              enumerable: false,
-            });
-            return clone;
-          },
+        supportsMutation: false,
+        supportsPersistence: true,
 
-          createContainerChildSet(
-            container: Container,
-          ): Array<Instance | TextInstance> {
-            return [];
-          },
+        cloneInstance(
+          instance: Instance,
+          updatePayload: null | Object,
+          type: string,
+          oldProps: Props,
+          newProps: Props,
+          internalInstanceHandle: Object,
+          keepChildren: boolean,
+          recyclableInstance: null | Instance,
+        ): Instance {
+          const clone = {
+            id: instance.id,
+            type: type,
+            children: keepChildren ? instance.children : [],
+            prop: newProps.prop,
+          };
+          Object.defineProperty(clone, 'id', {
+            value: clone.id,
+            enumerable: false,
+          });
+          return clone;
+        },
 
-          appendChildToContainerChildSet(
-            childSet: Array<Instance | TextInstance>,
-            child: Instance | TextInstance,
-          ): void {
-            childSet.push(child);
-          },
+        createContainerChildSet(
+          container: Container,
+        ): Array<Instance | TextInstance> {
+          return [];
+        },
 
-          finalizeContainerChildren(
-            container: Container,
-            newChildren: Array<Instance | TextInstance>,
-          ): void {},
+        appendChildToContainerChildSet(
+          childSet: Array<Instance | TextInstance>,
+          child: Instance | TextInstance,
+        ): void {
+          childSet.push(child);
+        },
 
-          replaceContainerChildren(
-            container: Container,
-            newChildren: Array<Instance | TextInstance>,
-          ): void {
-            container.children = newChildren;
-          },
+        finalizeContainerChildren(
+          container: Container,
+          newChildren: Array<Instance | TextInstance>,
+        ): void {},
+
+        replaceContainerChildren(
+          container: Container,
+          newChildren: Array<Instance | TextInstance>,
+        ): void {
+          container.children = newChildren;
         },
       };
 
-  const NoopRenderer = ReactFiberReconciler(hostConfig);
+  const NoopRenderer = reconciler(hostConfig);
 
   const rootContainers = new Map();
   const roots = new Map();
diff --git a/packages/react-reconciler/index.js b/packages/react-reconciler/index.js
index f513c9c965..5e6b0e53b8 100644
--- a/packages/react-reconciler/index.js
+++ b/packages/react-reconciler/index.js
@@ -3,18 +3,21 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
-'use strict';
+// This entry point is intentionally not typed. It exists only for third-party
+// renderers. The renderers we ship (such as React DOM) instead import a named
+// "inline" entry point (for example, `react-reconciler/inline.dom`). It uses
+// the same code, but the Flow configuration redirects the host config to its
+// real implementation so we can check it against exact intended host types.
+//
+// Only one renderer (the one you passed to `yarn flow <renderer>`) is fully
+// type-checked at any given time. The Flow config maps the
+// `react-reconciler/inline.<renderer>` import (which is *not* Flow typed) to
+// `react-reconciler/inline-typed` (which *is*) for the current renderer.
+// On CI, we run Flow checks for each renderer separately.
 
-// TODO: bundle Flow types with the package.
-export type {
-  HostConfig,
-  Deadline,
-  Reconciler,
-} from './src/ReactFiberReconciler';
+'use strict';
 
 const ReactFiberReconciler = require('./src/ReactFiberReconciler');
 
diff --git a/packages/react-reconciler/inline-typed.js b/packages/react-reconciler/inline-typed.js
new file mode 100644
index 0000000000..958abce94c
--- /dev/null
+++ b/packages/react-reconciler/inline-typed.js
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+// This file must have the Flow annotation.
+//
+// This is the Flow-typed entry point for the reconciler. It should not be
+// imported directly in code. Instead, our Flow configuration uses this entry
+// point for the currently checked renderer (the one you passed to `yarn flow`).
+//
+// For example, if you run `yarn flow dom`, `react-reconciler/inline.dom` points
+// to this module (and thus will be considered Flow-typed). But other renderers
+// (e.g. `react-test-renderer`) will see reconciler as untyped during the check.
+//
+// We can't make all entry points typed at the same time because different
+// renderers have different host config types. So we check them one by one.
+// We run Flow on all renderers on CI.
+
+export * from './src/ReactFiberReconciler';
diff --git a/packages/react-reconciler/inline.art.js b/packages/react-reconciler/inline.art.js
new file mode 100644
index 0000000000..0d988dfc10
--- /dev/null
+++ b/packages/react-reconciler/inline.art.js
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// This file intentionally does *not* have the Flow annotation.
+// Don't add it. See `./inline-typed.js` for an explanation.
+
+export * from './src/ReactFiberReconciler';
diff --git a/packages/react-reconciler/inline.dom.js b/packages/react-reconciler/inline.dom.js
new file mode 100644
index 0000000000..0d988dfc10
--- /dev/null
+++ b/packages/react-reconciler/inline.dom.js
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// This file intentionally does *not* have the Flow annotation.
+// Don't add it. See `./inline-typed.js` for an explanation.
+
+export * from './src/ReactFiberReconciler';
diff --git a/packages/react-reconciler/inline.fabric.js b/packages/react-reconciler/inline.fabric.js
new file mode 100644
index 0000000000..0d988dfc10
--- /dev/null
+++ b/packages/react-reconciler/inline.fabric.js
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// This file intentionally does *not* have the Flow annotation.
+// Don't add it. See `./inline-typed.js` for an explanation.
+
+export * from './src/ReactFiberReconciler';
diff --git a/packages/react-reconciler/inline.native.js b/packages/react-reconciler/inline.native.js
new file mode 100644
index 0000000000..0d988dfc10
--- /dev/null
+++ b/packages/react-reconciler/inline.native.js
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// This file intentionally does *not* have the Flow annotation.
+// Don't add it. See `./inline-typed.js` for an explanation.
+
+export * from './src/ReactFiberReconciler';
diff --git a/packages/react-reconciler/inline.test.js b/packages/react-reconciler/inline.test.js
new file mode 100644
index 0000000000..0d988dfc10
--- /dev/null
+++ b/packages/react-reconciler/inline.test.js
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// This file intentionally does *not* have the Flow annotation.
+// Don't add it. See `./inline-typed.js` for an explanation.
+
+export * from './src/ReactFiberReconciler';
diff --git a/packages/react-reconciler/persistent.js b/packages/react-reconciler/persistent.js
index fb015e1012..86623952b3 100644
--- a/packages/react-reconciler/persistent.js
+++ b/packages/react-reconciler/persistent.js
@@ -3,8 +3,6 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 'use strict';
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index d344ce0998..53ea870e67 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -7,16 +7,10 @@
  * @flow
  */
 
-import type {HostConfig} from 'react-reconciler';
 import type {ReactProviderType, ReactContext} from 'shared/ReactTypes';
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
-import type {HostContext} from './ReactFiberHostContext';
-import type {LegacyContext} from './ReactFiberContext';
-import type {NewContext} from './ReactFiberNewContext';
-import type {HydrationContext} from './ReactFiberHydrationContext';
 import type {FiberRoot} from './ReactFiberRoot';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
-import type {ProfilerTimer} from './ReactProfilerTimer';
 import checkPropTypes from 'prop-types/checkPropTypes';
 
 import {
@@ -58,9 +52,7 @@ import warning from 'fbjs/lib/warning';
 import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
 import {cancelWorkTimer} from './ReactDebugFiberPerf';
 
-import ReactFiberClassComponent, {
-  applyDerivedStateFromProps,
-} from './ReactFiberClassComponent';
+import {applyDerivedStateFromProps} from './ReactFiberClassComponent';
 import {
   mountChildFibers,
   reconcileChildFibers,
@@ -69,6 +61,40 @@ import {
 import {processUpdateQueue} from './ReactUpdateQueue';
 import {NoWork, Never} from './ReactFiberExpirationTime';
 import {AsyncMode, StrictMode} from './ReactTypeOfMode';
+import {
+  shouldSetTextContent,
+  shouldDeprioritizeSubtree,
+} from './ReactFiberHostConfig';
+import {pushHostContext, pushHostContainer} from './ReactFiberHostContext';
+import {
+  pushProvider,
+  getContextCurrentValue,
+  getContextChangedBits,
+} from './ReactFiberNewContext';
+import {
+  markActualRenderTimeStarted,
+  stopBaseRenderTimerIfRunning,
+} from './ReactProfilerTimer';
+import {
+  getMaskedContext,
+  getUnmaskedContext,
+  hasContextChanged as hasLegacyContextChanged,
+  pushContextProvider as pushLegacyContextProvider,
+  pushTopLevelContextObject,
+  invalidateContextProvider,
+} from './ReactFiberContext';
+import {
+  enterHydrationState,
+  resetHydrationState,
+  tryToClaimNextHydratableInstance,
+} from './ReactFiberHydrationContext';
+import {
+  adoptClassInstance,
+  constructClassInstance,
+  mountClassInstance,
+  resumeMountClassInstance,
+  updateClassInstance,
+} from './ReactFiberClassComponent';
 import MAX_SIGNED_31_BIT_INT from './maxSigned31BitInt';
 
 const {getCurrentFiberStackAddendum} = ReactDebugCurrentFiber;
@@ -83,86 +109,370 @@ if (__DEV__) {
   didWarnAboutStatelessRefs = {};
 }
 
-export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
-  config: HostConfig<T, P, I, TI, HI, PI, C, CC, CX, PL>,
-  hostContext: HostContext<C, CX>,
-  legacyContext: LegacyContext,
-  newContext: NewContext,
-  hydrationContext: HydrationContext<C, CX>,
-  scheduleWork: (fiber: Fiber, expirationTime: ExpirationTime) => void,
-  computeExpirationForFiber: (
-    startTime: ExpirationTime,
-    fiber: Fiber,
-  ) => ExpirationTime,
-  profilerTimer: ProfilerTimer,
-  recalculateCurrentTime: () => ExpirationTime,
-) {
-  const {shouldSetTextContent, shouldDeprioritizeSubtree} = config;
-
-  const {pushHostContext, pushHostContainer} = hostContext;
-
-  const {
-    pushProvider,
-    getContextCurrentValue,
-    getContextChangedBits,
-  } = newContext;
-
-  const {
-    markActualRenderTimeStarted,
-    stopBaseRenderTimerIfRunning,
-  } = profilerTimer;
-
-  const {
-    getMaskedContext,
-    getUnmaskedContext,
-    hasContextChanged: hasLegacyContextChanged,
-    pushContextProvider: pushLegacyContextProvider,
-    pushTopLevelContextObject,
-    invalidateContextProvider,
-  } = legacyContext;
-
-  const {
-    enterHydrationState,
-    resetHydrationState,
-    tryToClaimNextHydratableInstance,
-  } = hydrationContext;
-
-  const {
-    adoptClassInstance,
-    constructClassInstance,
-    mountClassInstance,
-    resumeMountClassInstance,
-    updateClassInstance,
-  } = ReactFiberClassComponent(
-    legacyContext,
-    scheduleWork,
-    computeExpirationForFiber,
-    memoizeProps,
-    memoizeState,
-    recalculateCurrentTime,
+// TODO: Remove this and use reconcileChildrenAtExpirationTime directly.
+function reconcileChildren(current, workInProgress, nextChildren) {
+  reconcileChildrenAtExpirationTime(
+    current,
+    workInProgress,
+    nextChildren,
+    workInProgress.expirationTime,
   );
+}
 
-  // TODO: Remove this and use reconcileChildrenAtExpirationTime directly.
-  function reconcileChildren(current, workInProgress, nextChildren) {
+function reconcileChildrenAtExpirationTime(
+  current,
+  workInProgress,
+  nextChildren,
+  renderExpirationTime,
+) {
+  if (current === null) {
+    // If this is a fresh new component that hasn't been rendered yet, we
+    // won't update its child set by applying minimal side-effects. Instead,
+    // we will add them all to the child before it gets rendered. That means
+    // we can optimize this reconciliation pass by not tracking side-effects.
+    workInProgress.child = mountChildFibers(
+      workInProgress,
+      null,
+      nextChildren,
+      renderExpirationTime,
+    );
+  } else {
+    // If the current child is the same as the work in progress, it means that
+    // we haven't yet started any work on these children. Therefore, we use
+    // the clone algorithm to create a copy of all the current children.
+
+    // If we had any progressed work already, that is invalid at this point so
+    // let's throw it out.
+    workInProgress.child = reconcileChildFibers(
+      workInProgress,
+      current.child,
+      nextChildren,
+      renderExpirationTime,
+    );
+  }
+}
+
+function updateForwardRef(current, workInProgress) {
+  const render = workInProgress.type.render;
+  const nextProps = workInProgress.pendingProps;
+  const ref = workInProgress.ref;
+  if (hasLegacyContextChanged()) {
+    // Normally we can bail out on props equality but if context has changed
+    // we don't do the bailout and we have to reuse existing props instead.
+  } else if (workInProgress.memoizedProps === nextProps) {
+    const currentRef = current !== null ? current.ref : null;
+    if (ref === currentRef) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+  }
+
+  let nextChildren;
+  if (__DEV__) {
+    ReactCurrentOwner.current = workInProgress;
+    ReactDebugCurrentFiber.setCurrentPhase('render');
+    nextChildren = render(nextProps, ref);
+    ReactDebugCurrentFiber.setCurrentPhase(null);
+  } else {
+    nextChildren = render(nextProps, ref);
+  }
+
+  reconcileChildren(current, workInProgress, nextChildren);
+  memoizeProps(workInProgress, nextProps);
+  return workInProgress.child;
+}
+
+function updateFragment(current, workInProgress) {
+  const nextChildren = workInProgress.pendingProps;
+  if (hasLegacyContextChanged()) {
+    // Normally we can bail out on props equality but if context has changed
+    // we don't do the bailout and we have to reuse existing props instead.
+  } else if (workInProgress.memoizedProps === nextChildren) {
+    return bailoutOnAlreadyFinishedWork(current, workInProgress);
+  }
+  reconcileChildren(current, workInProgress, nextChildren);
+  memoizeProps(workInProgress, nextChildren);
+  return workInProgress.child;
+}
+
+function updateMode(current, workInProgress) {
+  const nextChildren = workInProgress.pendingProps.children;
+  if (hasLegacyContextChanged()) {
+    // Normally we can bail out on props equality but if context has changed
+    // we don't do the bailout and we have to reuse existing props instead.
+  } else if (
+    nextChildren === null ||
+    workInProgress.memoizedProps === nextChildren
+  ) {
+    return bailoutOnAlreadyFinishedWork(current, workInProgress);
+  }
+  reconcileChildren(current, workInProgress, nextChildren);
+  memoizeProps(workInProgress, nextChildren);
+  return workInProgress.child;
+}
+
+function updateProfiler(current, workInProgress) {
+  const nextProps = workInProgress.pendingProps;
+  if (enableProfilerTimer) {
+    // Start render timer here and push start time onto queue
+    markActualRenderTimeStarted(workInProgress);
+
+    // Let the "complete" phase know to stop the timer,
+    // And the scheduler to record the measured time.
+    workInProgress.effectTag |= Update;
+  }
+  if (workInProgress.memoizedProps === nextProps) {
+    return bailoutOnAlreadyFinishedWork(current, workInProgress);
+  }
+  const nextChildren = nextProps.children;
+  reconcileChildren(current, workInProgress, nextChildren);
+  memoizeProps(workInProgress, nextProps);
+  return workInProgress.child;
+}
+
+function markRef(current: Fiber | null, workInProgress: Fiber) {
+  const ref = workInProgress.ref;
+  if (
+    (current === null && ref !== null) ||
+    (current !== null && current.ref !== ref)
+  ) {
+    // Schedule a Ref effect
+    workInProgress.effectTag |= Ref;
+  }
+}
+
+function updateFunctionalComponent(current, workInProgress) {
+  const fn = workInProgress.type;
+  const nextProps = workInProgress.pendingProps;
+
+  if (hasLegacyContextChanged()) {
+    // Normally we can bail out on props equality but if context has changed
+    // we don't do the bailout and we have to reuse existing props instead.
+  } else {
+    if (workInProgress.memoizedProps === nextProps) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+    // TODO: consider bringing fn.shouldComponentUpdate() back.
+    // It used to be here.
+  }
+
+  const unmaskedContext = getUnmaskedContext(workInProgress);
+  const context = getMaskedContext(workInProgress, unmaskedContext);
+
+  let nextChildren;
+
+  if (__DEV__) {
+    ReactCurrentOwner.current = workInProgress;
+    ReactDebugCurrentFiber.setCurrentPhase('render');
+    nextChildren = fn(nextProps, context);
+    ReactDebugCurrentFiber.setCurrentPhase(null);
+  } else {
+    nextChildren = fn(nextProps, context);
+  }
+  // React DevTools reads this flag.
+  workInProgress.effectTag |= PerformedWork;
+  reconcileChildren(current, workInProgress, nextChildren);
+  memoizeProps(workInProgress, nextProps);
+  return workInProgress.child;
+}
+
+function updateClassComponent(
+  current: Fiber | null,
+  workInProgress: Fiber,
+  renderExpirationTime: ExpirationTime,
+) {
+  // Push context providers early to prevent context stack mismatches.
+  // During mounting we don't know the child context yet as the instance doesn't exist.
+  // We will invalidate the child context in finishClassComponent() right after rendering.
+  const hasContext = pushLegacyContextProvider(workInProgress);
+  let shouldUpdate;
+  if (current === null) {
+    if (workInProgress.stateNode === null) {
+      // In the initial pass we might need to construct the instance.
+      constructClassInstance(
+        workInProgress,
+        workInProgress.pendingProps,
+        renderExpirationTime,
+      );
+      mountClassInstance(workInProgress, renderExpirationTime);
+
+      shouldUpdate = true;
+    } else {
+      // In a resume, we'll already have an instance we can reuse.
+      shouldUpdate = resumeMountClassInstance(
+        workInProgress,
+        renderExpirationTime,
+      );
+    }
+  } else {
+    shouldUpdate = updateClassInstance(
+      current,
+      workInProgress,
+      renderExpirationTime,
+    );
+  }
+  return finishClassComponent(
+    current,
+    workInProgress,
+    shouldUpdate,
+    hasContext,
+    renderExpirationTime,
+  );
+}
+
+function finishClassComponent(
+  current: Fiber | null,
+  workInProgress: Fiber,
+  shouldUpdate: boolean,
+  hasContext: boolean,
+  renderExpirationTime: ExpirationTime,
+) {
+  // Refs should update even if shouldComponentUpdate returns false
+  markRef(current, workInProgress);
+
+  const didCaptureError = (workInProgress.effectTag & DidCapture) !== NoEffect;
+
+  if (!shouldUpdate && !didCaptureError) {
+    // Context providers should defer to sCU for rendering
+    if (hasContext) {
+      invalidateContextProvider(workInProgress, false);
+    }
+
+    return bailoutOnAlreadyFinishedWork(current, workInProgress);
+  }
+
+  const ctor = workInProgress.type;
+  const instance = workInProgress.stateNode;
+
+  // Rerender
+  ReactCurrentOwner.current = workInProgress;
+  let nextChildren;
+  if (
+    didCaptureError &&
+    (!enableGetDerivedStateFromCatch ||
+      typeof ctor.getDerivedStateFromCatch !== 'function')
+  ) {
+    // If we captured an error, but getDerivedStateFrom catch is not defined,
+    // unmount all the children. componentDidCatch will schedule an update to
+    // re-render a fallback. This is temporary until we migrate everyone to
+    // the new API.
+    // TODO: Warn in a future release.
+    nextChildren = null;
+
+    if (enableProfilerTimer) {
+      stopBaseRenderTimerIfRunning();
+    }
+  } else {
+    if (__DEV__) {
+      ReactDebugCurrentFiber.setCurrentPhase('render');
+      nextChildren = instance.render();
+      if (
+        debugRenderPhaseSideEffects ||
+        (debugRenderPhaseSideEffectsForStrictMode &&
+          workInProgress.mode & StrictMode)
+      ) {
+        instance.render();
+      }
+      ReactDebugCurrentFiber.setCurrentPhase(null);
+    } else {
+      nextChildren = instance.render();
+    }
+  }
+
+  // React DevTools reads this flag.
+  workInProgress.effectTag |= PerformedWork;
+  if (didCaptureError) {
+    // If we're recovering from an error, reconcile twice: first to delete
+    // all the existing children.
     reconcileChildrenAtExpirationTime(
       current,
       workInProgress,
-      nextChildren,
-      workInProgress.expirationTime,
+      null,
+      renderExpirationTime,
     );
+    workInProgress.child = null;
+    // Now we can continue reconciling like normal. This has the effect of
+    // remounting all children regardless of whether their their
+    // identity matches.
   }
-
-  function reconcileChildrenAtExpirationTime(
+  reconcileChildrenAtExpirationTime(
     current,
     workInProgress,
     nextChildren,
     renderExpirationTime,
-  ) {
-    if (current === null) {
-      // If this is a fresh new component that hasn't been rendered yet, we
-      // won't update its child set by applying minimal side-effects. Instead,
-      // we will add them all to the child before it gets rendered. That means
-      // we can optimize this reconciliation pass by not tracking side-effects.
+  );
+  // Memoize props and state using the values we just used to render.
+  // TODO: Restructure so we never read values from the instance.
+  memoizeState(workInProgress, instance.state);
+  memoizeProps(workInProgress, instance.props);
+
+  // The context might have changed so we need to recalculate it.
+  if (hasContext) {
+    invalidateContextProvider(workInProgress, true);
+  }
+
+  return workInProgress.child;
+}
+
+function pushHostRootContext(workInProgress) {
+  const root = (workInProgress.stateNode: FiberRoot);
+  if (root.pendingContext) {
+    pushTopLevelContextObject(
+      workInProgress,
+      root.pendingContext,
+      root.pendingContext !== root.context,
+    );
+  } else if (root.context) {
+    // Should always be set
+    pushTopLevelContextObject(workInProgress, root.context, false);
+  }
+  pushHostContainer(workInProgress, root.containerInfo);
+}
+
+function updateHostRoot(current, workInProgress, renderExpirationTime) {
+  pushHostRootContext(workInProgress);
+  let updateQueue = workInProgress.updateQueue;
+  if (updateQueue !== null) {
+    const nextProps = workInProgress.pendingProps;
+    const prevState = workInProgress.memoizedState;
+    const prevChildren = prevState !== null ? prevState.element : null;
+    processUpdateQueue(
+      workInProgress,
+      updateQueue,
+      nextProps,
+      null,
+      renderExpirationTime,
+    );
+    const nextState = workInProgress.memoizedState;
+    // Caution: React DevTools currently depends on this property
+    // being called "element".
+    const nextChildren = nextState.element;
+
+    if (nextChildren === prevChildren) {
+      // If the state is the same as before, that's a bailout because we had
+      // no work that expires at this time.
+      resetHydrationState();
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+    const root: FiberRoot = workInProgress.stateNode;
+    if (
+      (current === null || current.child === null) &&
+      root.hydrate &&
+      enterHydrationState(workInProgress)
+    ) {
+      // If we don't have any current children this might be the first pass.
+      // We always try to hydrate. If this isn't a hydration pass there won't
+      // be any children to hydrate which is effectively the same thing as
+      // not hydrating.
+
+      // This is a bit of a hack. We track the host root as a placement to
+      // know that we're currently in a mounting state. That way isMounted
+      // works as expected. We must reset this before committing.
+      // TODO: Delete this when we delete isMounted and findDOMNode.
+      workInProgress.effectTag |= Placement;
+
+      // Ensure that children mount into this root without tracking
+      // side-effects. This ensures that we don't store Placement effects on
+      // nodes that will be hydrated.
       workInProgress.child = mountChildFibers(
         workInProgress,
         null,
@@ -170,782 +480,441 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         renderExpirationTime,
       );
     } else {
-      // If the current child is the same as the work in progress, it means that
-      // we haven't yet started any work on these children. Therefore, we use
-      // the clone algorithm to create a copy of all the current children.
+      // Otherwise reset hydration state in case we aborted and resumed another
+      // root.
+      resetHydrationState();
+      reconcileChildren(current, workInProgress, nextChildren);
+    }
+    return workInProgress.child;
+  }
+  resetHydrationState();
+  // If there is no update queue, that's a bailout because the root has no props.
+  return bailoutOnAlreadyFinishedWork(current, workInProgress);
+}
 
-      // If we had any progressed work already, that is invalid at this point so
-      // let's throw it out.
-      workInProgress.child = reconcileChildFibers(
+function updateHostComponent(current, workInProgress, renderExpirationTime) {
+  pushHostContext(workInProgress);
+
+  if (current === null) {
+    tryToClaimNextHydratableInstance(workInProgress);
+  }
+
+  const type = workInProgress.type;
+  const memoizedProps = workInProgress.memoizedProps;
+  const nextProps = workInProgress.pendingProps;
+  const prevProps = current !== null ? current.memoizedProps : null;
+
+  if (hasLegacyContextChanged()) {
+    // Normally we can bail out on props equality but if context has changed
+    // we don't do the bailout and we have to reuse existing props instead.
+  } else if (memoizedProps === nextProps) {
+    const isHidden =
+      workInProgress.mode & AsyncMode &&
+      shouldDeprioritizeSubtree(type, nextProps);
+    if (isHidden) {
+      // Before bailing out, make sure we've deprioritized a hidden component.
+      workInProgress.expirationTime = Never;
+    }
+    if (!isHidden || renderExpirationTime !== Never) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+    // If we're rendering a hidden node at hidden priority, don't bailout. The
+    // parent is complete, but the children may not be.
+  }
+
+  let nextChildren = nextProps.children;
+  const isDirectTextChild = shouldSetTextContent(type, nextProps);
+
+  if (isDirectTextChild) {
+    // We special case a direct text child of a host node. This is a common
+    // case. We won't handle it as a reified child. We will instead handle
+    // this in the host environment that also have access to this prop. That
+    // avoids allocating another HostText fiber and traversing it.
+    nextChildren = null;
+  } else if (prevProps && shouldSetTextContent(type, prevProps)) {
+    // If we're switching from a direct text child to a normal child, or to
+    // empty, we need to schedule the text content to be reset.
+    workInProgress.effectTag |= ContentReset;
+  }
+
+  markRef(current, workInProgress);
+
+  // Check the host config to see if the children are offscreen/hidden.
+  if (
+    renderExpirationTime !== Never &&
+    workInProgress.mode & AsyncMode &&
+    shouldDeprioritizeSubtree(type, nextProps)
+  ) {
+    // Down-prioritize the children.
+    workInProgress.expirationTime = Never;
+    // Bailout and come back to this fiber later.
+    workInProgress.memoizedProps = nextProps;
+    return null;
+  }
+
+  reconcileChildren(current, workInProgress, nextChildren);
+  memoizeProps(workInProgress, nextProps);
+  return workInProgress.child;
+}
+
+function updateHostText(current, workInProgress) {
+  if (current === null) {
+    tryToClaimNextHydratableInstance(workInProgress);
+  }
+  const nextProps = workInProgress.pendingProps;
+  memoizeProps(workInProgress, nextProps);
+  // Nothing to do here. This is terminal. We'll do the completion step
+  // immediately after.
+  return null;
+}
+
+function mountIndeterminateComponent(
+  current,
+  workInProgress,
+  renderExpirationTime,
+) {
+  invariant(
+    current === null,
+    'An indeterminate component should never have mounted. This error is ' +
+      'likely caused by a bug in React. Please file an issue.',
+  );
+  const fn = workInProgress.type;
+  const props = workInProgress.pendingProps;
+  const unmaskedContext = getUnmaskedContext(workInProgress);
+  const context = getMaskedContext(workInProgress, unmaskedContext);
+
+  let value;
+
+  if (__DEV__) {
+    if (fn.prototype && typeof fn.prototype.render === 'function') {
+      const componentName = getComponentName(workInProgress) || 'Unknown';
+
+      if (!didWarnAboutBadClass[componentName]) {
+        warning(
+          false,
+          "The <%s /> component appears to have a render method, but doesn't extend React.Component. " +
+            'This is likely to cause errors. Change %s to extend React.Component instead.',
+          componentName,
+          componentName,
+        );
+        didWarnAboutBadClass[componentName] = true;
+      }
+    }
+    ReactCurrentOwner.current = workInProgress;
+    value = fn(props, context);
+  } else {
+    value = fn(props, context);
+  }
+  // React DevTools reads this flag.
+  workInProgress.effectTag |= PerformedWork;
+
+  if (
+    typeof value === 'object' &&
+    value !== null &&
+    typeof value.render === 'function' &&
+    value.$$typeof === undefined
+  ) {
+    const Component = workInProgress.type;
+
+    // Proceed under the assumption that this is a class instance
+    workInProgress.tag = ClassComponent;
+
+    workInProgress.memoizedState =
+      value.state !== null && value.state !== undefined ? value.state : null;
+
+    const getDerivedStateFromProps = Component.getDerivedStateFromProps;
+    if (typeof getDerivedStateFromProps === 'function') {
+      applyDerivedStateFromProps(
         workInProgress,
-        current.child,
-        nextChildren,
-        renderExpirationTime,
+        getDerivedStateFromProps,
+        props,
       );
     }
-  }
 
-  function updateForwardRef(current, workInProgress) {
-    const render = workInProgress.type.render;
-    const nextProps = workInProgress.pendingProps;
-    const ref = workInProgress.ref;
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (workInProgress.memoizedProps === nextProps) {
-      const currentRef = current !== null ? current.ref : null;
-      if (ref === currentRef) {
-        return bailoutOnAlreadyFinishedWork(current, workInProgress);
-      }
-    }
-
-    let nextChildren;
-    if (__DEV__) {
-      ReactCurrentOwner.current = workInProgress;
-      ReactDebugCurrentFiber.setCurrentPhase('render');
-      nextChildren = render(nextProps, ref);
-      ReactDebugCurrentFiber.setCurrentPhase(null);
-    } else {
-      nextChildren = render(nextProps, ref);
-    }
-
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextProps);
-    return workInProgress.child;
-  }
-
-  function updateFragment(current, workInProgress) {
-    const nextChildren = workInProgress.pendingProps;
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (workInProgress.memoizedProps === nextChildren) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextChildren);
-    return workInProgress.child;
-  }
-
-  function updateMode(current, workInProgress) {
-    const nextChildren = workInProgress.pendingProps.children;
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (
-      nextChildren === null ||
-      workInProgress.memoizedProps === nextChildren
-    ) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextChildren);
-    return workInProgress.child;
-  }
-
-  function updateProfiler(current, workInProgress) {
-    const nextProps = workInProgress.pendingProps;
-    if (enableProfilerTimer) {
-      // Start render timer here and push start time onto queue
-      markActualRenderTimeStarted(workInProgress);
-
-      // Let the "complete" phase know to stop the timer,
-      // And the scheduler to record the measured time.
-      workInProgress.effectTag |= Update;
-    }
-    if (workInProgress.memoizedProps === nextProps) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-    const nextChildren = nextProps.children;
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextProps);
-    return workInProgress.child;
-  }
-
-  function markRef(current: Fiber | null, workInProgress: Fiber) {
-    const ref = workInProgress.ref;
-    if (
-      (current === null && ref !== null) ||
-      (current !== null && current.ref !== ref)
-    ) {
-      // Schedule a Ref effect
-      workInProgress.effectTag |= Ref;
-    }
-  }
-
-  function updateFunctionalComponent(current, workInProgress) {
-    const fn = workInProgress.type;
-    const nextProps = workInProgress.pendingProps;
-
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else {
-      if (workInProgress.memoizedProps === nextProps) {
-        return bailoutOnAlreadyFinishedWork(current, workInProgress);
-      }
-      // TODO: consider bringing fn.shouldComponentUpdate() back.
-      // It used to be here.
-    }
-
-    const unmaskedContext = getUnmaskedContext(workInProgress);
-    const context = getMaskedContext(workInProgress, unmaskedContext);
-
-    let nextChildren;
-
-    if (__DEV__) {
-      ReactCurrentOwner.current = workInProgress;
-      ReactDebugCurrentFiber.setCurrentPhase('render');
-      nextChildren = fn(nextProps, context);
-      ReactDebugCurrentFiber.setCurrentPhase(null);
-    } else {
-      nextChildren = fn(nextProps, context);
-    }
-    // React DevTools reads this flag.
-    workInProgress.effectTag |= PerformedWork;
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextProps);
-    return workInProgress.child;
-  }
-
-  function updateClassComponent(
-    current: Fiber | null,
-    workInProgress: Fiber,
-    renderExpirationTime: ExpirationTime,
-  ) {
     // Push context providers early to prevent context stack mismatches.
     // During mounting we don't know the child context yet as the instance doesn't exist.
     // We will invalidate the child context in finishClassComponent() right after rendering.
     const hasContext = pushLegacyContextProvider(workInProgress);
-    let shouldUpdate;
-    if (current === null) {
-      if (workInProgress.stateNode === null) {
-        // In the initial pass we might need to construct the instance.
-        constructClassInstance(
-          workInProgress,
-          workInProgress.pendingProps,
-          renderExpirationTime,
-        );
-        mountClassInstance(workInProgress, renderExpirationTime);
-
-        shouldUpdate = true;
-      } else {
-        // In a resume, we'll already have an instance we can reuse.
-        shouldUpdate = resumeMountClassInstance(
-          workInProgress,
-          renderExpirationTime,
-        );
-      }
-    } else {
-      shouldUpdate = updateClassInstance(
-        current,
-        workInProgress,
-        renderExpirationTime,
-      );
-    }
+    adoptClassInstance(workInProgress, value);
+    mountClassInstance(workInProgress, renderExpirationTime);
     return finishClassComponent(
       current,
       workInProgress,
-      shouldUpdate,
+      true,
       hasContext,
       renderExpirationTime,
     );
-  }
+  } else {
+    // Proceed under the assumption that this is a functional component
+    workInProgress.tag = FunctionalComponent;
+    if (__DEV__) {
+      const Component = workInProgress.type;
 
-  function finishClassComponent(
-    current: Fiber | null,
-    workInProgress: Fiber,
-    shouldUpdate: boolean,
-    hasContext: boolean,
-    renderExpirationTime: ExpirationTime,
-  ) {
-    // Refs should update even if shouldComponentUpdate returns false
-    markRef(current, workInProgress);
+      if (Component) {
+        warning(
+          !Component.childContextTypes,
+          '%s(...): childContextTypes cannot be defined on a functional component.',
+          Component.displayName || Component.name || 'Component',
+        );
+      }
+      if (workInProgress.ref !== null) {
+        let info = '';
+        const ownerName = ReactDebugCurrentFiber.getCurrentFiberOwnerName();
+        if (ownerName) {
+          info += '\n\nCheck the render method of `' + ownerName + '`.';
+        }
 
-    const didCaptureError =
-      (workInProgress.effectTag & DidCapture) !== NoEffect;
-
-    if (!shouldUpdate && !didCaptureError) {
-      // Context providers should defer to sCU for rendering
-      if (hasContext) {
-        invalidateContextProvider(workInProgress, false);
+        let warningKey = ownerName || workInProgress._debugID || '';
+        const debugSource = workInProgress._debugSource;
+        if (debugSource) {
+          warningKey = debugSource.fileName + ':' + debugSource.lineNumber;
+        }
+        if (!didWarnAboutStatelessRefs[warningKey]) {
+          didWarnAboutStatelessRefs[warningKey] = true;
+          warning(
+            false,
+            'Stateless function components cannot be given refs. ' +
+              'Attempts to access this ref will fail.%s%s',
+            info,
+            ReactDebugCurrentFiber.getCurrentFiberStackAddendum(),
+          );
+        }
       }
 
+      if (typeof fn.getDerivedStateFromProps === 'function') {
+        const componentName = getComponentName(workInProgress) || 'Unknown';
+
+        if (!didWarnAboutGetDerivedStateOnFunctionalComponent[componentName]) {
+          warning(
+            false,
+            '%s: Stateless functional components do not support getDerivedStateFromProps.',
+            componentName,
+          );
+          didWarnAboutGetDerivedStateOnFunctionalComponent[
+            componentName
+          ] = true;
+        }
+      }
+    }
+    reconcileChildren(current, workInProgress, value);
+    memoizeProps(workInProgress, props);
+    return workInProgress.child;
+  }
+}
+
+function updateTimeoutComponent(current, workInProgress, renderExpirationTime) {
+  if (enableSuspense) {
+    const nextProps = workInProgress.pendingProps;
+    const prevProps = workInProgress.memoizedProps;
+
+    const prevDidTimeout = workInProgress.memoizedState;
+
+    // Check if we already attempted to render the normal state. If we did,
+    // and we timed out, render the placeholder state.
+    const alreadyCaptured =
+      (workInProgress.effectTag & DidCapture) === NoEffect;
+    const nextDidTimeout = !alreadyCaptured;
+
+    if (hasLegacyContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (nextProps === prevProps && nextDidTimeout === prevDidTimeout) {
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
 
-    const ctor = workInProgress.type;
-    const instance = workInProgress.stateNode;
-
-    // Rerender
-    ReactCurrentOwner.current = workInProgress;
-    let nextChildren;
-    if (
-      didCaptureError &&
-      (!enableGetDerivedStateFromCatch ||
-        typeof ctor.getDerivedStateFromCatch !== 'function')
-    ) {
-      // If we captured an error, but getDerivedStateFrom catch is not defined,
-      // unmount all the children. componentDidCatch will schedule an update to
-      // re-render a fallback. This is temporary until we migrate everyone to
-      // the new API.
-      // TODO: Warn in a future release.
-      nextChildren = null;
-
-      if (enableProfilerTimer) {
-        stopBaseRenderTimerIfRunning();
-      }
-    } else {
-      if (__DEV__) {
-        ReactDebugCurrentFiber.setCurrentPhase('render');
-        nextChildren = instance.render();
-        if (
-          debugRenderPhaseSideEffects ||
-          (debugRenderPhaseSideEffectsForStrictMode &&
-            workInProgress.mode & StrictMode)
-        ) {
-          instance.render();
-        }
-        ReactDebugCurrentFiber.setCurrentPhase(null);
-      } else {
-        nextChildren = instance.render();
-      }
-    }
-
-    // React DevTools reads this flag.
-    workInProgress.effectTag |= PerformedWork;
-    if (didCaptureError) {
-      // If we're recovering from an error, reconcile twice: first to delete
-      // all the existing children.
-      reconcileChildrenAtExpirationTime(
-        current,
-        workInProgress,
-        null,
-        renderExpirationTime,
-      );
-      workInProgress.child = null;
-      // Now we can continue reconciling like normal. This has the effect of
-      // remounting all children regardless of whether their their
-      // identity matches.
-    }
-    reconcileChildrenAtExpirationTime(
-      current,
-      workInProgress,
-      nextChildren,
-      renderExpirationTime,
-    );
-    // Memoize props and state using the values we just used to render.
-    // TODO: Restructure so we never read values from the instance.
-    memoizeState(workInProgress, instance.state);
-    memoizeProps(workInProgress, instance.props);
-
-    // The context might have changed so we need to recalculate it.
-    if (hasContext) {
-      invalidateContextProvider(workInProgress, true);
-    }
-
+    const render = nextProps.children;
+    const nextChildren = render(nextDidTimeout);
+    workInProgress.memoizedProps = nextProps;
+    workInProgress.memoizedState = nextDidTimeout;
+    reconcileChildren(current, workInProgress, nextChildren);
     return workInProgress.child;
+  } else {
+    return null;
   }
+}
 
-  function pushHostRootContext(workInProgress) {
-    const root = (workInProgress.stateNode: FiberRoot);
-    if (root.pendingContext) {
-      pushTopLevelContextObject(
-        workInProgress,
-        root.pendingContext,
-        root.pendingContext !== root.context,
-      );
-    } else if (root.context) {
-      // Should always be set
-      pushTopLevelContextObject(workInProgress, root.context, false);
-    }
-    pushHostContainer(workInProgress, root.containerInfo);
-  }
-
-  function updateHostRoot(current, workInProgress, renderExpirationTime) {
-    pushHostRootContext(workInProgress);
-    let updateQueue = workInProgress.updateQueue;
-    if (updateQueue !== null) {
-      const nextProps = workInProgress.pendingProps;
-      const prevState = workInProgress.memoizedState;
-      const prevChildren = prevState !== null ? prevState.element : null;
-      processUpdateQueue(
-        workInProgress,
-        updateQueue,
-        nextProps,
-        null,
-        renderExpirationTime,
-      );
-      const nextState = workInProgress.memoizedState;
-      // Caution: React DevTools currently depends on this property
-      // being called "element".
-      const nextChildren = nextState.element;
-
-      if (nextChildren === prevChildren) {
-        // If the state is the same as before, that's a bailout because we had
-        // no work that expires at this time.
-        resetHydrationState();
-        return bailoutOnAlreadyFinishedWork(current, workInProgress);
-      }
-      const root: FiberRoot = workInProgress.stateNode;
-      if (
-        (current === null || current.child === null) &&
-        root.hydrate &&
-        enterHydrationState(workInProgress)
-      ) {
-        // If we don't have any current children this might be the first pass.
-        // We always try to hydrate. If this isn't a hydration pass there won't
-        // be any children to hydrate which is effectively the same thing as
-        // not hydrating.
-
-        // This is a bit of a hack. We track the host root as a placement to
-        // know that we're currently in a mounting state. That way isMounted
-        // works as expected. We must reset this before committing.
-        // TODO: Delete this when we delete isMounted and findDOMNode.
-        workInProgress.effectTag |= Placement;
-
-        // Ensure that children mount into this root without tracking
-        // side-effects. This ensures that we don't store Placement effects on
-        // nodes that will be hydrated.
-        workInProgress.child = mountChildFibers(
-          workInProgress,
-          null,
-          nextChildren,
-          renderExpirationTime,
-        );
-      } else {
-        // Otherwise reset hydration state in case we aborted and resumed another
-        // root.
-        resetHydrationState();
-        reconcileChildren(current, workInProgress, nextChildren);
-      }
-      return workInProgress.child;
-    }
-    resetHydrationState();
-    // If there is no update queue, that's a bailout because the root has no props.
+function updatePortalComponent(current, workInProgress, renderExpirationTime) {
+  pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
+  const nextChildren = workInProgress.pendingProps;
+  if (hasLegacyContextChanged()) {
+    // Normally we can bail out on props equality but if context has changed
+    // we don't do the bailout and we have to reuse existing props instead.
+  } else if (workInProgress.memoizedProps === nextChildren) {
     return bailoutOnAlreadyFinishedWork(current, workInProgress);
   }
 
-  function updateHostComponent(current, workInProgress, renderExpirationTime) {
-    pushHostContext(workInProgress);
-
-    if (current === null) {
-      tryToClaimNextHydratableInstance(workInProgress);
-    }
-
-    const type = workInProgress.type;
-    const memoizedProps = workInProgress.memoizedProps;
-    const nextProps = workInProgress.pendingProps;
-    const prevProps = current !== null ? current.memoizedProps : null;
-
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (memoizedProps === nextProps) {
-      const isHidden =
-        workInProgress.mode & AsyncMode &&
-        shouldDeprioritizeSubtree(type, nextProps);
-      if (isHidden) {
-        // Before bailing out, make sure we've deprioritized a hidden component.
-        workInProgress.expirationTime = Never;
-      }
-      if (!isHidden || renderExpirationTime !== Never) {
-        return bailoutOnAlreadyFinishedWork(current, workInProgress);
-      }
-      // If we're rendering a hidden node at hidden priority, don't bailout. The
-      // parent is complete, but the children may not be.
-    }
-
-    let nextChildren = nextProps.children;
-    const isDirectTextChild = shouldSetTextContent(type, nextProps);
-
-    if (isDirectTextChild) {
-      // We special case a direct text child of a host node. This is a common
-      // case. We won't handle it as a reified child. We will instead handle
-      // this in the host environment that also have access to this prop. That
-      // avoids allocating another HostText fiber and traversing it.
-      nextChildren = null;
-    } else if (prevProps && shouldSetTextContent(type, prevProps)) {
-      // If we're switching from a direct text child to a normal child, or to
-      // empty, we need to schedule the text content to be reset.
-      workInProgress.effectTag |= ContentReset;
-    }
-
-    markRef(current, workInProgress);
-
-    // Check the host config to see if the children are offscreen/hidden.
-    if (
-      renderExpirationTime !== Never &&
-      workInProgress.mode & AsyncMode &&
-      shouldDeprioritizeSubtree(type, nextProps)
-    ) {
-      // Down-prioritize the children.
-      workInProgress.expirationTime = Never;
-      // Bailout and come back to this fiber later.
-      workInProgress.memoizedProps = nextProps;
-      return null;
-    }
-
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextProps);
-    return workInProgress.child;
-  }
-
-  function updateHostText(current, workInProgress) {
-    if (current === null) {
-      tryToClaimNextHydratableInstance(workInProgress);
-    }
-    const nextProps = workInProgress.pendingProps;
-    memoizeProps(workInProgress, nextProps);
-    // Nothing to do here. This is terminal. We'll do the completion step
-    // immediately after.
-    return null;
-  }
-
-  function mountIndeterminateComponent(
-    current,
-    workInProgress,
-    renderExpirationTime,
-  ) {
-    invariant(
-      current === null,
-      'An indeterminate component should never have mounted. This error is ' +
-        'likely caused by a bug in React. Please file an issue.',
+  if (current === null) {
+    // Portals are special because we don't append the children during mount
+    // but at commit. Therefore we need to track insertions which the normal
+    // flow doesn't do during mount. This doesn't happen at the root because
+    // the root always starts with a "current" with a null child.
+    // TODO: Consider unifying this with how the root works.
+    workInProgress.child = reconcileChildFibers(
+      workInProgress,
+      null,
+      nextChildren,
+      renderExpirationTime,
     );
-    const fn = workInProgress.type;
-    const props = workInProgress.pendingProps;
-    const unmaskedContext = getUnmaskedContext(workInProgress);
-    const context = getMaskedContext(workInProgress, unmaskedContext);
-
-    let value;
-
-    if (__DEV__) {
-      if (fn.prototype && typeof fn.prototype.render === 'function') {
-        const componentName = getComponentName(workInProgress) || 'Unknown';
-
-        if (!didWarnAboutBadClass[componentName]) {
-          warning(
-            false,
-            "The <%s /> component appears to have a render method, but doesn't extend React.Component. " +
-              'This is likely to cause errors. Change %s to extend React.Component instead.',
-            componentName,
-            componentName,
-          );
-          didWarnAboutBadClass[componentName] = true;
-        }
-      }
-      ReactCurrentOwner.current = workInProgress;
-      value = fn(props, context);
-    } else {
-      value = fn(props, context);
-    }
-    // React DevTools reads this flag.
-    workInProgress.effectTag |= PerformedWork;
-
-    if (
-      typeof value === 'object' &&
-      value !== null &&
-      typeof value.render === 'function' &&
-      value.$$typeof === undefined
-    ) {
-      const Component = workInProgress.type;
-
-      // Proceed under the assumption that this is a class instance
-      workInProgress.tag = ClassComponent;
-
-      workInProgress.memoizedState =
-        value.state !== null && value.state !== undefined ? value.state : null;
-
-      const getDerivedStateFromProps = Component.getDerivedStateFromProps;
-      if (typeof getDerivedStateFromProps === 'function') {
-        applyDerivedStateFromProps(
-          workInProgress,
-          getDerivedStateFromProps,
-          props,
-        );
-      }
-
-      // Push context providers early to prevent context stack mismatches.
-      // During mounting we don't know the child context yet as the instance doesn't exist.
-      // We will invalidate the child context in finishClassComponent() right after rendering.
-      const hasContext = pushLegacyContextProvider(workInProgress);
-      adoptClassInstance(workInProgress, value);
-      mountClassInstance(workInProgress, renderExpirationTime);
-      return finishClassComponent(
-        current,
-        workInProgress,
-        true,
-        hasContext,
-        renderExpirationTime,
-      );
-    } else {
-      // Proceed under the assumption that this is a functional component
-      workInProgress.tag = FunctionalComponent;
-      if (__DEV__) {
-        const Component = workInProgress.type;
-
-        if (Component) {
-          warning(
-            !Component.childContextTypes,
-            '%s(...): childContextTypes cannot be defined on a functional component.',
-            Component.displayName || Component.name || 'Component',
-          );
-        }
-        if (workInProgress.ref !== null) {
-          let info = '';
-          const ownerName = ReactDebugCurrentFiber.getCurrentFiberOwnerName();
-          if (ownerName) {
-            info += '\n\nCheck the render method of `' + ownerName + '`.';
-          }
-
-          let warningKey = ownerName || workInProgress._debugID || '';
-          const debugSource = workInProgress._debugSource;
-          if (debugSource) {
-            warningKey = debugSource.fileName + ':' + debugSource.lineNumber;
-          }
-          if (!didWarnAboutStatelessRefs[warningKey]) {
-            didWarnAboutStatelessRefs[warningKey] = true;
-            warning(
-              false,
-              'Stateless function components cannot be given refs. ' +
-                'Attempts to access this ref will fail.%s%s',
-              info,
-              ReactDebugCurrentFiber.getCurrentFiberStackAddendum(),
-            );
-          }
-        }
-
-        if (typeof fn.getDerivedStateFromProps === 'function') {
-          const componentName = getComponentName(workInProgress) || 'Unknown';
-
-          if (
-            !didWarnAboutGetDerivedStateOnFunctionalComponent[componentName]
-          ) {
-            warning(
-              false,
-              '%s: Stateless functional components do not support getDerivedStateFromProps.',
-              componentName,
-            );
-            didWarnAboutGetDerivedStateOnFunctionalComponent[
-              componentName
-            ] = true;
-          }
-        }
-      }
-      reconcileChildren(current, workInProgress, value);
-      memoizeProps(workInProgress, props);
-      return workInProgress.child;
-    }
+    memoizeProps(workInProgress, nextChildren);
+  } else {
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextChildren);
   }
+  return workInProgress.child;
+}
 
-  function updateTimeoutComponent(
-    current,
-    workInProgress,
-    renderExpirationTime,
-  ) {
-    if (enableSuspense) {
-      const nextProps = workInProgress.pendingProps;
-      const prevProps = workInProgress.memoizedProps;
-
-      const prevDidTimeout = workInProgress.memoizedState;
-
-      // Check if we already attempted to render the normal state. If we did,
-      // and we timed out, render the placeholder state.
-      const alreadyCaptured =
-        (workInProgress.effectTag & DidCapture) === NoEffect;
-      const nextDidTimeout = !alreadyCaptured;
-
-      if (hasLegacyContextChanged()) {
-        // Normally we can bail out on props equality but if context has changed
-        // we don't do the bailout and we have to reuse existing props instead.
-      } else if (nextProps === prevProps && nextDidTimeout === prevDidTimeout) {
-        return bailoutOnAlreadyFinishedWork(current, workInProgress);
-      }
-
-      const render = nextProps.children;
-      const nextChildren = render(nextDidTimeout);
-      workInProgress.memoizedProps = nextProps;
-      workInProgress.memoizedState = nextDidTimeout;
-      reconcileChildren(current, workInProgress, nextChildren);
-      return workInProgress.child;
-    } else {
-      return null;
-    }
+function propagateContextChange<V>(
+  workInProgress: Fiber,
+  context: ReactContext<V>,
+  changedBits: number,
+  renderExpirationTime: ExpirationTime,
+): void {
+  let fiber = workInProgress.child;
+  if (fiber !== null) {
+    // Set the return pointer of the child to the work-in-progress fiber.
+    fiber.return = workInProgress;
   }
-
-  function updatePortalComponent(
-    current,
-    workInProgress,
-    renderExpirationTime,
-  ) {
-    pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
-    const nextChildren = workInProgress.pendingProps;
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (workInProgress.memoizedProps === nextChildren) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-
-    if (current === null) {
-      // Portals are special because we don't append the children during mount
-      // but at commit. Therefore we need to track insertions which the normal
-      // flow doesn't do during mount. This doesn't happen at the root because
-      // the root always starts with a "current" with a null child.
-      // TODO: Consider unifying this with how the root works.
-      workInProgress.child = reconcileChildFibers(
-        workInProgress,
-        null,
-        nextChildren,
-        renderExpirationTime,
-      );
-      memoizeProps(workInProgress, nextChildren);
-    } else {
-      reconcileChildren(current, workInProgress, nextChildren);
-      memoizeProps(workInProgress, nextChildren);
-    }
-    return workInProgress.child;
-  }
-
-  function propagateContextChange<V>(
-    workInProgress: Fiber,
-    context: ReactContext<V>,
-    changedBits: number,
-    renderExpirationTime: ExpirationTime,
-  ): void {
-    let fiber = workInProgress.child;
-    if (fiber !== null) {
-      // Set the return pointer of the child to the work-in-progress fiber.
-      fiber.return = workInProgress;
-    }
-    while (fiber !== null) {
-      let nextFiber;
-      // Visit this fiber.
-      switch (fiber.tag) {
-        case ContextConsumer:
-          // Check if the context matches.
-          const observedBits: number = fiber.stateNode | 0;
-          if (fiber.type === context && (observedBits & changedBits) !== 0) {
-            // Update the expiration time of all the ancestors, including
-            // the alternates.
-            let node = fiber;
-            while (node !== null) {
-              const alternate = node.alternate;
+  while (fiber !== null) {
+    let nextFiber;
+    // Visit this fiber.
+    switch (fiber.tag) {
+      case ContextConsumer:
+        // Check if the context matches.
+        const observedBits: number = fiber.stateNode | 0;
+        if (fiber.type === context && (observedBits & changedBits) !== 0) {
+          // Update the expiration time of all the ancestors, including
+          // the alternates.
+          let node = fiber;
+          while (node !== null) {
+            const alternate = node.alternate;
+            if (
+              node.expirationTime === NoWork ||
+              node.expirationTime > renderExpirationTime
+            ) {
+              node.expirationTime = renderExpirationTime;
               if (
-                node.expirationTime === NoWork ||
-                node.expirationTime > renderExpirationTime
-              ) {
-                node.expirationTime = renderExpirationTime;
-                if (
-                  alternate !== null &&
-                  (alternate.expirationTime === NoWork ||
-                    alternate.expirationTime > renderExpirationTime)
-                ) {
-                  alternate.expirationTime = renderExpirationTime;
-                }
-              } else if (
                 alternate !== null &&
                 (alternate.expirationTime === NoWork ||
                   alternate.expirationTime > renderExpirationTime)
               ) {
                 alternate.expirationTime = renderExpirationTime;
-              } else {
-                // Neither alternate was updated, which means the rest of the
-                // ancestor path already has sufficient priority.
-                break;
               }
-              node = node.return;
+            } else if (
+              alternate !== null &&
+              (alternate.expirationTime === NoWork ||
+                alternate.expirationTime > renderExpirationTime)
+            ) {
+              alternate.expirationTime = renderExpirationTime;
+            } else {
+              // Neither alternate was updated, which means the rest of the
+              // ancestor path already has sufficient priority.
+              break;
             }
-            // Don't scan deeper than a matching consumer. When we render the
-            // consumer, we'll continue scanning from that point. This way the
-            // scanning work is time-sliced.
-            nextFiber = null;
-          } else {
-            // Traverse down.
-            nextFiber = fiber.child;
+            node = node.return;
           }
-          break;
-        case ContextProvider:
-          // Don't scan deeper if this is a matching provider
-          nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
-          break;
-        default:
+          // Don't scan deeper than a matching consumer. When we render the
+          // consumer, we'll continue scanning from that point. This way the
+          // scanning work is time-sliced.
+          nextFiber = null;
+        } else {
           // Traverse down.
           nextFiber = fiber.child;
-          break;
-      }
-      if (nextFiber !== null) {
-        // Set the return pointer of the child to the work-in-progress fiber.
-        nextFiber.return = fiber;
-      } else {
-        // No child. Traverse to next sibling.
-        nextFiber = fiber;
-        while (nextFiber !== null) {
-          if (nextFiber === workInProgress) {
-            // We're back to the root of this subtree. Exit.
-            nextFiber = null;
-            break;
-          }
-          let sibling = nextFiber.sibling;
-          if (sibling !== null) {
-            // Set the return pointer of the sibling to the work-in-progress fiber.
-            sibling.return = nextFiber.return;
-            nextFiber = sibling;
-            break;
-          }
-          // No more siblings. Traverse up.
-          nextFiber = nextFiber.return;
         }
+        break;
+      case ContextProvider:
+        // Don't scan deeper if this is a matching provider
+        nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
+        break;
+      default:
+        // Traverse down.
+        nextFiber = fiber.child;
+        break;
+    }
+    if (nextFiber !== null) {
+      // Set the return pointer of the child to the work-in-progress fiber.
+      nextFiber.return = fiber;
+    } else {
+      // No child. Traverse to next sibling.
+      nextFiber = fiber;
+      while (nextFiber !== null) {
+        if (nextFiber === workInProgress) {
+          // We're back to the root of this subtree. Exit.
+          nextFiber = null;
+          break;
+        }
+        let sibling = nextFiber.sibling;
+        if (sibling !== null) {
+          // Set the return pointer of the sibling to the work-in-progress fiber.
+          sibling.return = nextFiber.return;
+          nextFiber = sibling;
+          break;
+        }
+        // No more siblings. Traverse up.
+        nextFiber = nextFiber.return;
       }
-      fiber = nextFiber;
+    }
+    fiber = nextFiber;
+  }
+}
+
+function updateContextProvider(current, workInProgress, renderExpirationTime) {
+  const providerType: ReactProviderType<any> = workInProgress.type;
+  const context: ReactContext<any> = providerType._context;
+
+  const newProps = workInProgress.pendingProps;
+  const oldProps = workInProgress.memoizedProps;
+  let canBailOnProps = true;
+
+  if (hasLegacyContextChanged()) {
+    canBailOnProps = false;
+    // Normally we can bail out on props equality but if context has changed
+    // we don't do the bailout and we have to reuse existing props instead.
+  } else if (oldProps === newProps) {
+    workInProgress.stateNode = 0;
+    pushProvider(workInProgress);
+    return bailoutOnAlreadyFinishedWork(current, workInProgress);
+  }
+
+  const newValue = newProps.value;
+  workInProgress.memoizedProps = newProps;
+
+  if (__DEV__) {
+    const providerPropTypes = workInProgress.type.propTypes;
+
+    if (providerPropTypes) {
+      checkPropTypes(
+        providerPropTypes,
+        newProps,
+        'prop',
+        'Context.Provider',
+        getCurrentFiberStackAddendum,
+      );
     }
   }
 
-  function updateContextProvider(
-    current,
-    workInProgress,
-    renderExpirationTime,
-  ) {
-    const providerType: ReactProviderType<any> = workInProgress.type;
-    const context: ReactContext<any> = providerType._context;
-
-    const newProps = workInProgress.pendingProps;
-    const oldProps = workInProgress.memoizedProps;
-    let canBailOnProps = true;
-
-    if (hasLegacyContextChanged()) {
-      canBailOnProps = false;
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (oldProps === newProps) {
-      workInProgress.stateNode = 0;
-      pushProvider(workInProgress);
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-
-    const newValue = newProps.value;
-    workInProgress.memoizedProps = newProps;
-
-    if (__DEV__) {
-      const providerPropTypes = workInProgress.type.propTypes;
-
-      if (providerPropTypes) {
-        checkPropTypes(
-          providerPropTypes,
-          newProps,
-          'prop',
-          'Context.Provider',
-          getCurrentFiberStackAddendum,
-        );
+  let changedBits: number;
+  if (oldProps === null) {
+    // Initial render
+    changedBits = MAX_SIGNED_31_BIT_INT;
+  } else {
+    if (oldProps.value === newProps.value) {
+      // No change. Bailout early if children are the same.
+      if (oldProps.children === newProps.children && canBailOnProps) {
+        workInProgress.stateNode = 0;
+        pushProvider(workInProgress);
+        return bailoutOnAlreadyFinishedWork(current, workInProgress);
       }
-    }
-
-    let changedBits: number;
-    if (oldProps === null) {
-      // Initial render
-      changedBits = MAX_SIGNED_31_BIT_INT;
+      changedBits = 0;
     } else {
-      if (oldProps.value === newProps.value) {
+      const oldValue = oldProps.value;
+      // Use Object.is to compare the new context value to the old value.
+      // Inlined Object.is polyfill.
+      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
+      if (
+        (oldValue === newValue &&
+          (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
+        (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
+      ) {
         // No change. Bailout early if children are the same.
         if (oldProps.children === newProps.children && canBailOnProps) {
           workInProgress.stateNode = 0;
@@ -954,139 +923,118 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
         }
         changedBits = 0;
       } else {
-        const oldValue = oldProps.value;
-        // Use Object.is to compare the new context value to the old value.
-        // Inlined Object.is polyfill.
-        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
-        if (
-          (oldValue === newValue &&
-            (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
-          (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
-        ) {
+        changedBits =
+          typeof context._calculateChangedBits === 'function'
+            ? context._calculateChangedBits(oldValue, newValue)
+            : MAX_SIGNED_31_BIT_INT;
+        if (__DEV__) {
+          warning(
+            (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
+            'calculateChangedBits: Expected the return value to be a ' +
+              '31-bit integer. Instead received: %s',
+            changedBits,
+          );
+        }
+        changedBits |= 0;
+
+        if (changedBits === 0) {
           // No change. Bailout early if children are the same.
           if (oldProps.children === newProps.children && canBailOnProps) {
             workInProgress.stateNode = 0;
             pushProvider(workInProgress);
             return bailoutOnAlreadyFinishedWork(current, workInProgress);
           }
-          changedBits = 0;
         } else {
-          changedBits =
-            typeof context._calculateChangedBits === 'function'
-              ? context._calculateChangedBits(oldValue, newValue)
-              : MAX_SIGNED_31_BIT_INT;
-          if (__DEV__) {
-            warning(
-              (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
-              'calculateChangedBits: Expected the return value to be a ' +
-                '31-bit integer. Instead received: %s',
-              changedBits,
-            );
-          }
-          changedBits |= 0;
-
-          if (changedBits === 0) {
-            // No change. Bailout early if children are the same.
-            if (oldProps.children === newProps.children && canBailOnProps) {
-              workInProgress.stateNode = 0;
-              pushProvider(workInProgress);
-              return bailoutOnAlreadyFinishedWork(current, workInProgress);
-            }
-          } else {
-            propagateContextChange(
-              workInProgress,
-              context,
-              changedBits,
-              renderExpirationTime,
-            );
-          }
+          propagateContextChange(
+            workInProgress,
+            context,
+            changedBits,
+            renderExpirationTime,
+          );
         }
       }
     }
-
-    workInProgress.stateNode = changedBits;
-    pushProvider(workInProgress);
-
-    const newChildren = newProps.children;
-    reconcileChildren(current, workInProgress, newChildren);
-    return workInProgress.child;
   }
 
-  function updateContextConsumer(
-    current,
-    workInProgress,
-    renderExpirationTime,
-  ) {
-    const context: ReactContext<any> = workInProgress.type;
-    const newProps = workInProgress.pendingProps;
-    const oldProps = workInProgress.memoizedProps;
+  workInProgress.stateNode = changedBits;
+  pushProvider(workInProgress);
 
-    const newValue = getContextCurrentValue(context);
-    const changedBits = getContextChangedBits(context);
+  const newChildren = newProps.children;
+  reconcileChildren(current, workInProgress, newChildren);
+  return workInProgress.child;
+}
 
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (changedBits === 0 && oldProps === newProps) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-    workInProgress.memoizedProps = newProps;
+function updateContextConsumer(current, workInProgress, renderExpirationTime) {
+  const context: ReactContext<any> = workInProgress.type;
+  const newProps = workInProgress.pendingProps;
+  const oldProps = workInProgress.memoizedProps;
 
-    let observedBits = newProps.unstable_observedBits;
-    if (observedBits === undefined || observedBits === null) {
-      // Subscribe to all changes by default
-      observedBits = MAX_SIGNED_31_BIT_INT;
-    }
-    // Store the observedBits on the fiber's stateNode for quick access.
-    workInProgress.stateNode = observedBits;
+  const newValue = getContextCurrentValue(context);
+  const changedBits = getContextChangedBits(context);
 
-    if ((changedBits & observedBits) !== 0) {
-      // Context change propagation stops at matching consumers, for time-
-      // slicing. Continue the propagation here.
-      propagateContextChange(
-        workInProgress,
-        context,
-        changedBits,
-        renderExpirationTime,
-      );
-    } else if (oldProps === newProps) {
-      // Skip over a memoized parent with a bitmask bailout even
-      // if we began working on it because of a deeper matching child.
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-    // There is no bailout on `children` equality because we expect people
-    // to often pass a bound method as a child, but it may reference
-    // `this.state` or `this.props` (and thus needs to re-render on `setState`).
+  if (hasLegacyContextChanged()) {
+    // Normally we can bail out on props equality but if context has changed
+    // we don't do the bailout and we have to reuse existing props instead.
+  } else if (changedBits === 0 && oldProps === newProps) {
+    return bailoutOnAlreadyFinishedWork(current, workInProgress);
+  }
+  workInProgress.memoizedProps = newProps;
 
-    const render = newProps.children;
+  let observedBits = newProps.unstable_observedBits;
+  if (observedBits === undefined || observedBits === null) {
+    // Subscribe to all changes by default
+    observedBits = MAX_SIGNED_31_BIT_INT;
+  }
+  // Store the observedBits on the fiber's stateNode for quick access.
+  workInProgress.stateNode = observedBits;
 
-    if (__DEV__) {
-      warning(
-        typeof render === 'function',
-        'A context consumer was rendered with multiple children, or a child ' +
-          "that isn't a function. A context consumer expects a single child " +
-          'that is a function. If you did pass a function, make sure there ' +
-          'is no trailing or leading whitespace around it.',
-      );
-    }
+  if ((changedBits & observedBits) !== 0) {
+    // Context change propagation stops at matching consumers, for time-
+    // slicing. Continue the propagation here.
+    propagateContextChange(
+      workInProgress,
+      context,
+      changedBits,
+      renderExpirationTime,
+    );
+  } else if (oldProps === newProps) {
+    // Skip over a memoized parent with a bitmask bailout even
+    // if we began working on it because of a deeper matching child.
+    return bailoutOnAlreadyFinishedWork(current, workInProgress);
+  }
+  // There is no bailout on `children` equality because we expect people
+  // to often pass a bound method as a child, but it may reference
+  // `this.state` or `this.props` (and thus needs to re-render on `setState`).
 
-    let newChildren;
-    if (__DEV__) {
-      ReactCurrentOwner.current = workInProgress;
-      ReactDebugCurrentFiber.setCurrentPhase('render');
-      newChildren = render(newValue);
-      ReactDebugCurrentFiber.setCurrentPhase(null);
-    } else {
-      newChildren = render(newValue);
-    }
+  const render = newProps.children;
 
-    // React DevTools reads this flag.
-    workInProgress.effectTag |= PerformedWork;
-    reconcileChildren(current, workInProgress, newChildren);
-    return workInProgress.child;
+  if (__DEV__) {
+    warning(
+      typeof render === 'function',
+      'A context consumer was rendered with multiple children, or a child ' +
+        "that isn't a function. A context consumer expects a single child " +
+        'that is a function. If you did pass a function, make sure there ' +
+        'is no trailing or leading whitespace around it.',
+    );
   }
 
-  /*
+  let newChildren;
+  if (__DEV__) {
+    ReactCurrentOwner.current = workInProgress;
+    ReactDebugCurrentFiber.setCurrentPhase('render');
+    newChildren = render(newValue);
+    ReactDebugCurrentFiber.setCurrentPhase(null);
+  } else {
+    newChildren = render(newValue);
+  }
+
+  // React DevTools reads this flag.
+  workInProgress.effectTag |= PerformedWork;
+  reconcileChildren(current, workInProgress, newChildren);
+  return workInProgress.child;
+}
+
+/*
   function reuseChildrenEffects(returnFiber : Fiber, firstChild : Fiber) {
     let child = firstChild;
     do {
@@ -1105,162 +1053,152 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
   }
   */
 
-  function bailoutOnAlreadyFinishedWork(
-    current,
-    workInProgress: Fiber,
-  ): Fiber | null {
-    cancelWorkTimer(workInProgress);
+function bailoutOnAlreadyFinishedWork(
+  current,
+  workInProgress: Fiber,
+): Fiber | null {
+  cancelWorkTimer(workInProgress);
 
-    if (enableProfilerTimer) {
-      // Don't update "base" render times for bailouts.
-      stopBaseRenderTimerIfRunning();
-    }
-
-    // TODO: We should ideally be able to bail out early if the children have no
-    // more work to do. However, since we don't have a separation of this
-    // Fiber's priority and its children yet - we don't know without doing lots
-    // of the same work we do anyway. Once we have that separation we can just
-    // bail out here if the children has no more work at this priority level.
-    // if (workInProgress.priorityOfChildren <= priorityLevel) {
-    //   // If there are side-effects in these children that have not yet been
-    //   // committed we need to ensure that they get properly transferred up.
-    //   if (current && current.child !== workInProgress.child) {
-    //     reuseChildrenEffects(workInProgress, child);
-    //   }
-    //   return null;
-    // }
-
-    cloneChildFibers(current, workInProgress);
-    return workInProgress.child;
+  if (enableProfilerTimer) {
+    // Don't update "base" render times for bailouts.
+    stopBaseRenderTimerIfRunning();
   }
 
-  function bailoutOnLowPriority(current, workInProgress) {
-    cancelWorkTimer(workInProgress);
+  // TODO: We should ideally be able to bail out early if the children have no
+  // more work to do. However, since we don't have a separation of this
+  // Fiber's priority and its children yet - we don't know without doing lots
+  // of the same work we do anyway. Once we have that separation we can just
+  // bail out here if the children has no more work at this priority level.
+  // if (workInProgress.priorityOfChildren <= priorityLevel) {
+  //   // If there are side-effects in these children that have not yet been
+  //   // committed we need to ensure that they get properly transferred up.
+  //   if (current && current.child !== workInProgress.child) {
+  //     reuseChildrenEffects(workInProgress, child);
+  //   }
+  //   return null;
+  // }
 
-    if (enableProfilerTimer) {
-      // Don't update "base" render times for bailouts.
-      stopBaseRenderTimerIfRunning();
-    }
-
-    // TODO: Handle HostComponent tags here as well and call pushHostContext()?
-    // See PR 8590 discussion for context
-    switch (workInProgress.tag) {
-      case HostRoot:
-        pushHostRootContext(workInProgress);
-        break;
-      case ClassComponent:
-        pushLegacyContextProvider(workInProgress);
-        break;
-      case HostPortal:
-        pushHostContainer(
-          workInProgress,
-          workInProgress.stateNode.containerInfo,
-        );
-        break;
-      case ContextProvider:
-        pushProvider(workInProgress);
-        break;
-      case Profiler:
-        if (enableProfilerTimer) {
-          markActualRenderTimeStarted(workInProgress);
-        }
-        break;
-    }
-    // TODO: What if this is currently in progress?
-    // How can that happen? How is this not being cloned?
-    return null;
-  }
-
-  // TODO: Delete memoizeProps/State and move to reconcile/bailout instead
-  function memoizeProps(workInProgress: Fiber, nextProps: any) {
-    workInProgress.memoizedProps = nextProps;
-  }
-
-  function memoizeState(workInProgress: Fiber, nextState: any) {
-    workInProgress.memoizedState = nextState;
-    // Don't reset the updateQueue, in case there are pending updates. Resetting
-    // is handled by processUpdateQueue.
-  }
-
-  function beginWork(
-    current: Fiber | null,
-    workInProgress: Fiber,
-    renderExpirationTime: ExpirationTime,
-  ): Fiber | null {
-    if (
-      workInProgress.expirationTime === NoWork ||
-      workInProgress.expirationTime > renderExpirationTime
-    ) {
-      return bailoutOnLowPriority(current, workInProgress);
-    }
-
-    switch (workInProgress.tag) {
-      case IndeterminateComponent:
-        return mountIndeterminateComponent(
-          current,
-          workInProgress,
-          renderExpirationTime,
-        );
-      case FunctionalComponent:
-        return updateFunctionalComponent(current, workInProgress);
-      case ClassComponent:
-        return updateClassComponent(
-          current,
-          workInProgress,
-          renderExpirationTime,
-        );
-      case HostRoot:
-        return updateHostRoot(current, workInProgress, renderExpirationTime);
-      case HostComponent:
-        return updateHostComponent(
-          current,
-          workInProgress,
-          renderExpirationTime,
-        );
-      case HostText:
-        return updateHostText(current, workInProgress);
-      case TimeoutComponent:
-        return updateTimeoutComponent(
-          current,
-          workInProgress,
-          renderExpirationTime,
-        );
-      case HostPortal:
-        return updatePortalComponent(
-          current,
-          workInProgress,
-          renderExpirationTime,
-        );
-      case ForwardRef:
-        return updateForwardRef(current, workInProgress);
-      case Fragment:
-        return updateFragment(current, workInProgress);
-      case Mode:
-        return updateMode(current, workInProgress);
-      case Profiler:
-        return updateProfiler(current, workInProgress);
-      case ContextProvider:
-        return updateContextProvider(
-          current,
-          workInProgress,
-          renderExpirationTime,
-        );
-      case ContextConsumer:
-        return updateContextConsumer(
-          current,
-          workInProgress,
-          renderExpirationTime,
-        );
-      default:
-        invariant(
-          false,
-          'Unknown unit of work tag. This error is likely caused by a bug in ' +
-            'React. Please file an issue.',
-        );
-    }
-  }
-
-  return {
-    beginWork,
-  };
+  cloneChildFibers(current, workInProgress);
+  return workInProgress.child;
 }
+
+function bailoutOnLowPriority(current, workInProgress) {
+  cancelWorkTimer(workInProgress);
+
+  if (enableProfilerTimer) {
+    // Don't update "base" render times for bailouts.
+    stopBaseRenderTimerIfRunning();
+  }
+
+  // TODO: Handle HostComponent tags here as well and call pushHostContext()?
+  // See PR 8590 discussion for context
+  switch (workInProgress.tag) {
+    case HostRoot:
+      pushHostRootContext(workInProgress);
+      break;
+    case ClassComponent:
+      pushLegacyContextProvider(workInProgress);
+      break;
+    case HostPortal:
+      pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
+      break;
+    case ContextProvider:
+      pushProvider(workInProgress);
+      break;
+    case Profiler:
+      if (enableProfilerTimer) {
+        markActualRenderTimeStarted(workInProgress);
+      }
+      break;
+  }
+  // TODO: What if this is currently in progress?
+  // How can that happen? How is this not being cloned?
+  return null;
+}
+
+// TODO: Delete memoizeProps/State and move to reconcile/bailout instead
+function memoizeProps(workInProgress: Fiber, nextProps: any) {
+  workInProgress.memoizedProps = nextProps;
+}
+
+function memoizeState(workInProgress: Fiber, nextState: any) {
+  workInProgress.memoizedState = nextState;
+  // Don't reset the updateQueue, in case there are pending updates. Resetting
+  // is handled by processUpdateQueue.
+}
+
+function beginWork(
+  current: Fiber | null,
+  workInProgress: Fiber,
+  renderExpirationTime: ExpirationTime,
+): Fiber | null {
+  if (
+    workInProgress.expirationTime === NoWork ||
+    workInProgress.expirationTime > renderExpirationTime
+  ) {
+    return bailoutOnLowPriority(current, workInProgress);
+  }
+
+  switch (workInProgress.tag) {
+    case IndeterminateComponent:
+      return mountIndeterminateComponent(
+        current,
+        workInProgress,
+        renderExpirationTime,
+      );
+    case FunctionalComponent:
+      return updateFunctionalComponent(current, workInProgress);
+    case ClassComponent:
+      return updateClassComponent(
+        current,
+        workInProgress,
+        renderExpirationTime,
+      );
+    case HostRoot:
+      return updateHostRoot(current, workInProgress, renderExpirationTime);
+    case HostComponent:
+      return updateHostComponent(current, workInProgress, renderExpirationTime);
+    case HostText:
+      return updateHostText(current, workInProgress);
+    case TimeoutComponent:
+      return updateTimeoutComponent(
+        current,
+        workInProgress,
+        renderExpirationTime,
+      );
+    case HostPortal:
+      return updatePortalComponent(
+        current,
+        workInProgress,
+        renderExpirationTime,
+      );
+    case ForwardRef:
+      return updateForwardRef(current, workInProgress);
+    case Fragment:
+      return updateFragment(current, workInProgress);
+    case Mode:
+      return updateMode(current, workInProgress);
+    case Profiler:
+      return updateProfiler(current, workInProgress);
+    case ContextProvider:
+      return updateContextProvider(
+        current,
+        workInProgress,
+        renderExpirationTime,
+      );
+    case ContextConsumer:
+      return updateContextConsumer(
+        current,
+        workInProgress,
+        renderExpirationTime,
+      );
+    default:
+      invariant(
+        false,
+        'Unknown unit of work tag. This error is likely caused by a bug in ' +
+          'React. Please file an issue.',
+      );
+  }
+}
+
+export {beginWork};
diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js
index 0a0cebddae..af1f409aa2 100644
--- a/packages/react-reconciler/src/ReactFiberClassComponent.js
+++ b/packages/react-reconciler/src/ReactFiberClassComponent.js
@@ -9,7 +9,6 @@
 
 import type {Fiber} from './ReactFiber';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
-import type {LegacyContext} from './ReactFiberContext';
 
 import {Update, Snapshot} from 'shared/ReactTypeOfSideEffect';
 import {
@@ -39,6 +38,18 @@ import {
   ForceUpdate,
 } from './ReactUpdateQueue';
 import {NoWork} from './ReactFiberExpirationTime';
+import {
+  cacheContext,
+  getMaskedContext,
+  getUnmaskedContext,
+  isContextConsumer,
+  hasContextChanged,
+} from './ReactFiberContext';
+import {
+  recalculateCurrentTime,
+  computeExpirationForFiber,
+  scheduleWork,
+} from './ReactFiberScheduler';
 
 const fakeInternalInstance = {};
 const isArray = Array.isArray;
@@ -152,545 +163,551 @@ export function applyDerivedStateFromProps(
   }
 }
 
-export default function(
-  legacyContext: LegacyContext,
-  scheduleWork: (fiber: Fiber, expirationTime: ExpirationTime) => void,
-  computeExpirationForFiber: (
-    currentTime: ExpirationTime,
-    fiber: Fiber,
-  ) => ExpirationTime,
-  memoizeProps: (workInProgress: Fiber, props: any) => void,
-  memoizeState: (workInProgress: Fiber, state: any) => void,
-  recalculateCurrentTime: () => ExpirationTime,
-) {
-  const {
-    cacheContext,
-    getMaskedContext,
-    getUnmaskedContext,
-    isContextConsumer,
-    hasContextChanged,
-  } = legacyContext;
-
-  const classComponentUpdater = {
-    isMounted,
-    enqueueSetState(inst, payload, callback) {
-      const fiber = ReactInstanceMap.get(inst);
-      const currentTime = recalculateCurrentTime();
-      const expirationTime = computeExpirationForFiber(currentTime, fiber);
-
-      const update = createUpdate(expirationTime);
-      update.payload = payload;
-      if (callback !== undefined && callback !== null) {
-        if (__DEV__) {
-          warnOnInvalidCallback(callback, 'setState');
-        }
-        update.callback = callback;
-      }
-
-      enqueueUpdate(fiber, update, expirationTime);
-      scheduleWork(fiber, expirationTime);
-    },
-    enqueueReplaceState(inst, payload, callback) {
-      const fiber = ReactInstanceMap.get(inst);
-      const currentTime = recalculateCurrentTime();
-      const expirationTime = computeExpirationForFiber(currentTime, fiber);
-
-      const update = createUpdate(expirationTime);
-      update.tag = ReplaceState;
-      update.payload = payload;
-
-      if (callback !== undefined && callback !== null) {
-        if (__DEV__) {
-          warnOnInvalidCallback(callback, 'replaceState');
-        }
-        update.callback = callback;
-      }
-
-      enqueueUpdate(fiber, update, expirationTime);
-      scheduleWork(fiber, expirationTime);
-    },
-    enqueueForceUpdate(inst, callback) {
-      const fiber = ReactInstanceMap.get(inst);
-      const currentTime = recalculateCurrentTime();
-      const expirationTime = computeExpirationForFiber(currentTime, fiber);
-
-      const update = createUpdate(expirationTime);
-      update.tag = ForceUpdate;
-
-      if (callback !== undefined && callback !== null) {
-        if (__DEV__) {
-          warnOnInvalidCallback(callback, 'forceUpdate');
-        }
-        update.callback = callback;
-      }
-
-      enqueueUpdate(fiber, update, expirationTime);
-      scheduleWork(fiber, expirationTime);
-    },
-  };
-
-  function checkShouldComponentUpdate(
-    workInProgress,
-    oldProps,
-    newProps,
-    oldState,
-    newState,
-    newContext,
-  ) {
-    const instance = workInProgress.stateNode;
-    const ctor = workInProgress.type;
-    if (typeof instance.shouldComponentUpdate === 'function') {
-      startPhaseTimer(workInProgress, 'shouldComponentUpdate');
-      const shouldUpdate = instance.shouldComponentUpdate(
-        newProps,
-        newState,
-        newContext,
-      );
-      stopPhaseTimer();
+const classComponentUpdater = {
+  isMounted,
+  enqueueSetState(inst, payload, callback) {
+    const fiber = ReactInstanceMap.get(inst);
+    const currentTime = recalculateCurrentTime();
+    const expirationTime = computeExpirationForFiber(currentTime, fiber);
 
+    const update = createUpdate(expirationTime);
+    update.payload = payload;
+    if (callback !== undefined && callback !== null) {
       if (__DEV__) {
-        warning(
-          shouldUpdate !== undefined,
-          '%s.shouldComponentUpdate(): Returned undefined instead of a ' +
-            'boolean value. Make sure to return true or false.',
-          getComponentName(workInProgress) || 'Component',
-        );
+        warnOnInvalidCallback(callback, 'setState');
       }
-
-      return shouldUpdate;
+      update.callback = callback;
     }
 
-    if (ctor.prototype && ctor.prototype.isPureReactComponent) {
-      return (
-        !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
+    enqueueUpdate(fiber, update, expirationTime);
+    scheduleWork(fiber, expirationTime);
+  },
+  enqueueReplaceState(inst, payload, callback) {
+    const fiber = ReactInstanceMap.get(inst);
+    const currentTime = recalculateCurrentTime();
+    const expirationTime = computeExpirationForFiber(currentTime, fiber);
+
+    const update = createUpdate(expirationTime);
+    update.tag = ReplaceState;
+    update.payload = payload;
+
+    if (callback !== undefined && callback !== null) {
+      if (__DEV__) {
+        warnOnInvalidCallback(callback, 'replaceState');
+      }
+      update.callback = callback;
+    }
+
+    enqueueUpdate(fiber, update, expirationTime);
+    scheduleWork(fiber, expirationTime);
+  },
+  enqueueForceUpdate(inst, callback) {
+    const fiber = ReactInstanceMap.get(inst);
+    const currentTime = recalculateCurrentTime();
+    const expirationTime = computeExpirationForFiber(currentTime, fiber);
+
+    const update = createUpdate(expirationTime);
+    update.tag = ForceUpdate;
+
+    if (callback !== undefined && callback !== null) {
+      if (__DEV__) {
+        warnOnInvalidCallback(callback, 'forceUpdate');
+      }
+      update.callback = callback;
+    }
+
+    enqueueUpdate(fiber, update, expirationTime);
+    scheduleWork(fiber, expirationTime);
+  },
+};
+
+function checkShouldComponentUpdate(
+  workInProgress,
+  oldProps,
+  newProps,
+  oldState,
+  newState,
+  newContext,
+) {
+  const instance = workInProgress.stateNode;
+  const ctor = workInProgress.type;
+  if (typeof instance.shouldComponentUpdate === 'function') {
+    startPhaseTimer(workInProgress, 'shouldComponentUpdate');
+    const shouldUpdate = instance.shouldComponentUpdate(
+      newProps,
+      newState,
+      newContext,
+    );
+    stopPhaseTimer();
+
+    if (__DEV__) {
+      warning(
+        shouldUpdate !== undefined,
+        '%s.shouldComponentUpdate(): Returned undefined instead of a ' +
+          'boolean value. Make sure to return true or false.',
+        getComponentName(workInProgress) || 'Component',
       );
     }
 
-    return true;
+    return shouldUpdate;
   }
 
-  function checkClassInstance(workInProgress: Fiber) {
-    const instance = workInProgress.stateNode;
-    const type = workInProgress.type;
-    if (__DEV__) {
-      const name = getComponentName(workInProgress) || 'Component';
-      const renderPresent = instance.render;
+  if (ctor.prototype && ctor.prototype.isPureReactComponent) {
+    return (
+      !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
+    );
+  }
 
-      if (!renderPresent) {
-        if (type.prototype && typeof type.prototype.render === 'function') {
-          warning(
-            false,
-            '%s(...): No `render` method found on the returned component ' +
-              'instance: did you accidentally return an object from the constructor?',
-            name,
-          );
-        } else {
-          warning(
-            false,
-            '%s(...): No `render` method found on the returned component ' +
-              'instance: you may have forgotten to define `render`.',
-            name,
-          );
-        }
-      }
+  return true;
+}
 
-      const noGetInitialStateOnES6 =
-        !instance.getInitialState ||
-        instance.getInitialState.isReactClassApproved ||
-        instance.state;
-      warning(
-        noGetInitialStateOnES6,
-        'getInitialState was defined on %s, a plain JavaScript class. ' +
-          'This is only supported for classes created using React.createClass. ' +
-          'Did you mean to define a state property instead?',
-        name,
-      );
-      const noGetDefaultPropsOnES6 =
-        !instance.getDefaultProps ||
-        instance.getDefaultProps.isReactClassApproved;
-      warning(
-        noGetDefaultPropsOnES6,
-        'getDefaultProps was defined on %s, a plain JavaScript class. ' +
-          'This is only supported for classes created using React.createClass. ' +
-          'Use a static property to define defaultProps instead.',
-        name,
-      );
-      const noInstancePropTypes = !instance.propTypes;
-      warning(
-        noInstancePropTypes,
-        'propTypes was defined as an instance property on %s. Use a static ' +
-          'property to define propTypes instead.',
-        name,
-      );
-      const noInstanceContextTypes = !instance.contextTypes;
-      warning(
-        noInstanceContextTypes,
-        'contextTypes was defined as an instance property on %s. Use a static ' +
-          'property to define contextTypes instead.',
-        name,
-      );
-      const noComponentShouldUpdate =
-        typeof instance.componentShouldUpdate !== 'function';
-      warning(
-        noComponentShouldUpdate,
-        '%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.',
-        name,
-      );
-      if (
-        type.prototype &&
-        type.prototype.isPureReactComponent &&
-        typeof instance.shouldComponentUpdate !== 'undefined'
-      ) {
+function checkClassInstance(workInProgress: Fiber) {
+  const instance = workInProgress.stateNode;
+  const type = workInProgress.type;
+  if (__DEV__) {
+    const name = getComponentName(workInProgress) || 'Component';
+    const renderPresent = instance.render;
+
+    if (!renderPresent) {
+      if (type.prototype && typeof type.prototype.render === 'function') {
         warning(
           false,
-          '%s has a method called shouldComponentUpdate(). ' +
-            'shouldComponentUpdate should not be used when extending React.PureComponent. ' +
-            'Please extend React.Component if shouldComponentUpdate is used.',
-          getComponentName(workInProgress) || 'A pure component',
+          '%s(...): No `render` method found on the returned component ' +
+            'instance: did you accidentally return an object from the constructor?',
+          name,
         );
-      }
-      const noComponentDidUnmount =
-        typeof instance.componentDidUnmount !== 'function';
-      warning(
-        noComponentDidUnmount,
-        '%s has a method called ' +
-          'componentDidUnmount(). But there is no such lifecycle method. ' +
-          'Did you mean componentWillUnmount()?',
-        name,
-      );
-      const noComponentDidReceiveProps =
-        typeof instance.componentDidReceiveProps !== 'function';
-      warning(
-        noComponentDidReceiveProps,
-        '%s has a method called ' +
-          'componentDidReceiveProps(). But there is no such lifecycle method. ' +
-          'If you meant to update the state in response to changing props, ' +
-          'use componentWillReceiveProps(). If you meant to fetch data or ' +
-          'run side-effects or mutations after React has updated the UI, use componentDidUpdate().',
-        name,
-      );
-      const noComponentWillRecieveProps =
-        typeof instance.componentWillRecieveProps !== 'function';
-      warning(
-        noComponentWillRecieveProps,
-        '%s has a method called ' +
-          'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
-        name,
-      );
-      const noUnsafeComponentWillRecieveProps =
-        typeof instance.UNSAFE_componentWillRecieveProps !== 'function';
-      warning(
-        noUnsafeComponentWillRecieveProps,
-        '%s has a method called ' +
-          'UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?',
-        name,
-      );
-      const hasMutatedProps = instance.props !== workInProgress.pendingProps;
-      warning(
-        instance.props === undefined || !hasMutatedProps,
-        '%s(...): When calling super() in `%s`, make sure to pass ' +
-          "up the same props that your component's constructor was passed.",
-        name,
-        name,
-      );
-      const noInstanceDefaultProps = !instance.defaultProps;
-      warning(
-        noInstanceDefaultProps,
-        'Setting defaultProps as an instance property on %s is not supported and will be ignored.' +
-          ' Instead, define defaultProps as a static property on %s.',
-        name,
-        name,
-      );
-
-      if (
-        typeof instance.getSnapshotBeforeUpdate === 'function' &&
-        typeof instance.componentDidUpdate !== 'function' &&
-        !didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.has(type)
-      ) {
-        didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.add(type);
+      } else {
         warning(
           false,
-          '%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). ' +
-            'This component defines getSnapshotBeforeUpdate() only.',
-          getComponentName(workInProgress),
-        );
-      }
-
-      const noInstanceGetDerivedStateFromProps =
-        typeof instance.getDerivedStateFromProps !== 'function';
-      warning(
-        noInstanceGetDerivedStateFromProps,
-        '%s: getDerivedStateFromProps() is defined as an instance method ' +
-          'and will be ignored. Instead, declare it as a static method.',
-        name,
-      );
-      const noInstanceGetDerivedStateFromCatch =
-        typeof instance.getDerivedStateFromCatch !== 'function';
-      warning(
-        noInstanceGetDerivedStateFromCatch,
-        '%s: getDerivedStateFromCatch() is defined as an instance method ' +
-          'and will be ignored. Instead, declare it as a static method.',
-        name,
-      );
-      const noStaticGetSnapshotBeforeUpdate =
-        typeof type.getSnapshotBeforeUpdate !== 'function';
-      warning(
-        noStaticGetSnapshotBeforeUpdate,
-        '%s: getSnapshotBeforeUpdate() is defined as a static method ' +
-          'and will be ignored. Instead, declare it as an instance method.',
-        name,
-      );
-      const state = instance.state;
-      if (state && (typeof state !== 'object' || isArray(state))) {
-        warning(false, '%s.state: must be set to an object or null', name);
-      }
-      if (typeof instance.getChildContext === 'function') {
-        warning(
-          typeof type.childContextTypes === 'object',
-          '%s.getChildContext(): childContextTypes must be defined in order to ' +
-            'use getChildContext().',
+          '%s(...): No `render` method found on the returned component ' +
+            'instance: you may have forgotten to define `render`.',
           name,
         );
       }
     }
-  }
 
-  function adoptClassInstance(workInProgress: Fiber, instance: any): void {
-    instance.updater = classComponentUpdater;
-    workInProgress.stateNode = instance;
-    // The instance needs access to the fiber so that it can schedule updates
-    ReactInstanceMap.set(instance, workInProgress);
-    if (__DEV__) {
-      instance._reactInternalInstance = fakeInternalInstance;
+    const noGetInitialStateOnES6 =
+      !instance.getInitialState ||
+      instance.getInitialState.isReactClassApproved ||
+      instance.state;
+    warning(
+      noGetInitialStateOnES6,
+      'getInitialState was defined on %s, a plain JavaScript class. ' +
+        'This is only supported for classes created using React.createClass. ' +
+        'Did you mean to define a state property instead?',
+      name,
+    );
+    const noGetDefaultPropsOnES6 =
+      !instance.getDefaultProps ||
+      instance.getDefaultProps.isReactClassApproved;
+    warning(
+      noGetDefaultPropsOnES6,
+      'getDefaultProps was defined on %s, a plain JavaScript class. ' +
+        'This is only supported for classes created using React.createClass. ' +
+        'Use a static property to define defaultProps instead.',
+      name,
+    );
+    const noInstancePropTypes = !instance.propTypes;
+    warning(
+      noInstancePropTypes,
+      'propTypes was defined as an instance property on %s. Use a static ' +
+        'property to define propTypes instead.',
+      name,
+    );
+    const noInstanceContextTypes = !instance.contextTypes;
+    warning(
+      noInstanceContextTypes,
+      'contextTypes was defined as an instance property on %s. Use a static ' +
+        'property to define contextTypes instead.',
+      name,
+    );
+    const noComponentShouldUpdate =
+      typeof instance.componentShouldUpdate !== 'function';
+    warning(
+      noComponentShouldUpdate,
+      '%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.',
+      name,
+    );
+    if (
+      type.prototype &&
+      type.prototype.isPureReactComponent &&
+      typeof instance.shouldComponentUpdate !== 'undefined'
+    ) {
+      warning(
+        false,
+        '%s has a method called shouldComponentUpdate(). ' +
+          'shouldComponentUpdate should not be used when extending React.PureComponent. ' +
+          'Please extend React.Component if shouldComponentUpdate is used.',
+        getComponentName(workInProgress) || 'A pure component',
+      );
+    }
+    const noComponentDidUnmount =
+      typeof instance.componentDidUnmount !== 'function';
+    warning(
+      noComponentDidUnmount,
+      '%s has a method called ' +
+        'componentDidUnmount(). But there is no such lifecycle method. ' +
+        'Did you mean componentWillUnmount()?',
+      name,
+    );
+    const noComponentDidReceiveProps =
+      typeof instance.componentDidReceiveProps !== 'function';
+    warning(
+      noComponentDidReceiveProps,
+      '%s has a method called ' +
+        'componentDidReceiveProps(). But there is no such lifecycle method. ' +
+        'If you meant to update the state in response to changing props, ' +
+        'use componentWillReceiveProps(). If you meant to fetch data or ' +
+        'run side-effects or mutations after React has updated the UI, use componentDidUpdate().',
+      name,
+    );
+    const noComponentWillRecieveProps =
+      typeof instance.componentWillRecieveProps !== 'function';
+    warning(
+      noComponentWillRecieveProps,
+      '%s has a method called ' +
+        'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
+      name,
+    );
+    const noUnsafeComponentWillRecieveProps =
+      typeof instance.UNSAFE_componentWillRecieveProps !== 'function';
+    warning(
+      noUnsafeComponentWillRecieveProps,
+      '%s has a method called ' +
+        'UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?',
+      name,
+    );
+    const hasMutatedProps = instance.props !== workInProgress.pendingProps;
+    warning(
+      instance.props === undefined || !hasMutatedProps,
+      '%s(...): When calling super() in `%s`, make sure to pass ' +
+        "up the same props that your component's constructor was passed.",
+      name,
+      name,
+    );
+    const noInstanceDefaultProps = !instance.defaultProps;
+    warning(
+      noInstanceDefaultProps,
+      'Setting defaultProps as an instance property on %s is not supported and will be ignored.' +
+        ' Instead, define defaultProps as a static property on %s.',
+      name,
+      name,
+    );
+
+    if (
+      typeof instance.getSnapshotBeforeUpdate === 'function' &&
+      typeof instance.componentDidUpdate !== 'function' &&
+      !didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.has(type)
+    ) {
+      didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.add(type);
+      warning(
+        false,
+        '%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). ' +
+          'This component defines getSnapshotBeforeUpdate() only.',
+        getComponentName(workInProgress),
+      );
+    }
+
+    const noInstanceGetDerivedStateFromProps =
+      typeof instance.getDerivedStateFromProps !== 'function';
+    warning(
+      noInstanceGetDerivedStateFromProps,
+      '%s: getDerivedStateFromProps() is defined as an instance method ' +
+        'and will be ignored. Instead, declare it as a static method.',
+      name,
+    );
+    const noInstanceGetDerivedStateFromCatch =
+      typeof instance.getDerivedStateFromCatch !== 'function';
+    warning(
+      noInstanceGetDerivedStateFromCatch,
+      '%s: getDerivedStateFromCatch() is defined as an instance method ' +
+        'and will be ignored. Instead, declare it as a static method.',
+      name,
+    );
+    const noStaticGetSnapshotBeforeUpdate =
+      typeof type.getSnapshotBeforeUpdate !== 'function';
+    warning(
+      noStaticGetSnapshotBeforeUpdate,
+      '%s: getSnapshotBeforeUpdate() is defined as a static method ' +
+        'and will be ignored. Instead, declare it as an instance method.',
+      name,
+    );
+    const state = instance.state;
+    if (state && (typeof state !== 'object' || isArray(state))) {
+      warning(false, '%s.state: must be set to an object or null', name);
+    }
+    if (typeof instance.getChildContext === 'function') {
+      warning(
+        typeof type.childContextTypes === 'object',
+        '%s.getChildContext(): childContextTypes must be defined in order to ' +
+          'use getChildContext().',
+        name,
+      );
+    }
+  }
+}
+
+function adoptClassInstance(workInProgress: Fiber, instance: any): void {
+  instance.updater = classComponentUpdater;
+  workInProgress.stateNode = instance;
+  // The instance needs access to the fiber so that it can schedule updates
+  ReactInstanceMap.set(instance, workInProgress);
+  if (__DEV__) {
+    instance._reactInternalInstance = fakeInternalInstance;
+  }
+}
+
+function constructClassInstance(
+  workInProgress: Fiber,
+  props: any,
+  renderExpirationTime: ExpirationTime,
+): any {
+  const ctor = workInProgress.type;
+  const unmaskedContext = getUnmaskedContext(workInProgress);
+  const needsContext = isContextConsumer(workInProgress);
+  const context = needsContext
+    ? getMaskedContext(workInProgress, unmaskedContext)
+    : emptyObject;
+
+  // Instantiate twice to help detect side-effects.
+  if (__DEV__) {
+    if (
+      debugRenderPhaseSideEffects ||
+      (debugRenderPhaseSideEffectsForStrictMode &&
+        workInProgress.mode & StrictMode)
+    ) {
+      new ctor(props, context); // eslint-disable-line no-new
     }
   }
 
-  function constructClassInstance(
-    workInProgress: Fiber,
-    props: any,
-    renderExpirationTime: ExpirationTime,
-  ): any {
-    const ctor = workInProgress.type;
-    const unmaskedContext = getUnmaskedContext(workInProgress);
-    const needsContext = isContextConsumer(workInProgress);
-    const context = needsContext
-      ? getMaskedContext(workInProgress, unmaskedContext)
-      : emptyObject;
+  const instance = new ctor(props, context);
+  const state = (workInProgress.memoizedState =
+    instance.state !== null && instance.state !== undefined
+      ? instance.state
+      : null);
+  adoptClassInstance(workInProgress, instance);
 
-    // Instantiate twice to help detect side-effects.
-    if (__DEV__) {
-      if (
-        debugRenderPhaseSideEffects ||
-        (debugRenderPhaseSideEffectsForStrictMode &&
-          workInProgress.mode & StrictMode)
-      ) {
-        new ctor(props, context); // eslint-disable-line no-new
-      }
-    }
-
-    const instance = new ctor(props, context);
-    const state = (workInProgress.memoizedState =
-      instance.state !== null && instance.state !== undefined
-        ? instance.state
-        : null);
-    adoptClassInstance(workInProgress, instance);
-
-    if (__DEV__) {
-      if (
-        typeof ctor.getDerivedStateFromProps === 'function' &&
-        state === null
-      ) {
-        const componentName = getComponentName(workInProgress) || 'Component';
-        if (!didWarnAboutUninitializedState.has(componentName)) {
-          didWarnAboutUninitializedState.add(componentName);
-          warning(
-            false,
-            '%s: Did not properly initialize state during construction. ' +
-              'Expected state to be an object, but it was %s.',
-            componentName,
-            instance.state === null ? 'null' : 'undefined',
-          );
-        }
-      }
-
-      // If new component APIs are defined, "unsafe" lifecycles won't be called.
-      // Warn about these lifecycles if they are present.
-      // Don't warn about react-lifecycles-compat polyfilled methods though.
-      if (
-        typeof ctor.getDerivedStateFromProps === 'function' ||
-        typeof instance.getSnapshotBeforeUpdate === 'function'
-      ) {
-        let foundWillMountName = null;
-        let foundWillReceivePropsName = null;
-        let foundWillUpdateName = null;
-        if (
-          typeof instance.componentWillMount === 'function' &&
-          instance.componentWillMount.__suppressDeprecationWarning !== true
-        ) {
-          foundWillMountName = 'componentWillMount';
-        } else if (typeof instance.UNSAFE_componentWillMount === 'function') {
-          foundWillMountName = 'UNSAFE_componentWillMount';
-        }
-        if (
-          typeof instance.componentWillReceiveProps === 'function' &&
-          instance.componentWillReceiveProps.__suppressDeprecationWarning !==
-            true
-        ) {
-          foundWillReceivePropsName = 'componentWillReceiveProps';
-        } else if (
-          typeof instance.UNSAFE_componentWillReceiveProps === 'function'
-        ) {
-          foundWillReceivePropsName = 'UNSAFE_componentWillReceiveProps';
-        }
-        if (
-          typeof instance.componentWillUpdate === 'function' &&
-          instance.componentWillUpdate.__suppressDeprecationWarning !== true
-        ) {
-          foundWillUpdateName = 'componentWillUpdate';
-        } else if (typeof instance.UNSAFE_componentWillUpdate === 'function') {
-          foundWillUpdateName = 'UNSAFE_componentWillUpdate';
-        }
-        if (
-          foundWillMountName !== null ||
-          foundWillReceivePropsName !== null ||
-          foundWillUpdateName !== null
-        ) {
-          const componentName = getComponentName(workInProgress) || 'Component';
-          const newApiName =
-            typeof ctor.getDerivedStateFromProps === 'function'
-              ? 'getDerivedStateFromProps()'
-              : 'getSnapshotBeforeUpdate()';
-          if (!didWarnAboutLegacyLifecyclesAndDerivedState.has(componentName)) {
-            didWarnAboutLegacyLifecyclesAndDerivedState.add(componentName);
-            warning(
-              false,
-              'Unsafe legacy lifecycles will not be called for components using new component APIs.\n\n' +
-                '%s uses %s but also contains the following legacy lifecycles:%s%s%s\n\n' +
-                'The above lifecycles should be removed. Learn more about this warning here:\n' +
-                'https://fb.me/react-async-component-lifecycle-hooks',
-              componentName,
-              newApiName,
-              foundWillMountName !== null ? `\n  ${foundWillMountName}` : '',
-              foundWillReceivePropsName !== null
-                ? `\n  ${foundWillReceivePropsName}`
-                : '',
-              foundWillUpdateName !== null ? `\n  ${foundWillUpdateName}` : '',
-            );
-          }
-        }
-      }
-    }
-
-    // Cache unmasked context so we can avoid recreating masked context unless necessary.
-    // ReactFiberContext usually updates this cache but can't for newly-created instances.
-    if (needsContext) {
-      cacheContext(workInProgress, unmaskedContext, context);
-    }
-
-    return instance;
-  }
-
-  function callComponentWillMount(workInProgress, instance) {
-    startPhaseTimer(workInProgress, 'componentWillMount');
-    const oldState = instance.state;
-
-    if (typeof instance.componentWillMount === 'function') {
-      instance.componentWillMount();
-    }
-    if (typeof instance.UNSAFE_componentWillMount === 'function') {
-      instance.UNSAFE_componentWillMount();
-    }
-
-    stopPhaseTimer();
-
-    if (oldState !== instance.state) {
-      if (__DEV__) {
+  if (__DEV__) {
+    if (typeof ctor.getDerivedStateFromProps === 'function' && state === null) {
+      const componentName = getComponentName(workInProgress) || 'Component';
+      if (!didWarnAboutUninitializedState.has(componentName)) {
+        didWarnAboutUninitializedState.add(componentName);
         warning(
           false,
-          '%s.componentWillMount(): Assigning directly to this.state is ' +
-            "deprecated (except inside a component's " +
-            'constructor). Use setState instead.',
-          getComponentName(workInProgress) || 'Component',
+          '%s: Did not properly initialize state during construction. ' +
+            'Expected state to be an object, but it was %s.',
+          componentName,
+          instance.state === null ? 'null' : 'undefined',
         );
       }
-      classComponentUpdater.enqueueReplaceState(instance, instance.state, null);
     }
-  }
 
-  function callComponentWillReceiveProps(
-    workInProgress,
-    instance,
-    newProps,
-    newContext,
-  ) {
-    const oldState = instance.state;
-    startPhaseTimer(workInProgress, 'componentWillReceiveProps');
-    if (typeof instance.componentWillReceiveProps === 'function') {
-      instance.componentWillReceiveProps(newProps, newContext);
-    }
-    if (typeof instance.UNSAFE_componentWillReceiveProps === 'function') {
-      instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
-    }
-    stopPhaseTimer();
-
-    if (instance.state !== oldState) {
-      if (__DEV__) {
+    // If new component APIs are defined, "unsafe" lifecycles won't be called.
+    // Warn about these lifecycles if they are present.
+    // Don't warn about react-lifecycles-compat polyfilled methods though.
+    if (
+      typeof ctor.getDerivedStateFromProps === 'function' ||
+      typeof instance.getSnapshotBeforeUpdate === 'function'
+    ) {
+      let foundWillMountName = null;
+      let foundWillReceivePropsName = null;
+      let foundWillUpdateName = null;
+      if (
+        typeof instance.componentWillMount === 'function' &&
+        instance.componentWillMount.__suppressDeprecationWarning !== true
+      ) {
+        foundWillMountName = 'componentWillMount';
+      } else if (typeof instance.UNSAFE_componentWillMount === 'function') {
+        foundWillMountName = 'UNSAFE_componentWillMount';
+      }
+      if (
+        typeof instance.componentWillReceiveProps === 'function' &&
+        instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
+      ) {
+        foundWillReceivePropsName = 'componentWillReceiveProps';
+      } else if (
+        typeof instance.UNSAFE_componentWillReceiveProps === 'function'
+      ) {
+        foundWillReceivePropsName = 'UNSAFE_componentWillReceiveProps';
+      }
+      if (
+        typeof instance.componentWillUpdate === 'function' &&
+        instance.componentWillUpdate.__suppressDeprecationWarning !== true
+      ) {
+        foundWillUpdateName = 'componentWillUpdate';
+      } else if (typeof instance.UNSAFE_componentWillUpdate === 'function') {
+        foundWillUpdateName = 'UNSAFE_componentWillUpdate';
+      }
+      if (
+        foundWillMountName !== null ||
+        foundWillReceivePropsName !== null ||
+        foundWillUpdateName !== null
+      ) {
         const componentName = getComponentName(workInProgress) || 'Component';
-        if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
-          didWarnAboutStateAssignmentForComponent.add(componentName);
+        const newApiName =
+          typeof ctor.getDerivedStateFromProps === 'function'
+            ? 'getDerivedStateFromProps()'
+            : 'getSnapshotBeforeUpdate()';
+        if (!didWarnAboutLegacyLifecyclesAndDerivedState.has(componentName)) {
+          didWarnAboutLegacyLifecyclesAndDerivedState.add(componentName);
           warning(
             false,
-            '%s.componentWillReceiveProps(): Assigning directly to ' +
-              "this.state is deprecated (except inside a component's " +
-              'constructor). Use setState instead.',
+            'Unsafe legacy lifecycles will not be called for components using new component APIs.\n\n' +
+              '%s uses %s but also contains the following legacy lifecycles:%s%s%s\n\n' +
+              'The above lifecycles should be removed. Learn more about this warning here:\n' +
+              'https://fb.me/react-async-component-lifecycle-hooks',
             componentName,
+            newApiName,
+            foundWillMountName !== null ? `\n  ${foundWillMountName}` : '',
+            foundWillReceivePropsName !== null
+              ? `\n  ${foundWillReceivePropsName}`
+              : '',
+            foundWillUpdateName !== null ? `\n  ${foundWillUpdateName}` : '',
           );
         }
       }
-      classComponentUpdater.enqueueReplaceState(instance, instance.state, null);
     }
   }
 
-  // Invokes the mount life-cycles on a previously never rendered instance.
-  function mountClassInstance(
-    workInProgress: Fiber,
-    renderExpirationTime: ExpirationTime,
-  ): void {
-    const ctor = workInProgress.type;
+  // Cache unmasked context so we can avoid recreating masked context unless necessary.
+  // ReactFiberContext usually updates this cache but can't for newly-created instances.
+  if (needsContext) {
+    cacheContext(workInProgress, unmaskedContext, context);
+  }
 
+  return instance;
+}
+
+function callComponentWillMount(workInProgress, instance) {
+  startPhaseTimer(workInProgress, 'componentWillMount');
+  const oldState = instance.state;
+
+  if (typeof instance.componentWillMount === 'function') {
+    instance.componentWillMount();
+  }
+  if (typeof instance.UNSAFE_componentWillMount === 'function') {
+    instance.UNSAFE_componentWillMount();
+  }
+
+  stopPhaseTimer();
+
+  if (oldState !== instance.state) {
     if (__DEV__) {
-      checkClassInstance(workInProgress);
+      warning(
+        false,
+        '%s.componentWillMount(): Assigning directly to this.state is ' +
+          "deprecated (except inside a component's " +
+          'constructor). Use setState instead.',
+        getComponentName(workInProgress) || 'Component',
+      );
+    }
+    classComponentUpdater.enqueueReplaceState(instance, instance.state, null);
+  }
+}
+
+function callComponentWillReceiveProps(
+  workInProgress,
+  instance,
+  newProps,
+  newContext,
+) {
+  const oldState = instance.state;
+  startPhaseTimer(workInProgress, 'componentWillReceiveProps');
+  if (typeof instance.componentWillReceiveProps === 'function') {
+    instance.componentWillReceiveProps(newProps, newContext);
+  }
+  if (typeof instance.UNSAFE_componentWillReceiveProps === 'function') {
+    instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+  }
+  stopPhaseTimer();
+
+  if (instance.state !== oldState) {
+    if (__DEV__) {
+      const componentName = getComponentName(workInProgress) || 'Component';
+      if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
+        didWarnAboutStateAssignmentForComponent.add(componentName);
+        warning(
+          false,
+          '%s.componentWillReceiveProps(): Assigning directly to ' +
+            "this.state is deprecated (except inside a component's " +
+            'constructor). Use setState instead.',
+          componentName,
+        );
+      }
+    }
+    classComponentUpdater.enqueueReplaceState(instance, instance.state, null);
+  }
+}
+
+// Invokes the mount life-cycles on a previously never rendered instance.
+function mountClassInstance(
+  workInProgress: Fiber,
+  renderExpirationTime: ExpirationTime,
+): void {
+  const ctor = workInProgress.type;
+
+  if (__DEV__) {
+    checkClassInstance(workInProgress);
+  }
+
+  const instance = workInProgress.stateNode;
+  const props = workInProgress.pendingProps;
+  const unmaskedContext = getUnmaskedContext(workInProgress);
+
+  instance.props = props;
+  instance.state = workInProgress.memoizedState;
+  instance.refs = emptyObject;
+  instance.context = getMaskedContext(workInProgress, unmaskedContext);
+
+  if (__DEV__) {
+    if (workInProgress.mode & StrictMode) {
+      ReactStrictModeWarnings.recordUnsafeLifecycleWarnings(
+        workInProgress,
+        instance,
+      );
     }
 
-    const instance = workInProgress.stateNode;
-    const props = workInProgress.pendingProps;
-    const unmaskedContext = getUnmaskedContext(workInProgress);
+    if (warnAboutDeprecatedLifecycles) {
+      ReactStrictModeWarnings.recordDeprecationWarnings(
+        workInProgress,
+        instance,
+      );
+    }
+  }
 
-    instance.props = props;
+  let updateQueue = workInProgress.updateQueue;
+  if (updateQueue !== null) {
+    processUpdateQueue(
+      workInProgress,
+      updateQueue,
+      props,
+      instance,
+      renderExpirationTime,
+    );
     instance.state = workInProgress.memoizedState;
-    instance.refs = emptyObject;
-    instance.context = getMaskedContext(workInProgress, unmaskedContext);
+  }
 
-    if (__DEV__) {
-      if (workInProgress.mode & StrictMode) {
-        ReactStrictModeWarnings.recordUnsafeLifecycleWarnings(
-          workInProgress,
-          instance,
-        );
-      }
+  const getDerivedStateFromProps = workInProgress.type.getDerivedStateFromProps;
+  if (typeof getDerivedStateFromProps === 'function') {
+    applyDerivedStateFromProps(workInProgress, getDerivedStateFromProps, props);
+    instance.state = workInProgress.memoizedState;
+  }
 
-      if (warnAboutDeprecatedLifecycles) {
-        ReactStrictModeWarnings.recordDeprecationWarnings(
-          workInProgress,
-          instance,
-        );
-      }
-    }
-
-    let updateQueue = workInProgress.updateQueue;
+  // In order to support react-lifecycles-compat polyfilled components,
+  // Unsafe lifecycles should not be invoked for components using the new APIs.
+  if (
+    typeof ctor.getDerivedStateFromProps !== 'function' &&
+    typeof instance.getSnapshotBeforeUpdate !== 'function' &&
+    (typeof instance.UNSAFE_componentWillMount === 'function' ||
+      typeof instance.componentWillMount === 'function')
+  ) {
+    callComponentWillMount(workInProgress, instance);
+    // If we had additional state updates during this life-cycle, let's
+    // process them now.
+    updateQueue = workInProgress.updateQueue;
     if (updateQueue !== null) {
       processUpdateQueue(
         workInProgress,
@@ -701,118 +718,233 @@ export default function(
       );
       instance.state = workInProgress.memoizedState;
     }
+  }
 
-    const getDerivedStateFromProps =
-      workInProgress.type.getDerivedStateFromProps;
-    if (typeof getDerivedStateFromProps === 'function') {
-      applyDerivedStateFromProps(
+  if (typeof instance.componentDidMount === 'function') {
+    workInProgress.effectTag |= Update;
+  }
+}
+
+function resumeMountClassInstance(
+  workInProgress: Fiber,
+  renderExpirationTime: ExpirationTime,
+): boolean {
+  const ctor = workInProgress.type;
+  const instance = workInProgress.stateNode;
+
+  const oldProps = workInProgress.memoizedProps;
+  const newProps = workInProgress.pendingProps;
+  instance.props = oldProps;
+
+  const oldContext = instance.context;
+  const newUnmaskedContext = getUnmaskedContext(workInProgress);
+  const newContext = getMaskedContext(workInProgress, newUnmaskedContext);
+
+  const getDerivedStateFromProps = ctor.getDerivedStateFromProps;
+  const hasNewLifecycles =
+    typeof getDerivedStateFromProps === 'function' ||
+    typeof instance.getSnapshotBeforeUpdate === 'function';
+
+  // Note: During these life-cycles, instance.props/instance.state are what
+  // ever the previously attempted to render - not the "current". However,
+  // during componentDidUpdate we pass the "current" props.
+
+  // In order to support react-lifecycles-compat polyfilled components,
+  // Unsafe lifecycles should not be invoked for components using the new APIs.
+  if (
+    !hasNewLifecycles &&
+    (typeof instance.UNSAFE_componentWillReceiveProps === 'function' ||
+      typeof instance.componentWillReceiveProps === 'function')
+  ) {
+    if (oldProps !== newProps || oldContext !== newContext) {
+      callComponentWillReceiveProps(
         workInProgress,
-        getDerivedStateFromProps,
-        props,
+        instance,
+        newProps,
+        newContext,
       );
-      instance.state = workInProgress.memoizedState;
     }
+  }
 
-    // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for components using the new APIs.
-    if (
-      typeof ctor.getDerivedStateFromProps !== 'function' &&
-      typeof instance.getSnapshotBeforeUpdate !== 'function' &&
-      (typeof instance.UNSAFE_componentWillMount === 'function' ||
-        typeof instance.componentWillMount === 'function')
-    ) {
-      callComponentWillMount(workInProgress, instance);
-      // If we had additional state updates during this life-cycle, let's
-      // process them now.
-      updateQueue = workInProgress.updateQueue;
-      if (updateQueue !== null) {
-        processUpdateQueue(
-          workInProgress,
-          updateQueue,
-          props,
-          instance,
-          renderExpirationTime,
-        );
-        instance.state = workInProgress.memoizedState;
-      }
-    }
+  resetHasForceUpdateBeforeProcessing();
 
+  const oldState = workInProgress.memoizedState;
+  let newState = (instance.state = oldState);
+  let updateQueue = workInProgress.updateQueue;
+  if (updateQueue !== null) {
+    processUpdateQueue(
+      workInProgress,
+      updateQueue,
+      newProps,
+      instance,
+      renderExpirationTime,
+    );
+    newState = workInProgress.memoizedState;
+  }
+  if (
+    oldProps === newProps &&
+    oldState === newState &&
+    !hasContextChanged() &&
+    !checkHasForceUpdateAfterProcessing()
+  ) {
+    // If an update was already in progress, we should schedule an Update
+    // effect even though we're bailing out, so that cWU/cDU are called.
     if (typeof instance.componentDidMount === 'function') {
       workInProgress.effectTag |= Update;
     }
+    return false;
   }
 
-  function resumeMountClassInstance(
-    workInProgress: Fiber,
-    renderExpirationTime: ExpirationTime,
-  ): boolean {
-    const ctor = workInProgress.type;
-    const instance = workInProgress.stateNode;
+  if (typeof getDerivedStateFromProps === 'function') {
+    applyDerivedStateFromProps(
+      workInProgress,
+      getDerivedStateFromProps,
+      newProps,
+    );
+    newState = workInProgress.memoizedState;
+  }
 
-    const oldProps = workInProgress.memoizedProps;
-    const newProps = workInProgress.pendingProps;
-    instance.props = oldProps;
-
-    const oldContext = instance.context;
-    const newUnmaskedContext = getUnmaskedContext(workInProgress);
-    const newContext = getMaskedContext(workInProgress, newUnmaskedContext);
-
-    const getDerivedStateFromProps = ctor.getDerivedStateFromProps;
-    const hasNewLifecycles =
-      typeof getDerivedStateFromProps === 'function' ||
-      typeof instance.getSnapshotBeforeUpdate === 'function';
-
-    // Note: During these life-cycles, instance.props/instance.state are what
-    // ever the previously attempted to render - not the "current". However,
-    // during componentDidUpdate we pass the "current" props.
+  const shouldUpdate =
+    checkHasForceUpdateAfterProcessing() ||
+    checkShouldComponentUpdate(
+      workInProgress,
+      oldProps,
+      newProps,
+      oldState,
+      newState,
+      newContext,
+    );
 
+  if (shouldUpdate) {
     // In order to support react-lifecycles-compat polyfilled components,
     // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
       !hasNewLifecycles &&
-      (typeof instance.UNSAFE_componentWillReceiveProps === 'function' ||
-        typeof instance.componentWillReceiveProps === 'function')
+      (typeof instance.UNSAFE_componentWillMount === 'function' ||
+        typeof instance.componentWillMount === 'function')
     ) {
-      if (oldProps !== newProps || oldContext !== newContext) {
-        callComponentWillReceiveProps(
-          workInProgress,
-          instance,
-          newProps,
-          newContext,
-        );
+      startPhaseTimer(workInProgress, 'componentWillMount');
+      if (typeof instance.componentWillMount === 'function') {
+        instance.componentWillMount();
       }
+      if (typeof instance.UNSAFE_componentWillMount === 'function') {
+        instance.UNSAFE_componentWillMount();
+      }
+      stopPhaseTimer();
+    }
+    if (typeof instance.componentDidMount === 'function') {
+      workInProgress.effectTag |= Update;
+    }
+  } else {
+    // If an update was already in progress, we should schedule an Update
+    // effect even though we're bailing out, so that cWU/cDU are called.
+    if (typeof instance.componentDidMount === 'function') {
+      workInProgress.effectTag |= Update;
     }
 
-    resetHasForceUpdateBeforeProcessing();
+    // If shouldComponentUpdate returned false, we should still update the
+    // memoized state to indicate that this work can be reused.
+    workInProgress.memoizedProps = newProps;
+    workInProgress.memoizedState = newState;
+  }
 
-    const oldState = workInProgress.memoizedState;
-    let newState = (instance.state = oldState);
-    let updateQueue = workInProgress.updateQueue;
-    if (updateQueue !== null) {
-      processUpdateQueue(
+  // Update the existing instance's state, props, and context pointers even
+  // if shouldComponentUpdate returns false.
+  instance.props = newProps;
+  instance.state = newState;
+  instance.context = newContext;
+
+  return shouldUpdate;
+}
+
+// Invokes the update life-cycles and returns false if it shouldn't rerender.
+function updateClassInstance(
+  current: Fiber,
+  workInProgress: Fiber,
+  renderExpirationTime: ExpirationTime,
+): boolean {
+  const ctor = workInProgress.type;
+  const instance = workInProgress.stateNode;
+
+  const oldProps = workInProgress.memoizedProps;
+  const newProps = workInProgress.pendingProps;
+  instance.props = oldProps;
+
+  const oldContext = instance.context;
+  const newUnmaskedContext = getUnmaskedContext(workInProgress);
+  const newContext = getMaskedContext(workInProgress, newUnmaskedContext);
+
+  const getDerivedStateFromProps = ctor.getDerivedStateFromProps;
+  const hasNewLifecycles =
+    typeof getDerivedStateFromProps === 'function' ||
+    typeof instance.getSnapshotBeforeUpdate === 'function';
+
+  // Note: During these life-cycles, instance.props/instance.state are what
+  // ever the previously attempted to render - not the "current". However,
+  // during componentDidUpdate we pass the "current" props.
+
+  // In order to support react-lifecycles-compat polyfilled components,
+  // Unsafe lifecycles should not be invoked for components using the new APIs.
+  if (
+    !hasNewLifecycles &&
+    (typeof instance.UNSAFE_componentWillReceiveProps === 'function' ||
+      typeof instance.componentWillReceiveProps === 'function')
+  ) {
+    if (oldProps !== newProps || oldContext !== newContext) {
+      callComponentWillReceiveProps(
         workInProgress,
-        updateQueue,
-        newProps,
         instance,
-        renderExpirationTime,
+        newProps,
+        newContext,
       );
-      newState = workInProgress.memoizedState;
     }
-    if (
-      oldProps === newProps &&
-      oldState === newState &&
-      !hasContextChanged() &&
-      !checkHasForceUpdateAfterProcessing()
-    ) {
-      // If an update was already in progress, we should schedule an Update
-      // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidMount === 'function') {
+  }
+
+  resetHasForceUpdateBeforeProcessing();
+
+  const oldState = workInProgress.memoizedState;
+  let newState = (instance.state = oldState);
+  let updateQueue = workInProgress.updateQueue;
+  if (updateQueue !== null) {
+    processUpdateQueue(
+      workInProgress,
+      updateQueue,
+      newProps,
+      instance,
+      renderExpirationTime,
+    );
+    newState = workInProgress.memoizedState;
+  }
+
+  if (
+    oldProps === newProps &&
+    oldState === newState &&
+    !hasContextChanged() &&
+    !checkHasForceUpdateAfterProcessing()
+  ) {
+    // If an update was already in progress, we should schedule an Update
+    // effect even though we're bailing out, so that cWU/cDU are called.
+    if (typeof instance.componentDidUpdate === 'function') {
+      if (
+        oldProps !== current.memoizedProps ||
+        oldState !== current.memoizedState
+      ) {
         workInProgress.effectTag |= Update;
       }
-      return false;
     }
+    if (typeof instance.getSnapshotBeforeUpdate === 'function') {
+      if (
+        oldProps !== current.memoizedProps ||
+        oldState !== current.memoizedState
+      ) {
+        workInProgress.effectTag |= Snapshot;
+      }
+    }
+    return false;
+  }
 
-    if (typeof getDerivedStateFromProps === 'function') {
+  if (typeof getDerivedStateFromProps === 'function') {
+    if (fireGetDerivedStateFromPropsOnStateUpdates || oldProps !== newProps) {
       applyDerivedStateFromProps(
         workInProgress,
         getDerivedStateFromProps,
@@ -820,231 +952,81 @@ export default function(
       );
       newState = workInProgress.memoizedState;
     }
-
-    const shouldUpdate =
-      checkHasForceUpdateAfterProcessing() ||
-      checkShouldComponentUpdate(
-        workInProgress,
-        oldProps,
-        newProps,
-        oldState,
-        newState,
-        newContext,
-      );
-
-    if (shouldUpdate) {
-      // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for components using the new APIs.
-      if (
-        !hasNewLifecycles &&
-        (typeof instance.UNSAFE_componentWillMount === 'function' ||
-          typeof instance.componentWillMount === 'function')
-      ) {
-        startPhaseTimer(workInProgress, 'componentWillMount');
-        if (typeof instance.componentWillMount === 'function') {
-          instance.componentWillMount();
-        }
-        if (typeof instance.UNSAFE_componentWillMount === 'function') {
-          instance.UNSAFE_componentWillMount();
-        }
-        stopPhaseTimer();
-      }
-      if (typeof instance.componentDidMount === 'function') {
-        workInProgress.effectTag |= Update;
-      }
-    } else {
-      // If an update was already in progress, we should schedule an Update
-      // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidMount === 'function') {
-        workInProgress.effectTag |= Update;
-      }
-
-      // If shouldComponentUpdate returned false, we should still update the
-      // memoized state to indicate that this work can be reused.
-      workInProgress.memoizedProps = newProps;
-      workInProgress.memoizedState = newState;
-    }
-
-    // Update the existing instance's state, props, and context pointers even
-    // if shouldComponentUpdate returns false.
-    instance.props = newProps;
-    instance.state = newState;
-    instance.context = newContext;
-
-    return shouldUpdate;
   }
 
-  // Invokes the update life-cycles and returns false if it shouldn't rerender.
-  function updateClassInstance(
-    current: Fiber,
-    workInProgress: Fiber,
-    renderExpirationTime: ExpirationTime,
-  ): boolean {
-    const ctor = workInProgress.type;
-    const instance = workInProgress.stateNode;
-
-    const oldProps = workInProgress.memoizedProps;
-    const newProps = workInProgress.pendingProps;
-    instance.props = oldProps;
-
-    const oldContext = instance.context;
-    const newUnmaskedContext = getUnmaskedContext(workInProgress);
-    const newContext = getMaskedContext(workInProgress, newUnmaskedContext);
-
-    const getDerivedStateFromProps = ctor.getDerivedStateFromProps;
-    const hasNewLifecycles =
-      typeof getDerivedStateFromProps === 'function' ||
-      typeof instance.getSnapshotBeforeUpdate === 'function';
-
-    // Note: During these life-cycles, instance.props/instance.state are what
-    // ever the previously attempted to render - not the "current". However,
-    // during componentDidUpdate we pass the "current" props.
+  const shouldUpdate =
+    checkHasForceUpdateAfterProcessing() ||
+    checkShouldComponentUpdate(
+      workInProgress,
+      oldProps,
+      newProps,
+      oldState,
+      newState,
+      newContext,
+    );
 
+  if (shouldUpdate) {
     // In order to support react-lifecycles-compat polyfilled components,
     // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
       !hasNewLifecycles &&
-      (typeof instance.UNSAFE_componentWillReceiveProps === 'function' ||
-        typeof instance.componentWillReceiveProps === 'function')
+      (typeof instance.UNSAFE_componentWillUpdate === 'function' ||
+        typeof instance.componentWillUpdate === 'function')
     ) {
-      if (oldProps !== newProps || oldContext !== newContext) {
-        callComponentWillReceiveProps(
-          workInProgress,
-          instance,
-          newProps,
-          newContext,
-        );
+      startPhaseTimer(workInProgress, 'componentWillUpdate');
+      if (typeof instance.componentWillUpdate === 'function') {
+        instance.componentWillUpdate(newProps, newState, newContext);
       }
-    }
-
-    resetHasForceUpdateBeforeProcessing();
-
-    const oldState = workInProgress.memoizedState;
-    let newState = (instance.state = oldState);
-    let updateQueue = workInProgress.updateQueue;
-    if (updateQueue !== null) {
-      processUpdateQueue(
-        workInProgress,
-        updateQueue,
-        newProps,
-        instance,
-        renderExpirationTime,
-      );
-      newState = workInProgress.memoizedState;
-    }
-
-    if (
-      oldProps === newProps &&
-      oldState === newState &&
-      !hasContextChanged() &&
-      !checkHasForceUpdateAfterProcessing()
-    ) {
-      // If an update was already in progress, we should schedule an Update
-      // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidUpdate === 'function') {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
-        ) {
-          workInProgress.effectTag |= Update;
-        }
+      if (typeof instance.UNSAFE_componentWillUpdate === 'function') {
+        instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
       }
-      if (typeof instance.getSnapshotBeforeUpdate === 'function') {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
-        ) {
-          workInProgress.effectTag |= Snapshot;
-        }
-      }
-      return false;
+      stopPhaseTimer();
     }
-
-    if (typeof getDerivedStateFromProps === 'function') {
-      if (fireGetDerivedStateFromPropsOnStateUpdates || oldProps !== newProps) {
-        applyDerivedStateFromProps(
-          workInProgress,
-          getDerivedStateFromProps,
-          newProps,
-        );
-        newState = workInProgress.memoizedState;
-      }
+    if (typeof instance.componentDidUpdate === 'function') {
+      workInProgress.effectTag |= Update;
     }
-
-    const shouldUpdate =
-      checkHasForceUpdateAfterProcessing() ||
-      checkShouldComponentUpdate(
-        workInProgress,
-        oldProps,
-        newProps,
-        oldState,
-        newState,
-        newContext,
-      );
-
-    if (shouldUpdate) {
-      // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for components using the new APIs.
+    if (typeof instance.getSnapshotBeforeUpdate === 'function') {
+      workInProgress.effectTag |= Snapshot;
+    }
+  } else {
+    // If an update was already in progress, we should schedule an Update
+    // effect even though we're bailing out, so that cWU/cDU are called.
+    if (typeof instance.componentDidUpdate === 'function') {
       if (
-        !hasNewLifecycles &&
-        (typeof instance.UNSAFE_componentWillUpdate === 'function' ||
-          typeof instance.componentWillUpdate === 'function')
+        oldProps !== current.memoizedProps ||
+        oldState !== current.memoizedState
       ) {
-        startPhaseTimer(workInProgress, 'componentWillUpdate');
-        if (typeof instance.componentWillUpdate === 'function') {
-          instance.componentWillUpdate(newProps, newState, newContext);
-        }
-        if (typeof instance.UNSAFE_componentWillUpdate === 'function') {
-          instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
-        }
-        stopPhaseTimer();
-      }
-      if (typeof instance.componentDidUpdate === 'function') {
         workInProgress.effectTag |= Update;
       }
-      if (typeof instance.getSnapshotBeforeUpdate === 'function') {
+    }
+    if (typeof instance.getSnapshotBeforeUpdate === 'function') {
+      if (
+        oldProps !== current.memoizedProps ||
+        oldState !== current.memoizedState
+      ) {
         workInProgress.effectTag |= Snapshot;
       }
-    } else {
-      // If an update was already in progress, we should schedule an Update
-      // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidUpdate === 'function') {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
-        ) {
-          workInProgress.effectTag |= Update;
-        }
-      }
-      if (typeof instance.getSnapshotBeforeUpdate === 'function') {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
-        ) {
-          workInProgress.effectTag |= Snapshot;
-        }
-      }
-
-      // If shouldComponentUpdate returned false, we should still update the
-      // memoized props/state to indicate that this work can be reused.
-      workInProgress.memoizedProps = newProps;
-      workInProgress.memoizedState = newState;
     }
 
-    // Update the existing instance's state, props, and context pointers even
-    // if shouldComponentUpdate returns false.
-    instance.props = newProps;
-    instance.state = newState;
-    instance.context = newContext;
-
-    return shouldUpdate;
+    // If shouldComponentUpdate returned false, we should still update the
+    // memoized props/state to indicate that this work can be reused.
+    workInProgress.memoizedProps = newProps;
+    workInProgress.memoizedState = newState;
   }
 
-  return {
-    adoptClassInstance,
-    constructClassInstance,
-    mountClassInstance,
-    resumeMountClassInstance,
-    updateClassInstance,
-  };
+  // Update the existing instance's state, props, and context pointers even
+  // if shouldComponentUpdate returns false.
+  instance.props = newProps;
+  instance.state = newState;
+  instance.context = newContext;
+
+  return shouldUpdate;
 }
+
+export {
+  adoptClassInstance,
+  constructClassInstance,
+  mountClassInstance,
+  resumeMountClassInstance,
+  updateClassInstance,
+};
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index e5e2f26402..9c492b9b79 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -7,18 +7,19 @@
  * @flow
  */
 
-import type {HostConfig} from 'react-reconciler';
+import type {
+  Instance,
+  TextInstance,
+  Container,
+  ChildSet,
+  UpdatePayload,
+} from './ReactFiberHostConfig';
 import type {Fiber} from './ReactFiber';
 import type {FiberRoot} from './ReactFiberRoot';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 import type {CapturedValue, CapturedError} from './ReactCapturedValue';
 
-import {
-  enableMutatingReconciler,
-  enableNoopReconciler,
-  enablePersistentReconciler,
-  enableProfilerTimer,
-} from 'shared/ReactFeatureFlags';
+import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
 import {
   ClassComponent,
   HostRoot,
@@ -44,6 +45,24 @@ import {startPhaseTimer, stopPhaseTimer} from './ReactDebugFiberPerf';
 import getComponentName from 'shared/getComponentName';
 import {getStackAddendumByWorkInProgressFiber} from 'shared/ReactFiberComponentTreeHook';
 import {logCapturedError} from './ReactFiberErrorLogger';
+import {
+  getPublicInstance,
+  supportsMutation,
+  supportsPersistence,
+  commitMount,
+  commitUpdate,
+  resetTextContent,
+  commitTextUpdate,
+  appendChild,
+  appendChildToContainer,
+  insertBefore,
+  insertInContainerBefore,
+  removeChild,
+  removeChildFromContainer,
+  replaceContainerChildren,
+  createContainerChildSet,
+} from './ReactFiberHostConfig';
+import {captureCommitPhaseError} from './ReactFiberScheduler';
 
 const {
   invokeGuardedCallback,
@@ -92,779 +111,737 @@ export function logError(boundary: Fiber, errorInfo: CapturedValue<mixed>) {
   }
 }
 
-export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
-  config: HostConfig<T, P, I, TI, HI, PI, C, CC, CX, PL>,
-  captureError: (failedFiber: Fiber, error: mixed) => void,
-  scheduleWork: (
-    fiber: Fiber,
-    startTime: ExpirationTime,
-    expirationTime: ExpirationTime,
-  ) => void,
-  computeExpirationForFiber: (
-    startTime: ExpirationTime,
-    fiber: Fiber,
-  ) => ExpirationTime,
-  markLegacyErrorBoundaryAsFailed: (instance: mixed) => void,
-  recalculateCurrentTime: () => ExpirationTime,
-) {
-  const {getPublicInstance, mutation, persistence} = config;
+const callComponentWillUnmountWithTimer = function(current, instance) {
+  startPhaseTimer(current, 'componentWillUnmount');
+  instance.props = current.memoizedProps;
+  instance.state = current.memoizedState;
+  instance.componentWillUnmount();
+  stopPhaseTimer();
+};
 
-  const callComponentWillUnmountWithTimer = function(current, instance) {
-    startPhaseTimer(current, 'componentWillUnmount');
-    instance.props = current.memoizedProps;
-    instance.state = current.memoizedState;
-    instance.componentWillUnmount();
-    stopPhaseTimer();
-  };
-
-  // Capture errors so they don't interrupt unmounting.
-  function safelyCallComponentWillUnmount(current, instance) {
-    if (__DEV__) {
-      invokeGuardedCallback(
-        null,
-        callComponentWillUnmountWithTimer,
-        null,
-        current,
-        instance,
-      );
-      if (hasCaughtError()) {
-        const unmountError = clearCaughtError();
-        captureError(current, unmountError);
-      }
-    } else {
-      try {
-        callComponentWillUnmountWithTimer(current, instance);
-      } catch (unmountError) {
-        captureError(current, unmountError);
-      }
+// Capture errors so they don't interrupt unmounting.
+function safelyCallComponentWillUnmount(current, instance) {
+  if (__DEV__) {
+    invokeGuardedCallback(
+      null,
+      callComponentWillUnmountWithTimer,
+      null,
+      current,
+      instance,
+    );
+    if (hasCaughtError()) {
+      const unmountError = clearCaughtError();
+      captureCommitPhaseError(current, unmountError);
+    }
+  } else {
+    try {
+      callComponentWillUnmountWithTimer(current, instance);
+    } catch (unmountError) {
+      captureCommitPhaseError(current, unmountError);
     }
   }
+}
 
-  function safelyDetachRef(current: Fiber) {
-    const ref = current.ref;
-    if (ref !== null) {
-      if (typeof ref === 'function') {
-        if (__DEV__) {
-          invokeGuardedCallback(null, ref, null, null);
-          if (hasCaughtError()) {
-            const refError = clearCaughtError();
-            captureError(current, refError);
-          }
-        } else {
-          try {
-            ref(null);
-          } catch (refError) {
-            captureError(current, refError);
-          }
+function safelyDetachRef(current: Fiber) {
+  const ref = current.ref;
+  if (ref !== null) {
+    if (typeof ref === 'function') {
+      if (__DEV__) {
+        invokeGuardedCallback(null, ref, null, null);
+        if (hasCaughtError()) {
+          const refError = clearCaughtError();
+          captureCommitPhaseError(current, refError);
         }
       } else {
-        ref.current = null;
+        try {
+          ref(null);
+        } catch (refError) {
+          captureCommitPhaseError(current, refError);
+        }
       }
+    } else {
+      ref.current = null;
     }
   }
+}
 
-  function commitBeforeMutationLifeCycles(
-    current: Fiber | null,
-    finishedWork: Fiber,
-  ): void {
-    switch (finishedWork.tag) {
-      case ClassComponent: {
-        if (finishedWork.effectTag & Snapshot) {
-          if (current !== null) {
-            const prevProps = current.memoizedProps;
-            const prevState = current.memoizedState;
-            startPhaseTimer(finishedWork, 'getSnapshotBeforeUpdate');
-            const instance = finishedWork.stateNode;
-            instance.props = finishedWork.memoizedProps;
-            instance.state = finishedWork.memoizedState;
-            const snapshot = instance.getSnapshotBeforeUpdate(
-              prevProps,
-              prevState,
-            );
-            if (__DEV__) {
-              const didWarnSet = ((didWarnAboutUndefinedSnapshotBeforeUpdate: any): Set<
-                mixed,
-              >);
-              if (
-                snapshot === undefined &&
-                !didWarnSet.has(finishedWork.type)
-              ) {
-                didWarnSet.add(finishedWork.type);
-                warning(
-                  false,
-                  '%s.getSnapshotBeforeUpdate(): A snapshot value (or null) ' +
-                    'must be returned. You have returned undefined.',
-                  getComponentName(finishedWork),
-                );
-              }
-            }
-            instance.__reactInternalSnapshotBeforeUpdate = snapshot;
-            stopPhaseTimer();
-          }
-        }
-        return;
-      }
-      case HostRoot:
-      case HostComponent:
-      case HostText:
-      case HostPortal:
-        // Nothing to do for these component types
-        return;
-      default: {
-        invariant(
-          false,
-          'This unit of work tag should not have side-effects. This error is ' +
-            'likely caused by a bug in React. Please file an issue.',
-        );
-      }
-    }
-  }
-
-  function commitLifeCycles(
-    finishedRoot: FiberRoot,
-    current: Fiber | null,
-    finishedWork: Fiber,
-    currentTime: ExpirationTime,
-    committedExpirationTime: ExpirationTime,
-  ): void {
-    switch (finishedWork.tag) {
-      case ClassComponent: {
-        const instance = finishedWork.stateNode;
-        if (finishedWork.effectTag & Update) {
-          if (current === null) {
-            startPhaseTimer(finishedWork, 'componentDidMount');
-            instance.props = finishedWork.memoizedProps;
-            instance.state = finishedWork.memoizedState;
-            instance.componentDidMount();
-            stopPhaseTimer();
-          } else {
-            const prevProps = current.memoizedProps;
-            const prevState = current.memoizedState;
-            startPhaseTimer(finishedWork, 'componentDidUpdate');
-            instance.props = finishedWork.memoizedProps;
-            instance.state = finishedWork.memoizedState;
-            instance.componentDidUpdate(
-              prevProps,
-              prevState,
-              instance.__reactInternalSnapshotBeforeUpdate,
-            );
-            stopPhaseTimer();
-          }
-        }
-        const updateQueue = finishedWork.updateQueue;
-        if (updateQueue !== null) {
+function commitBeforeMutationLifeCycles(
+  current: Fiber | null,
+  finishedWork: Fiber,
+): void {
+  switch (finishedWork.tag) {
+    case ClassComponent: {
+      if (finishedWork.effectTag & Snapshot) {
+        if (current !== null) {
+          const prevProps = current.memoizedProps;
+          const prevState = current.memoizedState;
+          startPhaseTimer(finishedWork, 'getSnapshotBeforeUpdate');
+          const instance = finishedWork.stateNode;
           instance.props = finishedWork.memoizedProps;
           instance.state = finishedWork.memoizedState;
-          commitUpdateQueue(
-            finishedWork,
-            updateQueue,
-            instance,
-            committedExpirationTime,
+          const snapshot = instance.getSnapshotBeforeUpdate(
+            prevProps,
+            prevState,
           );
-        }
-        return;
-      }
-      case HostRoot: {
-        const updateQueue = finishedWork.updateQueue;
-        if (updateQueue !== null) {
-          let instance = null;
-          if (finishedWork.child !== null) {
-            switch (finishedWork.child.tag) {
-              case HostComponent:
-                instance = getPublicInstance(finishedWork.child.stateNode);
-                break;
-              case ClassComponent:
-                instance = finishedWork.child.stateNode;
-                break;
+          if (__DEV__) {
+            const didWarnSet = ((didWarnAboutUndefinedSnapshotBeforeUpdate: any): Set<
+              mixed,
+            >);
+            if (snapshot === undefined && !didWarnSet.has(finishedWork.type)) {
+              didWarnSet.add(finishedWork.type);
+              warning(
+                false,
+                '%s.getSnapshotBeforeUpdate(): A snapshot value (or null) ' +
+                  'must be returned. You have returned undefined.',
+                getComponentName(finishedWork),
+              );
             }
           }
-          commitUpdateQueue(
-            finishedWork,
-            updateQueue,
-            instance,
-            committedExpirationTime,
+          instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+          stopPhaseTimer();
+        }
+      }
+      return;
+    }
+    case HostRoot:
+    case HostComponent:
+    case HostText:
+    case HostPortal:
+      // Nothing to do for these component types
+      return;
+    default: {
+      invariant(
+        false,
+        'This unit of work tag should not have side-effects. This error is ' +
+          'likely caused by a bug in React. Please file an issue.',
+      );
+    }
+  }
+}
+
+function commitLifeCycles(
+  finishedRoot: FiberRoot,
+  current: Fiber | null,
+  finishedWork: Fiber,
+  currentTime: ExpirationTime,
+  committedExpirationTime: ExpirationTime,
+): void {
+  switch (finishedWork.tag) {
+    case ClassComponent: {
+      const instance = finishedWork.stateNode;
+      if (finishedWork.effectTag & Update) {
+        if (current === null) {
+          startPhaseTimer(finishedWork, 'componentDidMount');
+          instance.props = finishedWork.memoizedProps;
+          instance.state = finishedWork.memoizedState;
+          instance.componentDidMount();
+          stopPhaseTimer();
+        } else {
+          const prevProps = current.memoizedProps;
+          const prevState = current.memoizedState;
+          startPhaseTimer(finishedWork, 'componentDidUpdate');
+          instance.props = finishedWork.memoizedProps;
+          instance.state = finishedWork.memoizedState;
+          instance.componentDidUpdate(
+            prevProps,
+            prevState,
+            instance.__reactInternalSnapshotBeforeUpdate,
           );
+          stopPhaseTimer();
         }
-        return;
       }
-      case HostComponent: {
-        const instance: I = finishedWork.stateNode;
-
-        // Renderers may schedule work to be done after host components are mounted
-        // (eg DOM renderer may schedule auto-focus for inputs and form controls).
-        // These effects should only be committed when components are first mounted,
-        // aka when there is no current/alternate.
-        if (current === null && finishedWork.effectTag & Update) {
-          const type = finishedWork.type;
-          const props = finishedWork.memoizedProps;
-          commitMount(instance, type, props, finishedWork);
-        }
-
-        return;
-      }
-      case HostText: {
-        // We have no life-cycles associated with text.
-        return;
-      }
-      case HostPortal: {
-        // We have no life-cycles associated with portals.
-        return;
-      }
-      case Profiler: {
-        // We have no life-cycles associated with Profiler.
-        return;
-      }
-      case TimeoutComponent: {
-        // We have no life-cycles associated with Timeouts.
-        return;
-      }
-      default: {
-        invariant(
-          false,
-          'This unit of work tag should not have side-effects. This error is ' +
-            'likely caused by a bug in React. Please file an issue.',
+      const updateQueue = finishedWork.updateQueue;
+      if (updateQueue !== null) {
+        instance.props = finishedWork.memoizedProps;
+        instance.state = finishedWork.memoizedState;
+        commitUpdateQueue(
+          finishedWork,
+          updateQueue,
+          instance,
+          committedExpirationTime,
         );
       }
+      return;
     }
-  }
-
-  function commitAttachRef(finishedWork: Fiber) {
-    const ref = finishedWork.ref;
-    if (ref !== null) {
-      const instance = finishedWork.stateNode;
-      let instanceToUse;
-      switch (finishedWork.tag) {
-        case HostComponent:
-          instanceToUse = getPublicInstance(instance);
-          break;
-        default:
-          instanceToUse = instance;
-      }
-      if (typeof ref === 'function') {
-        ref(instanceToUse);
-      } else {
-        if (__DEV__) {
-          if (!ref.hasOwnProperty('current')) {
-            warning(
-              false,
-              'Unexpected ref object provided for %s. ' +
-                'Use either a ref-setter function or React.createRef().%s',
-              getComponentName(finishedWork),
-              getStackAddendumByWorkInProgressFiber(finishedWork),
-            );
+    case HostRoot: {
+      const updateQueue = finishedWork.updateQueue;
+      if (updateQueue !== null) {
+        let instance = null;
+        if (finishedWork.child !== null) {
+          switch (finishedWork.child.tag) {
+            case HostComponent:
+              instance = getPublicInstance(finishedWork.child.stateNode);
+              break;
+            case ClassComponent:
+              instance = finishedWork.child.stateNode;
+              break;
           }
         }
-
-        ref.current = instanceToUse;
+        commitUpdateQueue(
+          finishedWork,
+          updateQueue,
+          instance,
+          committedExpirationTime,
+        );
       }
+      return;
+    }
+    case HostComponent: {
+      const instance: Instance = finishedWork.stateNode;
+
+      // Renderers may schedule work to be done after host components are mounted
+      // (eg DOM renderer may schedule auto-focus for inputs and form controls).
+      // These effects should only be committed when components are first mounted,
+      // aka when there is no current/alternate.
+      if (current === null && finishedWork.effectTag & Update) {
+        const type = finishedWork.type;
+        const props = finishedWork.memoizedProps;
+        commitMount(instance, type, props, finishedWork);
+      }
+
+      return;
+    }
+    case HostText: {
+      // We have no life-cycles associated with text.
+      return;
+    }
+    case HostPortal: {
+      // We have no life-cycles associated with portals.
+      return;
+    }
+    case Profiler: {
+      // We have no life-cycles associated with Profiler.
+      return;
+    }
+    case TimeoutComponent: {
+      // We have no life-cycles associated with Timeouts.
+      return;
+    }
+    default: {
+      invariant(
+        false,
+        'This unit of work tag should not have side-effects. This error is ' +
+          'likely caused by a bug in React. Please file an issue.',
+      );
     }
   }
+}
 
-  function commitDetachRef(current: Fiber) {
-    const currentRef = current.ref;
-    if (currentRef !== null) {
-      if (typeof currentRef === 'function') {
-        currentRef(null);
-      } else {
-        currentRef.current = null;
-      }
-    }
-  }
-
-  // User-originating errors (lifecycles and refs) should not interrupt
-  // deletion, so don't let them throw. Host-originating errors should
-  // interrupt deletion, so it's okay
-  function commitUnmount(current: Fiber): void {
-    if (typeof onCommitUnmount === 'function') {
-      onCommitUnmount(current);
-    }
-
-    switch (current.tag) {
-      case ClassComponent: {
-        safelyDetachRef(current);
-        const instance = current.stateNode;
-        if (typeof instance.componentWillUnmount === 'function') {
-          safelyCallComponentWillUnmount(current, instance);
-        }
-        return;
-      }
-      case HostComponent: {
-        safelyDetachRef(current);
-        return;
-      }
-      case HostPortal: {
-        // TODO: this is recursive.
-        // We are also not using this parent because
-        // the portal will get pushed immediately.
-        if (enableMutatingReconciler && mutation) {
-          unmountHostComponents(current);
-        } else if (enablePersistentReconciler && persistence) {
-          emptyPortalContainer(current);
-        }
-        return;
-      }
-    }
-  }
-
-  function commitNestedUnmounts(root: Fiber): void {
-    // While we're inside a removed host node we don't want to call
-    // removeChild on the inner nodes because they're removed by the top
-    // call anyway. We also want to call componentWillUnmount on all
-    // composites before this host node is removed from the tree. Therefore
-    // we do an inner loop while we're still inside the host node.
-    let node: Fiber = root;
-    while (true) {
-      commitUnmount(node);
-      // Visit children because they may contain more composite or host nodes.
-      // Skip portals because commitUnmount() currently visits them recursively.
-      if (
-        node.child !== null &&
-        // If we use mutation we drill down into portals using commitUnmount above.
-        // If we don't use mutation we drill down into portals here instead.
-        (!mutation || node.tag !== HostPortal)
-      ) {
-        node.child.return = node;
-        node = node.child;
-        continue;
-      }
-      if (node === root) {
-        return;
-      }
-      while (node.sibling === null) {
-        if (node.return === null || node.return === root) {
-          return;
-        }
-        node = node.return;
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }
-
-  function detachFiber(current: Fiber) {
-    // Cut off the return pointers to disconnect it from the tree. Ideally, we
-    // should clear the child pointer of the parent alternate to let this
-    // get GC:ed but we don't know which for sure which parent is the current
-    // one so we'll settle for GC:ing the subtree of this child. This child
-    // itself will be GC:ed when the parent updates the next time.
-    current.return = null;
-    current.child = null;
-    if (current.alternate) {
-      current.alternate.child = null;
-      current.alternate.return = null;
-    }
-  }
-
-  let emptyPortalContainer;
-
-  if (!mutation) {
-    let commitContainer;
-    if (persistence) {
-      const {replaceContainerChildren, createContainerChildSet} = persistence;
-      emptyPortalContainer = function(current: Fiber) {
-        const portal: {containerInfo: C, pendingChildren: CC} =
-          current.stateNode;
-        const {containerInfo} = portal;
-        const emptyChildSet = createContainerChildSet(containerInfo);
-        replaceContainerChildren(containerInfo, emptyChildSet);
-      };
-      commitContainer = function(finishedWork: Fiber) {
-        switch (finishedWork.tag) {
-          case ClassComponent: {
-            return;
-          }
-          case HostComponent: {
-            return;
-          }
-          case HostText: {
-            return;
-          }
-          case HostRoot:
-          case HostPortal: {
-            const portalOrRoot: {containerInfo: C, pendingChildren: CC} =
-              finishedWork.stateNode;
-            const {containerInfo, pendingChildren} = portalOrRoot;
-            replaceContainerChildren(containerInfo, pendingChildren);
-            return;
-          }
-          default: {
-            invariant(
-              false,
-              'This unit of work tag should not have side-effects. This error is ' +
-                'likely caused by a bug in React. Please file an issue.',
-            );
-          }
-        }
-      };
-    } else {
-      commitContainer = function(finishedWork: Fiber) {
-        // Noop
-      };
-    }
-    if (enablePersistentReconciler || enableNoopReconciler) {
-      return {
-        commitResetTextContent(finishedWork: Fiber) {},
-        commitPlacement(finishedWork: Fiber) {},
-        commitDeletion(current: Fiber) {
-          // Detach refs and call componentWillUnmount() on the whole subtree.
-          commitNestedUnmounts(current);
-          detachFiber(current);
-        },
-        commitWork(current: Fiber | null, finishedWork: Fiber) {
-          commitContainer(finishedWork);
-        },
-        commitLifeCycles,
-        commitBeforeMutationLifeCycles,
-        commitAttachRef,
-        commitDetachRef,
-      };
-    } else if (persistence) {
-      invariant(false, 'Persistent reconciler is disabled.');
-    } else {
-      invariant(false, 'Noop reconciler is disabled.');
-    }
-  }
-  const {
-    commitMount,
-    commitUpdate,
-    resetTextContent,
-    commitTextUpdate,
-    appendChild,
-    appendChildToContainer,
-    insertBefore,
-    insertInContainerBefore,
-    removeChild,
-    removeChildFromContainer,
-  } = mutation;
-
-  function getHostParentFiber(fiber: Fiber): Fiber {
-    let parent = fiber.return;
-    while (parent !== null) {
-      if (isHostParent(parent)) {
-        return parent;
-      }
-      parent = parent.return;
-    }
-    invariant(
-      false,
-      'Expected to find a host parent. This error is likely caused by a bug ' +
-        'in React. Please file an issue.',
-    );
-  }
-
-  function isHostParent(fiber: Fiber): boolean {
-    return (
-      fiber.tag === HostComponent ||
-      fiber.tag === HostRoot ||
-      fiber.tag === HostPortal
-    );
-  }
-
-  function getHostSibling(fiber: Fiber): ?I {
-    // We're going to search forward into the tree until we find a sibling host
-    // node. Unfortunately, if multiple insertions are done in a row we have to
-    // search past them. This leads to exponential search for the next sibling.
-    // TODO: Find a more efficient way to do this.
-    let node: Fiber = fiber;
-    siblings: while (true) {
-      // If we didn't find anything, let's try the next sibling.
-      while (node.sibling === null) {
-        if (node.return === null || isHostParent(node.return)) {
-          // If we pop out of the root or hit the parent the fiber we are the
-          // last sibling.
-          return null;
-        }
-        node = node.return;
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-      while (node.tag !== HostComponent && node.tag !== HostText) {
-        // If it is not host node and, we might have a host node inside it.
-        // Try to search down until we find one.
-        if (node.effectTag & Placement) {
-          // If we don't have a child, try the siblings instead.
-          continue siblings;
-        }
-        // If we don't have a child, try the siblings instead.
-        // We also skip portals because they are not part of this host tree.
-        if (node.child === null || node.tag === HostPortal) {
-          continue siblings;
-        } else {
-          node.child.return = node;
-          node = node.child;
-        }
-      }
-      // Check if this host node is stable or about to be placed.
-      if (!(node.effectTag & Placement)) {
-        // Found it!
-        return node.stateNode;
-      }
-    }
-  }
-
-  function commitPlacement(finishedWork: Fiber): void {
-    // Recursively insert all host nodes into the parent.
-    const parentFiber = getHostParentFiber(finishedWork);
-    let parent;
-    let isContainer;
-    switch (parentFiber.tag) {
+function commitAttachRef(finishedWork: Fiber) {
+  const ref = finishedWork.ref;
+  if (ref !== null) {
+    const instance = finishedWork.stateNode;
+    let instanceToUse;
+    switch (finishedWork.tag) {
       case HostComponent:
-        parent = parentFiber.stateNode;
-        isContainer = false;
-        break;
-      case HostRoot:
-        parent = parentFiber.stateNode.containerInfo;
-        isContainer = true;
-        break;
-      case HostPortal:
-        parent = parentFiber.stateNode.containerInfo;
-        isContainer = true;
+        instanceToUse = getPublicInstance(instance);
         break;
       default:
-        invariant(
-          false,
-          'Invalid host parent fiber. This error is likely caused by a bug ' +
-            'in React. Please file an issue.',
-        );
+        instanceToUse = instance;
     }
-    if (parentFiber.effectTag & ContentReset) {
-      // Reset the text content of the parent before doing any insertions
-      resetTextContent(parent);
-      // Clear ContentReset from the effect tag
-      parentFiber.effectTag &= ~ContentReset;
+    if (typeof ref === 'function') {
+      ref(instanceToUse);
+    } else {
+      if (__DEV__) {
+        if (!ref.hasOwnProperty('current')) {
+          warning(
+            false,
+            'Unexpected ref object provided for %s. ' +
+              'Use either a ref-setter function or React.createRef().%s',
+            getComponentName(finishedWork),
+            getStackAddendumByWorkInProgressFiber(finishedWork),
+          );
+        }
+      }
+
+      ref.current = instanceToUse;
+    }
+  }
+}
+
+function commitDetachRef(current: Fiber) {
+  const currentRef = current.ref;
+  if (currentRef !== null) {
+    if (typeof currentRef === 'function') {
+      currentRef(null);
+    } else {
+      currentRef.current = null;
+    }
+  }
+}
+
+// User-originating errors (lifecycles and refs) should not interrupt
+// deletion, so don't let them throw. Host-originating errors should
+// interrupt deletion, so it's okay
+function commitUnmount(current: Fiber): void {
+  if (typeof onCommitUnmount === 'function') {
+    onCommitUnmount(current);
+  }
+
+  switch (current.tag) {
+    case ClassComponent: {
+      safelyDetachRef(current);
+      const instance = current.stateNode;
+      if (typeof instance.componentWillUnmount === 'function') {
+        safelyCallComponentWillUnmount(current, instance);
+      }
+      return;
+    }
+    case HostComponent: {
+      safelyDetachRef(current);
+      return;
+    }
+    case HostPortal: {
+      // TODO: this is recursive.
+      // We are also not using this parent because
+      // the portal will get pushed immediately.
+      if (supportsMutation) {
+        unmountHostComponents(current);
+      } else if (supportsPersistence) {
+        emptyPortalContainer(current);
+      }
+      return;
+    }
+  }
+}
+
+function commitNestedUnmounts(root: Fiber): void {
+  // While we're inside a removed host node we don't want to call
+  // removeChild on the inner nodes because they're removed by the top
+  // call anyway. We also want to call componentWillUnmount on all
+  // composites before this host node is removed from the tree. Therefore
+  // we do an inner loop while we're still inside the host node.
+  let node: Fiber = root;
+  while (true) {
+    commitUnmount(node);
+    // Visit children because they may contain more composite or host nodes.
+    // Skip portals because commitUnmount() currently visits them recursively.
+    if (
+      node.child !== null &&
+      // If we use mutation we drill down into portals using commitUnmount above.
+      // If we don't use mutation we drill down into portals here instead.
+      (!supportsMutation || node.tag !== HostPortal)
+    ) {
+      node.child.return = node;
+      node = node.child;
+      continue;
+    }
+    if (node === root) {
+      return;
+    }
+    while (node.sibling === null) {
+      if (node.return === null || node.return === root) {
+        return;
+      }
+      node = node.return;
+    }
+    node.sibling.return = node.return;
+    node = node.sibling;
+  }
+}
+
+function detachFiber(current: Fiber) {
+  // Cut off the return pointers to disconnect it from the tree. Ideally, we
+  // should clear the child pointer of the parent alternate to let this
+  // get GC:ed but we don't know which for sure which parent is the current
+  // one so we'll settle for GC:ing the subtree of this child. This child
+  // itself will be GC:ed when the parent updates the next time.
+  current.return = null;
+  current.child = null;
+  if (current.alternate) {
+    current.alternate.child = null;
+    current.alternate.return = null;
+  }
+}
+
+function emptyPortalContainer(current: Fiber) {
+  if (!supportsPersistence) {
+    return;
+  }
+
+  const portal: {containerInfo: Container, pendingChildren: ChildSet} =
+    current.stateNode;
+  const {containerInfo} = portal;
+  const emptyChildSet = createContainerChildSet(containerInfo);
+  replaceContainerChildren(containerInfo, emptyChildSet);
+}
+
+function commitContainer(finishedWork: Fiber) {
+  if (!supportsPersistence) {
+    return;
+  }
+
+  switch (finishedWork.tag) {
+    case ClassComponent: {
+      return;
+    }
+    case HostComponent: {
+      return;
+    }
+    case HostText: {
+      return;
+    }
+    case HostRoot:
+    case HostPortal: {
+      const portalOrRoot: {
+        containerInfo: Container,
+        pendingChildren: ChildSet,
+      } =
+        finishedWork.stateNode;
+      const {containerInfo, pendingChildren} = portalOrRoot;
+      replaceContainerChildren(containerInfo, pendingChildren);
+      return;
+    }
+    default: {
+      invariant(
+        false,
+        'This unit of work tag should not have side-effects. This error is ' +
+          'likely caused by a bug in React. Please file an issue.',
+      );
+    }
+  }
+}
+
+function getHostParentFiber(fiber: Fiber): Fiber {
+  let parent = fiber.return;
+  while (parent !== null) {
+    if (isHostParent(parent)) {
+      return parent;
+    }
+    parent = parent.return;
+  }
+  invariant(
+    false,
+    'Expected to find a host parent. This error is likely caused by a bug ' +
+      'in React. Please file an issue.',
+  );
+}
+
+function isHostParent(fiber: Fiber): boolean {
+  return (
+    fiber.tag === HostComponent ||
+    fiber.tag === HostRoot ||
+    fiber.tag === HostPortal
+  );
+}
+
+function getHostSibling(fiber: Fiber): ?Instance {
+  // We're going to search forward into the tree until we find a sibling host
+  // node. Unfortunately, if multiple insertions are done in a row we have to
+  // search past them. This leads to exponential search for the next sibling.
+  // TODO: Find a more efficient way to do this.
+  let node: Fiber = fiber;
+  siblings: while (true) {
+    // If we didn't find anything, let's try the next sibling.
+    while (node.sibling === null) {
+      if (node.return === null || isHostParent(node.return)) {
+        // If we pop out of the root or hit the parent the fiber we are the
+        // last sibling.
+        return null;
+      }
+      node = node.return;
+    }
+    node.sibling.return = node.return;
+    node = node.sibling;
+    while (node.tag !== HostComponent && node.tag !== HostText) {
+      // If it is not host node and, we might have a host node inside it.
+      // Try to search down until we find one.
+      if (node.effectTag & Placement) {
+        // If we don't have a child, try the siblings instead.
+        continue siblings;
+      }
+      // If we don't have a child, try the siblings instead.
+      // We also skip portals because they are not part of this host tree.
+      if (node.child === null || node.tag === HostPortal) {
+        continue siblings;
+      } else {
+        node.child.return = node;
+        node = node.child;
+      }
+    }
+    // Check if this host node is stable or about to be placed.
+    if (!(node.effectTag & Placement)) {
+      // Found it!
+      return node.stateNode;
+    }
+  }
+}
+
+function commitPlacement(finishedWork: Fiber): void {
+  if (!supportsMutation) {
+    return;
+  }
+
+  // Recursively insert all host nodes into the parent.
+  const parentFiber = getHostParentFiber(finishedWork);
+  let parent;
+  let isContainer;
+  switch (parentFiber.tag) {
+    case HostComponent:
+      parent = parentFiber.stateNode;
+      isContainer = false;
+      break;
+    case HostRoot:
+      parent = parentFiber.stateNode.containerInfo;
+      isContainer = true;
+      break;
+    case HostPortal:
+      parent = parentFiber.stateNode.containerInfo;
+      isContainer = true;
+      break;
+    default:
+      invariant(
+        false,
+        'Invalid host parent fiber. This error is likely caused by a bug ' +
+          'in React. Please file an issue.',
+      );
+  }
+  if (parentFiber.effectTag & ContentReset) {
+    // Reset the text content of the parent before doing any insertions
+    resetTextContent(parent);
+    // Clear ContentReset from the effect tag
+    parentFiber.effectTag &= ~ContentReset;
+  }
+
+  const before = getHostSibling(finishedWork);
+  // We only have the top Fiber that was inserted but we need recurse down its
+  // children to find all the terminal nodes.
+  let node: Fiber = finishedWork;
+  while (true) {
+    if (node.tag === HostComponent || node.tag === HostText) {
+      if (before) {
+        if (isContainer) {
+          insertInContainerBefore(parent, node.stateNode, before);
+        } else {
+          insertBefore(parent, node.stateNode, before);
+        }
+      } else {
+        if (isContainer) {
+          appendChildToContainer(parent, node.stateNode);
+        } else {
+          appendChild(parent, node.stateNode);
+        }
+      }
+    } else if (node.tag === HostPortal) {
+      // If the insertion itself is a portal, then we don't want to traverse
+      // down its children. Instead, we'll get insertions from each child in
+      // the portal directly.
+    } else if (node.child !== null) {
+      node.child.return = node;
+      node = node.child;
+      continue;
+    }
+    if (node === finishedWork) {
+      return;
+    }
+    while (node.sibling === null) {
+      if (node.return === null || node.return === finishedWork) {
+        return;
+      }
+      node = node.return;
+    }
+    node.sibling.return = node.return;
+    node = node.sibling;
+  }
+}
+
+function unmountHostComponents(current): void {
+  // We only have the top Fiber that was inserted but we need recurse down its
+  // children to find all the terminal nodes.
+  let node: Fiber = current;
+
+  // Each iteration, currentParent is populated with node's host parent if not
+  // currentParentIsValid.
+  let currentParentIsValid = false;
+  let currentParent;
+  let currentParentIsContainer;
+
+  while (true) {
+    if (!currentParentIsValid) {
+      let parent = node.return;
+      findParent: while (true) {
+        invariant(
+          parent !== null,
+          'Expected to find a host parent. This error is likely caused by ' +
+            'a bug in React. Please file an issue.',
+        );
+        switch (parent.tag) {
+          case HostComponent:
+            currentParent = parent.stateNode;
+            currentParentIsContainer = false;
+            break findParent;
+          case HostRoot:
+            currentParent = parent.stateNode.containerInfo;
+            currentParentIsContainer = true;
+            break findParent;
+          case HostPortal:
+            currentParent = parent.stateNode.containerInfo;
+            currentParentIsContainer = true;
+            break findParent;
+        }
+        parent = parent.return;
+      }
+      currentParentIsValid = true;
     }
 
-    const before = getHostSibling(finishedWork);
-    // We only have the top Fiber that was inserted but we need recurse down its
-    // children to find all the terminal nodes.
-    let node: Fiber = finishedWork;
-    while (true) {
-      if (node.tag === HostComponent || node.tag === HostText) {
-        if (before) {
-          if (isContainer) {
-            insertInContainerBefore(parent, node.stateNode, before);
-          } else {
-            insertBefore(parent, node.stateNode, before);
-          }
-        } else {
-          if (isContainer) {
-            appendChildToContainer(parent, node.stateNode);
-          } else {
-            appendChild(parent, node.stateNode);
-          }
-        }
-      } else if (node.tag === HostPortal) {
-        // If the insertion itself is a portal, then we don't want to traverse
-        // down its children. Instead, we'll get insertions from each child in
-        // the portal directly.
-      } else if (node.child !== null) {
+    if (node.tag === HostComponent || node.tag === HostText) {
+      commitNestedUnmounts(node);
+      // After all the children have unmounted, it is now safe to remove the
+      // node from the tree.
+      if (currentParentIsContainer) {
+        removeChildFromContainer((currentParent: any), node.stateNode);
+      } else {
+        removeChild((currentParent: any), node.stateNode);
+      }
+      // Don't visit children because we already visited them.
+    } else if (node.tag === HostPortal) {
+      // When we go into a portal, it becomes the parent to remove from.
+      // We will reassign it back when we pop the portal on the way up.
+      currentParent = node.stateNode.containerInfo;
+      // Visit children because portals might contain host components.
+      if (node.child !== null) {
         node.child.return = node;
         node = node.child;
         continue;
       }
-      if (node === finishedWork) {
+    } else {
+      commitUnmount(node);
+      // Visit children because we may find more host components below.
+      if (node.child !== null) {
+        node.child.return = node;
+        node = node.child;
+        continue;
+      }
+    }
+    if (node === current) {
+      return;
+    }
+    while (node.sibling === null) {
+      if (node.return === null || node.return === current) {
         return;
       }
-      while (node.sibling === null) {
-        if (node.return === null || node.return === finishedWork) {
-          return;
-        }
-        node = node.return;
+      node = node.return;
+      if (node.tag === HostPortal) {
+        // When we go out of the portal, we need to restore the parent.
+        // Since we don't keep a stack of them, we will search for it.
+        currentParentIsValid = false;
       }
-      node.sibling.return = node.return;
-      node = node.sibling;
     }
+    node.sibling.return = node.return;
+    node = node.sibling;
   }
+}
 
-  function unmountHostComponents(current): void {
-    // We only have the top Fiber that was inserted but we need recurse down its
-    // children to find all the terminal nodes.
-    let node: Fiber = current;
-
-    // Each iteration, currentParent is populated with node's host parent if not
-    // currentParentIsValid.
-    let currentParentIsValid = false;
-    let currentParent;
-    let currentParentIsContainer;
-
-    while (true) {
-      if (!currentParentIsValid) {
-        let parent = node.return;
-        findParent: while (true) {
-          invariant(
-            parent !== null,
-            'Expected to find a host parent. This error is likely caused by ' +
-              'a bug in React. Please file an issue.',
-          );
-          switch (parent.tag) {
-            case HostComponent:
-              currentParent = parent.stateNode;
-              currentParentIsContainer = false;
-              break findParent;
-            case HostRoot:
-              currentParent = parent.stateNode.containerInfo;
-              currentParentIsContainer = true;
-              break findParent;
-            case HostPortal:
-              currentParent = parent.stateNode.containerInfo;
-              currentParentIsContainer = true;
-              break findParent;
-          }
-          parent = parent.return;
-        }
-        currentParentIsValid = true;
-      }
-
-      if (node.tag === HostComponent || node.tag === HostText) {
-        commitNestedUnmounts(node);
-        // After all the children have unmounted, it is now safe to remove the
-        // node from the tree.
-        if (currentParentIsContainer) {
-          removeChildFromContainer((currentParent: any), node.stateNode);
-        } else {
-          removeChild((currentParent: any), node.stateNode);
-        }
-        // Don't visit children because we already visited them.
-      } else if (node.tag === HostPortal) {
-        // When we go into a portal, it becomes the parent to remove from.
-        // We will reassign it back when we pop the portal on the way up.
-        currentParent = node.stateNode.containerInfo;
-        // Visit children because portals might contain host components.
-        if (node.child !== null) {
-          node.child.return = node;
-          node = node.child;
-          continue;
-        }
-      } else {
-        commitUnmount(node);
-        // Visit children because we may find more host components below.
-        if (node.child !== null) {
-          node.child.return = node;
-          node = node.child;
-          continue;
-        }
-      }
-      if (node === current) {
-        return;
-      }
-      while (node.sibling === null) {
-        if (node.return === null || node.return === current) {
-          return;
-        }
-        node = node.return;
-        if (node.tag === HostPortal) {
-          // When we go out of the portal, we need to restore the parent.
-          // Since we don't keep a stack of them, we will search for it.
-          currentParentIsValid = false;
-        }
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }
-
-  function commitDeletion(current: Fiber): void {
+function commitDeletion(current: Fiber): void {
+  if (supportsMutation) {
     // Recursively delete all host nodes from the parent.
     // Detach refs and call componentWillUnmount() on the whole subtree.
     unmountHostComponents(current);
-    detachFiber(current);
+  } else {
+    // Detach refs and call componentWillUnmount() on the whole subtree.
+    commitNestedUnmounts(current);
+  }
+  detachFiber(current);
+}
+
+function commitWork(current: Fiber | null, finishedWork: Fiber): void {
+  if (!supportsMutation) {
+    commitContainer(finishedWork);
+    return;
   }
 
-  function commitWork(current: Fiber | null, finishedWork: Fiber): void {
-    switch (finishedWork.tag) {
-      case ClassComponent: {
-        return;
-      }
-      case HostComponent: {
-        const instance: I = finishedWork.stateNode;
-        if (instance != null) {
-          // Commit the work prepared earlier.
-          const newProps = finishedWork.memoizedProps;
-          // For hydration we reuse the update path but we treat the oldProps
-          // as the newProps. The updatePayload will contain the real change in
-          // this case.
-          const oldProps = current !== null ? current.memoizedProps : newProps;
-          const type = finishedWork.type;
-          // TODO: Type the updateQueue to be specific to host components.
-          const updatePayload: null | PL = (finishedWork.updateQueue: any);
-          finishedWork.updateQueue = null;
-          if (updatePayload !== null) {
-            commitUpdate(
-              instance,
-              updatePayload,
-              type,
-              oldProps,
-              newProps,
-              finishedWork,
-            );
-          }
-        }
-        return;
-      }
-      case HostText: {
-        invariant(
-          finishedWork.stateNode !== null,
-          'This should have a text node initialized. This error is likely ' +
-            'caused by a bug in React. Please file an issue.',
-        );
-        const textInstance: TI = finishedWork.stateNode;
-        const newText: string = finishedWork.memoizedProps;
+  switch (finishedWork.tag) {
+    case ClassComponent: {
+      return;
+    }
+    case HostComponent: {
+      const instance: Instance = finishedWork.stateNode;
+      if (instance != null) {
+        // Commit the work prepared earlier.
+        const newProps = finishedWork.memoizedProps;
         // For hydration we reuse the update path but we treat the oldProps
         // as the newProps. The updatePayload will contain the real change in
         // this case.
-        const oldText: string =
-          current !== null ? current.memoizedProps : newText;
-        commitTextUpdate(textInstance, oldText, newText);
-        return;
-      }
-      case HostRoot: {
-        return;
-      }
-      case Profiler: {
-        if (enableProfilerTimer) {
-          const onRender = finishedWork.memoizedProps.onRender;
-          onRender(
-            finishedWork.memoizedProps.id,
-            current === null ? 'mount' : 'update',
-            finishedWork.stateNode.duration,
-            finishedWork.treeBaseTime,
+        const oldProps = current !== null ? current.memoizedProps : newProps;
+        const type = finishedWork.type;
+        // TODO: Type the updateQueue to be specific to host components.
+        const updatePayload: null | UpdatePayload = (finishedWork.updateQueue: any);
+        finishedWork.updateQueue = null;
+        if (updatePayload !== null) {
+          commitUpdate(
+            instance,
+            updatePayload,
+            type,
+            oldProps,
+            newProps,
+            finishedWork,
           );
-
-          // Reset actualTime after successful commit.
-          // By default, we append to this time to account for errors and pauses.
-          finishedWork.stateNode.duration = 0;
         }
-        return;
       }
-      case TimeoutComponent: {
-        return;
-      }
-      default: {
-        invariant(
-          false,
-          'This unit of work tag should not have side-effects. This error is ' +
-            'likely caused by a bug in React. Please file an issue.',
+      return;
+    }
+    case HostText: {
+      invariant(
+        finishedWork.stateNode !== null,
+        'This should have a text node initialized. This error is likely ' +
+          'caused by a bug in React. Please file an issue.',
+      );
+      const textInstance: TextInstance = finishedWork.stateNode;
+      const newText: string = finishedWork.memoizedProps;
+      // For hydration we reuse the update path but we treat the oldProps
+      // as the newProps. The updatePayload will contain the real change in
+      // this case.
+      const oldText: string =
+        current !== null ? current.memoizedProps : newText;
+      commitTextUpdate(textInstance, oldText, newText);
+      return;
+    }
+    case HostRoot: {
+      return;
+    }
+    case Profiler: {
+      if (enableProfilerTimer) {
+        const onRender = finishedWork.memoizedProps.onRender;
+        onRender(
+          finishedWork.memoizedProps.id,
+          current === null ? 'mount' : 'update',
+          finishedWork.stateNode.duration,
+          finishedWork.treeBaseTime,
         );
+
+        // Reset actualTime after successful commit.
+        // By default, we append to this time to account for errors and pauses.
+        finishedWork.stateNode.duration = 0;
       }
+      return;
+    }
+    case TimeoutComponent: {
+      return;
+    }
+    default: {
+      invariant(
+        false,
+        'This unit of work tag should not have side-effects. This error is ' +
+          'likely caused by a bug in React. Please file an issue.',
+      );
     }
   }
-
-  function commitResetTextContent(current: Fiber) {
-    resetTextContent(current.stateNode);
-  }
-
-  if (enableMutatingReconciler) {
-    return {
-      commitBeforeMutationLifeCycles,
-      commitResetTextContent,
-      commitPlacement,
-      commitDeletion,
-      commitWork,
-      commitLifeCycles,
-      commitAttachRef,
-      commitDetachRef,
-    };
-  } else {
-    invariant(false, 'Mutating reconciler is disabled.');
-  }
 }
+
+function commitResetTextContent(current: Fiber) {
+  if (!supportsMutation) {
+    return;
+  }
+  resetTextContent(current.stateNode);
+}
+
+export {
+  commitBeforeMutationLifeCycles,
+  commitResetTextContent,
+  commitPlacement,
+  commitDeletion,
+  commitWork,
+  commitLifeCycles,
+  commitAttachRef,
+  commitDetachRef,
+};
diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js
index 9d2cec1f35..8ed630b82d 100644
--- a/packages/react-reconciler/src/ReactFiberCompleteWork.js
+++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js
@@ -7,22 +7,20 @@
  * @flow
  */
 
-import type {HostConfig} from 'react-reconciler';
 import type {Fiber} from './ReactFiber';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
-import type {HostContext} from './ReactFiberHostContext';
-import type {LegacyContext} from './ReactFiberContext';
-import type {NewContext} from './ReactFiberNewContext';
-import type {HydrationContext} from './ReactFiberHydrationContext';
 import type {FiberRoot} from './ReactFiberRoot';
-import type {ProfilerTimer} from './ReactProfilerTimer';
+import type {
+  Instance,
+  Type,
+  Props,
+  UpdatePayload,
+  Container,
+  ChildSet,
+  HostContext,
+} from './ReactFiberHostConfig';
 
-import {
-  enableMutatingReconciler,
-  enablePersistentReconciler,
-  enableNoopReconciler,
-  enableProfilerTimer,
-} from 'shared/ReactFeatureFlags';
+import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
 import {
   IndeterminateComponent,
   FunctionalComponent,
@@ -42,63 +40,129 @@ import {
 import {Placement, Ref, Update} from 'shared/ReactTypeOfSideEffect';
 import invariant from 'fbjs/lib/invariant';
 
-export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
-  config: HostConfig<T, P, I, TI, HI, PI, C, CC, CX, PL>,
-  hostContext: HostContext<C, CX>,
-  legacyContext: LegacyContext,
-  newContext: NewContext,
-  hydrationContext: HydrationContext<C, CX>,
-  profilerTimer: ProfilerTimer,
-) {
-  const {
-    createInstance,
-    createTextInstance,
-    appendInitialChild,
-    finalizeInitialChildren,
-    prepareUpdate,
-    mutation,
-    persistence,
-  } = config;
+import {
+  createInstance,
+  createTextInstance,
+  appendInitialChild,
+  finalizeInitialChildren,
+  prepareUpdate,
+  supportsMutation,
+  supportsPersistence,
+  cloneInstance,
+  createContainerChildSet,
+  appendChildToContainerChildSet,
+  finalizeContainerChildren,
+} from './ReactFiberHostConfig';
+import {
+  getRootHostContainer,
+  popHostContext,
+  getHostContext,
+  popHostContainer,
+} from './ReactFiberHostContext';
+import {recordElapsedActualRenderTime} from './ReactProfilerTimer';
+import {
+  popContextProvider as popLegacyContextProvider,
+  popTopLevelContextObject as popTopLevelLegacyContextObject,
+} from './ReactFiberContext';
+import {popProvider} from './ReactFiberNewContext';
+import {
+  prepareToHydrateHostInstance,
+  prepareToHydrateHostTextInstance,
+  popHydrationState,
+} from './ReactFiberHydrationContext';
 
-  const {
-    getRootHostContainer,
-    popHostContext,
-    getHostContext,
-    popHostContainer,
-  } = hostContext;
+function markUpdate(workInProgress: Fiber) {
+  // Tag the fiber with an update effect. This turns a Placement into
+  // a PlacementAndUpdate.
+  workInProgress.effectTag |= Update;
+}
 
-  const {recordElapsedActualRenderTime} = profilerTimer;
+function markRef(workInProgress: Fiber) {
+  workInProgress.effectTag |= Ref;
+}
 
-  const {
-    popContextProvider: popLegacyContextProvider,
-    popTopLevelContextObject: popTopLevelLegacyContextObject,
-  } = legacyContext;
-
-  const {popProvider} = newContext;
-
-  const {
-    prepareToHydrateHostInstance,
-    prepareToHydrateHostTextInstance,
-    popHydrationState,
-  } = hydrationContext;
-
-  function markUpdate(workInProgress: Fiber) {
-    // Tag the fiber with an update effect. This turns a Placement into
-    // a PlacementAndUpdate.
-    workInProgress.effectTag |= Update;
+function appendAllChildren(parent: Instance, workInProgress: Fiber) {
+  // We only have the top Fiber that was created but we need recurse down its
+  // children to find all the terminal nodes.
+  let node = workInProgress.child;
+  while (node !== null) {
+    if (node.tag === HostComponent || node.tag === HostText) {
+      appendInitialChild(parent, node.stateNode);
+    } else if (node.tag === HostPortal) {
+      // If we have a portal child, then we don't want to traverse
+      // down its children. Instead, we'll get insertions from each child in
+      // the portal directly.
+    } else if (node.child !== null) {
+      node.child.return = node;
+      node = node.child;
+      continue;
+    }
+    if (node === workInProgress) {
+      return;
+    }
+    while (node.sibling === null) {
+      if (node.return === null || node.return === workInProgress) {
+        return;
+      }
+      node = node.return;
+    }
+    node.sibling.return = node.return;
+    node = node.sibling;
   }
+}
 
-  function markRef(workInProgress: Fiber) {
-    workInProgress.effectTag |= Ref;
-  }
+let updateHostContainer;
+let updateHostComponent;
+let updateHostText;
+if (supportsMutation) {
+  // Mutation mode
 
-  function appendAllChildren(parent: I, workInProgress: Fiber) {
+  updateHostContainer = function(workInProgress: Fiber) {
+    // Noop
+  };
+  updateHostComponent = function(
+    current: Fiber,
+    workInProgress: Fiber,
+    updatePayload: null | UpdatePayload,
+    type: Type,
+    oldProps: Props,
+    newProps: Props,
+    rootContainerInstance: Container,
+    currentHostContext: HostContext,
+  ) {
+    // TODO: Type this specific to this type of component.
+    workInProgress.updateQueue = (updatePayload: any);
+    // If the update payload indicates that there is a change or if there
+    // is a new ref we mark this as an update. All the work is done in commitWork.
+    if (updatePayload) {
+      markUpdate(workInProgress);
+    }
+  };
+  updateHostText = function(
+    current: Fiber,
+    workInProgress: Fiber,
+    oldText: string,
+    newText: string,
+  ) {
+    // If the text differs, mark it as an update. All the work in done in commitWork.
+    if (oldText !== newText) {
+      markUpdate(workInProgress);
+    }
+  };
+} else if (supportsPersistence) {
+  // Persistent host tree mode
+
+  // An unfortunate fork of appendAllChildren because we have two different parent types.
+  const appendAllChildrenToContainer = function(
+    containerChildSet: ChildSet,
+    workInProgress: Fiber,
+  ) {
     // We only have the top Fiber that was created but we need recurse down its
     // children to find all the terminal nodes.
     let node = workInProgress.child;
     while (node !== null) {
       if (node.tag === HostComponent || node.tag === HostText) {
-        appendInitialChild(parent, node.stateNode);
+        appendChildToContainerChildSet(containerChildSet, node.stateNode);
       } else if (node.tag === HostPortal) {
         // If we have a portal child, then we don't want to traverse
         // down its children. Instead, we'll get insertions from each child in
@@ -120,142 +184,249 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
       node.sibling.return = node.return;
       node = node.sibling;
     }
-  }
-
-  let updateHostContainer;
-  let updateHostComponent;
-  let updateHostText;
-  if (mutation) {
-    if (enableMutatingReconciler) {
-      // Mutation mode
-      updateHostContainer = function(workInProgress: Fiber) {
-        // Noop
-      };
-      updateHostComponent = function(
-        current: Fiber,
-        workInProgress: Fiber,
-        updatePayload: null | PL,
-        type: T,
-        oldProps: P,
-        newProps: P,
-        rootContainerInstance: C,
-        currentHostContext: CX,
-      ) {
-        // TODO: Type this specific to this type of component.
-        workInProgress.updateQueue = (updatePayload: any);
-        // If the update payload indicates that there is a change or if there
-        // is a new ref we mark this as an update. All the work is done in commitWork.
-        if (updatePayload) {
-          markUpdate(workInProgress);
-        }
-      };
-      updateHostText = function(
-        current: Fiber,
-        workInProgress: Fiber,
-        oldText: string,
-        newText: string,
-      ) {
-        // If the text differs, mark it as an update. All the work in done in commitWork.
-        if (oldText !== newText) {
-          markUpdate(workInProgress);
-        }
-      };
+  };
+  updateHostContainer = function(workInProgress: Fiber) {
+    const portalOrRoot: {
+      containerInfo: Container,
+      pendingChildren: ChildSet,
+    } =
+      workInProgress.stateNode;
+    const childrenUnchanged = workInProgress.firstEffect === null;
+    if (childrenUnchanged) {
+      // No changes, just reuse the existing instance.
     } else {
-      invariant(false, 'Mutating reconciler is disabled.');
+      const container = portalOrRoot.containerInfo;
+      let newChildSet = createContainerChildSet(container);
+      // If children might have changed, we have to add them all to the set.
+      appendAllChildrenToContainer(newChildSet, workInProgress);
+      portalOrRoot.pendingChildren = newChildSet;
+      // Schedule an update on the container to swap out the container.
+      markUpdate(workInProgress);
+      finalizeContainerChildren(container, newChildSet);
     }
-  } else if (persistence) {
-    if (enablePersistentReconciler) {
-      // Persistent host tree mode
-      const {
-        cloneInstance,
-        createContainerChildSet,
-        appendChildToContainerChildSet,
-        finalizeContainerChildren,
-      } = persistence;
+  };
+  updateHostComponent = function(
+    current: Fiber,
+    workInProgress: Fiber,
+    updatePayload: null | UpdatePayload,
+    type: Type,
+    oldProps: Props,
+    newProps: Props,
+    rootContainerInstance: Container,
+    currentHostContext: HostContext,
+  ) {
+    // If there are no effects associated with this node, then none of our children had any updates.
+    // This guarantees that we can reuse all of them.
+    const childrenUnchanged = workInProgress.firstEffect === null;
+    const currentInstance = current.stateNode;
+    if (childrenUnchanged && updatePayload === null) {
+      // No changes, just reuse the existing instance.
+      // Note that this might release a previous clone.
+      workInProgress.stateNode = currentInstance;
+    } else {
+      let recyclableInstance = workInProgress.stateNode;
+      let newInstance = cloneInstance(
+        currentInstance,
+        updatePayload,
+        type,
+        oldProps,
+        newProps,
+        workInProgress,
+        childrenUnchanged,
+        recyclableInstance,
+      );
+      if (
+        finalizeInitialChildren(
+          newInstance,
+          type,
+          newProps,
+          rootContainerInstance,
+          currentHostContext,
+        )
+      ) {
+        markUpdate(workInProgress);
+      }
+      workInProgress.stateNode = newInstance;
+      if (childrenUnchanged) {
+        // If there are no other effects in this tree, we need to flag this node as having one.
+        // Even though we're not going to use it for anything.
+        // Otherwise parents won't know that there are new children to propagate upwards.
+        markUpdate(workInProgress);
+      } else {
+        // If children might have changed, we have to add them all to the set.
+        appendAllChildren(newInstance, workInProgress);
+      }
+    }
+  };
+  updateHostText = function(
+    current: Fiber,
+    workInProgress: Fiber,
+    oldText: string,
+    newText: string,
+  ) {
+    if (oldText !== newText) {
+      // If the text content differs, we'll create a new text instance for it.
+      const rootContainerInstance = getRootHostContainer();
+      const currentHostContext = getHostContext();
+      workInProgress.stateNode = createTextInstance(
+        newText,
+        rootContainerInstance,
+        currentHostContext,
+        workInProgress,
+      );
+      // We'll have to mark it as having an effect, even though we won't use the effect for anything.
+      // This lets the parents know that at least one of their children has changed.
+      markUpdate(workInProgress);
+    }
+  };
+} else {
+  // No host operations
+  updateHostContainer = function(workInProgress: Fiber) {
+    // Noop
+  };
+  updateHostComponent = function(
+    current: Fiber,
+    workInProgress: Fiber,
+    updatePayload: null | UpdatePayload,
+    type: Type,
+    oldProps: Props,
+    newProps: Props,
+    rootContainerInstance: Container,
+    currentHostContext: HostContext,
+  ) {
+    // Noop
+  };
+  updateHostText = function(
+    current: Fiber,
+    workInProgress: Fiber,
+    oldText: string,
+    newText: string,
+  ) {
+    // Noop
+  };
+}
 
-      // An unfortunate fork of appendAllChildren because we have two different parent types.
-      const appendAllChildrenToContainer = function(
-        containerChildSet: CC,
-        workInProgress: Fiber,
-      ) {
-        // We only have the top Fiber that was created but we need recurse down its
-        // children to find all the terminal nodes.
-        let node = workInProgress.child;
-        while (node !== null) {
-          if (node.tag === HostComponent || node.tag === HostText) {
-            appendChildToContainerChildSet(containerChildSet, node.stateNode);
-          } else if (node.tag === HostPortal) {
-            // If we have a portal child, then we don't want to traverse
-            // down its children. Instead, we'll get insertions from each child in
-            // the portal directly.
-          } else if (node.child !== null) {
-            node.child.return = node;
-            node = node.child;
-            continue;
-          }
-          if (node === workInProgress) {
-            return;
-          }
-          while (node.sibling === null) {
-            if (node.return === null || node.return === workInProgress) {
-              return;
-            }
-            node = node.return;
-          }
-          node.sibling.return = node.return;
-          node = node.sibling;
+function completeWork(
+  current: Fiber | null,
+  workInProgress: Fiber,
+  renderExpirationTime: ExpirationTime,
+): Fiber | null {
+  const newProps = workInProgress.pendingProps;
+  switch (workInProgress.tag) {
+    case FunctionalComponent:
+      return null;
+    case ClassComponent: {
+      // We are leaving this subtree, so pop context if any.
+      popLegacyContextProvider(workInProgress);
+      return null;
+    }
+    case HostRoot: {
+      popHostContainer(workInProgress);
+      popTopLevelLegacyContextObject(workInProgress);
+      const fiberRoot = (workInProgress.stateNode: FiberRoot);
+      if (fiberRoot.pendingContext) {
+        fiberRoot.context = fiberRoot.pendingContext;
+        fiberRoot.pendingContext = null;
+      }
+      if (current === null || current.child === null) {
+        // If we hydrated, pop so that we can delete any remaining children
+        // that weren't hydrated.
+        popHydrationState(workInProgress);
+        // This resets the hacky state to fix isMounted before committing.
+        // TODO: Delete this when we delete isMounted and findDOMNode.
+        workInProgress.effectTag &= ~Placement;
+      }
+      updateHostContainer(workInProgress);
+      return null;
+    }
+    case HostComponent: {
+      popHostContext(workInProgress);
+      const rootContainerInstance = getRootHostContainer();
+      const type = workInProgress.type;
+      if (current !== null && workInProgress.stateNode != null) {
+        // If we have an alternate, that means this is an update and we need to
+        // schedule a side-effect to do the updates.
+        const oldProps = current.memoizedProps;
+        // If we get updated because one of our children updated, we don't
+        // have newProps so we'll have to reuse them.
+        // TODO: Split the update API as separate for the props vs. children.
+        // Even better would be if children weren't special cased at all tho.
+        const instance: Instance = workInProgress.stateNode;
+        const currentHostContext = getHostContext();
+        // TODO: Experiencing an error where oldProps is null. Suggests a host
+        // component is hitting the resume path. Figure out why. Possibly
+        // related to `hidden`.
+        const updatePayload = prepareUpdate(
+          instance,
+          type,
+          oldProps,
+          newProps,
+          rootContainerInstance,
+          currentHostContext,
+        );
+
+        updateHostComponent(
+          current,
+          workInProgress,
+          updatePayload,
+          type,
+          oldProps,
+          newProps,
+          rootContainerInstance,
+          currentHostContext,
+        );
+
+        if (current.ref !== workInProgress.ref) {
+          markRef(workInProgress);
         }
-      };
-      updateHostContainer = function(workInProgress: Fiber) {
-        const portalOrRoot: {containerInfo: C, pendingChildren: CC} =
-          workInProgress.stateNode;
-        const childrenUnchanged = workInProgress.firstEffect === null;
-        if (childrenUnchanged) {
-          // No changes, just reuse the existing instance.
-        } else {
-          const container = portalOrRoot.containerInfo;
-          let newChildSet = createContainerChildSet(container);
-          // If children might have changed, we have to add them all to the set.
-          appendAllChildrenToContainer(newChildSet, workInProgress);
-          portalOrRoot.pendingChildren = newChildSet;
-          // Schedule an update on the container to swap out the container.
-          markUpdate(workInProgress);
-          finalizeContainerChildren(container, newChildSet);
-        }
-      };
-      updateHostComponent = function(
-        current: Fiber,
-        workInProgress: Fiber,
-        updatePayload: null | PL,
-        type: T,
-        oldProps: P,
-        newProps: P,
-        rootContainerInstance: C,
-        currentHostContext: CX,
-      ) {
-        // If there are no effects associated with this node, then none of our children had any updates.
-        // This guarantees that we can reuse all of them.
-        const childrenUnchanged = workInProgress.firstEffect === null;
-        const currentInstance = current.stateNode;
-        if (childrenUnchanged && updatePayload === null) {
-          // No changes, just reuse the existing instance.
-          // Note that this might release a previous clone.
-          workInProgress.stateNode = currentInstance;
-        } else {
-          let recyclableInstance = workInProgress.stateNode;
-          let newInstance = cloneInstance(
-            currentInstance,
-            updatePayload,
-            type,
-            oldProps,
-            newProps,
-            workInProgress,
-            childrenUnchanged,
-            recyclableInstance,
+      } else {
+        if (!newProps) {
+          invariant(
+            workInProgress.stateNode !== null,
+            'We must have new props for new mounts. This error is likely ' +
+              'caused by a bug in React. Please file an issue.',
           );
+          // This can happen when we abort work.
+          return null;
+        }
+
+        const currentHostContext = getHostContext();
+        // TODO: Move createInstance to beginWork and keep it on a context
+        // "stack" as the parent. Then append children as we go in beginWork
+        // or completeWork depending on we want to add then top->down or
+        // bottom->up. Top->down is faster in IE11.
+        let wasHydrated = popHydrationState(workInProgress);
+        if (wasHydrated) {
+          // TODO: Move this and createInstance step into the beginPhase
+          // to consolidate.
+          if (
+            prepareToHydrateHostInstance(
+              workInProgress,
+              rootContainerInstance,
+              currentHostContext,
+            )
+          ) {
+            // If changes to the hydrated node needs to be applied at the
+            // commit-phase we mark this as such.
+            markUpdate(workInProgress);
+          }
+        } else {
+          let instance = createInstance(
+            type,
+            newProps,
+            rootContainerInstance,
+            currentHostContext,
+            workInProgress,
+          );
+
+          appendAllChildren(instance, workInProgress);
+
+          // Certain renderers require commit-time effects for initial mount.
+          // (eg DOM renderer supports auto-focus for certain elements).
+          // Make sure such renderers get scheduled for later work.
           if (
             finalizeInitialChildren(
-              newInstance,
+              instance,
               type,
               newProps,
               rootContainerInstance,
@@ -264,289 +435,90 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
           ) {
             markUpdate(workInProgress);
           }
-          workInProgress.stateNode = newInstance;
-          if (childrenUnchanged) {
-            // If there are no other effects in this tree, we need to flag this node as having one.
-            // Even though we're not going to use it for anything.
-            // Otherwise parents won't know that there are new children to propagate upwards.
-            markUpdate(workInProgress);
-          } else {
-            // If children might have changed, we have to add them all to the set.
-            appendAllChildren(newInstance, workInProgress);
-          }
+          workInProgress.stateNode = instance;
         }
-      };
-      updateHostText = function(
-        current: Fiber,
-        workInProgress: Fiber,
-        oldText: string,
-        newText: string,
-      ) {
-        if (oldText !== newText) {
-          // If the text content differs, we'll create a new text instance for it.
-          const rootContainerInstance = getRootHostContainer();
-          const currentHostContext = getHostContext();
+
+        if (workInProgress.ref !== null) {
+          // If there is a ref on a host node we need to schedule a callback
+          markRef(workInProgress);
+        }
+      }
+      return null;
+    }
+    case HostText: {
+      let newText = newProps;
+      if (current && workInProgress.stateNode != null) {
+        const oldText = current.memoizedProps;
+        // If we have an alternate, that means this is an update and we need
+        // to schedule a side-effect to do the updates.
+        updateHostText(current, workInProgress, oldText, newText);
+      } else {
+        if (typeof newText !== 'string') {
+          invariant(
+            workInProgress.stateNode !== null,
+            'We must have new props for new mounts. This error is likely ' +
+              'caused by a bug in React. Please file an issue.',
+          );
+          // This can happen when we abort work.
+          return null;
+        }
+        const rootContainerInstance = getRootHostContainer();
+        const currentHostContext = getHostContext();
+        let wasHydrated = popHydrationState(workInProgress);
+        if (wasHydrated) {
+          if (prepareToHydrateHostTextInstance(workInProgress)) {
+            markUpdate(workInProgress);
+          }
+        } else {
           workInProgress.stateNode = createTextInstance(
             newText,
             rootContainerInstance,
             currentHostContext,
             workInProgress,
           );
-          // We'll have to mark it as having an effect, even though we won't use the effect for anything.
-          // This lets the parents know that at least one of their children has changed.
-          markUpdate(workInProgress);
         }
-      };
-    } else {
-      invariant(false, 'Persistent reconciler is disabled.');
-    }
-  } else {
-    if (enableNoopReconciler) {
-      // No host operations
-      updateHostContainer = function(workInProgress: Fiber) {
-        // Noop
-      };
-      updateHostComponent = function(
-        current: Fiber,
-        workInProgress: Fiber,
-        updatePayload: null | PL,
-        type: T,
-        oldProps: P,
-        newProps: P,
-        rootContainerInstance: C,
-        currentHostContext: CX,
-      ) {
-        // Noop
-      };
-      updateHostText = function(
-        current: Fiber,
-        workInProgress: Fiber,
-        oldText: string,
-        newText: string,
-      ) {
-        // Noop
-      };
-    } else {
-      invariant(false, 'Noop reconciler is disabled.');
+      }
+      return null;
     }
+    case ForwardRef:
+      return null;
+    case TimeoutComponent:
+      return null;
+    case Fragment:
+      return null;
+    case Mode:
+      return null;
+    case Profiler:
+      if (enableProfilerTimer) {
+        recordElapsedActualRenderTime(workInProgress);
+      }
+      return null;
+    case HostPortal:
+      popHostContainer(workInProgress);
+      updateHostContainer(workInProgress);
+      return null;
+    case ContextProvider:
+      // Pop provider fiber
+      popProvider(workInProgress);
+      return null;
+    case ContextConsumer:
+      return null;
+    // Error cases
+    case IndeterminateComponent:
+      invariant(
+        false,
+        'An indeterminate component should have become determinate before ' +
+          'completing. This error is likely caused by a bug in React. Please ' +
+          'file an issue.',
+      );
+    // eslint-disable-next-line no-fallthrough
+    default:
+      invariant(
+        false,
+        'Unknown unit of work tag. This error is likely caused by a bug in ' +
+          'React. Please file an issue.',
+      );
   }
-
-  function completeWork(
-    current: Fiber | null,
-    workInProgress: Fiber,
-    renderExpirationTime: ExpirationTime,
-  ): Fiber | null {
-    const newProps = workInProgress.pendingProps;
-    switch (workInProgress.tag) {
-      case FunctionalComponent:
-        return null;
-      case ClassComponent: {
-        // We are leaving this subtree, so pop context if any.
-        popLegacyContextProvider(workInProgress);
-        return null;
-      }
-      case HostRoot: {
-        popHostContainer(workInProgress);
-        popTopLevelLegacyContextObject(workInProgress);
-        const fiberRoot = (workInProgress.stateNode: FiberRoot);
-        if (fiberRoot.pendingContext) {
-          fiberRoot.context = fiberRoot.pendingContext;
-          fiberRoot.pendingContext = null;
-        }
-        if (current === null || current.child === null) {
-          // If we hydrated, pop so that we can delete any remaining children
-          // that weren't hydrated.
-          popHydrationState(workInProgress);
-          // This resets the hacky state to fix isMounted before committing.
-          // TODO: Delete this when we delete isMounted and findDOMNode.
-          workInProgress.effectTag &= ~Placement;
-        }
-        updateHostContainer(workInProgress);
-        return null;
-      }
-      case HostComponent: {
-        popHostContext(workInProgress);
-        const rootContainerInstance = getRootHostContainer();
-        const type = workInProgress.type;
-        if (current !== null && workInProgress.stateNode != null) {
-          // If we have an alternate, that means this is an update and we need to
-          // schedule a side-effect to do the updates.
-          const oldProps = current.memoizedProps;
-          // If we get updated because one of our children updated, we don't
-          // have newProps so we'll have to reuse them.
-          // TODO: Split the update API as separate for the props vs. children.
-          // Even better would be if children weren't special cased at all tho.
-          const instance: I = workInProgress.stateNode;
-          const currentHostContext = getHostContext();
-          // TODO: Experiencing an error where oldProps is null. Suggests a host
-          // component is hitting the resume path. Figure out why. Possibly
-          // related to `hidden`.
-          const updatePayload = prepareUpdate(
-            instance,
-            type,
-            oldProps,
-            newProps,
-            rootContainerInstance,
-            currentHostContext,
-          );
-
-          updateHostComponent(
-            current,
-            workInProgress,
-            updatePayload,
-            type,
-            oldProps,
-            newProps,
-            rootContainerInstance,
-            currentHostContext,
-          );
-
-          if (current.ref !== workInProgress.ref) {
-            markRef(workInProgress);
-          }
-        } else {
-          if (!newProps) {
-            invariant(
-              workInProgress.stateNode !== null,
-              'We must have new props for new mounts. This error is likely ' +
-                'caused by a bug in React. Please file an issue.',
-            );
-            // This can happen when we abort work.
-            return null;
-          }
-
-          const currentHostContext = getHostContext();
-          // TODO: Move createInstance to beginWork and keep it on a context
-          // "stack" as the parent. Then append children as we go in beginWork
-          // or completeWork depending on we want to add then top->down or
-          // bottom->up. Top->down is faster in IE11.
-          let wasHydrated = popHydrationState(workInProgress);
-          if (wasHydrated) {
-            // TODO: Move this and createInstance step into the beginPhase
-            // to consolidate.
-            if (
-              prepareToHydrateHostInstance(
-                workInProgress,
-                rootContainerInstance,
-                currentHostContext,
-              )
-            ) {
-              // If changes to the hydrated node needs to be applied at the
-              // commit-phase we mark this as such.
-              markUpdate(workInProgress);
-            }
-          } else {
-            let instance = createInstance(
-              type,
-              newProps,
-              rootContainerInstance,
-              currentHostContext,
-              workInProgress,
-            );
-
-            appendAllChildren(instance, workInProgress);
-
-            // Certain renderers require commit-time effects for initial mount.
-            // (eg DOM renderer supports auto-focus for certain elements).
-            // Make sure such renderers get scheduled for later work.
-            if (
-              finalizeInitialChildren(
-                instance,
-                type,
-                newProps,
-                rootContainerInstance,
-                currentHostContext,
-              )
-            ) {
-              markUpdate(workInProgress);
-            }
-            workInProgress.stateNode = instance;
-          }
-
-          if (workInProgress.ref !== null) {
-            // If there is a ref on a host node we need to schedule a callback
-            markRef(workInProgress);
-          }
-        }
-        return null;
-      }
-      case HostText: {
-        let newText = newProps;
-        if (current && workInProgress.stateNode != null) {
-          const oldText = current.memoizedProps;
-          // If we have an alternate, that means this is an update and we need
-          // to schedule a side-effect to do the updates.
-          updateHostText(current, workInProgress, oldText, newText);
-        } else {
-          if (typeof newText !== 'string') {
-            invariant(
-              workInProgress.stateNode !== null,
-              'We must have new props for new mounts. This error is likely ' +
-                'caused by a bug in React. Please file an issue.',
-            );
-            // This can happen when we abort work.
-            return null;
-          }
-          const rootContainerInstance = getRootHostContainer();
-          const currentHostContext = getHostContext();
-          let wasHydrated = popHydrationState(workInProgress);
-          if (wasHydrated) {
-            if (prepareToHydrateHostTextInstance(workInProgress)) {
-              markUpdate(workInProgress);
-            }
-          } else {
-            workInProgress.stateNode = createTextInstance(
-              newText,
-              rootContainerInstance,
-              currentHostContext,
-              workInProgress,
-            );
-          }
-        }
-        return null;
-      }
-      case ForwardRef:
-        return null;
-      case TimeoutComponent:
-        return null;
-      case Fragment:
-        return null;
-      case Mode:
-        return null;
-      case Profiler:
-        if (enableProfilerTimer) {
-          recordElapsedActualRenderTime(workInProgress);
-        }
-        return null;
-      case HostPortal:
-        popHostContainer(workInProgress);
-        updateHostContainer(workInProgress);
-        return null;
-      case ContextProvider:
-        // Pop provider fiber
-        popProvider(workInProgress);
-        return null;
-      case ContextConsumer:
-        return null;
-      // Error cases
-      case IndeterminateComponent:
-        invariant(
-          false,
-          'An indeterminate component should have become determinate before ' +
-            'completing. This error is likely caused by a bug in React. Please ' +
-            'file an issue.',
-        );
-      // eslint-disable-next-line no-fallthrough
-      default:
-        invariant(
-          false,
-          'Unknown unit of work tag. This error is likely caused by a bug in ' +
-            'React. Please file an issue.',
-        );
-    }
-  }
-
-  return {
-    completeWork,
-  };
 }
+
+export {completeWork};
diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js
index 5db0841703..edbe7b2fa5 100644
--- a/packages/react-reconciler/src/ReactFiberContext.js
+++ b/packages/react-reconciler/src/ReactFiberContext.js
@@ -8,7 +8,7 @@
  */
 
 import type {Fiber} from './ReactFiber';
-import type {StackCursor, Stack} from './ReactFiberStack';
+import type {StackCursor} from './ReactFiberStack';
 
 import {isFiberMounted} from 'react-reconciler/reflection';
 import {ClassComponent, HostRoot} from 'shared/ReactTypeOfWork';
@@ -20,6 +20,7 @@ import checkPropTypes from 'prop-types/checkPropTypes';
 
 import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
 import {startPhaseTimer, stopPhaseTimer} from './ReactDebugFiberPerf';
+import {createCursor, push, pop} from './ReactFiberStack';
 
 let warnedAboutMissingGetChildContext;
 
@@ -27,308 +28,280 @@ if (__DEV__) {
   warnedAboutMissingGetChildContext = {};
 }
 
-export type LegacyContext = {
-  getUnmaskedContext(workInProgress: Fiber): Object,
-  cacheContext(
-    workInProgress: Fiber,
-    unmaskedContext: Object,
-    maskedContext: Object,
-  ): void,
-  getMaskedContext(workInProgress: Fiber, unmaskedContext: Object): Object,
-  hasContextChanged(): boolean,
-  isContextConsumer(fiber: Fiber): boolean,
-  isContextProvider(fiber: Fiber): boolean,
-  popContextProvider(fiber: Fiber): void,
-  popTopLevelContextObject(fiber: Fiber): void,
-  pushTopLevelContextObject(
-    fiber: Fiber,
-    context: Object,
-    didChange: boolean,
-  ): void,
-  processChildContext(fiber: Fiber, parentContext: Object): Object,
-  pushContextProvider(workInProgress: Fiber): boolean,
-  invalidateContextProvider(workInProgress: Fiber, didChange: boolean): void,
-  findCurrentUnmaskedContext(fiber: Fiber): Object,
-};
+// A cursor to the current merged context object on the stack.
+let contextStackCursor: StackCursor<Object> = createCursor(emptyObject);
+// A cursor to a boolean indicating whether the context has changed.
+let didPerformWorkStackCursor: StackCursor<boolean> = createCursor(false);
+// Keep track of the previous context object that was on the stack.
+// We use this to get access to the parent context after we have already
+// pushed the next context provider, and now need to merge their contexts.
+let previousContext: Object = emptyObject;
 
-export default function(stack: Stack): LegacyContext {
-  const {createCursor, push, pop} = stack;
-
-  // A cursor to the current merged context object on the stack.
-  let contextStackCursor: StackCursor<Object> = createCursor(emptyObject);
-  // A cursor to a boolean indicating whether the context has changed.
-  let didPerformWorkStackCursor: StackCursor<boolean> = createCursor(false);
-  // Keep track of the previous context object that was on the stack.
-  // We use this to get access to the parent context after we have already
-  // pushed the next context provider, and now need to merge their contexts.
-  let previousContext: Object = emptyObject;
-
-  function getUnmaskedContext(workInProgress: Fiber): Object {
-    const hasOwnContext = isContextProvider(workInProgress);
-    if (hasOwnContext) {
-      // If the fiber is a context provider itself, when we read its context
-      // we have already pushed its own child context on the stack. A context
-      // provider should not "see" its own child context. Therefore we read the
-      // previous (parent) context instead for a context provider.
-      return previousContext;
-    }
-    return contextStackCursor.current;
+function getUnmaskedContext(workInProgress: Fiber): Object {
+  const hasOwnContext = isContextProvider(workInProgress);
+  if (hasOwnContext) {
+    // If the fiber is a context provider itself, when we read its context
+    // we have already pushed its own child context on the stack. A context
+    // provider should not "see" its own child context. Therefore we read the
+    // previous (parent) context instead for a context provider.
+    return previousContext;
   }
-
-  function cacheContext(
-    workInProgress: Fiber,
-    unmaskedContext: Object,
-    maskedContext: Object,
-  ) {
-    const instance = workInProgress.stateNode;
-    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
-    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
-  }
-
-  function getMaskedContext(workInProgress: Fiber, unmaskedContext: Object) {
-    const type = workInProgress.type;
-    const contextTypes = type.contextTypes;
-    if (!contextTypes) {
-      return emptyObject;
-    }
-
-    // Avoid recreating masked context unless unmasked context has changed.
-    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
-    // This may trigger infinite loops if componentWillReceiveProps calls setState.
-    const instance = workInProgress.stateNode;
-    if (
-      instance &&
-      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-    ) {
-      return instance.__reactInternalMemoizedMaskedChildContext;
-    }
-
-    const context = {};
-    for (let key in contextTypes) {
-      context[key] = unmaskedContext[key];
-    }
-
-    if (__DEV__) {
-      const name = getComponentName(workInProgress) || 'Unknown';
-      checkPropTypes(
-        contextTypes,
-        context,
-        'context',
-        name,
-        ReactDebugCurrentFiber.getCurrentFiberStackAddendum,
-      );
-    }
-
-    // Cache unmasked context so we can avoid recreating masked context unless necessary.
-    // Context is created before the class component is instantiated so check for instance.
-    if (instance) {
-      cacheContext(workInProgress, unmaskedContext, context);
-    }
-
-    return context;
-  }
-
-  function hasContextChanged(): boolean {
-    return didPerformWorkStackCursor.current;
-  }
-
-  function isContextConsumer(fiber: Fiber): boolean {
-    return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
-  }
-
-  function isContextProvider(fiber: Fiber): boolean {
-    return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
-  }
-
-  function popContextProvider(fiber: Fiber): void {
-    if (!isContextProvider(fiber)) {
-      return;
-    }
-
-    pop(didPerformWorkStackCursor, fiber);
-    pop(contextStackCursor, fiber);
-  }
-
-  function popTopLevelContextObject(fiber: Fiber) {
-    pop(didPerformWorkStackCursor, fiber);
-    pop(contextStackCursor, fiber);
-  }
-
-  function pushTopLevelContextObject(
-    fiber: Fiber,
-    context: Object,
-    didChange: boolean,
-  ): void {
-    invariant(
-      contextStackCursor.cursor == null,
-      'Unexpected context found on stack. ' +
-        'This error is likely caused by a bug in React. Please file an issue.',
-    );
-
-    push(contextStackCursor, context, fiber);
-    push(didPerformWorkStackCursor, didChange, fiber);
-  }
-
-  function processChildContext(fiber: Fiber, parentContext: Object): Object {
-    const instance = fiber.stateNode;
-    const childContextTypes = fiber.type.childContextTypes;
-
-    // TODO (bvaughn) Replace this behavior with an invariant() in the future.
-    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
-    if (typeof instance.getChildContext !== 'function') {
-      if (__DEV__) {
-        const componentName = getComponentName(fiber) || 'Unknown';
-
-        if (!warnedAboutMissingGetChildContext[componentName]) {
-          warnedAboutMissingGetChildContext[componentName] = true;
-          warning(
-            false,
-            '%s.childContextTypes is specified but there is no getChildContext() method ' +
-              'on the instance. You can either define getChildContext() on %s or remove ' +
-              'childContextTypes from it.',
-            componentName,
-            componentName,
-          );
-        }
-      }
-      return parentContext;
-    }
-
-    let childContext;
-    if (__DEV__) {
-      ReactDebugCurrentFiber.setCurrentPhase('getChildContext');
-    }
-    startPhaseTimer(fiber, 'getChildContext');
-    childContext = instance.getChildContext();
-    stopPhaseTimer();
-    if (__DEV__) {
-      ReactDebugCurrentFiber.setCurrentPhase(null);
-    }
-    for (let contextKey in childContext) {
-      invariant(
-        contextKey in childContextTypes,
-        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-        getComponentName(fiber) || 'Unknown',
-        contextKey,
-      );
-    }
-    if (__DEV__) {
-      const name = getComponentName(fiber) || 'Unknown';
-      checkPropTypes(
-        childContextTypes,
-        childContext,
-        'child context',
-        name,
-        // In practice, there is one case in which we won't get a stack. It's when
-        // somebody calls unstable_renderSubtreeIntoContainer() and we process
-        // context from the parent component instance. The stack will be missing
-        // because it's outside of the reconciliation, and so the pointer has not
-        // been set. This is rare and doesn't matter. We'll also remove that API.
-        ReactDebugCurrentFiber.getCurrentFiberStackAddendum,
-      );
-    }
-
-    return {...parentContext, ...childContext};
-  }
-
-  function pushContextProvider(workInProgress: Fiber): boolean {
-    if (!isContextProvider(workInProgress)) {
-      return false;
-    }
-
-    const instance = workInProgress.stateNode;
-    // 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) ||
-      emptyObject;
-
-    // Remember the parent context so we can merge with it later.
-    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
-    previousContext = contextStackCursor.current;
-    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
-    push(
-      didPerformWorkStackCursor,
-      didPerformWorkStackCursor.current,
-      workInProgress,
-    );
-
-    return true;
-  }
-
-  function invalidateContextProvider(
-    workInProgress: Fiber,
-    didChange: boolean,
-  ): void {
-    const instance = workInProgress.stateNode;
-    invariant(
-      instance,
-      'Expected to have an instance by this point. ' +
-        'This error is likely caused by a bug in React. Please file an issue.',
-    );
-
-    if (didChange) {
-      // Merge parent and own context.
-      // Skip this if we're not updating due to sCU.
-      // This avoids unnecessarily recomputing memoized values.
-      const mergedContext = processChildContext(
-        workInProgress,
-        previousContext,
-      );
-      instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-
-      // Replace the old (or empty) context with the new one.
-      // It is important to unwind the context in the reverse order.
-      pop(didPerformWorkStackCursor, workInProgress);
-      pop(contextStackCursor, workInProgress);
-      // Now push the new context and mark that it has changed.
-      push(contextStackCursor, mergedContext, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
-    } else {
-      pop(didPerformWorkStackCursor, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
-    }
-  }
-
-  function findCurrentUnmaskedContext(fiber: Fiber): Object {
-    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
-    // makes sense elsewhere
-    invariant(
-      isFiberMounted(fiber) && fiber.tag === ClassComponent,
-      'Expected subtree parent to be a mounted class component. ' +
-        'This error is likely caused by a bug in React. Please file an issue.',
-    );
-
-    let node: Fiber = fiber;
-    while (node.tag !== HostRoot) {
-      if (isContextProvider(node)) {
-        return node.stateNode.__reactInternalMemoizedMergedChildContext;
-      }
-      const parent = node.return;
-      invariant(
-        parent,
-        'Found unexpected detached subtree parent. ' +
-          'This error is likely caused by a bug in React. Please file an issue.',
-      );
-      node = parent;
-    }
-    return node.stateNode.context;
-  }
-
-  return {
-    getUnmaskedContext,
-    cacheContext,
-    getMaskedContext,
-    hasContextChanged,
-    isContextConsumer,
-    isContextProvider,
-    popContextProvider,
-    popTopLevelContextObject,
-    pushTopLevelContextObject,
-    processChildContext,
-    pushContextProvider,
-    invalidateContextProvider,
-    findCurrentUnmaskedContext,
-  };
+  return contextStackCursor.current;
 }
+
+function cacheContext(
+  workInProgress: Fiber,
+  unmaskedContext: Object,
+  maskedContext: Object,
+): void {
+  const instance = workInProgress.stateNode;
+  instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+  instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+}
+
+function getMaskedContext(
+  workInProgress: Fiber,
+  unmaskedContext: Object,
+): Object {
+  const type = workInProgress.type;
+  const contextTypes = type.contextTypes;
+  if (!contextTypes) {
+    return emptyObject;
+  }
+
+  // Avoid recreating masked context unless unmasked context has changed.
+  // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
+  // This may trigger infinite loops if componentWillReceiveProps calls setState.
+  const instance = workInProgress.stateNode;
+  if (
+    instance &&
+    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+  ) {
+    return instance.__reactInternalMemoizedMaskedChildContext;
+  }
+
+  const context = {};
+  for (let key in contextTypes) {
+    context[key] = unmaskedContext[key];
+  }
+
+  if (__DEV__) {
+    const name = getComponentName(workInProgress) || 'Unknown';
+    checkPropTypes(
+      contextTypes,
+      context,
+      'context',
+      name,
+      ReactDebugCurrentFiber.getCurrentFiberStackAddendum,
+    );
+  }
+
+  // Cache unmasked context so we can avoid recreating masked context unless necessary.
+  // Context is created before the class component is instantiated so check for instance.
+  if (instance) {
+    cacheContext(workInProgress, unmaskedContext, context);
+  }
+
+  return context;
+}
+
+function hasContextChanged(): boolean {
+  return didPerformWorkStackCursor.current;
+}
+
+function isContextConsumer(fiber: Fiber): boolean {
+  return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
+}
+
+function isContextProvider(fiber: Fiber): boolean {
+  return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
+}
+
+function popContextProvider(fiber: Fiber): void {
+  if (!isContextProvider(fiber)) {
+    return;
+  }
+
+  pop(didPerformWorkStackCursor, fiber);
+  pop(contextStackCursor, fiber);
+}
+
+function popTopLevelContextObject(fiber: Fiber): void {
+  pop(didPerformWorkStackCursor, fiber);
+  pop(contextStackCursor, fiber);
+}
+
+function pushTopLevelContextObject(
+  fiber: Fiber,
+  context: Object,
+  didChange: boolean,
+): void {
+  invariant(
+    contextStackCursor.cursor == null,
+    'Unexpected context found on stack. ' +
+      'This error is likely caused by a bug in React. Please file an issue.',
+  );
+
+  push(contextStackCursor, context, fiber);
+  push(didPerformWorkStackCursor, didChange, fiber);
+}
+
+function processChildContext(fiber: Fiber, parentContext: Object): Object {
+  const instance = fiber.stateNode;
+  const childContextTypes = fiber.type.childContextTypes;
+
+  // TODO (bvaughn) Replace this behavior with an invariant() in the future.
+  // It has only been added in Fiber to match the (unintentional) behavior in Stack.
+  if (typeof instance.getChildContext !== 'function') {
+    if (__DEV__) {
+      const componentName = getComponentName(fiber) || 'Unknown';
+
+      if (!warnedAboutMissingGetChildContext[componentName]) {
+        warnedAboutMissingGetChildContext[componentName] = true;
+        warning(
+          false,
+          '%s.childContextTypes is specified but there is no getChildContext() method ' +
+            'on the instance. You can either define getChildContext() on %s or remove ' +
+            'childContextTypes from it.',
+          componentName,
+          componentName,
+        );
+      }
+    }
+    return parentContext;
+  }
+
+  let childContext;
+  if (__DEV__) {
+    ReactDebugCurrentFiber.setCurrentPhase('getChildContext');
+  }
+  startPhaseTimer(fiber, 'getChildContext');
+  childContext = instance.getChildContext();
+  stopPhaseTimer();
+  if (__DEV__) {
+    ReactDebugCurrentFiber.setCurrentPhase(null);
+  }
+  for (let contextKey in childContext) {
+    invariant(
+      contextKey in childContextTypes,
+      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+      getComponentName(fiber) || 'Unknown',
+      contextKey,
+    );
+  }
+  if (__DEV__) {
+    const name = getComponentName(fiber) || 'Unknown';
+    checkPropTypes(
+      childContextTypes,
+      childContext,
+      'child context',
+      name,
+      // In practice, there is one case in which we won't get a stack. It's when
+      // somebody calls unstable_renderSubtreeIntoContainer() and we process
+      // context from the parent component instance. The stack will be missing
+      // because it's outside of the reconciliation, and so the pointer has not
+      // been set. This is rare and doesn't matter. We'll also remove that API.
+      ReactDebugCurrentFiber.getCurrentFiberStackAddendum,
+    );
+  }
+
+  return {...parentContext, ...childContext};
+}
+
+function pushContextProvider(workInProgress: Fiber): boolean {
+  if (!isContextProvider(workInProgress)) {
+    return false;
+  }
+
+  const instance = workInProgress.stateNode;
+  // 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) ||
+    emptyObject;
+
+  // Remember the parent context so we can merge with it later.
+  // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
+  previousContext = contextStackCursor.current;
+  push(contextStackCursor, memoizedMergedChildContext, workInProgress);
+  push(
+    didPerformWorkStackCursor,
+    didPerformWorkStackCursor.current,
+    workInProgress,
+  );
+
+  return true;
+}
+
+function invalidateContextProvider(
+  workInProgress: Fiber,
+  didChange: boolean,
+): void {
+  const instance = workInProgress.stateNode;
+  invariant(
+    instance,
+    'Expected to have an instance by this point. ' +
+      'This error is likely caused by a bug in React. Please file an issue.',
+  );
+
+  if (didChange) {
+    // Merge parent and own context.
+    // Skip this if we're not updating due to sCU.
+    // This avoids unnecessarily recomputing memoized values.
+    const mergedContext = processChildContext(workInProgress, previousContext);
+    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+
+    // Replace the old (or empty) context with the new one.
+    // It is important to unwind the context in the reverse order.
+    pop(didPerformWorkStackCursor, workInProgress);
+    pop(contextStackCursor, workInProgress);
+    // Now push the new context and mark that it has changed.
+    push(contextStackCursor, mergedContext, workInProgress);
+    push(didPerformWorkStackCursor, didChange, workInProgress);
+  } else {
+    pop(didPerformWorkStackCursor, workInProgress);
+    push(didPerformWorkStackCursor, didChange, workInProgress);
+  }
+}
+
+function findCurrentUnmaskedContext(fiber: Fiber): Object {
+  // Currently this is only used with renderSubtreeIntoContainer; not sure if it
+  // makes sense elsewhere
+  invariant(
+    isFiberMounted(fiber) && fiber.tag === ClassComponent,
+    'Expected subtree parent to be a mounted class component. ' +
+      'This error is likely caused by a bug in React. Please file an issue.',
+  );
+
+  let node: Fiber = fiber;
+  while (node.tag !== HostRoot) {
+    if (isContextProvider(node)) {
+      return node.stateNode.__reactInternalMemoizedMergedChildContext;
+    }
+    const parent = node.return;
+    invariant(
+      parent,
+      'Found unexpected detached subtree parent. ' +
+        'This error is likely caused by a bug in React. Please file an issue.',
+    );
+    node = parent;
+  }
+  return node.stateNode.context;
+}
+
+export {
+  getUnmaskedContext,
+  cacheContext,
+  getMaskedContext,
+  hasContextChanged,
+  isContextConsumer,
+  isContextProvider,
+  popContextProvider,
+  popTopLevelContextObject,
+  pushTopLevelContextObject,
+  processChildContext,
+  pushContextProvider,
+  invalidateContextProvider,
+  findCurrentUnmaskedContext,
+};
diff --git a/packages/react-reconciler/src/ReactFiberHostConfig.js b/packages/react-reconciler/src/ReactFiberHostConfig.js
new file mode 100644
index 0000000000..d06b75b9a4
--- /dev/null
+++ b/packages/react-reconciler/src/ReactFiberHostConfig.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import invariant from 'fbjs/lib/invariant';
+
+// We expect that our Rollup, Jest, and Flow configurations
+// always shim this module with the corresponding host config
+// (either provided by a renderer, or a generic shim for npm).
+//
+// We should never resolve to this file, but it exists to make
+// sure that if we *do* accidentally break the configuration,
+// the failure isn't silent.
+
+invariant(false, 'This module must be shimmed by a specific renderer.');
diff --git a/packages/react-reconciler/src/ReactFiberHostContext.js b/packages/react-reconciler/src/ReactFiberHostContext.js
index 7caa1671a7..4f091e610b 100644
--- a/packages/react-reconciler/src/ReactFiberHostContext.js
+++ b/packages/react-reconciler/src/ReactFiberHostContext.js
@@ -7,119 +7,107 @@
  * @flow
  */
 
-import type {HostConfig} from 'react-reconciler';
 import type {Fiber} from './ReactFiber';
-import type {StackCursor, Stack} from './ReactFiberStack';
+import type {StackCursor} from './ReactFiberStack';
+import type {Container, HostContext} from './ReactFiberHostConfig';
 
 import invariant from 'fbjs/lib/invariant';
 
+import {getChildHostContext, getRootHostContext} from './ReactFiberHostConfig';
+import {createCursor, push, pop} from './ReactFiberStack';
+
 declare class NoContextT {}
 const NO_CONTEXT: NoContextT = ({}: any);
 
-export type HostContext<C, CX> = {
-  getHostContext(): CX,
-  getRootHostContainer(): C,
-  popHostContainer(fiber: Fiber): void,
-  popHostContext(fiber: Fiber): void,
-  pushHostContainer(fiber: Fiber, container: C): void,
-  pushHostContext(fiber: Fiber): void,
-};
+let contextStackCursor: StackCursor<HostContext | NoContextT> = createCursor(
+  NO_CONTEXT,
+);
+let contextFiberStackCursor: StackCursor<Fiber | NoContextT> = createCursor(
+  NO_CONTEXT,
+);
+let rootInstanceStackCursor: StackCursor<Container | NoContextT> = createCursor(
+  NO_CONTEXT,
+);
 
-export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
-  config: HostConfig<T, P, I, TI, HI, PI, C, CC, CX, PL>,
-  stack: Stack,
-): HostContext<C, CX> {
-  const {getChildHostContext, getRootHostContext} = config;
-  const {createCursor, push, pop} = stack;
-
-  let contextStackCursor: StackCursor<CX | NoContextT> = createCursor(
-    NO_CONTEXT,
+function requiredContext<Value>(c: Value | NoContextT): Value {
+  invariant(
+    c !== NO_CONTEXT,
+    'Expected host context to exist. This error is likely caused by a bug ' +
+      'in React. Please file an issue.',
   );
-  let contextFiberStackCursor: StackCursor<Fiber | NoContextT> = createCursor(
-    NO_CONTEXT,
-  );
-  let rootInstanceStackCursor: StackCursor<C | NoContextT> = createCursor(
-    NO_CONTEXT,
-  );
-
-  function requiredContext<Value>(c: Value | NoContextT): Value {
-    invariant(
-      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;
-  }
-
-  function pushHostContainer(fiber: Fiber, nextRootInstance: C) {
-    // Push current root instance onto the stack;
-    // This allows us to reset root when portals are popped.
-    push(rootInstanceStackCursor, nextRootInstance, fiber);
-    // Track the context and the Fiber that provided it.
-    // This enables us to pop only Fibers that provide unique contexts.
-    push(contextFiberStackCursor, fiber, fiber);
-
-    // Finally, we need to push the host context to the stack.
-    // However, we can't just call getRootHostContext() and push it because
-    // we'd have a different number of entries on the stack depending on
-    // whether getRootHostContext() throws somewhere in renderer code or not.
-    // So we push an empty value first. This lets us safely unwind on errors.
-    push(contextStackCursor, NO_CONTEXT, fiber);
-    const nextRootContext = getRootHostContext(nextRootInstance);
-    // Now that we know this function doesn't throw, replace it.
-    pop(contextStackCursor, fiber);
-    push(contextStackCursor, nextRootContext, fiber);
-  }
-
-  function popHostContainer(fiber: Fiber) {
-    pop(contextStackCursor, fiber);
-    pop(contextFiberStackCursor, fiber);
-    pop(rootInstanceStackCursor, fiber);
-  }
-
-  function getHostContext(): CX {
-    const context = requiredContext(contextStackCursor.current);
-    return context;
-  }
-
-  function pushHostContext(fiber: Fiber): void {
-    const rootInstance: C = requiredContext(rootInstanceStackCursor.current);
-    const context: CX = requiredContext(contextStackCursor.current);
-    const nextContext = getChildHostContext(context, fiber.type, rootInstance);
-
-    // Don't push this Fiber's context unless it's unique.
-    if (context === nextContext) {
-      return;
-    }
-
-    // Track the context and the Fiber that provided it.
-    // This enables us to pop only Fibers that provide unique contexts.
-    push(contextFiberStackCursor, fiber, fiber);
-    push(contextStackCursor, nextContext, fiber);
-  }
-
-  function popHostContext(fiber: Fiber): void {
-    // Do not pop unless this Fiber provided the current context.
-    // pushHostContext() only pushes Fibers that provide unique contexts.
-    if (contextFiberStackCursor.current !== fiber) {
-      return;
-    }
-
-    pop(contextStackCursor, fiber);
-    pop(contextFiberStackCursor, fiber);
-  }
-
-  return {
-    getHostContext,
-    getRootHostContainer,
-    popHostContainer,
-    popHostContext,
-    pushHostContainer,
-    pushHostContext,
-  };
+  return (c: any);
 }
+
+function getRootHostContainer(): Container {
+  const rootInstance = requiredContext(rootInstanceStackCursor.current);
+  return rootInstance;
+}
+
+function pushHostContainer(fiber: Fiber, nextRootInstance: Container) {
+  // Push current root instance onto the stack;
+  // This allows us to reset root when portals are popped.
+  push(rootInstanceStackCursor, nextRootInstance, fiber);
+  // Track the context and the Fiber that provided it.
+  // This enables us to pop only Fibers that provide unique contexts.
+  push(contextFiberStackCursor, fiber, fiber);
+
+  // Finally, we need to push the host context to the stack.
+  // However, we can't just call getRootHostContext() and push it because
+  // we'd have a different number of entries on the stack depending on
+  // whether getRootHostContext() throws somewhere in renderer code or not.
+  // So we push an empty value first. This lets us safely unwind on errors.
+  push(contextStackCursor, NO_CONTEXT, fiber);
+  const nextRootContext = getRootHostContext(nextRootInstance);
+  // Now that we know this function doesn't throw, replace it.
+  pop(contextStackCursor, fiber);
+  push(contextStackCursor, nextRootContext, fiber);
+}
+
+function popHostContainer(fiber: Fiber) {
+  pop(contextStackCursor, fiber);
+  pop(contextFiberStackCursor, fiber);
+  pop(rootInstanceStackCursor, fiber);
+}
+
+function getHostContext(): HostContext {
+  const context = requiredContext(contextStackCursor.current);
+  return context;
+}
+
+function pushHostContext(fiber: Fiber): void {
+  const rootInstance: Container = requiredContext(
+    rootInstanceStackCursor.current,
+  );
+  const context: HostContext = requiredContext(contextStackCursor.current);
+  const nextContext = getChildHostContext(context, fiber.type, rootInstance);
+
+  // Don't push this Fiber's context unless it's unique.
+  if (context === nextContext) {
+    return;
+  }
+
+  // Track the context and the Fiber that provided it.
+  // This enables us to pop only Fibers that provide unique contexts.
+  push(contextFiberStackCursor, fiber, fiber);
+  push(contextStackCursor, nextContext, fiber);
+}
+
+function popHostContext(fiber: Fiber): void {
+  // Do not pop unless this Fiber provided the current context.
+  // pushHostContext() only pushes Fibers that provide unique contexts.
+  if (contextFiberStackCursor.current !== fiber) {
+    return;
+  }
+
+  pop(contextStackCursor, fiber);
+  pop(contextFiberStackCursor, fiber);
+}
+
+export {
+  getHostContext,
+  getRootHostContainer,
+  popHostContainer,
+  popHostContext,
+  pushHostContainer,
+  pushHostContext,
+};
diff --git a/packages/react-reconciler/src/ReactFiberHydrationContext.js b/packages/react-reconciler/src/ReactFiberHydrationContext.js
index bd3889580a..bc4b9eae80 100644
--- a/packages/react-reconciler/src/ReactFiberHydrationContext.js
+++ b/packages/react-reconciler/src/ReactFiberHydrationContext.js
@@ -7,380 +7,367 @@
  * @flow
  */
 
-import type {HostConfig} from 'react-reconciler';
 import type {Fiber} from './ReactFiber';
+import type {
+  Instance,
+  TextInstance,
+  HydratableInstance,
+  Container,
+  HostContext,
+} from './ReactFiberHostConfig';
 
 import {HostComponent, HostText, HostRoot} from 'shared/ReactTypeOfWork';
 import {Deletion, Placement} from 'shared/ReactTypeOfSideEffect';
 import invariant from 'fbjs/lib/invariant';
 
 import {createFiberFromHostInstanceForDeletion} from './ReactFiber';
+import {
+  shouldSetTextContent,
+  supportsHydration,
+  canHydrateInstance,
+  canHydrateTextInstance,
+  getNextHydratableSibling,
+  getFirstHydratableChild,
+  hydrateInstance,
+  hydrateTextInstance,
+  didNotMatchHydratedContainerTextInstance,
+  didNotMatchHydratedTextInstance,
+  didNotHydrateContainerInstance,
+  didNotHydrateInstance,
+  didNotFindHydratableContainerInstance,
+  didNotFindHydratableContainerTextInstance,
+  didNotFindHydratableInstance,
+  didNotFindHydratableTextInstance,
+} from './ReactFiberHostConfig';
 
-export type HydrationContext<C, CX> = {
-  enterHydrationState(fiber: Fiber): boolean,
-  resetHydrationState(): void,
-  tryToClaimNextHydratableInstance(fiber: Fiber): void,
-  prepareToHydrateHostInstance(
-    fiber: Fiber,
-    rootContainerInstance: C,
-    hostContext: CX,
-  ): boolean,
-  prepareToHydrateHostTextInstance(fiber: Fiber): boolean,
-  popHydrationState(fiber: Fiber): boolean,
-};
+// The deepest Fiber on the stack involved in a hydration context.
+// This may have been an insertion or a hydration.
+let hydrationParentFiber: null | Fiber = null;
+let nextHydratableInstance: null | HydratableInstance = null;
+let isHydrating: boolean = false;
 
-export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
-  config: HostConfig<T, P, I, TI, HI, PI, C, CC, CX, PL>,
-): HydrationContext<C, CX> {
-  const {shouldSetTextContent, hydration} = config;
+function enterHydrationState(fiber: Fiber): boolean {
+  if (!supportsHydration) {
+    return false;
+  }
 
-  // If this doesn't have hydration mode.
-  if (!hydration) {
-    return {
-      enterHydrationState() {
-        return false;
-      },
-      resetHydrationState() {},
-      tryToClaimNextHydratableInstance() {},
-      prepareToHydrateHostInstance() {
-        invariant(
-          false,
-          'Expected prepareToHydrateHostInstance() to never be called. ' +
-            'This error is likely caused by a bug in React. Please file an issue.',
+  const parentInstance = fiber.stateNode.containerInfo;
+  nextHydratableInstance = getFirstHydratableChild(parentInstance);
+  hydrationParentFiber = fiber;
+  isHydrating = true;
+  return true;
+}
+
+function deleteHydratableInstance(
+  returnFiber: Fiber,
+  instance: HydratableInstance,
+) {
+  if (__DEV__) {
+    switch (returnFiber.tag) {
+      case HostRoot:
+        didNotHydrateContainerInstance(
+          returnFiber.stateNode.containerInfo,
+          instance,
         );
-      },
-      prepareToHydrateHostTextInstance() {
-        invariant(
-          false,
-          'Expected prepareToHydrateHostTextInstance() to never be called. ' +
-            'This error is likely caused by a bug in React. Please file an issue.',
+        break;
+      case HostComponent:
+        didNotHydrateInstance(
+          returnFiber.type,
+          returnFiber.memoizedProps,
+          returnFiber.stateNode,
+          instance,
         );
-      },
-      popHydrationState(fiber: Fiber) {
-        return false;
-      },
-    };
-  }
-
-  const {
-    canHydrateInstance,
-    canHydrateTextInstance,
-    getNextHydratableSibling,
-    getFirstHydratableChild,
-    hydrateInstance,
-    hydrateTextInstance,
-    didNotMatchHydratedContainerTextInstance,
-    didNotMatchHydratedTextInstance,
-    didNotHydrateContainerInstance,
-    didNotHydrateInstance,
-    didNotFindHydratableContainerInstance,
-    didNotFindHydratableContainerTextInstance,
-    didNotFindHydratableInstance,
-    didNotFindHydratableTextInstance,
-  } = hydration;
-
-  // The deepest Fiber on the stack involved in a hydration context.
-  // This may have been an insertion or a hydration.
-  let hydrationParentFiber: null | Fiber = null;
-  let nextHydratableInstance: null | HI = null;
-  let isHydrating: boolean = false;
-
-  function enterHydrationState(fiber: Fiber) {
-    const parentInstance = fiber.stateNode.containerInfo;
-    nextHydratableInstance = getFirstHydratableChild(parentInstance);
-    hydrationParentFiber = fiber;
-    isHydrating = true;
-    return true;
-  }
-
-  function deleteHydratableInstance(returnFiber: Fiber, instance: I | TI) {
-    if (__DEV__) {
-      switch (returnFiber.tag) {
-        case HostRoot:
-          didNotHydrateContainerInstance(
-            returnFiber.stateNode.containerInfo,
-            instance,
-          );
-          break;
-        case HostComponent:
-          didNotHydrateInstance(
-            returnFiber.type,
-            returnFiber.memoizedProps,
-            returnFiber.stateNode,
-            instance,
-          );
-          break;
-      }
-    }
-
-    const childToDelete = createFiberFromHostInstanceForDeletion();
-    childToDelete.stateNode = instance;
-    childToDelete.return = returnFiber;
-    childToDelete.effectTag = Deletion;
-
-    // This might seem like it belongs on progressedFirstDeletion. However,
-    // these children are not part of the reconciliation list of children.
-    // Even if we abort and rereconcile the children, that will try to hydrate
-    // again and the nodes are still in the host tree so these will be
-    // recreated.
-    if (returnFiber.lastEffect !== null) {
-      returnFiber.lastEffect.nextEffect = childToDelete;
-      returnFiber.lastEffect = childToDelete;
-    } else {
-      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
+        break;
     }
   }
 
-  function insertNonHydratedInstance(returnFiber: Fiber, fiber: Fiber) {
-    fiber.effectTag |= Placement;
-    if (__DEV__) {
-      switch (returnFiber.tag) {
-        case HostRoot: {
-          const parentContainer = returnFiber.stateNode.containerInfo;
-          switch (fiber.tag) {
-            case HostComponent:
-              const type = fiber.type;
-              const props = fiber.pendingProps;
-              didNotFindHydratableContainerInstance(
-                parentContainer,
-                type,
-                props,
-              );
-              break;
-            case HostText:
-              const text = fiber.pendingProps;
-              didNotFindHydratableContainerTextInstance(parentContainer, text);
-              break;
-          }
-          break;
+  const childToDelete = createFiberFromHostInstanceForDeletion();
+  childToDelete.stateNode = instance;
+  childToDelete.return = returnFiber;
+  childToDelete.effectTag = Deletion;
+
+  // This might seem like it belongs on progressedFirstDeletion. However,
+  // these children are not part of the reconciliation list of children.
+  // Even if we abort and rereconcile the children, that will try to hydrate
+  // again and the nodes are still in the host tree so these will be
+  // recreated.
+  if (returnFiber.lastEffect !== null) {
+    returnFiber.lastEffect.nextEffect = childToDelete;
+    returnFiber.lastEffect = childToDelete;
+  } else {
+    returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
+  }
+}
+
+function insertNonHydratedInstance(returnFiber: Fiber, fiber: Fiber) {
+  fiber.effectTag |= Placement;
+  if (__DEV__) {
+    switch (returnFiber.tag) {
+      case HostRoot: {
+        const parentContainer = returnFiber.stateNode.containerInfo;
+        switch (fiber.tag) {
+          case HostComponent:
+            const type = fiber.type;
+            const props = fiber.pendingProps;
+            didNotFindHydratableContainerInstance(parentContainer, type, props);
+            break;
+          case HostText:
+            const text = fiber.pendingProps;
+            didNotFindHydratableContainerTextInstance(parentContainer, text);
+            break;
         }
-        case HostComponent: {
-          const parentType = returnFiber.type;
-          const parentProps = returnFiber.memoizedProps;
-          const parentInstance = returnFiber.stateNode;
-          switch (fiber.tag) {
-            case HostComponent:
-              const type = fiber.type;
-              const props = fiber.pendingProps;
-              didNotFindHydratableInstance(
-                parentType,
-                parentProps,
-                parentInstance,
-                type,
-                props,
-              );
-              break;
-            case HostText:
-              const text = fiber.pendingProps;
-              didNotFindHydratableTextInstance(
-                parentType,
-                parentProps,
-                parentInstance,
-                text,
-              );
-              break;
-          }
-          break;
-        }
-        default:
-          return;
+        break;
       }
-    }
-  }
-
-  function tryHydrate(fiber, nextInstance) {
-    switch (fiber.tag) {
       case HostComponent: {
-        const type = fiber.type;
-        const props = fiber.pendingProps;
-        const instance = canHydrateInstance(nextInstance, type, props);
-        if (instance !== null) {
-          fiber.stateNode = (instance: I);
-          return true;
+        const parentType = returnFiber.type;
+        const parentProps = returnFiber.memoizedProps;
+        const parentInstance = returnFiber.stateNode;
+        switch (fiber.tag) {
+          case HostComponent:
+            const type = fiber.type;
+            const props = fiber.pendingProps;
+            didNotFindHydratableInstance(
+              parentType,
+              parentProps,
+              parentInstance,
+              type,
+              props,
+            );
+            break;
+          case HostText:
+            const text = fiber.pendingProps;
+            didNotFindHydratableTextInstance(
+              parentType,
+              parentProps,
+              parentInstance,
+              text,
+            );
+            break;
         }
-        return false;
-      }
-      case HostText: {
-        const text = fiber.pendingProps;
-        const textInstance = canHydrateTextInstance(nextInstance, text);
-        if (textInstance !== null) {
-          fiber.stateNode = (textInstance: TI);
-          return true;
-        }
-        return false;
+        break;
       }
       default:
-        return false;
+        return;
     }
   }
+}
 
-  function tryToClaimNextHydratableInstance(fiber: Fiber) {
-    if (!isHydrating) {
-      return;
+function tryHydrate(fiber, nextInstance) {
+  switch (fiber.tag) {
+    case HostComponent: {
+      const type = fiber.type;
+      const props = fiber.pendingProps;
+      const instance = canHydrateInstance(nextInstance, type, props);
+      if (instance !== null) {
+        fiber.stateNode = (instance: Instance);
+        return true;
+      }
+      return false;
     }
-    let nextInstance = nextHydratableInstance;
-    if (!nextInstance) {
+    case HostText: {
+      const text = fiber.pendingProps;
+      const textInstance = canHydrateTextInstance(nextInstance, text);
+      if (textInstance !== null) {
+        fiber.stateNode = (textInstance: TextInstance);
+        return true;
+      }
+      return false;
+    }
+    default:
+      return false;
+  }
+}
+
+function tryToClaimNextHydratableInstance(fiber: Fiber): void {
+  if (!isHydrating) {
+    return;
+  }
+  let nextInstance = nextHydratableInstance;
+  if (!nextInstance) {
+    // Nothing to hydrate. Make it an insertion.
+    insertNonHydratedInstance((hydrationParentFiber: any), fiber);
+    isHydrating = false;
+    hydrationParentFiber = fiber;
+    return;
+  }
+  const firstAttemptedInstance = nextInstance;
+  if (!tryHydrate(fiber, nextInstance)) {
+    // If we can't hydrate this instance let's try the next one.
+    // We use this as a heuristic. It's based on intuition and not data so it
+    // might be flawed or unnecessary.
+    nextInstance = getNextHydratableSibling(firstAttemptedInstance);
+    if (!nextInstance || !tryHydrate(fiber, nextInstance)) {
       // Nothing to hydrate. Make it an insertion.
       insertNonHydratedInstance((hydrationParentFiber: any), fiber);
       isHydrating = false;
       hydrationParentFiber = fiber;
       return;
     }
-    if (!tryHydrate(fiber, nextInstance)) {
-      // If we can't hydrate this instance let's try the next one.
-      // We use this as a heuristic. It's based on intuition and not data so it
-      // might be flawed or unnecessary.
-      nextInstance = getNextHydratableSibling(nextInstance);
-      if (!nextInstance || !tryHydrate(fiber, nextInstance)) {
-        // Nothing to hydrate. Make it an insertion.
-        insertNonHydratedInstance((hydrationParentFiber: any), fiber);
-        isHydrating = false;
-        hydrationParentFiber = fiber;
-        return;
-      }
-      // We matched the next one, we'll now assume that the first one was
-      // superfluous and we'll delete it. Since we can't eagerly delete it
-      // we'll have to schedule a deletion. To do that, this node needs a dummy
-      // fiber associated with it.
-      deleteHydratableInstance(
-        (hydrationParentFiber: any),
-        nextHydratableInstance,
-      );
-    }
-    hydrationParentFiber = fiber;
-    nextHydratableInstance = getFirstHydratableChild(nextInstance);
+    // We matched the next one, we'll now assume that the first one was
+    // superfluous and we'll delete it. Since we can't eagerly delete it
+    // we'll have to schedule a deletion. To do that, this node needs a dummy
+    // fiber associated with it.
+    deleteHydratableInstance(
+      (hydrationParentFiber: any),
+      firstAttemptedInstance,
+    );
   }
+  hydrationParentFiber = fiber;
+  nextHydratableInstance = getFirstHydratableChild((nextInstance: any));
+}
 
-  function prepareToHydrateHostInstance(
-    fiber: Fiber,
-    rootContainerInstance: C,
-    hostContext: CX,
-  ): boolean {
-    const instance: I = fiber.stateNode;
-    const updatePayload = hydrateInstance(
-      instance,
-      fiber.type,
-      fiber.memoizedProps,
-      rootContainerInstance,
-      hostContext,
-      fiber,
+function prepareToHydrateHostInstance(
+  fiber: Fiber,
+  rootContainerInstance: Container,
+  hostContext: HostContext,
+): boolean {
+  if (!supportsHydration) {
+    invariant(
+      false,
+      'Expected prepareToHydrateHostInstance() to never be called. ' +
+        'This error is likely caused by a bug in React. Please file an issue.',
     );
-    // TODO: Type this specific to this type of component.
-    fiber.updateQueue = (updatePayload: any);
-    // If the update payload indicates that there is a change or if there
-    // is a new ref we mark this as an update.
-    if (updatePayload !== null) {
-      return true;
-    }
-    return false;
   }
 
-  function prepareToHydrateHostTextInstance(fiber: Fiber): boolean {
-    const textInstance: TI = fiber.stateNode;
-    const textContent: string = fiber.memoizedProps;
-    const shouldUpdate = hydrateTextInstance(textInstance, textContent, fiber);
-    if (__DEV__) {
-      if (shouldUpdate) {
-        // We assume that prepareToHydrateHostTextInstance is called in a context where the
-        // hydration parent is the parent host component of this host text.
-        const returnFiber = hydrationParentFiber;
-        if (returnFiber !== null) {
-          switch (returnFiber.tag) {
-            case HostRoot: {
-              const parentContainer = returnFiber.stateNode.containerInfo;
-              didNotMatchHydratedContainerTextInstance(
-                parentContainer,
-                textInstance,
-                textContent,
-              );
-              break;
-            }
-            case HostComponent: {
-              const parentType = returnFiber.type;
-              const parentProps = returnFiber.memoizedProps;
-              const parentInstance = returnFiber.stateNode;
-              didNotMatchHydratedTextInstance(
-                parentType,
-                parentProps,
-                parentInstance,
-                textInstance,
-                textContent,
-              );
-              break;
-            }
+  const instance: Instance = fiber.stateNode;
+  const updatePayload = hydrateInstance(
+    instance,
+    fiber.type,
+    fiber.memoizedProps,
+    rootContainerInstance,
+    hostContext,
+    fiber,
+  );
+  // TODO: Type this specific to this type of component.
+  fiber.updateQueue = (updatePayload: any);
+  // If the update payload indicates that there is a change or if there
+  // is a new ref we mark this as an update.
+  if (updatePayload !== null) {
+    return true;
+  }
+  return false;
+}
+
+function prepareToHydrateHostTextInstance(fiber: Fiber): boolean {
+  if (!supportsHydration) {
+    invariant(
+      false,
+      'Expected prepareToHydrateHostTextInstance() to never be called. ' +
+        'This error is likely caused by a bug in React. Please file an issue.',
+    );
+  }
+
+  const textInstance: TextInstance = fiber.stateNode;
+  const textContent: string = fiber.memoizedProps;
+  const shouldUpdate = hydrateTextInstance(textInstance, textContent, fiber);
+  if (__DEV__) {
+    if (shouldUpdate) {
+      // We assume that prepareToHydrateHostTextInstance is called in a context where the
+      // hydration parent is the parent host component of this host text.
+      const returnFiber = hydrationParentFiber;
+      if (returnFiber !== null) {
+        switch (returnFiber.tag) {
+          case HostRoot: {
+            const parentContainer = returnFiber.stateNode.containerInfo;
+            didNotMatchHydratedContainerTextInstance(
+              parentContainer,
+              textInstance,
+              textContent,
+            );
+            break;
+          }
+          case HostComponent: {
+            const parentType = returnFiber.type;
+            const parentProps = returnFiber.memoizedProps;
+            const parentInstance = returnFiber.stateNode;
+            didNotMatchHydratedTextInstance(
+              parentType,
+              parentProps,
+              parentInstance,
+              textInstance,
+              textContent,
+            );
+            break;
           }
         }
       }
     }
-    return shouldUpdate;
   }
-
-  function popToNextHostParent(fiber: Fiber): void {
-    let parent = fiber.return;
-    while (
-      parent !== null &&
-      parent.tag !== HostComponent &&
-      parent.tag !== HostRoot
-    ) {
-      parent = parent.return;
-    }
-    hydrationParentFiber = parent;
-  }
-
-  function popHydrationState(fiber: Fiber): boolean {
-    if (fiber !== hydrationParentFiber) {
-      // We're deeper than the current hydration context, inside an inserted
-      // tree.
-      return false;
-    }
-    if (!isHydrating) {
-      // If we're not currently hydrating but we're in a hydration context, then
-      // we were an insertion and now need to pop up reenter hydration of our
-      // siblings.
-      popToNextHostParent(fiber);
-      isHydrating = true;
-      return false;
-    }
-
-    const type = fiber.type;
-
-    // If we have any remaining hydratable nodes, we need to delete them now.
-    // We only do this deeper than head and body since they tend to have random
-    // other nodes in them. We also ignore components with pure text content in
-    // side of them.
-    // TODO: Better heuristic.
-    if (
-      fiber.tag !== HostComponent ||
-      (type !== 'head' &&
-        type !== 'body' &&
-        !shouldSetTextContent(type, fiber.memoizedProps))
-    ) {
-      let nextInstance = nextHydratableInstance;
-      while (nextInstance) {
-        deleteHydratableInstance(fiber, nextInstance);
-        nextInstance = getNextHydratableSibling(nextInstance);
-      }
-    }
-
-    popToNextHostParent(fiber);
-    nextHydratableInstance = hydrationParentFiber
-      ? getNextHydratableSibling(fiber.stateNode)
-      : null;
-    return true;
-  }
-
-  function resetHydrationState() {
-    hydrationParentFiber = null;
-    nextHydratableInstance = null;
-    isHydrating = false;
-  }
-
-  return {
-    enterHydrationState,
-    resetHydrationState,
-    tryToClaimNextHydratableInstance,
-    prepareToHydrateHostInstance,
-    prepareToHydrateHostTextInstance,
-    popHydrationState,
-  };
+  return shouldUpdate;
 }
+
+function popToNextHostParent(fiber: Fiber): void {
+  let parent = fiber.return;
+  while (
+    parent !== null &&
+    parent.tag !== HostComponent &&
+    parent.tag !== HostRoot
+  ) {
+    parent = parent.return;
+  }
+  hydrationParentFiber = parent;
+}
+
+function popHydrationState(fiber: Fiber): boolean {
+  if (!supportsHydration) {
+    return false;
+  }
+  if (fiber !== hydrationParentFiber) {
+    // We're deeper than the current hydration context, inside an inserted
+    // tree.
+    return false;
+  }
+  if (!isHydrating) {
+    // If we're not currently hydrating but we're in a hydration context, then
+    // we were an insertion and now need to pop up reenter hydration of our
+    // siblings.
+    popToNextHostParent(fiber);
+    isHydrating = true;
+    return false;
+  }
+
+  const type = fiber.type;
+
+  // If we have any remaining hydratable nodes, we need to delete them now.
+  // We only do this deeper than head and body since they tend to have random
+  // other nodes in them. We also ignore components with pure text content in
+  // side of them.
+  // TODO: Better heuristic.
+  if (
+    fiber.tag !== HostComponent ||
+    (type !== 'head' &&
+      type !== 'body' &&
+      !shouldSetTextContent(type, fiber.memoizedProps))
+  ) {
+    let nextInstance = nextHydratableInstance;
+    while (nextInstance) {
+      deleteHydratableInstance(fiber, nextInstance);
+      nextInstance = getNextHydratableSibling(nextInstance);
+    }
+  }
+
+  popToNextHostParent(fiber);
+  nextHydratableInstance = hydrationParentFiber
+    ? getNextHydratableSibling(fiber.stateNode)
+    : null;
+  return true;
+}
+
+function resetHydrationState(): void {
+  if (!supportsHydration) {
+    return;
+  }
+
+  hydrationParentFiber = null;
+  nextHydratableInstance = null;
+  isHydrating = false;
+}
+
+export {
+  enterHydrationState,
+  resetHydrationState,
+  tryToClaimNextHydratableInstance,
+  prepareToHydrateHostInstance,
+  prepareToHydrateHostTextInstance,
+  popHydrationState,
+};
diff --git a/packages/react-reconciler/src/ReactFiberNewContext.js b/packages/react-reconciler/src/ReactFiberNewContext.js
index 74e1c73390..f2715acfb2 100644
--- a/packages/react-reconciler/src/ReactFiberNewContext.js
+++ b/packages/react-reconciler/src/ReactFiberNewContext.js
@@ -9,7 +9,7 @@
 
 import type {Fiber} from './ReactFiber';
 import type {ReactContext} from 'shared/ReactTypes';
-import type {StackCursor, Stack} from './ReactFiberStack';
+import type {StackCursor} from './ReactFiberStack';
 
 export type NewContext = {
   pushProvider(providerFiber: Fiber): void,
@@ -19,90 +19,88 @@ export type NewContext = {
 };
 
 import warning from 'fbjs/lib/warning';
+import {isPrimaryRenderer} from './ReactFiberHostConfig';
+import {createCursor, push, pop} from './ReactFiberStack';
 
-export default function(stack: Stack, isPrimaryRenderer: boolean) {
-  const {createCursor, push, pop} = stack;
+const providerCursor: StackCursor<Fiber | null> = createCursor(null);
+const valueCursor: StackCursor<mixed> = createCursor(null);
+const changedBitsCursor: StackCursor<number> = createCursor(0);
 
-  const providerCursor: StackCursor<Fiber | null> = createCursor(null);
-  const valueCursor: StackCursor<mixed> = createCursor(null);
-  const changedBitsCursor: StackCursor<number> = createCursor(0);
-
-  let rendererSigil;
-  if (__DEV__) {
-    // Use this to detect multiple renderers using the same context
-    rendererSigil = {};
-  }
-
-  function pushProvider(providerFiber: Fiber): void {
-    const context: ReactContext<any> = providerFiber.type._context;
-
-    if (isPrimaryRenderer) {
-      push(changedBitsCursor, context._changedBits, providerFiber);
-      push(valueCursor, context._currentValue, providerFiber);
-      push(providerCursor, providerFiber, providerFiber);
-
-      context._currentValue = providerFiber.pendingProps.value;
-      context._changedBits = providerFiber.stateNode;
-      if (__DEV__) {
-        warning(
-          context._currentRenderer === undefined ||
-            context._currentRenderer === null ||
-            context._currentRenderer === rendererSigil,
-          'Detected multiple renderers concurrently rendering the ' +
-            'same context provider. This is currently unsupported.',
-        );
-        context._currentRenderer = rendererSigil;
-      }
-    } else {
-      push(changedBitsCursor, context._changedBits2, providerFiber);
-      push(valueCursor, context._currentValue2, providerFiber);
-      push(providerCursor, providerFiber, providerFiber);
-
-      context._currentValue2 = providerFiber.pendingProps.value;
-      context._changedBits2 = providerFiber.stateNode;
-      if (__DEV__) {
-        warning(
-          context._currentRenderer2 === undefined ||
-            context._currentRenderer2 === null ||
-            context._currentRenderer2 === rendererSigil,
-          'Detected multiple renderers concurrently rendering the ' +
-            'same context provider. This is currently unsupported.',
-        );
-        context._currentRenderer2 = rendererSigil;
-      }
-    }
-  }
-
-  function popProvider(providerFiber: Fiber): void {
-    const changedBits = changedBitsCursor.current;
-    const currentValue = valueCursor.current;
-
-    pop(providerCursor, providerFiber);
-    pop(valueCursor, providerFiber);
-    pop(changedBitsCursor, providerFiber);
-
-    const context: ReactContext<any> = providerFiber.type._context;
-    if (isPrimaryRenderer) {
-      context._currentValue = currentValue;
-      context._changedBits = changedBits;
-    } else {
-      context._currentValue2 = currentValue;
-      context._changedBits2 = changedBits;
-    }
-  }
-
-  function getContextCurrentValue(context: ReactContext<any>): any {
-    return isPrimaryRenderer ? context._currentValue : context._currentValue2;
-  }
-
-  function getContextChangedBits(context: ReactContext<any>): number {
-    return isPrimaryRenderer ? context._changedBits : context._changedBits2;
-  }
-
-  return {
-    pushProvider,
-    popProvider,
-    getContextCurrentValue,
-    getContextChangedBits,
-  };
+let rendererSigil;
+if (__DEV__) {
+  // Use this to detect multiple renderers using the same context
+  rendererSigil = {};
 }
+
+function pushProvider(providerFiber: Fiber): void {
+  const context: ReactContext<any> = providerFiber.type._context;
+
+  if (isPrimaryRenderer) {
+    push(changedBitsCursor, context._changedBits, providerFiber);
+    push(valueCursor, context._currentValue, providerFiber);
+    push(providerCursor, providerFiber, providerFiber);
+
+    context._currentValue = providerFiber.pendingProps.value;
+    context._changedBits = providerFiber.stateNode;
+    if (__DEV__) {
+      warning(
+        context._currentRenderer === undefined ||
+          context._currentRenderer === null ||
+          context._currentRenderer === rendererSigil,
+        'Detected multiple renderers concurrently rendering the ' +
+          'same context provider. This is currently unsupported.',
+      );
+      context._currentRenderer = rendererSigil;
+    }
+  } else {
+    push(changedBitsCursor, context._changedBits2, providerFiber);
+    push(valueCursor, context._currentValue2, providerFiber);
+    push(providerCursor, providerFiber, providerFiber);
+
+    context._currentValue2 = providerFiber.pendingProps.value;
+    context._changedBits2 = providerFiber.stateNode;
+    if (__DEV__) {
+      warning(
+        context._currentRenderer2 === undefined ||
+          context._currentRenderer2 === null ||
+          context._currentRenderer2 === rendererSigil,
+        'Detected multiple renderers concurrently rendering the ' +
+          'same context provider. This is currently unsupported.',
+      );
+      context._currentRenderer2 = rendererSigil;
+    }
+  }
+}
+
+function popProvider(providerFiber: Fiber): void {
+  const changedBits = changedBitsCursor.current;
+  const currentValue = valueCursor.current;
+
+  pop(providerCursor, providerFiber);
+  pop(valueCursor, providerFiber);
+  pop(changedBitsCursor, providerFiber);
+
+  const context: ReactContext<any> = providerFiber.type._context;
+  if (isPrimaryRenderer) {
+    context._currentValue = currentValue;
+    context._changedBits = changedBits;
+  } else {
+    context._currentValue2 = currentValue;
+    context._changedBits2 = changedBits;
+  }
+}
+
+function getContextCurrentValue(context: ReactContext<any>): any {
+  return isPrimaryRenderer ? context._currentValue : context._currentValue2;
+}
+
+function getContextChangedBits(context: ReactContext<any>): number {
+  return isPrimaryRenderer ? context._changedBits : context._changedBits2;
+}
+
+export {
+  pushProvider,
+  popProvider,
+  getContextCurrentValue,
+  getContextChangedBits,
+};
diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js
index 52a42646ba..2e3034522b 100644
--- a/packages/react-reconciler/src/ReactFiberReconciler.js
+++ b/packages/react-reconciler/src/ReactFiberReconciler.js
@@ -9,6 +9,12 @@
 
 import type {Fiber} from './ReactFiber';
 import type {FiberRoot} from './ReactFiberRoot';
+import type {
+  Instance,
+  TextInstance,
+  Container,
+  PublicInstance,
+} from './ReactFiberHostConfig';
 import type {ReactNodeList} from 'shared/ReactTypes';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 
@@ -23,508 +29,254 @@ import getComponentName from 'shared/getComponentName';
 import invariant from 'fbjs/lib/invariant';
 import warning from 'fbjs/lib/warning';
 
+import {getPublicInstance} from './ReactFiberHostConfig';
+import {
+  findCurrentUnmaskedContext,
+  isContextProvider,
+  processChildContext,
+} from './ReactFiberContext';
 import {createFiberRoot} from './ReactFiberRoot';
 import * as ReactFiberDevToolsHook from './ReactFiberDevToolsHook';
-import ReactFiberScheduler from './ReactFiberScheduler';
+import {
+  computeUniqueAsyncExpiration,
+  recalculateCurrentTime,
+  computeExpirationForFiber,
+  scheduleWork,
+  requestWork,
+  flushRoot,
+  batchedUpdates,
+  unbatchedUpdates,
+  flushSync,
+  flushControlled,
+  deferredUpdates,
+  syncUpdates,
+  interactiveUpdates,
+  flushInteractiveUpdates,
+} from './ReactFiberScheduler';
 import {createUpdate, enqueueUpdate} from './ReactUpdateQueue';
 import ReactFiberInstrumentation from './ReactFiberInstrumentation';
 import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
 
+type OpaqueRoot = FiberRoot;
+
+// 0 is PROD, 1 is DEV.
+// Might add PROFILE later.
+type BundleType = 0 | 1;
+
+type DevToolsConfig = {|
+  bundleType: BundleType,
+  version: string,
+  rendererPackageName: string,
+  // Note: this actually *does* depend on Fiber internal fields.
+  // Used by "inspect clicked DOM element" in React DevTools.
+  findFiberByHostInstance?: (instance: Instance | TextInstance) => Fiber,
+  // Used by RN in-app inspector.
+  // This API is unfortunately RN-specific.
+  // TODO: Change it to accept Fiber instead and type it properly.
+  getInspectorDataForViewTag?: (tag: number) => Object,
+|};
+
 let didWarnAboutNestedUpdates;
 
 if (__DEV__) {
   didWarnAboutNestedUpdates = false;
 }
 
-export type Deadline = {
-  timeRemaining: () => number,
-  didTimeout: boolean,
-};
-
-type OpaqueHandle = Fiber;
-type OpaqueRoot = FiberRoot;
-
-export type HostConfig<T, P, I, TI, HI, PI, C, CC, CX, PL> = {
-  getRootHostContext(rootContainerInstance: C): CX,
-  getChildHostContext(parentHostContext: CX, type: T, instance: C): CX,
-  getPublicInstance(instance: I | TI): PI,
-
-  createInstance(
-    type: T,
-    props: P,
-    rootContainerInstance: C,
-    hostContext: CX,
-    internalInstanceHandle: OpaqueHandle,
-  ): I,
-  appendInitialChild(parentInstance: I, child: I | TI): void,
-  finalizeInitialChildren(
-    parentInstance: I,
-    type: T,
-    props: P,
-    rootContainerInstance: C,
-    hostContext: CX,
-  ): boolean,
-
-  prepareUpdate(
-    instance: I,
-    type: T,
-    oldProps: P,
-    newProps: P,
-    rootContainerInstance: C,
-    hostContext: CX,
-  ): null | PL,
-
-  shouldSetTextContent(type: T, props: P): boolean,
-  shouldDeprioritizeSubtree(type: T, props: P): boolean,
-
-  createTextInstance(
-    text: string,
-    rootContainerInstance: C,
-    hostContext: CX,
-    internalInstanceHandle: OpaqueHandle,
-  ): TI,
-
-  scheduleDeferredCallback(
-    callback: (deadline: Deadline) => void,
-    options?: {timeout: number},
-  ): number,
-  cancelDeferredCallback(callbackID: number): void,
-
-  prepareForCommit(containerInfo: C): void,
-  resetAfterCommit(containerInfo: C): void,
-
-  now(): number,
-
-  // Temporary workaround for scenario where multiple renderers concurrently
-  // render using the same context objects. E.g. React DOM and React ART on the
-  // same page. DOM is the primary renderer; ART is the secondary renderer.
-  isPrimaryRenderer: boolean,
-
-  +hydration?: HydrationHostConfig<T, P, I, TI, HI, C, CX, PL>,
-
-  +mutation?: MutableUpdatesHostConfig<T, P, I, TI, C, PL>,
-  +persistence?: PersistentUpdatesHostConfig<T, P, I, TI, C, CC, PL>,
-};
-
-type MutableUpdatesHostConfig<T, P, I, TI, C, PL> = {
-  commitUpdate(
-    instance: I,
-    updatePayload: PL,
-    type: T,
-    oldProps: P,
-    newProps: P,
-    internalInstanceHandle: OpaqueHandle,
-  ): void,
-  commitMount(
-    instance: I,
-    type: T,
-    newProps: P,
-    internalInstanceHandle: OpaqueHandle,
-  ): void,
-  commitTextUpdate(textInstance: TI, oldText: string, newText: string): void,
-  resetTextContent(instance: I): void,
-  appendChild(parentInstance: I, child: I | TI): void,
-  appendChildToContainer(container: C, child: I | TI): void,
-  insertBefore(parentInstance: I, child: I | TI, beforeChild: I | TI): void,
-  insertInContainerBefore(
-    container: C,
-    child: I | TI,
-    beforeChild: I | TI,
-  ): void,
-  removeChild(parentInstance: I, child: I | TI): void,
-  removeChildFromContainer(container: C, child: I | TI): void,
-};
-
-type PersistentUpdatesHostConfig<T, P, I, TI, C, CC, PL> = {
-  cloneInstance(
-    instance: I,
-    updatePayload: null | PL,
-    type: T,
-    oldProps: P,
-    newProps: P,
-    internalInstanceHandle: OpaqueHandle,
-    keepChildren: boolean,
-    recyclableInstance: I,
-  ): I,
-
-  createContainerChildSet(container: C): CC,
-
-  appendChildToContainerChildSet(childSet: CC, child: I | TI): void,
-  finalizeContainerChildren(container: C, newChildren: CC): void,
-
-  replaceContainerChildren(container: C, newChildren: CC): void,
-};
-
-type HydrationHostConfig<T, P, I, TI, HI, C, CX, PL> = {
-  // Optional hydration
-  canHydrateInstance(instance: HI, type: T, props: P): null | I,
-  canHydrateTextInstance(instance: HI, text: string): null | TI,
-  getNextHydratableSibling(instance: I | TI | HI): null | HI,
-  getFirstHydratableChild(parentInstance: I | C): null | HI,
-  hydrateInstance(
-    instance: I,
-    type: T,
-    props: P,
-    rootContainerInstance: C,
-    hostContext: CX,
-    internalInstanceHandle: OpaqueHandle,
-  ): null | PL,
-  hydrateTextInstance(
-    textInstance: TI,
-    text: string,
-    internalInstanceHandle: OpaqueHandle,
-  ): boolean,
-  didNotMatchHydratedContainerTextInstance(
-    parentContainer: C,
-    textInstance: TI,
-    text: string,
-  ): void,
-  didNotMatchHydratedTextInstance(
-    parentType: T,
-    parentProps: P,
-    parentInstance: I,
-    textInstance: TI,
-    text: string,
-  ): void,
-  didNotHydrateContainerInstance(parentContainer: C, instance: I | TI): void,
-  didNotHydrateInstance(
-    parentType: T,
-    parentProps: P,
-    parentInstance: I,
-    instance: I | TI,
-  ): void,
-  didNotFindHydratableContainerInstance(
-    parentContainer: C,
-    type: T,
-    props: P,
-  ): void,
-  didNotFindHydratableContainerTextInstance(
-    parentContainer: C,
-    text: string,
-  ): void,
-  didNotFindHydratableInstance(
-    parentType: T,
-    parentProps: P,
-    parentInstance: I,
-    type: T,
-    props: P,
-  ): void,
-  didNotFindHydratableTextInstance(
-    parentType: T,
-    parentProps: P,
-    parentInstance: I,
-    text: string,
-  ): void,
-};
-
-// 0 is PROD, 1 is DEV.
-// Might add PROFILE later.
-type BundleType = 0 | 1;
-
-type DevToolsConfig<I, TI> = {|
-  bundleType: BundleType,
-  version: string,
-  rendererPackageName: string,
-  // Note: this actually *does* depend on Fiber internal fields.
-  // Used by "inspect clicked DOM element" in React DevTools.
-  findFiberByHostInstance?: (instance: I | TI) => Fiber,
-  // Used by RN in-app inspector.
-  // This API is unfortunately RN-specific.
-  // TODO: Change it to accept Fiber instead and type it properly.
-  getInspectorDataForViewTag?: (tag: number) => Object,
-|};
-
-export type Reconciler<C, I, TI> = {
-  createContainer(
-    containerInfo: C,
-    isAsync: boolean,
-    hydrate: boolean,
-  ): OpaqueRoot,
-  updateContainer(
-    element: ReactNodeList,
-    container: OpaqueRoot,
-    parentComponent: ?React$Component<any, any>,
-    callback: ?Function,
-  ): ExpirationTime,
-  updateContainerAtExpirationTime(
-    element: ReactNodeList,
-    container: OpaqueRoot,
-    parentComponent: ?React$Component<any, any>,
-    expirationTime: ExpirationTime,
-    callback: ?Function,
-  ): ExpirationTime,
-  flushRoot(root: OpaqueRoot, expirationTime: ExpirationTime): void,
-  requestWork(root: OpaqueRoot, expirationTime: ExpirationTime): void,
-  batchedUpdates<A>(fn: () => A): A,
-  unbatchedUpdates<A>(fn: () => A): A,
-  flushSync<A>(fn: () => A): A,
-  flushControlled(fn: () => mixed): void,
-  deferredUpdates<A>(fn: () => A): A,
-  interactiveUpdates<A>(fn: () => A): A,
-  injectIntoDevTools(devToolsConfig: DevToolsConfig<I, TI>): boolean,
-  computeUniqueAsyncExpiration(): ExpirationTime,
-
-  // Used to extract the return value from the initial render. Legacy API.
-  getPublicRootInstance(
-    container: OpaqueRoot,
-  ): React$Component<any, any> | TI | I | null,
-
-  // Use for findDOMNode/findHostNode. Legacy API.
-  findHostInstance(component: Object): I | TI | null,
-
-  // Used internally for filtering out portals. Legacy API.
-  findHostInstanceWithNoPortals(component: Fiber): I | TI | null,
-};
-
-export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
-  config: HostConfig<T, P, I, TI, HI, PI, C, CC, CX, PL>,
-): Reconciler<C, I, TI> {
-  const {getPublicInstance} = config;
-
-  const {
-    computeUniqueAsyncExpiration,
-    recalculateCurrentTime,
-    computeExpirationForFiber,
-    scheduleWork,
-    requestWork,
-    flushRoot,
-    batchedUpdates,
-    unbatchedUpdates,
-    flushSync,
-    flushControlled,
-    deferredUpdates,
-    syncUpdates,
-    interactiveUpdates,
-    flushInteractiveUpdates,
-    legacyContext,
-  } = ReactFiberScheduler(config);
-
-  const {
-    findCurrentUnmaskedContext,
-    isContextProvider,
-    processChildContext,
-  } = legacyContext;
-
-  function getContextForSubtree(
-    parentComponent: ?React$Component<any, any>,
-  ): Object {
-    if (!parentComponent) {
-      return emptyObject;
-    }
-
-    const fiber = ReactInstanceMap.get(parentComponent);
-    const parentContext = findCurrentUnmaskedContext(fiber);
-    return isContextProvider(fiber)
-      ? processChildContext(fiber, parentContext)
-      : parentContext;
+function getContextForSubtree(
+  parentComponent: ?React$Component<any, any>,
+): Object {
+  if (!parentComponent) {
+    return emptyObject;
   }
 
-  function scheduleRootUpdate(
-    current: Fiber,
-    element: ReactNodeList,
-    expirationTime: ExpirationTime,
-    callback: ?Function,
-  ) {
-    if (__DEV__) {
-      if (
-        ReactDebugCurrentFiber.phase === 'render' &&
-        ReactDebugCurrentFiber.current !== null &&
-        !didWarnAboutNestedUpdates
-      ) {
-        didWarnAboutNestedUpdates = true;
-        warning(
-          false,
-          'Render methods should be a pure function of props and state; ' +
-            'triggering nested component updates from render is not allowed. ' +
-            'If necessary, trigger nested updates in componentDidUpdate.\n\n' +
-            'Check the render method of %s.',
-          getComponentName(ReactDebugCurrentFiber.current) || 'Unknown',
-        );
-      }
-    }
+  const fiber = ReactInstanceMap.get(parentComponent);
+  const parentContext = findCurrentUnmaskedContext(fiber);
+  return isContextProvider(fiber)
+    ? processChildContext(fiber, parentContext)
+    : parentContext;
+}
 
-    const update = createUpdate(expirationTime);
-    // Caution: React DevTools currently depends on this property
-    // being called "element".
-    update.payload = {element};
-
-    callback = callback === undefined ? null : callback;
-    if (callback !== null) {
-      warning(
-        typeof callback === 'function',
-        'render(...): Expected the last optional `callback` argument to be a ' +
-          'function. Instead received: %s.',
-        callback,
-      );
-      update.callback = callback;
-    }
-    enqueueUpdate(current, update, expirationTime);
-
-    scheduleWork(current, expirationTime);
-    return expirationTime;
-  }
-
-  function updateContainerAtExpirationTime(
-    element: ReactNodeList,
-    container: OpaqueRoot,
-    parentComponent: ?React$Component<any, any>,
-    expirationTime: ExpirationTime,
-    callback: ?Function,
-  ) {
-    // 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;
-    }
-
-    return scheduleRootUpdate(current, element, expirationTime, callback);
-  }
-
-  function findHostInstance(component: Object): PI | null {
-    const fiber = ReactInstanceMap.get(component);
-    if (fiber === undefined) {
-      if (typeof component.render === 'function') {
-        invariant(false, 'Unable to find node on an unmounted component.');
-      } else {
-        invariant(
-          false,
-          'Argument appears to not be a ReactComponent. Keys: %s',
-          Object.keys(component),
-        );
-      }
-    }
-    const hostFiber = findCurrentHostFiber(fiber);
-    if (hostFiber === null) {
-      return null;
-    }
-    return hostFiber.stateNode;
-  }
-
-  return {
-    createContainer(
-      containerInfo: C,
-      isAsync: boolean,
-      hydrate: boolean,
-    ): OpaqueRoot {
-      return createFiberRoot(containerInfo, isAsync, hydrate);
-    },
-
-    updateContainer(
-      element: ReactNodeList,
-      container: OpaqueRoot,
-      parentComponent: ?React$Component<any, any>,
-      callback: ?Function,
-    ): ExpirationTime {
-      const current = container.current;
-      const currentTime = recalculateCurrentTime();
-      const expirationTime = computeExpirationForFiber(currentTime, current);
-      return updateContainerAtExpirationTime(
-        element,
-        container,
-        parentComponent,
-        expirationTime,
-        callback,
-      );
-    },
-
-    updateContainerAtExpirationTime(
-      element,
-      container,
-      parentComponent,
-      expirationTime,
-      callback,
+function scheduleRootUpdate(
+  current: Fiber,
+  element: ReactNodeList,
+  expirationTime: ExpirationTime,
+  callback: ?Function,
+) {
+  if (__DEV__) {
+    if (
+      ReactDebugCurrentFiber.phase === 'render' &&
+      ReactDebugCurrentFiber.current !== null &&
+      !didWarnAboutNestedUpdates
     ) {
-      return updateContainerAtExpirationTime(
-        element,
-        container,
-        parentComponent,
-        expirationTime,
-        callback,
+      didWarnAboutNestedUpdates = true;
+      warning(
+        false,
+        'Render methods should be a pure function of props and state; ' +
+          'triggering nested component updates from render is not allowed. ' +
+          'If necessary, trigger nested updates in componentDidUpdate.\n\n' +
+          'Check the render method of %s.',
+        getComponentName(ReactDebugCurrentFiber.current) || 'Unknown',
       );
-    },
+    }
+  }
 
-    flushRoot,
+  const update = createUpdate(expirationTime);
+  // Caution: React DevTools currently depends on this property
+  // being called "element".
+  update.payload = {element};
 
-    requestWork,
+  callback = callback === undefined ? null : callback;
+  if (callback !== null) {
+    warning(
+      typeof callback === 'function',
+      'render(...): Expected the last optional `callback` argument to be a ' +
+        'function. Instead received: %s.',
+      callback,
+    );
+    update.callback = callback;
+  }
+  enqueueUpdate(current, update, expirationTime);
 
-    computeUniqueAsyncExpiration,
+  scheduleWork(current, expirationTime);
+  return expirationTime;
+}
 
-    batchedUpdates,
+export function updateContainerAtExpirationTime(
+  element: ReactNodeList,
+  container: OpaqueRoot,
+  parentComponent: ?React$Component<any, any>,
+  expirationTime: ExpirationTime,
+  callback: ?Function,
+) {
+  // TODO: If this is a nested container, this won't be the root.
+  const current = container.current;
 
-    unbatchedUpdates,
-
-    deferredUpdates,
-
-    syncUpdates,
-
-    interactiveUpdates,
-
-    flushInteractiveUpdates,
-
-    flushControlled,
-
-    flushSync,
-
-    getPublicRootInstance(
-      container: OpaqueRoot,
-    ): React$Component<any, any> | PI | null {
-      const containerFiber = container.current;
-      if (!containerFiber.child) {
-        return null;
+  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);
       }
-      switch (containerFiber.child.tag) {
-        case HostComponent:
-          return getPublicInstance(containerFiber.child.stateNode);
-        default:
-          return containerFiber.child.stateNode;
-      }
-    },
+    }
+  }
 
-    findHostInstance,
+  const context = getContextForSubtree(parentComponent);
+  if (container.context === null) {
+    container.context = context;
+  } else {
+    container.pendingContext = context;
+  }
 
-    findHostInstanceWithNoPortals(fiber: Fiber): PI | null {
-      const hostFiber = findCurrentHostFiberWithNoPortals(fiber);
+  return scheduleRootUpdate(current, element, expirationTime, callback);
+}
+
+function findHostInstance(component: Object): PublicInstance | null {
+  const fiber = ReactInstanceMap.get(component);
+  if (fiber === undefined) {
+    if (typeof component.render === 'function') {
+      invariant(false, 'Unable to find node on an unmounted component.');
+    } else {
+      invariant(
+        false,
+        'Argument appears to not be a ReactComponent. Keys: %s',
+        Object.keys(component),
+      );
+    }
+  }
+  const hostFiber = findCurrentHostFiber(fiber);
+  if (hostFiber === null) {
+    return null;
+  }
+  return hostFiber.stateNode;
+}
+
+export function createContainer(
+  containerInfo: Container,
+  isAsync: boolean,
+  hydrate: boolean,
+): OpaqueRoot {
+  return createFiberRoot(containerInfo, isAsync, hydrate);
+}
+
+export function updateContainer(
+  element: ReactNodeList,
+  container: OpaqueRoot,
+  parentComponent: ?React$Component<any, any>,
+  callback: ?Function,
+): ExpirationTime {
+  const current = container.current;
+  const currentTime = recalculateCurrentTime();
+  const expirationTime = computeExpirationForFiber(currentTime, current);
+  return updateContainerAtExpirationTime(
+    element,
+    container,
+    parentComponent,
+    expirationTime,
+    callback,
+  );
+}
+
+export {
+  flushRoot,
+  requestWork,
+  computeUniqueAsyncExpiration,
+  batchedUpdates,
+  unbatchedUpdates,
+  deferredUpdates,
+  syncUpdates,
+  interactiveUpdates,
+  flushInteractiveUpdates,
+  flushControlled,
+  flushSync,
+};
+
+export function getPublicRootInstance(
+  container: OpaqueRoot,
+): React$Component<any, any> | PublicInstance | null {
+  const containerFiber = container.current;
+  if (!containerFiber.child) {
+    return null;
+  }
+  switch (containerFiber.child.tag) {
+    case HostComponent:
+      return getPublicInstance(containerFiber.child.stateNode);
+    default:
+      return containerFiber.child.stateNode;
+  }
+}
+
+export {findHostInstance};
+
+export function findHostInstanceWithNoPortals(
+  fiber: Fiber,
+): PublicInstance | null {
+  const hostFiber = findCurrentHostFiberWithNoPortals(fiber);
+  if (hostFiber === null) {
+    return null;
+  }
+  return hostFiber.stateNode;
+}
+
+export function injectIntoDevTools(devToolsConfig: DevToolsConfig): boolean {
+  const {findFiberByHostInstance} = devToolsConfig;
+  return ReactFiberDevToolsHook.injectInternals({
+    ...devToolsConfig,
+    findHostInstanceByFiber(fiber: Fiber): Instance | TextInstance | null {
+      const hostFiber = findCurrentHostFiber(fiber);
       if (hostFiber === null) {
         return null;
       }
       return hostFiber.stateNode;
     },
-
-    injectIntoDevTools(devToolsConfig: DevToolsConfig<I, TI>): boolean {
-      const {findFiberByHostInstance} = devToolsConfig;
-      return ReactFiberDevToolsHook.injectInternals({
-        ...devToolsConfig,
-        findHostInstanceByFiber(fiber: Fiber): I | TI | null {
-          const hostFiber = findCurrentHostFiber(fiber);
-          if (hostFiber === null) {
-            return null;
-          }
-          return hostFiber.stateNode;
-        },
-        findFiberByHostInstance(instance: I | TI): Fiber | null {
-          if (!findFiberByHostInstance) {
-            // Might not be implemented by the renderer.
-            return null;
-          }
-          return findFiberByHostInstance(instance);
-        },
-      });
+    findFiberByHostInstance(instance: Instance | TextInstance): Fiber | null {
+      if (!findFiberByHostInstance) {
+        // Might not be implemented by the renderer.
+        return null;
+      }
+      return findFiberByHostInstance(instance);
     },
-  };
+  });
 }
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index b2102a5e85..43f71c6213 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -7,10 +7,8 @@
  * @flow
  */
 
-import type {HostConfig, Deadline} from 'react-reconciler';
 import type {Fiber} from './ReactFiber';
 import type {FiberRoot, Batch} from './ReactFiberRoot';
-import type {HydrationContext} from './ReactFiberHydrationContext';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 
 import ReactErrorUtils from 'shared/ReactErrorUtils';
@@ -45,19 +43,19 @@ import {
   replayFailedUnitOfWorkWithInvokeGuardedCallback,
   warnAboutDeprecatedLifecycles,
 } from 'shared/ReactFeatureFlags';
-import {createProfilerTimer} from './ReactProfilerTimer';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'fbjs/lib/invariant';
 import warning from 'fbjs/lib/warning';
 
-import ReactFiberBeginWork from './ReactFiberBeginWork';
-import ReactFiberCompleteWork from './ReactFiberCompleteWork';
-import ReactFiberUnwindWork from './ReactFiberUnwindWork';
-import ReactFiberCommitWork from './ReactFiberCommitWork';
-import ReactFiberHostContext from './ReactFiberHostContext';
-import ReactFiberHydrationContext from './ReactFiberHydrationContext';
 import ReactFiberInstrumentation from './ReactFiberInstrumentation';
 import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
+import {
+  now,
+  scheduleDeferredCallback,
+  cancelDeferredCallback,
+  prepareForCommit,
+  resetAfterCommit,
+} from './ReactFiberHostConfig';
 import {
   markPendingPriorityLevel,
   markCommittedPriorityLevels,
@@ -95,11 +93,51 @@ import {
   computeExpirationBucket,
 } from './ReactFiberExpirationTime';
 import {AsyncMode, ProfileMode} from './ReactTypeOfMode';
-import ReactFiberLegacyContext from './ReactFiberContext';
-import ReactFiberNewContext from './ReactFiberNewContext';
 import {enqueueUpdate, resetCurrentlyProcessingQueue} from './ReactUpdateQueue';
 import {createCapturedValue} from './ReactCapturedValue';
-import ReactFiberStack from './ReactFiberStack';
+import {
+  popTopLevelContextObject as popTopLevelLegacyContextObject,
+  popContextProvider as popLegacyContextProvider,
+} from './ReactFiberContext';
+import {popProvider} from './ReactFiberNewContext';
+import {popHostContext, popHostContainer} from './ReactFiberHostContext';
+import {
+  checkActualRenderTimeStackEmpty,
+  pauseActualRenderTimerIfRunning,
+  recordElapsedBaseRenderTimeIfRunning,
+  resetActualRenderTimer,
+  resumeActualRenderTimerIfPaused,
+  startBaseRenderTimer,
+  stopBaseRenderTimerIfRunning,
+} from './ReactProfilerTimer';
+import {
+  checkThatStackIsEmpty,
+  resetStackAfterFatalErrorInDev,
+} from './ReactFiberStack';
+import {beginWork} from './ReactFiberBeginWork';
+import {completeWork} from './ReactFiberCompleteWork';
+import {
+  throwException,
+  unwindWork,
+  unwindInterruptedWork,
+  createRootErrorUpdate,
+  createClassErrorUpdate,
+} from './ReactFiberUnwindWork';
+import {
+  commitBeforeMutationLifeCycles,
+  commitResetTextContent,
+  commitPlacement,
+  commitDeletion,
+  commitWork,
+  commitLifeCycles,
+  commitAttachRef,
+  commitDetachRef,
+} from './ReactFiberCommitWork';
+
+export type Deadline = {
+  timeRemaining: () => number,
+  didTimeout: boolean,
+};
 
 export type Thenable = {
   then(resolve: () => mixed, reject?: () => mixed): mixed,
@@ -168,1057 +206,953 @@ if (__DEV__) {
   };
 }
 
-export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
-  config: HostConfig<T, P, I, TI, HI, PI, C, CC, CX, PL>,
-) {
-  const {
-    now,
-    scheduleDeferredCallback,
-    cancelDeferredCallback,
-    prepareForCommit,
-    resetAfterCommit,
-  } = config;
-  const stack = ReactFiberStack();
-  const hostContext = ReactFiberHostContext(config, stack);
-  const legacyContext = ReactFiberLegacyContext(stack);
-  const newContext = ReactFiberNewContext(stack, config.isPrimaryRenderer);
-  const profilerTimer = createProfilerTimer(now);
-  const {popHostContext, popHostContainer} = hostContext;
-  const {
-    popTopLevelContextObject: popTopLevelLegacyContextObject,
-    popContextProvider: popLegacyContextProvider,
-  } = legacyContext;
-  const {popProvider} = newContext;
-  const hydrationContext: HydrationContext<C, CX> = ReactFiberHydrationContext(
-    config,
-  );
-  const {beginWork} = ReactFiberBeginWork(
-    config,
-    hostContext,
-    legacyContext,
-    newContext,
-    hydrationContext,
-    scheduleWork,
-    computeExpirationForFiber,
-    profilerTimer,
-    recalculateCurrentTime,
-  );
-  const {completeWork} = ReactFiberCompleteWork(
-    config,
-    hostContext,
-    legacyContext,
-    newContext,
-    hydrationContext,
-    profilerTimer,
-  );
-  const {
-    throwException,
-    unwindWork,
-    unwindInterruptedWork,
-    createRootErrorUpdate,
-    createClassErrorUpdate,
-  } = ReactFiberUnwindWork(
-    config,
-    hostContext,
-    legacyContext,
-    newContext,
-    scheduleWork,
-    computeExpirationForFiber,
-    recalculateCurrentTime,
-    markLegacyErrorBoundaryAsFailed,
-    isAlreadyFailedLegacyErrorBoundary,
-    onUncaughtError,
-    profilerTimer,
-    suspendRoot,
-    retrySuspendedRoot,
-  );
-  const {
-    commitBeforeMutationLifeCycles,
-    commitResetTextContent,
-    commitPlacement,
-    commitDeletion,
-    commitWork,
-    commitLifeCycles,
-    commitAttachRef,
-    commitDetachRef,
-  } = ReactFiberCommitWork(
-    config,
-    onCommitPhaseError,
-    scheduleWork,
-    computeExpirationForFiber,
-    markLegacyErrorBoundaryAsFailed,
-    recalculateCurrentTime,
-  );
+// Represents the current time in ms.
+const originalStartTimeMs = now();
+let mostRecentCurrentTime: ExpirationTime = msToExpirationTime(0);
+let mostRecentCurrentTimeMs: number = originalStartTimeMs;
 
-  const {
-    checkActualRenderTimeStackEmpty,
-    pauseActualRenderTimerIfRunning,
-    recordElapsedBaseRenderTimeIfRunning,
-    resetActualRenderTimer,
-    resumeActualRenderTimerIfPaused,
-    startBaseRenderTimer,
-    stopBaseRenderTimerIfRunning,
-  } = profilerTimer;
+// Used to ensure computeUniqueAsyncExpiration is monotonically increases.
+let lastUniqueAsyncExpiration: number = 0;
 
-  // Represents the current time in ms.
-  const originalStartTimeMs = now();
-  let mostRecentCurrentTime: ExpirationTime = msToExpirationTime(0);
-  let mostRecentCurrentTimeMs: number = originalStartTimeMs;
+// Represents the expiration time that incoming updates should use. (If this
+// is NoWork, use the default strategy: async updates in async mode, sync
+// updates in sync mode.)
+let expirationContext: ExpirationTime = NoWork;
 
-  // Used to ensure computeUniqueAsyncExpiration is monotonically increases.
-  let lastUniqueAsyncExpiration: number = 0;
+let isWorking: boolean = false;
 
-  // Represents the expiration time that incoming updates should use. (If this
-  // is NoWork, use the default strategy: async updates in async mode, sync
-  // updates in sync mode.)
-  let expirationContext: ExpirationTime = NoWork;
+// The next work in progress fiber that we're currently working on.
+let nextUnitOfWork: Fiber | null = null;
+let nextRoot: FiberRoot | null = null;
+// The time at which we're currently rendering work.
+let nextRenderExpirationTime: ExpirationTime = NoWork;
+let nextLatestTimeoutMs: number = -1;
+let nextRenderIsExpired: boolean = false;
 
-  let isWorking: boolean = false;
+// The next fiber with an effect that we're currently committing.
+let nextEffect: Fiber | null = null;
 
-  // The next work in progress fiber that we're currently working on.
-  let nextUnitOfWork: Fiber | null = null;
-  let nextRoot: FiberRoot | null = null;
-  // The time at which we're currently rendering work.
-  let nextRenderExpirationTime: ExpirationTime = NoWork;
-  let nextLatestTimeoutMs: number = -1;
-  let nextRenderIsExpired: boolean = false;
+let isCommitting: boolean = false;
 
-  // The next fiber with an effect that we're currently committing.
-  let nextEffect: Fiber | null = null;
+let isRootReadyForCommit: boolean = false;
 
-  let isCommitting: boolean = false;
+let legacyErrorBoundariesThatAlreadyFailed: Set<mixed> | null = null;
 
-  let isRootReadyForCommit: boolean = false;
+// Used for performance tracking.
+let interruptedBy: Fiber | null = null;
 
-  let legacyErrorBoundariesThatAlreadyFailed: Set<mixed> | null = null;
-
-  // Used for performance tracking.
-  let interruptedBy: Fiber | null = null;
-
-  let stashedWorkInProgressProperties;
-  let replayUnitOfWork;
-  let isReplayingFailedUnitOfWork;
-  let originalReplayError;
-  let rethrowOriginalError;
-  if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
-    stashedWorkInProgressProperties = null;
-    isReplayingFailedUnitOfWork = false;
-    originalReplayError = null;
-    replayUnitOfWork = (
-      failedUnitOfWork: Fiber,
-      thrownValue: mixed,
-      isAsync: boolean,
-    ) => {
-      if (
-        thrownValue !== null &&
-        typeof thrownValue === 'object' &&
-        typeof thrownValue.then === 'function'
-      ) {
-        // Don't replay promises. Treat everything else like an error.
-        // TODO: Need to figure out a different strategy if/when we add
-        // support for catching other types.
-        return;
-      }
-
-      // Restore the original state of the work-in-progress
-      if (stashedWorkInProgressProperties === null) {
-        // This should never happen. Don't throw because this code is DEV-only.
-        warning(
-          false,
-          'Could not replay rendering after an error. This is likely a bug in React. ' +
-            'Please file an issue.',
-        );
-        return;
-      }
-      assignFiberPropertiesInDEV(
-        failedUnitOfWork,
-        stashedWorkInProgressProperties,
-      );
-
-      switch (failedUnitOfWork.tag) {
-        case HostRoot:
-          popHostContainer(failedUnitOfWork);
-          popTopLevelLegacyContextObject(failedUnitOfWork);
-          break;
-        case HostComponent:
-          popHostContext(failedUnitOfWork);
-          break;
-        case ClassComponent:
-          popLegacyContextProvider(failedUnitOfWork);
-          break;
-        case HostPortal:
-          popHostContainer(failedUnitOfWork);
-          break;
-        case ContextProvider:
-          popProvider(failedUnitOfWork);
-          break;
-      }
-      // Replay the begin phase.
-      isReplayingFailedUnitOfWork = true;
-      originalReplayError = thrownValue;
-      invokeGuardedCallback(null, workLoop, null, isAsync);
-      isReplayingFailedUnitOfWork = false;
-      originalReplayError = null;
-      if (hasCaughtError()) {
-        clearCaughtError();
-
-        if (enableProfilerTimer) {
-          // Stop "base" render timer again (after the re-thrown error).
-          stopBaseRenderTimerIfRunning();
-        }
-      } else {
-        // If the begin phase did not fail the second time, set this pointer
-        // back to the original value.
-        nextUnitOfWork = failedUnitOfWork;
-      }
-    };
-    rethrowOriginalError = () => {
-      throw originalReplayError;
-    };
-  }
-
-  function resetStack() {
-    if (nextUnitOfWork !== null) {
-      let interruptedWork = nextUnitOfWork.return;
-      while (interruptedWork !== null) {
-        unwindInterruptedWork(interruptedWork);
-        interruptedWork = interruptedWork.return;
-      }
-    }
-
-    if (__DEV__) {
-      ReactStrictModeWarnings.discardPendingWarnings();
-      stack.checkThatStackIsEmpty();
-    }
-
-    nextRoot = null;
-    nextRenderExpirationTime = NoWork;
-    nextLatestTimeoutMs = -1;
-    nextRenderIsExpired = false;
-    nextUnitOfWork = null;
-
-    isRootReadyForCommit = false;
-  }
-
-  function commitAllHostEffects() {
-    while (nextEffect !== null) {
-      if (__DEV__) {
-        ReactDebugCurrentFiber.setCurrentFiber(nextEffect);
-      }
-      recordEffect();
-
-      const effectTag = nextEffect.effectTag;
-
-      if (effectTag & ContentReset) {
-        commitResetTextContent(nextEffect);
-      }
-
-      if (effectTag & Ref) {
-        const current = nextEffect.alternate;
-        if (current !== null) {
-          commitDetachRef(current);
-        }
-      }
-
-      // The following switch statement is only concerned about placement,
-      // updates, and deletions. To avoid needing to add a case for every
-      // possible bitmap value, we remove the secondary effects from the
-      // effect tag and switch on that value.
-      let primaryEffectTag = effectTag & (Placement | Update | Deletion);
-      switch (primaryEffectTag) {
-        case Placement: {
-          commitPlacement(nextEffect);
-          // Clear the "placement" from effect tag so that we know that this is inserted, before
-          // any life-cycles like componentDidMount gets called.
-          // TODO: findDOMNode doesn't rely on this any more but isMounted
-          // does and isMounted is deprecated anyway so we should be able
-          // to kill this.
-          nextEffect.effectTag &= ~Placement;
-          break;
-        }
-        case PlacementAndUpdate: {
-          // Placement
-          commitPlacement(nextEffect);
-          // Clear the "placement" from effect tag so that we know that this is inserted, before
-          // any life-cycles like componentDidMount gets called.
-          nextEffect.effectTag &= ~Placement;
-
-          // Update
-          const current = nextEffect.alternate;
-          commitWork(current, nextEffect);
-          break;
-        }
-        case Update: {
-          const current = nextEffect.alternate;
-          commitWork(current, nextEffect);
-          break;
-        }
-        case Deletion: {
-          commitDeletion(nextEffect);
-          break;
-        }
-      }
-      nextEffect = nextEffect.nextEffect;
-    }
-
-    if (__DEV__) {
-      ReactDebugCurrentFiber.resetCurrentFiber();
-    }
-  }
-
-  function commitBeforeMutationLifecycles() {
-    while (nextEffect !== null) {
-      const effectTag = nextEffect.effectTag;
-
-      if (effectTag & Snapshot) {
-        recordEffect();
-        const current = nextEffect.alternate;
-        commitBeforeMutationLifeCycles(current, nextEffect);
-      }
-
-      // Don't cleanup effects yet;
-      // This will be done by commitAllLifeCycles()
-      nextEffect = nextEffect.nextEffect;
-    }
-  }
-
-  function commitAllLifeCycles(
-    finishedRoot: FiberRoot,
-    currentTime: ExpirationTime,
-    committedExpirationTime: ExpirationTime,
-  ) {
-    if (__DEV__) {
-      ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings();
-
-      if (warnAboutDeprecatedLifecycles) {
-        ReactStrictModeWarnings.flushPendingDeprecationWarnings();
-      }
-    }
-    while (nextEffect !== null) {
-      const effectTag = nextEffect.effectTag;
-
-      if (effectTag & (Update | Callback)) {
-        recordEffect();
-        const current = nextEffect.alternate;
-        commitLifeCycles(
-          finishedRoot,
-          current,
-          nextEffect,
-          currentTime,
-          committedExpirationTime,
-        );
-      }
-
-      if (effectTag & Ref) {
-        recordEffect();
-        commitAttachRef(nextEffect);
-      }
-
-      const next = nextEffect.nextEffect;
-      // Ensure that we clean these up so that we don't accidentally keep them.
-      // I'm not actually sure this matters because we can't reset firstEffect
-      // and lastEffect since they're on every node, not just the effectful
-      // ones. So we have to clean everything as we reuse nodes anyway.
-      nextEffect.nextEffect = null;
-      // Ensure that we reset the effectTag here so that we can rely on effect
-      // tags to reason about the current life-cycle.
-      nextEffect = next;
-    }
-  }
-
-  function isAlreadyFailedLegacyErrorBoundary(instance: mixed): boolean {
-    return (
-      legacyErrorBoundariesThatAlreadyFailed !== null &&
-      legacyErrorBoundariesThatAlreadyFailed.has(instance)
-    );
-  }
-
-  function markLegacyErrorBoundaryAsFailed(instance: mixed) {
-    if (legacyErrorBoundariesThatAlreadyFailed === null) {
-      legacyErrorBoundariesThatAlreadyFailed = new Set([instance]);
-    } else {
-      legacyErrorBoundariesThatAlreadyFailed.add(instance);
-    }
-  }
-
-  function commitRoot(finishedWork: Fiber): ExpirationTime {
-    isWorking = true;
-    isCommitting = true;
-    startCommitTimer();
-
-    const root: FiberRoot = finishedWork.stateNode;
-    invariant(
-      root.current !== finishedWork,
-      'Cannot commit the same tree as before. This is probably a bug ' +
-        'related to the return field. This error is likely caused by a bug ' +
-        'in React. Please file an issue.',
-    );
-    const committedExpirationTime = root.pendingCommitExpirationTime;
-    invariant(
-      committedExpirationTime !== NoWork,
-      'Cannot commit an incomplete root. This error is likely caused by a ' +
-        'bug in React. Please file an issue.',
-    );
-    root.pendingCommitExpirationTime = NoWork;
-
-    const currentTime = recalculateCurrentTime();
-
-    // Reset this to null before calling lifecycles
-    ReactCurrentOwner.current = null;
-
-    let firstEffect;
-    if (finishedWork.effectTag > PerformedWork) {
-      // A fiber's effect list consists only of its children, not itself. So if
-      // the root has an effect, we need to add it to the end of the list. The
-      // resulting list is the set that would belong to the root's parent, if
-      // it had one; that is, all the effects in the tree including the root.
-      if (finishedWork.lastEffect !== null) {
-        finishedWork.lastEffect.nextEffect = finishedWork;
-        firstEffect = finishedWork.firstEffect;
-      } else {
-        firstEffect = finishedWork;
-      }
-    } else {
-      // There is no effect on the root.
-      firstEffect = finishedWork.firstEffect;
-    }
-
-    prepareForCommit(root.containerInfo);
-
-    // Invoke instances of getSnapshotBeforeUpdate before mutation.
-    nextEffect = firstEffect;
-    startCommitSnapshotEffectsTimer();
-    while (nextEffect !== null) {
-      let didError = false;
-      let error;
-      if (__DEV__) {
-        invokeGuardedCallback(null, commitBeforeMutationLifecycles, null);
-        if (hasCaughtError()) {
-          didError = true;
-          error = clearCaughtError();
-        }
-      } else {
-        try {
-          commitBeforeMutationLifecycles();
-        } catch (e) {
-          didError = true;
-          error = e;
-        }
-      }
-      if (didError) {
-        invariant(
-          nextEffect !== null,
-          'Should have next effect. This error is likely caused by a bug ' +
-            'in React. Please file an issue.',
-        );
-        onCommitPhaseError(nextEffect, error);
-        // Clean-up
-        if (nextEffect !== null) {
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    }
-    stopCommitSnapshotEffectsTimer();
-
-    // Commit all the side-effects within a tree. We'll do this in two passes.
-    // The first pass performs all the host insertions, updates, deletions and
-    // ref unmounts.
-    nextEffect = firstEffect;
-    startCommitHostEffectsTimer();
-    while (nextEffect !== null) {
-      let didError = false;
-      let error;
-      if (__DEV__) {
-        invokeGuardedCallback(null, commitAllHostEffects, null);
-        if (hasCaughtError()) {
-          didError = true;
-          error = clearCaughtError();
-        }
-      } else {
-        try {
-          commitAllHostEffects();
-        } catch (e) {
-          didError = true;
-          error = e;
-        }
-      }
-      if (didError) {
-        invariant(
-          nextEffect !== null,
-          'Should have next effect. This error is likely caused by a bug ' +
-            'in React. Please file an issue.',
-        );
-        onCommitPhaseError(nextEffect, error);
-        // Clean-up
-        if (nextEffect !== null) {
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    }
-    stopCommitHostEffectsTimer();
-
-    resetAfterCommit(root.containerInfo);
-
-    // The work-in-progress tree is now the current tree. This must come after
-    // the first pass of the commit phase, so that the previous tree is still
-    // current during componentWillUnmount, but before the second pass, so that
-    // the finished work is current during componentDidMount/Update.
-    root.current = finishedWork;
-
-    // In the second pass we'll perform all life-cycles and ref callbacks.
-    // Life-cycles happen as a separate pass so that all placements, updates,
-    // and deletions in the entire tree have already been invoked.
-    // This pass also triggers any renderer-specific initial effects.
-    nextEffect = firstEffect;
-    startCommitLifeCyclesTimer();
-    while (nextEffect !== null) {
-      let didError = false;
-      let error;
-      if (__DEV__) {
-        invokeGuardedCallback(
-          null,
-          commitAllLifeCycles,
-          null,
-          root,
-          currentTime,
-          committedExpirationTime,
-        );
-        if (hasCaughtError()) {
-          didError = true;
-          error = clearCaughtError();
-        }
-      } else {
-        try {
-          commitAllLifeCycles(root, currentTime, committedExpirationTime);
-        } catch (e) {
-          didError = true;
-          error = e;
-        }
-      }
-      if (didError) {
-        invariant(
-          nextEffect !== null,
-          'Should have next effect. This error is likely caused by a bug ' +
-            'in React. Please file an issue.',
-        );
-        onCommitPhaseError(nextEffect, error);
-        if (nextEffect !== null) {
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    }
-
-    if (enableProfilerTimer) {
-      if (__DEV__) {
-        checkActualRenderTimeStackEmpty();
-      }
-      resetActualRenderTimer();
-    }
-
-    isCommitting = false;
-    isWorking = false;
-    stopCommitLifeCyclesTimer();
-    stopCommitTimer();
-    if (typeof onCommitRoot === 'function') {
-      onCommitRoot(finishedWork.stateNode);
-    }
-    if (__DEV__ && ReactFiberInstrumentation.debugTool) {
-      ReactFiberInstrumentation.debugTool.onCommitWork(finishedWork);
-    }
-
-    markCommittedPriorityLevels(root, currentTime, root.current.expirationTime);
-    const remainingTime = findNextPendingPriorityLevel(root);
-    if (remainingTime === NoWork) {
-      // If there's no remaining work, we can clear the set of already failed
-      // error boundaries.
-      legacyErrorBoundariesThatAlreadyFailed = null;
-    }
-    return remainingTime;
-  }
-
-  function resetExpirationTime(
-    workInProgress: Fiber,
-    renderTime: ExpirationTime,
-  ) {
-    if (renderTime !== Never && workInProgress.expirationTime === Never) {
-      // The children of this component are hidden. Don't bubble their
-      // expiration times.
+let stashedWorkInProgressProperties;
+let replayUnitOfWork;
+let isReplayingFailedUnitOfWork;
+let originalReplayError;
+let rethrowOriginalError;
+if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+  stashedWorkInProgressProperties = null;
+  isReplayingFailedUnitOfWork = false;
+  originalReplayError = null;
+  replayUnitOfWork = (
+    failedUnitOfWork: Fiber,
+    thrownValue: mixed,
+    isAsync: boolean,
+  ) => {
+    if (
+      thrownValue !== null &&
+      typeof thrownValue === 'object' &&
+      typeof thrownValue.then === 'function'
+    ) {
+      // Don't replay promises. Treat everything else like an error.
+      // TODO: Need to figure out a different strategy if/when we add
+      // support for catching other types.
       return;
     }
 
-    // Check for pending updates.
-    let newExpirationTime = NoWork;
-    switch (workInProgress.tag) {
+    // Restore the original state of the work-in-progress
+    if (stashedWorkInProgressProperties === null) {
+      // This should never happen. Don't throw because this code is DEV-only.
+      warning(
+        false,
+        'Could not replay rendering after an error. This is likely a bug in React. ' +
+          'Please file an issue.',
+      );
+      return;
+    }
+    assignFiberPropertiesInDEV(
+      failedUnitOfWork,
+      stashedWorkInProgressProperties,
+    );
+
+    switch (failedUnitOfWork.tag) {
       case HostRoot:
-      case ClassComponent: {
-        const updateQueue = workInProgress.updateQueue;
-        if (updateQueue !== null) {
-          newExpirationTime = updateQueue.expirationTime;
-        }
-      }
+        popHostContainer(failedUnitOfWork);
+        popTopLevelLegacyContextObject(failedUnitOfWork);
+        break;
+      case HostComponent:
+        popHostContext(failedUnitOfWork);
+        break;
+      case ClassComponent:
+        popLegacyContextProvider(failedUnitOfWork);
+        break;
+      case HostPortal:
+        popHostContainer(failedUnitOfWork);
+        break;
+      case ContextProvider:
+        popProvider(failedUnitOfWork);
+        break;
     }
+    // Replay the begin phase.
+    isReplayingFailedUnitOfWork = true;
+    originalReplayError = thrownValue;
+    invokeGuardedCallback(null, workLoop, null, isAsync);
+    isReplayingFailedUnitOfWork = false;
+    originalReplayError = null;
+    if (hasCaughtError()) {
+      clearCaughtError();
 
-    // TODO: Calls need to visit stateNode
-
-    // Bubble up the earliest expiration time.
-    // (And "base" render timers if that feature flag is enabled)
-    if (enableProfilerTimer && workInProgress.mode & ProfileMode) {
-      let treeBaseTime = workInProgress.selfBaseTime;
-      let child = workInProgress.child;
-      while (child !== null) {
-        treeBaseTime += child.treeBaseTime;
-        if (
-          child.expirationTime !== NoWork &&
-          (newExpirationTime === NoWork ||
-            newExpirationTime > child.expirationTime)
-        ) {
-          newExpirationTime = child.expirationTime;
-        }
-        child = child.sibling;
+      if (enableProfilerTimer) {
+        // Stop "base" render timer again (after the re-thrown error).
+        stopBaseRenderTimerIfRunning();
       }
-      workInProgress.treeBaseTime = treeBaseTime;
     } else {
-      let child = workInProgress.child;
-      while (child !== null) {
-        if (
-          child.expirationTime !== NoWork &&
-          (newExpirationTime === NoWork ||
-            newExpirationTime > child.expirationTime)
-        ) {
-          newExpirationTime = child.expirationTime;
-        }
-        child = child.sibling;
+      // If the begin phase did not fail the second time, set this pointer
+      // back to the original value.
+      nextUnitOfWork = failedUnitOfWork;
+    }
+  };
+  rethrowOriginalError = () => {
+    throw originalReplayError;
+  };
+}
+
+function resetStack() {
+  if (nextUnitOfWork !== null) {
+    let interruptedWork = nextUnitOfWork.return;
+    while (interruptedWork !== null) {
+      unwindInterruptedWork(interruptedWork);
+      interruptedWork = interruptedWork.return;
+    }
+  }
+
+  if (__DEV__) {
+    ReactStrictModeWarnings.discardPendingWarnings();
+    checkThatStackIsEmpty();
+  }
+
+  nextRoot = null;
+  nextRenderExpirationTime = NoWork;
+  nextLatestTimeoutMs = -1;
+  nextRenderIsExpired = false;
+  nextUnitOfWork = null;
+
+  isRootReadyForCommit = false;
+}
+
+function commitAllHostEffects() {
+  while (nextEffect !== null) {
+    if (__DEV__) {
+      ReactDebugCurrentFiber.setCurrentFiber(nextEffect);
+    }
+    recordEffect();
+
+    const effectTag = nextEffect.effectTag;
+
+    if (effectTag & ContentReset) {
+      commitResetTextContent(nextEffect);
+    }
+
+    if (effectTag & Ref) {
+      const current = nextEffect.alternate;
+      if (current !== null) {
+        commitDetachRef(current);
       }
     }
 
-    workInProgress.expirationTime = newExpirationTime;
-  }
-
-  function completeUnitOfWork(workInProgress: Fiber): Fiber | null {
-    // Attempt to complete the current unit of work, then move to the
-    // next sibling. If there are no more siblings, return to the
-    // parent fiber.
-    while (true) {
-      // The current, flushed, state of this fiber is the alternate.
-      // Ideally nothing should rely on this, but relying on it here
-      // means that we don't need an additional field on the work in
-      // progress.
-      const current = workInProgress.alternate;
-      if (__DEV__) {
-        ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
+    // The following switch statement is only concerned about placement,
+    // updates, and deletions. To avoid needing to add a case for every
+    // possible bitmap value, we remove the secondary effects from the
+    // effect tag and switch on that value.
+    let primaryEffectTag = effectTag & (Placement | Update | Deletion);
+    switch (primaryEffectTag) {
+      case Placement: {
+        commitPlacement(nextEffect);
+        // Clear the "placement" from effect tag so that we know that this is inserted, before
+        // any life-cycles like componentDidMount gets called.
+        // TODO: findDOMNode doesn't rely on this any more but isMounted
+        // does and isMounted is deprecated anyway so we should be able
+        // to kill this.
+        nextEffect.effectTag &= ~Placement;
+        break;
       }
+      case PlacementAndUpdate: {
+        // Placement
+        commitPlacement(nextEffect);
+        // Clear the "placement" from effect tag so that we know that this is inserted, before
+        // any life-cycles like componentDidMount gets called.
+        nextEffect.effectTag &= ~Placement;
 
-      const returnFiber = workInProgress.return;
-      const siblingFiber = workInProgress.sibling;
-
-      if ((workInProgress.effectTag & Incomplete) === NoEffect) {
-        // This fiber completed.
-        let next = completeWork(
-          current,
-          workInProgress,
-          nextRenderExpirationTime,
-        );
-        stopWorkTimer(workInProgress);
-        resetExpirationTime(workInProgress, nextRenderExpirationTime);
-        if (__DEV__) {
-          ReactDebugCurrentFiber.resetCurrentFiber();
-        }
-
-        if (next !== null) {
-          stopWorkTimer(workInProgress);
-          if (__DEV__ && ReactFiberInstrumentation.debugTool) {
-            ReactFiberInstrumentation.debugTool.onCompleteWork(workInProgress);
-          }
-          // If completing this work spawned new work, do that next. We'll come
-          // back here again.
-          return next;
-        }
-
-        if (
-          returnFiber !== null &&
-          // Do not append effects to parents if a sibling failed to complete
-          (returnFiber.effectTag & Incomplete) === NoEffect
-        ) {
-          // Append all the effects of the subtree and this fiber onto the effect
-          // list of the parent. The completion order of the children affects the
-          // side-effect order.
-          if (returnFiber.firstEffect === null) {
-            returnFiber.firstEffect = workInProgress.firstEffect;
-          }
-          if (workInProgress.lastEffect !== null) {
-            if (returnFiber.lastEffect !== null) {
-              returnFiber.lastEffect.nextEffect = workInProgress.firstEffect;
-            }
-            returnFiber.lastEffect = workInProgress.lastEffect;
-          }
-
-          // If this fiber had side-effects, we append it AFTER the children's
-          // side-effects. We can perform certain side-effects earlier if
-          // needed, by doing multiple passes over the effect list. We don't want
-          // to schedule our own side-effect on our own list because if end up
-          // reusing children we'll schedule this effect onto itself since we're
-          // at the end.
-          const effectTag = workInProgress.effectTag;
-          // Skip both NoWork and PerformedWork tags when creating the effect list.
-          // PerformedWork effect is read by React DevTools but shouldn't be committed.
-          if (effectTag > PerformedWork) {
-            if (returnFiber.lastEffect !== null) {
-              returnFiber.lastEffect.nextEffect = workInProgress;
-            } else {
-              returnFiber.firstEffect = workInProgress;
-            }
-            returnFiber.lastEffect = workInProgress;
-          }
-        }
-
-        if (__DEV__ && ReactFiberInstrumentation.debugTool) {
-          ReactFiberInstrumentation.debugTool.onCompleteWork(workInProgress);
-        }
-
-        if (siblingFiber !== null) {
-          // If there is more work to do in this returnFiber, do that next.
-          return siblingFiber;
-        } else if (returnFiber !== null) {
-          // If there's no more work in this returnFiber. Complete the returnFiber.
-          workInProgress = returnFiber;
-          continue;
-        } else {
-          // We've reached the root.
-          isRootReadyForCommit = true;
-          return null;
-        }
-      } else {
-        // This fiber did not complete because something threw. Pop values off
-        // the stack without entering the complete phase. If this is a boundary,
-        // capture values if possible.
-        const next = unwindWork(
-          workInProgress,
-          nextRenderIsExpired,
-          nextRenderExpirationTime,
-        );
-        // Because this fiber did not complete, don't reset its expiration time.
-        if (workInProgress.effectTag & DidCapture) {
-          // Restarting an error boundary
-          stopFailedWorkTimer(workInProgress);
-        } else {
-          stopWorkTimer(workInProgress);
-        }
-
-        if (__DEV__) {
-          ReactDebugCurrentFiber.resetCurrentFiber();
-        }
-
-        if (next !== null) {
-          stopWorkTimer(workInProgress);
-          if (__DEV__ && ReactFiberInstrumentation.debugTool) {
-            ReactFiberInstrumentation.debugTool.onCompleteWork(workInProgress);
-          }
-          // If completing this work spawned new work, do that next. We'll come
-          // back here again.
-          // Since we're restarting, remove anything that is not a host effect
-          // from the effect tag.
-          next.effectTag &= HostEffectMask;
-          return next;
-        }
-
-        if (returnFiber !== null) {
-          // Mark the parent fiber as incomplete and clear its effect list.
-          returnFiber.firstEffect = returnFiber.lastEffect = null;
-          returnFiber.effectTag |= Incomplete;
-        }
-
-        if (__DEV__ && ReactFiberInstrumentation.debugTool) {
-          ReactFiberInstrumentation.debugTool.onCompleteWork(workInProgress);
-        }
-
-        if (siblingFiber !== null) {
-          // If there is more work to do in this returnFiber, do that next.
-          return siblingFiber;
-        } else if (returnFiber !== null) {
-          // If there's no more work in this returnFiber. Complete the returnFiber.
-          workInProgress = returnFiber;
-          continue;
-        } else {
-          return null;
-        }
+        // Update
+        const current = nextEffect.alternate;
+        commitWork(current, nextEffect);
+        break;
+      }
+      case Update: {
+        const current = nextEffect.alternate;
+        commitWork(current, nextEffect);
+        break;
+      }
+      case Deletion: {
+        commitDeletion(nextEffect);
+        break;
       }
     }
-
-    // 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;
+    nextEffect = nextEffect.nextEffect;
   }
 
-  function performUnitOfWork(workInProgress: Fiber): Fiber | null {
+  if (__DEV__) {
+    ReactDebugCurrentFiber.resetCurrentFiber();
+  }
+}
+
+function commitBeforeMutationLifecycles() {
+  while (nextEffect !== null) {
+    const effectTag = nextEffect.effectTag;
+
+    if (effectTag & Snapshot) {
+      recordEffect();
+      const current = nextEffect.alternate;
+      commitBeforeMutationLifeCycles(current, nextEffect);
+    }
+
+    // Don't cleanup effects yet;
+    // This will be done by commitAllLifeCycles()
+    nextEffect = nextEffect.nextEffect;
+  }
+}
+
+function commitAllLifeCycles(
+  finishedRoot: FiberRoot,
+  currentTime: ExpirationTime,
+  committedExpirationTime: ExpirationTime,
+) {
+  if (__DEV__) {
+    ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings();
+
+    if (warnAboutDeprecatedLifecycles) {
+      ReactStrictModeWarnings.flushPendingDeprecationWarnings();
+    }
+  }
+  while (nextEffect !== null) {
+    const effectTag = nextEffect.effectTag;
+
+    if (effectTag & (Update | Callback)) {
+      recordEffect();
+      const current = nextEffect.alternate;
+      commitLifeCycles(
+        finishedRoot,
+        current,
+        nextEffect,
+        currentTime,
+        committedExpirationTime,
+      );
+    }
+
+    if (effectTag & Ref) {
+      recordEffect();
+      commitAttachRef(nextEffect);
+    }
+
+    const next = nextEffect.nextEffect;
+    // Ensure that we clean these up so that we don't accidentally keep them.
+    // I'm not actually sure this matters because we can't reset firstEffect
+    // and lastEffect since they're on every node, not just the effectful
+    // ones. So we have to clean everything as we reuse nodes anyway.
+    nextEffect.nextEffect = null;
+    // Ensure that we reset the effectTag here so that we can rely on effect
+    // tags to reason about the current life-cycle.
+    nextEffect = next;
+  }
+}
+
+function isAlreadyFailedLegacyErrorBoundary(instance: mixed): boolean {
+  return (
+    legacyErrorBoundariesThatAlreadyFailed !== null &&
+    legacyErrorBoundariesThatAlreadyFailed.has(instance)
+  );
+}
+
+function markLegacyErrorBoundaryAsFailed(instance: mixed) {
+  if (legacyErrorBoundariesThatAlreadyFailed === null) {
+    legacyErrorBoundariesThatAlreadyFailed = new Set([instance]);
+  } else {
+    legacyErrorBoundariesThatAlreadyFailed.add(instance);
+  }
+}
+
+function commitRoot(finishedWork: Fiber): ExpirationTime {
+  isWorking = true;
+  isCommitting = true;
+  startCommitTimer();
+
+  const root: FiberRoot = finishedWork.stateNode;
+  invariant(
+    root.current !== finishedWork,
+    'Cannot commit the same tree as before. This is probably a bug ' +
+      'related to the return field. This error is likely caused by a bug ' +
+      'in React. Please file an issue.',
+  );
+  const committedExpirationTime = root.pendingCommitExpirationTime;
+  invariant(
+    committedExpirationTime !== NoWork,
+    'Cannot commit an incomplete root. This error is likely caused by a ' +
+      'bug in React. Please file an issue.',
+  );
+  root.pendingCommitExpirationTime = NoWork;
+
+  const currentTime = recalculateCurrentTime();
+
+  // Reset this to null before calling lifecycles
+  ReactCurrentOwner.current = null;
+
+  let firstEffect;
+  if (finishedWork.effectTag > PerformedWork) {
+    // A fiber's effect list consists only of its children, not itself. So if
+    // the root has an effect, we need to add it to the end of the list. The
+    // resulting list is the set that would belong to the root's parent, if
+    // it had one; that is, all the effects in the tree including the root.
+    if (finishedWork.lastEffect !== null) {
+      finishedWork.lastEffect.nextEffect = finishedWork;
+      firstEffect = finishedWork.firstEffect;
+    } else {
+      firstEffect = finishedWork;
+    }
+  } else {
+    // There is no effect on the root.
+    firstEffect = finishedWork.firstEffect;
+  }
+
+  prepareForCommit(root.containerInfo);
+
+  // Invoke instances of getSnapshotBeforeUpdate before mutation.
+  nextEffect = firstEffect;
+  startCommitSnapshotEffectsTimer();
+  while (nextEffect !== null) {
+    let didError = false;
+    let error;
+    if (__DEV__) {
+      invokeGuardedCallback(null, commitBeforeMutationLifecycles, null);
+      if (hasCaughtError()) {
+        didError = true;
+        error = clearCaughtError();
+      }
+    } else {
+      try {
+        commitBeforeMutationLifecycles();
+      } catch (e) {
+        didError = true;
+        error = e;
+      }
+    }
+    if (didError) {
+      invariant(
+        nextEffect !== null,
+        'Should have next effect. This error is likely caused by a bug ' +
+          'in React. Please file an issue.',
+      );
+      captureCommitPhaseError(nextEffect, error);
+      // Clean-up
+      if (nextEffect !== null) {
+        nextEffect = nextEffect.nextEffect;
+      }
+    }
+  }
+  stopCommitSnapshotEffectsTimer();
+
+  // Commit all the side-effects within a tree. We'll do this in two passes.
+  // The first pass performs all the host insertions, updates, deletions and
+  // ref unmounts.
+  nextEffect = firstEffect;
+  startCommitHostEffectsTimer();
+  while (nextEffect !== null) {
+    let didError = false;
+    let error;
+    if (__DEV__) {
+      invokeGuardedCallback(null, commitAllHostEffects, null);
+      if (hasCaughtError()) {
+        didError = true;
+        error = clearCaughtError();
+      }
+    } else {
+      try {
+        commitAllHostEffects();
+      } catch (e) {
+        didError = true;
+        error = e;
+      }
+    }
+    if (didError) {
+      invariant(
+        nextEffect !== null,
+        'Should have next effect. This error is likely caused by a bug ' +
+          'in React. Please file an issue.',
+      );
+      captureCommitPhaseError(nextEffect, error);
+      // Clean-up
+      if (nextEffect !== null) {
+        nextEffect = nextEffect.nextEffect;
+      }
+    }
+  }
+  stopCommitHostEffectsTimer();
+
+  resetAfterCommit(root.containerInfo);
+
+  // The work-in-progress tree is now the current tree. This must come after
+  // the first pass of the commit phase, so that the previous tree is still
+  // current during componentWillUnmount, but before the second pass, so that
+  // the finished work is current during componentDidMount/Update.
+  root.current = finishedWork;
+
+  // In the second pass we'll perform all life-cycles and ref callbacks.
+  // Life-cycles happen as a separate pass so that all placements, updates,
+  // and deletions in the entire tree have already been invoked.
+  // This pass also triggers any renderer-specific initial effects.
+  nextEffect = firstEffect;
+  startCommitLifeCyclesTimer();
+  while (nextEffect !== null) {
+    let didError = false;
+    let error;
+    if (__DEV__) {
+      invokeGuardedCallback(
+        null,
+        commitAllLifeCycles,
+        null,
+        root,
+        currentTime,
+        committedExpirationTime,
+      );
+      if (hasCaughtError()) {
+        didError = true;
+        error = clearCaughtError();
+      }
+    } else {
+      try {
+        commitAllLifeCycles(root, currentTime, committedExpirationTime);
+      } catch (e) {
+        didError = true;
+        error = e;
+      }
+    }
+    if (didError) {
+      invariant(
+        nextEffect !== null,
+        'Should have next effect. This error is likely caused by a bug ' +
+          'in React. Please file an issue.',
+      );
+      captureCommitPhaseError(nextEffect, error);
+      if (nextEffect !== null) {
+        nextEffect = nextEffect.nextEffect;
+      }
+    }
+  }
+
+  if (enableProfilerTimer) {
+    if (__DEV__) {
+      checkActualRenderTimeStackEmpty();
+    }
+    resetActualRenderTimer();
+  }
+
+  isCommitting = false;
+  isWorking = false;
+  stopCommitLifeCyclesTimer();
+  stopCommitTimer();
+  if (typeof onCommitRoot === 'function') {
+    onCommitRoot(finishedWork.stateNode);
+  }
+  if (__DEV__ && ReactFiberInstrumentation.debugTool) {
+    ReactFiberInstrumentation.debugTool.onCommitWork(finishedWork);
+  }
+
+  markCommittedPriorityLevels(root, currentTime, root.current.expirationTime);
+  const remainingTime = findNextPendingPriorityLevel(root);
+  if (remainingTime === NoWork) {
+    // If there's no remaining work, we can clear the set of already failed
+    // error boundaries.
+    legacyErrorBoundariesThatAlreadyFailed = null;
+  }
+  return remainingTime;
+}
+
+function resetExpirationTime(
+  workInProgress: Fiber,
+  renderTime: ExpirationTime,
+) {
+  if (renderTime !== Never && workInProgress.expirationTime === Never) {
+    // The children of this component are hidden. Don't bubble their
+    // expiration times.
+    return;
+  }
+
+  // Check for pending updates.
+  let newExpirationTime = NoWork;
+  switch (workInProgress.tag) {
+    case HostRoot:
+    case ClassComponent: {
+      const updateQueue = workInProgress.updateQueue;
+      if (updateQueue !== null) {
+        newExpirationTime = updateQueue.expirationTime;
+      }
+    }
+  }
+
+  // TODO: Calls need to visit stateNode
+
+  // Bubble up the earliest expiration time.
+  // (And "base" render timers if that feature flag is enabled)
+  if (enableProfilerTimer && workInProgress.mode & ProfileMode) {
+    let treeBaseTime = workInProgress.selfBaseTime;
+    let child = workInProgress.child;
+    while (child !== null) {
+      treeBaseTime += child.treeBaseTime;
+      if (
+        child.expirationTime !== NoWork &&
+        (newExpirationTime === NoWork ||
+          newExpirationTime > child.expirationTime)
+      ) {
+        newExpirationTime = child.expirationTime;
+      }
+      child = child.sibling;
+    }
+    workInProgress.treeBaseTime = treeBaseTime;
+  } else {
+    let child = workInProgress.child;
+    while (child !== null) {
+      if (
+        child.expirationTime !== NoWork &&
+        (newExpirationTime === NoWork ||
+          newExpirationTime > child.expirationTime)
+      ) {
+        newExpirationTime = child.expirationTime;
+      }
+      child = child.sibling;
+    }
+  }
+
+  workInProgress.expirationTime = newExpirationTime;
+}
+
+function completeUnitOfWork(workInProgress: Fiber): Fiber | null {
+  // Attempt to complete the current unit of work, then move to the
+  // next sibling. If there are no more siblings, return to the
+  // parent fiber.
+  while (true) {
     // The current, flushed, state of this fiber is the alternate.
     // Ideally nothing should rely on this, but relying on it here
     // means that we don't need an additional field on the work in
     // progress.
     const current = workInProgress.alternate;
-
-    // See if beginning this work spawns more work.
-    startWorkTimer(workInProgress);
     if (__DEV__) {
       ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
     }
 
-    if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
-      stashedWorkInProgressProperties = assignFiberPropertiesInDEV(
-        stashedWorkInProgressProperties,
+    const returnFiber = workInProgress.return;
+    const siblingFiber = workInProgress.sibling;
+
+    if ((workInProgress.effectTag & Incomplete) === NoEffect) {
+      // This fiber completed.
+      let next = completeWork(
+        current,
         workInProgress,
-      );
-    }
-
-    let next;
-    if (enableProfilerTimer) {
-      if (workInProgress.mode & ProfileMode) {
-        startBaseRenderTimer();
-      }
-
-      next = beginWork(current, workInProgress, nextRenderExpirationTime);
-
-      if (workInProgress.mode & ProfileMode) {
-        // Update "base" time if the render wasn't bailed out on.
-        recordElapsedBaseRenderTimeIfRunning(workInProgress);
-        stopBaseRenderTimerIfRunning();
-      }
-    } else {
-      next = beginWork(current, workInProgress, nextRenderExpirationTime);
-    }
-
-    if (__DEV__) {
-      ReactDebugCurrentFiber.resetCurrentFiber();
-      if (isReplayingFailedUnitOfWork) {
-        // Currently replaying a failed unit of work. This should be unreachable,
-        // because the render phase is meant to be idempotent, and it should
-        // have thrown again. Since it didn't, rethrow the original error, so
-        // React's internal stack is not misaligned.
-        rethrowOriginalError();
-      }
-    }
-    if (__DEV__ && ReactFiberInstrumentation.debugTool) {
-      ReactFiberInstrumentation.debugTool.onBeginWork(workInProgress);
-    }
-
-    if (next === null) {
-      // If this doesn't spawn new work, complete the current work.
-      next = completeUnitOfWork(workInProgress);
-    }
-
-    ReactCurrentOwner.current = null;
-
-    return next;
-  }
-
-  function workLoop(isAsync) {
-    if (!isAsync) {
-      // Flush all expired work.
-      while (nextUnitOfWork !== null) {
-        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-      }
-    } else {
-      // Flush asynchronous work until the deadline runs out of time.
-      while (nextUnitOfWork !== null && !shouldYield()) {
-        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-      }
-
-      if (enableProfilerTimer) {
-        // If we didn't finish, pause the "actual" render timer.
-        // We'll restart it when we resume work.
-        pauseActualRenderTimerIfRunning();
-      }
-    }
-  }
-
-  function renderRoot(
-    root: FiberRoot,
-    expirationTime: ExpirationTime,
-    isAsync: boolean,
-  ): Fiber | null {
-    invariant(
-      !isWorking,
-      'renderRoot was called recursively. This error is likely caused ' +
-        'by a bug in React. Please file an issue.',
-    );
-    isWorking = true;
-
-    // Check if we're starting from a fresh stack, or if we're resuming from
-    // previously yielded work.
-    if (
-      expirationTime !== nextRenderExpirationTime ||
-      root !== nextRoot ||
-      nextUnitOfWork === null
-    ) {
-      // Reset the stack and start working from the root.
-      resetStack();
-      nextRoot = root;
-      nextRenderExpirationTime = expirationTime;
-      nextLatestTimeoutMs = -1;
-      nextUnitOfWork = createWorkInProgress(
-        nextRoot.current,
-        null,
         nextRenderExpirationTime,
       );
-      root.pendingCommitExpirationTime = NoWork;
-    }
-
-    let didFatal = false;
-
-    nextRenderIsExpired =
-      !isAsync || nextRenderExpirationTime <= mostRecentCurrentTime;
-
-    startWorkLoopTimer(nextUnitOfWork);
-
-    do {
-      try {
-        workLoop(isAsync);
-      } catch (thrownValue) {
-        if (enableProfilerTimer) {
-          // Stop "base" render timer in the event of an error.
-          stopBaseRenderTimerIfRunning();
-        }
-
-        if (nextUnitOfWork === null) {
-          // This is a fatal error.
-          didFatal = true;
-          onUncaughtError(thrownValue);
-        } else {
-          if (__DEV__) {
-            // Reset global debug state
-            // We assume this is defined in DEV
-            (resetCurrentlyProcessingQueue: any)();
-          }
-
-          const failedUnitOfWork: Fiber = nextUnitOfWork;
-          if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
-            replayUnitOfWork(failedUnitOfWork, thrownValue, isAsync);
-          }
-
-          // TODO: we already know this isn't true in some cases.
-          // At least this shows a nicer error message until we figure out the cause.
-          // https://github.com/facebook/react/issues/12449#issuecomment-386727431
-          invariant(
-            nextUnitOfWork !== null,
-            'Failed to replay rendering after an error. This ' +
-              'is likely caused by a bug in React. Please file an issue ' +
-              'with a reproducing case to help us find it.',
-          );
-
-          const sourceFiber: Fiber = nextUnitOfWork;
-          let returnFiber = sourceFiber.return;
-          if (returnFiber === null) {
-            // This is the root. The root could capture its own errors. However,
-            // we don't know if it errors before or after we pushed the host
-            // context. This information is needed to avoid a stack mismatch.
-            // Because we're not sure, treat this as a fatal error. We could track
-            // which phase it fails in, but doesn't seem worth it. At least
-            // for now.
-            didFatal = true;
-            onUncaughtError(thrownValue);
-            break;
-          }
-          throwException(
-            root,
-            returnFiber,
-            sourceFiber,
-            thrownValue,
-            nextRenderIsExpired,
-            nextRenderExpirationTime,
-            mostRecentCurrentTimeMs,
-          );
-          nextUnitOfWork = completeUnitOfWork(sourceFiber);
-        }
-      }
-      break;
-    } while (true);
-
-    // We're done performing work. Time to clean up.
-    let didCompleteRoot = false;
-    isWorking = false;
-
-    // Yield back to main thread.
-    if (didFatal) {
-      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
-      interruptedBy = null;
-      // There was a fatal error.
+      stopWorkTimer(workInProgress);
+      resetExpirationTime(workInProgress, nextRenderExpirationTime);
       if (__DEV__) {
-        stack.resetStackAfterFatalErrorInDev();
+        ReactDebugCurrentFiber.resetCurrentFiber();
       }
-      return null;
-    } else if (nextUnitOfWork === null) {
-      // We reached the root.
-      if (isRootReadyForCommit) {
-        didCompleteRoot = true;
-        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
-        interruptedBy = null;
-        // The root successfully completed. It's ready for commit.
-        root.pendingCommitExpirationTime = expirationTime;
-        const finishedWork = root.current.alternate;
-        return finishedWork;
-      } else {
-        // The root did not complete.
-        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
-        interruptedBy = null;
-        invariant(
-          !nextRenderIsExpired,
-          'Expired work should have completed. This error is likely caused ' +
-            'by a bug in React. Please file an issue.',
-        );
-        markSuspendedPriorityLevel(root, expirationTime);
-        if (nextLatestTimeoutMs >= 0) {
-          setTimeout(() => {
-            retrySuspendedRoot(root, expirationTime);
-          }, nextLatestTimeoutMs);
+
+      if (next !== null) {
+        stopWorkTimer(workInProgress);
+        if (__DEV__ && ReactFiberInstrumentation.debugTool) {
+          ReactFiberInstrumentation.debugTool.onCompleteWork(workInProgress);
         }
-        const firstUnblockedExpirationTime = findNextPendingPriorityLevel(root);
-        onBlock(firstUnblockedExpirationTime);
+        // If completing this work spawned new work, do that next. We'll come
+        // back here again.
+        return next;
+      }
+
+      if (
+        returnFiber !== null &&
+        // Do not append effects to parents if a sibling failed to complete
+        (returnFiber.effectTag & Incomplete) === NoEffect
+      ) {
+        // Append all the effects of the subtree and this fiber onto the effect
+        // list of the parent. The completion order of the children affects the
+        // side-effect order.
+        if (returnFiber.firstEffect === null) {
+          returnFiber.firstEffect = workInProgress.firstEffect;
+        }
+        if (workInProgress.lastEffect !== null) {
+          if (returnFiber.lastEffect !== null) {
+            returnFiber.lastEffect.nextEffect = workInProgress.firstEffect;
+          }
+          returnFiber.lastEffect = workInProgress.lastEffect;
+        }
+
+        // If this fiber had side-effects, we append it AFTER the children's
+        // side-effects. We can perform certain side-effects earlier if
+        // needed, by doing multiple passes over the effect list. We don't want
+        // to schedule our own side-effect on our own list because if end up
+        // reusing children we'll schedule this effect onto itself since we're
+        // at the end.
+        const effectTag = workInProgress.effectTag;
+        // Skip both NoWork and PerformedWork tags when creating the effect list.
+        // PerformedWork effect is read by React DevTools but shouldn't be committed.
+        if (effectTag > PerformedWork) {
+          if (returnFiber.lastEffect !== null) {
+            returnFiber.lastEffect.nextEffect = workInProgress;
+          } else {
+            returnFiber.firstEffect = workInProgress;
+          }
+          returnFiber.lastEffect = workInProgress;
+        }
+      }
+
+      if (__DEV__ && ReactFiberInstrumentation.debugTool) {
+        ReactFiberInstrumentation.debugTool.onCompleteWork(workInProgress);
+      }
+
+      if (siblingFiber !== null) {
+        // If there is more work to do in this returnFiber, do that next.
+        return siblingFiber;
+      } else if (returnFiber !== null) {
+        // If there's no more work in this returnFiber. Complete the returnFiber.
+        workInProgress = returnFiber;
+        continue;
+      } else {
+        // We've reached the root.
+        isRootReadyForCommit = true;
         return null;
       }
     } else {
-      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
-      interruptedBy = null;
-      // There's more work to do, but we ran out of time. Yield back to
-      // the renderer.
-      return null;
+      // This fiber did not complete because something threw. Pop values off
+      // the stack without entering the complete phase. If this is a boundary,
+      // capture values if possible.
+      const next = unwindWork(
+        workInProgress,
+        nextRenderIsExpired,
+        nextRenderExpirationTime,
+      );
+      // Because this fiber did not complete, don't reset its expiration time.
+      if (workInProgress.effectTag & DidCapture) {
+        // Restarting an error boundary
+        stopFailedWorkTimer(workInProgress);
+      } else {
+        stopWorkTimer(workInProgress);
+      }
+
+      if (__DEV__) {
+        ReactDebugCurrentFiber.resetCurrentFiber();
+      }
+
+      if (next !== null) {
+        stopWorkTimer(workInProgress);
+        if (__DEV__ && ReactFiberInstrumentation.debugTool) {
+          ReactFiberInstrumentation.debugTool.onCompleteWork(workInProgress);
+        }
+        // If completing this work spawned new work, do that next. We'll come
+        // back here again.
+        // Since we're restarting, remove anything that is not a host effect
+        // from the effect tag.
+        next.effectTag &= HostEffectMask;
+        return next;
+      }
+
+      if (returnFiber !== null) {
+        // Mark the parent fiber as incomplete and clear its effect list.
+        returnFiber.firstEffect = returnFiber.lastEffect = null;
+        returnFiber.effectTag |= Incomplete;
+      }
+
+      if (__DEV__ && ReactFiberInstrumentation.debugTool) {
+        ReactFiberInstrumentation.debugTool.onCompleteWork(workInProgress);
+      }
+
+      if (siblingFiber !== null) {
+        // If there is more work to do in this returnFiber, do that next.
+        return siblingFiber;
+      } else if (returnFiber !== null) {
+        // If there's no more work in this returnFiber. Complete the returnFiber.
+        workInProgress = returnFiber;
+        continue;
+      } else {
+        return null;
+      }
     }
   }
 
-  function dispatch(
-    sourceFiber: Fiber,
-    value: mixed,
-    expirationTime: ExpirationTime,
-  ) {
-    invariant(
-      !isWorking || isCommitting,
-      'dispatch: Cannot dispatch during the render phase.',
-    );
+  // 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;
+}
 
-    let fiber = sourceFiber.return;
-    while (fiber !== null) {
-      switch (fiber.tag) {
-        case ClassComponent:
-          const ctor = fiber.type;
-          const instance = fiber.stateNode;
-          if (
-            typeof ctor.getDerivedStateFromCatch === 'function' ||
-            (typeof instance.componentDidCatch === 'function' &&
-              !isAlreadyFailedLegacyErrorBoundary(instance))
-          ) {
-            const errorInfo = createCapturedValue(value, sourceFiber);
-            const update = createClassErrorUpdate(
-              fiber,
-              errorInfo,
-              expirationTime,
-            );
-            enqueueUpdate(fiber, update, expirationTime);
-            scheduleWork(fiber, expirationTime);
-            return;
-          }
+function performUnitOfWork(workInProgress: Fiber): Fiber | null {
+  // The current, flushed, state of this fiber is the alternate.
+  // Ideally nothing should rely on this, but relying on it here
+  // means that we don't need an additional field on the work in
+  // progress.
+  const current = workInProgress.alternate;
+
+  // See if beginning this work spawns more work.
+  startWorkTimer(workInProgress);
+  if (__DEV__) {
+    ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
+  }
+
+  if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+    stashedWorkInProgressProperties = assignFiberPropertiesInDEV(
+      stashedWorkInProgressProperties,
+      workInProgress,
+    );
+  }
+
+  let next;
+  if (enableProfilerTimer) {
+    if (workInProgress.mode & ProfileMode) {
+      startBaseRenderTimer();
+    }
+
+    next = beginWork(current, workInProgress, nextRenderExpirationTime);
+
+    if (workInProgress.mode & ProfileMode) {
+      // Update "base" time if the render wasn't bailed out on.
+      recordElapsedBaseRenderTimeIfRunning(workInProgress);
+      stopBaseRenderTimerIfRunning();
+    }
+  } else {
+    next = beginWork(current, workInProgress, nextRenderExpirationTime);
+  }
+
+  if (__DEV__) {
+    ReactDebugCurrentFiber.resetCurrentFiber();
+    if (isReplayingFailedUnitOfWork) {
+      // Currently replaying a failed unit of work. This should be unreachable,
+      // because the render phase is meant to be idempotent, and it should
+      // have thrown again. Since it didn't, rethrow the original error, so
+      // React's internal stack is not misaligned.
+      rethrowOriginalError();
+    }
+  }
+  if (__DEV__ && ReactFiberInstrumentation.debugTool) {
+    ReactFiberInstrumentation.debugTool.onBeginWork(workInProgress);
+  }
+
+  if (next === null) {
+    // If this doesn't spawn new work, complete the current work.
+    next = completeUnitOfWork(workInProgress);
+  }
+
+  ReactCurrentOwner.current = null;
+
+  return next;
+}
+
+function workLoop(isAsync) {
+  if (!isAsync) {
+    // Flush all expired work.
+    while (nextUnitOfWork !== null) {
+      nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
+    }
+  } else {
+    // Flush asynchronous work until the deadline runs out of time.
+    while (nextUnitOfWork !== null && !shouldYield()) {
+      nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
+    }
+
+    if (enableProfilerTimer) {
+      // If we didn't finish, pause the "actual" render timer.
+      // We'll restart it when we resume work.
+      pauseActualRenderTimerIfRunning();
+    }
+  }
+}
+
+function renderRoot(
+  root: FiberRoot,
+  expirationTime: ExpirationTime,
+  isAsync: boolean,
+): Fiber | null {
+  invariant(
+    !isWorking,
+    'renderRoot was called recursively. This error is likely caused ' +
+      'by a bug in React. Please file an issue.',
+  );
+  isWorking = true;
+
+  // Check if we're starting from a fresh stack, or if we're resuming from
+  // previously yielded work.
+  if (
+    expirationTime !== nextRenderExpirationTime ||
+    root !== nextRoot ||
+    nextUnitOfWork === null
+  ) {
+    // Reset the stack and start working from the root.
+    resetStack();
+    nextRoot = root;
+    nextRenderExpirationTime = expirationTime;
+    nextLatestTimeoutMs = -1;
+    nextUnitOfWork = createWorkInProgress(
+      nextRoot.current,
+      null,
+      nextRenderExpirationTime,
+    );
+    root.pendingCommitExpirationTime = NoWork;
+  }
+
+  let didFatal = false;
+
+  nextRenderIsExpired =
+    !isAsync || nextRenderExpirationTime <= mostRecentCurrentTime;
+
+  startWorkLoopTimer(nextUnitOfWork);
+
+  do {
+    try {
+      workLoop(isAsync);
+    } catch (thrownValue) {
+      if (enableProfilerTimer) {
+        // Stop "base" render timer in the event of an error.
+        stopBaseRenderTimerIfRunning();
+      }
+
+      if (nextUnitOfWork === null) {
+        // This is a fatal error.
+        didFatal = true;
+        onUncaughtError(thrownValue);
+      } else {
+        if (__DEV__) {
+          // Reset global debug state
+          // We assume this is defined in DEV
+          (resetCurrentlyProcessingQueue: any)();
+        }
+
+        const failedUnitOfWork: Fiber = nextUnitOfWork;
+        if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+          replayUnitOfWork(failedUnitOfWork, thrownValue, isAsync);
+        }
+
+        // TODO: we already know this isn't true in some cases.
+        // At least this shows a nicer error message until we figure out the cause.
+        // https://github.com/facebook/react/issues/12449#issuecomment-386727431
+        invariant(
+          nextUnitOfWork !== null,
+          'Failed to replay rendering after an error. This ' +
+            'is likely caused by a bug in React. Please file an issue ' +
+            'with a reproducing case to help us find it.',
+        );
+
+        const sourceFiber: Fiber = nextUnitOfWork;
+        let returnFiber = sourceFiber.return;
+        if (returnFiber === null) {
+          // This is the root. The root could capture its own errors. However,
+          // we don't know if it errors before or after we pushed the host
+          // context. This information is needed to avoid a stack mismatch.
+          // Because we're not sure, treat this as a fatal error. We could track
+          // which phase it fails in, but doesn't seem worth it. At least
+          // for now.
+          didFatal = true;
+          onUncaughtError(thrownValue);
           break;
-        case HostRoot: {
+        }
+        throwException(
+          root,
+          returnFiber,
+          sourceFiber,
+          thrownValue,
+          nextRenderIsExpired,
+          nextRenderExpirationTime,
+          mostRecentCurrentTimeMs,
+        );
+        nextUnitOfWork = completeUnitOfWork(sourceFiber);
+      }
+    }
+    break;
+  } while (true);
+
+  // We're done performing work. Time to clean up.
+  let didCompleteRoot = false;
+  isWorking = false;
+
+  // Yield back to main thread.
+  if (didFatal) {
+    stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+    interruptedBy = null;
+    // There was a fatal error.
+    if (__DEV__) {
+      resetStackAfterFatalErrorInDev();
+    }
+    return null;
+  } else if (nextUnitOfWork === null) {
+    // We reached the root.
+    if (isRootReadyForCommit) {
+      didCompleteRoot = true;
+      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+      interruptedBy = null;
+      // The root successfully completed. It's ready for commit.
+      root.pendingCommitExpirationTime = expirationTime;
+      const finishedWork = root.current.alternate;
+      return finishedWork;
+    } else {
+      // The root did not complete.
+      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+      interruptedBy = null;
+      invariant(
+        !nextRenderIsExpired,
+        'Expired work should have completed. This error is likely caused ' +
+          'by a bug in React. Please file an issue.',
+      );
+      markSuspendedPriorityLevel(root, expirationTime);
+      if (nextLatestTimeoutMs >= 0) {
+        setTimeout(() => {
+          retrySuspendedRoot(root, expirationTime);
+        }, nextLatestTimeoutMs);
+      }
+      const firstUnblockedExpirationTime = findNextPendingPriorityLevel(root);
+      onBlock(firstUnblockedExpirationTime);
+      return null;
+    }
+  } else {
+    stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+    interruptedBy = null;
+    // There's more work to do, but we ran out of time. Yield back to
+    // the renderer.
+    return null;
+  }
+}
+
+function dispatch(
+  sourceFiber: Fiber,
+  value: mixed,
+  expirationTime: ExpirationTime,
+) {
+  invariant(
+    !isWorking || isCommitting,
+    'dispatch: Cannot dispatch during the render phase.',
+  );
+
+  let fiber = sourceFiber.return;
+  while (fiber !== null) {
+    switch (fiber.tag) {
+      case ClassComponent:
+        const ctor = fiber.type;
+        const instance = fiber.stateNode;
+        if (
+          typeof ctor.getDerivedStateFromCatch === 'function' ||
+          (typeof instance.componentDidCatch === 'function' &&
+            !isAlreadyFailedLegacyErrorBoundary(instance))
+        ) {
           const errorInfo = createCapturedValue(value, sourceFiber);
-          const update = createRootErrorUpdate(
+          const update = createClassErrorUpdate(
             fiber,
             errorInfo,
             expirationTime,
@@ -1227,815 +1161,820 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
           scheduleWork(fiber, expirationTime);
           return;
         }
+        break;
+      case HostRoot: {
+        const errorInfo = createCapturedValue(value, sourceFiber);
+        const update = createRootErrorUpdate(fiber, errorInfo, expirationTime);
+        enqueueUpdate(fiber, update, expirationTime);
+        scheduleWork(fiber, expirationTime);
+        return;
       }
-      fiber = fiber.return;
-    }
-
-    if (sourceFiber.tag === HostRoot) {
-      // Error was thrown at the root. There is no parent, so the root
-      // itself should capture it.
-      const rootFiber = sourceFiber;
-      const errorInfo = createCapturedValue(value, rootFiber);
-      const update = createRootErrorUpdate(
-        rootFiber,
-        errorInfo,
-        expirationTime,
-      );
-      enqueueUpdate(rootFiber, update, expirationTime);
-      scheduleWork(rootFiber, expirationTime);
     }
+    fiber = fiber.return;
   }
 
-  function onCommitPhaseError(fiber: Fiber, error: mixed) {
-    return dispatch(fiber, error, Sync);
+  if (sourceFiber.tag === HostRoot) {
+    // Error was thrown at the root. There is no parent, so the root
+    // itself should capture it.
+    const rootFiber = sourceFiber;
+    const errorInfo = createCapturedValue(value, rootFiber);
+    const update = createRootErrorUpdate(rootFiber, errorInfo, expirationTime);
+    enqueueUpdate(rootFiber, update, expirationTime);
+    scheduleWork(rootFiber, expirationTime);
   }
+}
 
-  function computeAsyncExpiration(currentTime: ExpirationTime) {
-    // Given the current clock time, returns an expiration time. We use rounding
-    // to batch like updates together.
-    // Should complete within ~1000ms. 1200ms max.
-    const expirationMs = 5000;
-    const bucketSizeMs = 250;
-    return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
+function captureCommitPhaseError(fiber: Fiber, error: mixed) {
+  return dispatch(fiber, error, Sync);
+}
+
+function computeAsyncExpiration(currentTime: ExpirationTime) {
+  // Given the current clock time, returns an expiration time. We use rounding
+  // to batch like updates together.
+  // Should complete within ~1000ms. 1200ms max.
+  const expirationMs = 5000;
+  const bucketSizeMs = 250;
+  return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
+}
+
+function computeInteractiveExpiration(currentTime: ExpirationTime) {
+  let expirationMs;
+  // We intentionally set a higher expiration time for interactive updates in
+  // dev than in production.
+  // If the main thread is being blocked so long that you hit the expiration,
+  // it's a problem that could be solved with better scheduling.
+  // People will be more likely to notice this and fix it with the long
+  // expiration time in development.
+  // In production we opt for better UX at the risk of masking scheduling
+  // problems, by expiring fast.
+  if (__DEV__) {
+    // Should complete within ~500ms. 600ms max.
+    expirationMs = 500;
+  } else {
+    // In production things should be more responsive, 150ms max.
+    expirationMs = 150;
   }
+  const bucketSizeMs = 100;
+  return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
+}
 
-  function computeInteractiveExpiration(currentTime: ExpirationTime) {
-    let expirationMs;
-    // We intentionally set a higher expiration time for interactive updates in
-    // dev than in production.
-    // If the main thread is being blocked so long that you hit the expiration,
-    // it's a problem that could be solved with better scheduling.
-    // People will be more likely to notice this and fix it with the long
-    // expiration time in development.
-    // In production we opt for better UX at the risk of masking scheduling
-    // problems, by expiring fast.
-    if (__DEV__) {
-      // Should complete within ~500ms. 600ms max.
-      expirationMs = 500;
+// Creates a unique async expiration time.
+function computeUniqueAsyncExpiration(): ExpirationTime {
+  const currentTime = recalculateCurrentTime();
+  let result = computeAsyncExpiration(currentTime);
+  if (result <= lastUniqueAsyncExpiration) {
+    // Since we assume the current time monotonically increases, we only hit
+    // this branch when computeUniqueAsyncExpiration is fired multiple times
+    // within a 200ms window (or whatever the async bucket size is).
+    result = lastUniqueAsyncExpiration + 1;
+  }
+  lastUniqueAsyncExpiration = result;
+  return lastUniqueAsyncExpiration;
+}
+
+function computeExpirationForFiber(currentTime: ExpirationTime, fiber: Fiber) {
+  let expirationTime;
+  if (expirationContext !== NoWork) {
+    // An explicit expiration context was set;
+    expirationTime = expirationContext;
+  } else if (isWorking) {
+    if (isCommitting) {
+      // Updates that occur during the commit phase should have sync priority
+      // by default.
+      expirationTime = Sync;
     } else {
-      // In production things should be more responsive, 150ms max.
-      expirationMs = 150;
+      // Updates during the render phase should expire at the same time as
+      // the work that is being rendered.
+      expirationTime = nextRenderExpirationTime;
     }
-    const bucketSizeMs = 100;
-    return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
-  }
-
-  // Creates a unique async expiration time.
-  function computeUniqueAsyncExpiration(): ExpirationTime {
-    const currentTime = recalculateCurrentTime();
-    let result = computeAsyncExpiration(currentTime);
-    if (result <= lastUniqueAsyncExpiration) {
-      // Since we assume the current time monotonically increases, we only hit
-      // this branch when computeUniqueAsyncExpiration is fired multiple times
-      // within a 200ms window (or whatever the async bucket size is).
-      result = lastUniqueAsyncExpiration + 1;
-    }
-    lastUniqueAsyncExpiration = result;
-    return lastUniqueAsyncExpiration;
-  }
-
-  function computeExpirationForFiber(
-    currentTime: ExpirationTime,
-    fiber: Fiber,
-  ) {
-    let expirationTime;
-    if (expirationContext !== NoWork) {
-      // An explicit expiration context was set;
-      expirationTime = expirationContext;
-    } else if (isWorking) {
-      if (isCommitting) {
-        // Updates that occur during the commit phase should have sync priority
-        // by default.
-        expirationTime = Sync;
+  } else {
+    // No explicit expiration context was set, and we're not currently
+    // performing work. Calculate a new expiration time.
+    if (fiber.mode & AsyncMode) {
+      if (isBatchingInteractiveUpdates) {
+        // This is an interactive update
+        expirationTime = computeInteractiveExpiration(currentTime);
       } else {
-        // Updates during the render phase should expire at the same time as
-        // the work that is being rendered.
-        expirationTime = nextRenderExpirationTime;
+        // This is an async update
+        expirationTime = computeAsyncExpiration(currentTime);
       }
     } else {
-      // No explicit expiration context was set, and we're not currently
-      // performing work. Calculate a new expiration time.
-      if (fiber.mode & AsyncMode) {
-        if (isBatchingInteractiveUpdates) {
-          // This is an interactive update
-          expirationTime = computeInteractiveExpiration(currentTime);
-        } else {
-          // This is an async update
-          expirationTime = computeAsyncExpiration(currentTime);
-        }
-      } else {
-        // This is a sync update
-        expirationTime = Sync;
-      }
+      // This is a sync update
+      expirationTime = Sync;
     }
-    if (isBatchingInteractiveUpdates) {
-      // This is an interactive update. Keep track of the lowest pending
-      // interactive expiration time. This allows us to synchronously flush
-      // all interactive updates when needed.
+  }
+  if (isBatchingInteractiveUpdates) {
+    // This is an interactive update. Keep track of the lowest pending
+    // interactive expiration time. This allows us to synchronously flush
+    // all interactive updates when needed.
+    if (
+      lowestPendingInteractiveExpirationTime === NoWork ||
+      expirationTime > lowestPendingInteractiveExpirationTime
+    ) {
+      lowestPendingInteractiveExpirationTime = expirationTime;
+    }
+  }
+  return expirationTime;
+}
+
+// TODO: Rename this to scheduleTimeout or something
+function suspendRoot(
+  root: FiberRoot,
+  thenable: Thenable,
+  timeoutMs: number,
+  suspendedTime: ExpirationTime,
+) {
+  // Schedule the timeout.
+  if (timeoutMs >= 0 && nextLatestTimeoutMs < timeoutMs) {
+    nextLatestTimeoutMs = timeoutMs;
+  }
+}
+
+function retrySuspendedRoot(root: FiberRoot, suspendedTime: ExpirationTime) {
+  markPingedPriorityLevel(root, suspendedTime);
+  const retryTime = findNextPendingPriorityLevel(root);
+  if (retryTime !== NoWork) {
+    requestRetry(root, retryTime);
+  }
+}
+
+function scheduleWork(fiber: Fiber, expirationTime: ExpirationTime) {
+  recordScheduleUpdate();
+
+  if (__DEV__) {
+    if (fiber.tag === ClassComponent) {
+      const instance = fiber.stateNode;
+      warnAboutInvalidUpdates(instance);
+    }
+  }
+
+  let node = fiber;
+  while (node !== null) {
+    // Walk the parent path to the root and update each node's
+    // expiration time.
+    if (
+      node.expirationTime === NoWork ||
+      node.expirationTime > expirationTime
+    ) {
+      node.expirationTime = expirationTime;
+    }
+    if (node.alternate !== null) {
       if (
-        lowestPendingInteractiveExpirationTime === NoWork ||
-        expirationTime > lowestPendingInteractiveExpirationTime
+        node.alternate.expirationTime === NoWork ||
+        node.alternate.expirationTime > expirationTime
       ) {
-        lowestPendingInteractiveExpirationTime = expirationTime;
+        node.alternate.expirationTime = expirationTime;
       }
     }
-    return expirationTime;
-  }
-
-  // TODO: Rename this to scheduleTimeout or something
-  function suspendRoot(
-    root: FiberRoot,
-    thenable: Thenable,
-    timeoutMs: number,
-    suspendedTime: ExpirationTime,
-  ) {
-    // Schedule the timeout.
-    if (timeoutMs >= 0 && nextLatestTimeoutMs < timeoutMs) {
-      nextLatestTimeoutMs = timeoutMs;
-    }
-  }
-
-  function retrySuspendedRoot(root, suspendedTime) {
-    markPingedPriorityLevel(root, suspendedTime);
-    const retryTime = findNextPendingPriorityLevel(root);
-    if (retryTime !== NoWork) {
-      requestRetry(root, retryTime);
-    }
-  }
-
-  function scheduleWork(fiber: Fiber, expirationTime: ExpirationTime) {
-    recordScheduleUpdate();
-
-    if (__DEV__) {
-      if (fiber.tag === ClassComponent) {
-        const instance = fiber.stateNode;
-        warnAboutInvalidUpdates(instance);
-      }
-    }
-
-    let node = fiber;
-    while (node !== null) {
-      // Walk the parent path to the root and update each node's
-      // expiration time.
-      if (
-        node.expirationTime === NoWork ||
-        node.expirationTime > expirationTime
-      ) {
-        node.expirationTime = expirationTime;
-      }
-      if (node.alternate !== null) {
+    if (node.return === null) {
+      if (node.tag === HostRoot) {
+        const root: FiberRoot = (node.stateNode: any);
         if (
-          node.alternate.expirationTime === NoWork ||
-          node.alternate.expirationTime > expirationTime
+          !isWorking &&
+          nextRenderExpirationTime !== NoWork &&
+          expirationTime < nextRenderExpirationTime
         ) {
-          node.alternate.expirationTime = expirationTime;
+          // This is an interruption. (Used for performance tracking.)
+          interruptedBy = fiber;
+          resetStack();
         }
-      }
-      if (node.return === null) {
-        if (node.tag === HostRoot) {
-          const root: FiberRoot = (node.stateNode: any);
-          if (
-            !isWorking &&
-            nextRenderExpirationTime !== NoWork &&
-            expirationTime < nextRenderExpirationTime
-          ) {
-            // This is an interruption. (Used for performance tracking.)
-            interruptedBy = fiber;
-            resetStack();
-          }
-          markPendingPriorityLevel(root, expirationTime);
-          const nextExpirationTimeToWorkOn = findNextPendingPriorityLevel(root);
-          if (
-            // If we're in the render phase, we don't need to schedule this root
-            // for an update, because we'll do it before we exit...
-            !isWorking ||
-            isCommitting ||
-            // ...unless this is a different root than the one we're rendering.
-            nextRoot !== root
-          ) {
-            requestWork(root, nextExpirationTimeToWorkOn);
-          }
-          if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
-            invariant(
-              false,
-              'Maximum update depth exceeded. This can happen when a ' +
-                'component repeatedly calls setState inside ' +
-                'componentWillUpdate or componentDidUpdate. React limits ' +
-                'the number of nested updates to prevent infinite loops.',
-            );
-          }
-        } else {
-          if (__DEV__) {
-            if (fiber.tag === ClassComponent) {
-              warnAboutUpdateOnUnmounted(fiber);
-            }
-          }
-          return;
+        markPendingPriorityLevel(root, expirationTime);
+        const nextExpirationTimeToWorkOn = findNextPendingPriorityLevel(root);
+        if (
+          // If we're in the render phase, we don't need to schedule this root
+          // for an update, because we'll do it before we exit...
+          !isWorking ||
+          isCommitting ||
+          // ...unless this is a different root than the one we're rendering.
+          nextRoot !== root
+        ) {
+          requestWork(root, nextExpirationTimeToWorkOn);
         }
-      }
-      node = node.return;
-    }
-  }
-
-  function recalculateCurrentTime(): ExpirationTime {
-    // Subtract initial time so it fits inside 32bits
-    mostRecentCurrentTimeMs = now() - originalStartTimeMs;
-    mostRecentCurrentTime = msToExpirationTime(mostRecentCurrentTimeMs);
-    return mostRecentCurrentTime;
-  }
-
-  function deferredUpdates<A>(fn: () => A): A {
-    const previousExpirationContext = expirationContext;
-    const currentTime = recalculateCurrentTime();
-    expirationContext = computeAsyncExpiration(currentTime);
-    try {
-      return fn();
-    } finally {
-      expirationContext = previousExpirationContext;
-    }
-  }
-  function syncUpdates<A, B, C0, D, R>(
-    fn: (A, B, C0, D) => R,
-    a: A,
-    b: B,
-    c: C0,
-    d: D,
-  ): R {
-    const previousExpirationContext = expirationContext;
-    expirationContext = Sync;
-    try {
-      return fn(a, b, c, d);
-    } finally {
-      expirationContext = previousExpirationContext;
-    }
-  }
-
-  // TODO: Everything below this is written as if it has been lifted to the
-  // renderers. I'll do this in a follow-up.
-
-  // Linked-list of roots
-  let firstScheduledRoot: FiberRoot | null = null;
-  let lastScheduledRoot: FiberRoot | null = null;
-
-  let callbackExpirationTime: ExpirationTime = NoWork;
-  let callbackID: number = -1;
-  let isRendering: boolean = false;
-  let nextFlushedRoot: FiberRoot | null = null;
-  let nextFlushedExpirationTime: ExpirationTime = NoWork;
-  let lowestPendingInteractiveExpirationTime: ExpirationTime = NoWork;
-  let deadlineDidExpire: boolean = false;
-  let hasUnhandledError: boolean = false;
-  let unhandledError: mixed | null = null;
-  let deadline: Deadline | null = null;
-
-  let isBatchingUpdates: boolean = false;
-  let isUnbatchingUpdates: boolean = false;
-  let isBatchingInteractiveUpdates: boolean = false;
-
-  let completedBatches: Array<Batch> | null = null;
-
-  // Use these to prevent an infinite loop of nested updates
-  const NESTED_UPDATE_LIMIT = 1000;
-  let nestedUpdateCount: number = 0;
-
-  const timeHeuristicForUnitOfWork = 1;
-
-  function scheduleCallbackWithExpiration(expirationTime) {
-    if (callbackExpirationTime !== NoWork) {
-      // A callback is already scheduled. Check its expiration time (timeout).
-      if (expirationTime > callbackExpirationTime) {
-        // Existing callback has sufficient timeout. Exit.
-        return;
-      } else {
-        // Existing callback has insufficient timeout. Cancel and schedule a
-        // new one.
-        cancelDeferredCallback(callbackID);
-      }
-      // The request callback timer is already running. Don't start a new one.
-    } else {
-      startRequestCallbackTimer();
-    }
-
-    // Compute a timeout for the given expiration time.
-    const currentMs = now() - originalStartTimeMs;
-    const expirationMs = expirationTimeToMs(expirationTime);
-    const timeout = expirationMs - currentMs;
-
-    callbackExpirationTime = expirationTime;
-    callbackID = scheduleDeferredCallback(performAsyncWork, {timeout});
-  }
-
-  function requestRetry(root: FiberRoot, expirationTime: ExpirationTime) {
-    if (
-      root.remainingExpirationTime === NoWork ||
-      root.remainingExpirationTime < expirationTime
-    ) {
-      // For a retry, only update the remaining expiration time if it has a
-      // *lower priority* than the existing value. This is because, on a retry,
-      // we should attempt to coalesce as much as possible.
-      requestWork(root, expirationTime);
-    }
-  }
-
-  // requestWork is called by the scheduler whenever a root receives an update.
-  // It's up to the renderer to call renderRoot at some point in the future.
-  function requestWork(root: FiberRoot, expirationTime: ExpirationTime) {
-    addRootToSchedule(root, expirationTime);
-
-    if (isRendering) {
-      // Prevent reentrancy. Remaining work will be scheduled at the end of
-      // the currently rendering batch.
-      return;
-    }
-
-    if (isBatchingUpdates) {
-      // Flush work at the end of the batch.
-      if (isUnbatchingUpdates) {
-        // ...unless we're inside unbatchedUpdates, in which case we should
-        // flush it now.
-        nextFlushedRoot = root;
-        nextFlushedExpirationTime = Sync;
-        performWorkOnRoot(root, Sync, false);
-      }
-      return;
-    }
-
-    // TODO: Get rid of Sync and use current time?
-    if (expirationTime === Sync) {
-      performSyncWork();
-    } else {
-      scheduleCallbackWithExpiration(expirationTime);
-    }
-  }
-
-  function addRootToSchedule(root: FiberRoot, expirationTime: ExpirationTime) {
-    // Add the root to the schedule.
-    // Check if this root is already part of the schedule.
-    if (root.nextScheduledRoot === null) {
-      // This root is not already scheduled. Add it.
-      root.remainingExpirationTime = expirationTime;
-      if (lastScheduledRoot === null) {
-        firstScheduledRoot = lastScheduledRoot = root;
-        root.nextScheduledRoot = root;
-      } else {
-        lastScheduledRoot.nextScheduledRoot = root;
-        lastScheduledRoot = root;
-        lastScheduledRoot.nextScheduledRoot = firstScheduledRoot;
-      }
-    } else {
-      // This root is already scheduled, but its priority may have increased.
-      const remainingExpirationTime = root.remainingExpirationTime;
-      if (
-        remainingExpirationTime === NoWork ||
-        expirationTime < remainingExpirationTime
-      ) {
-        // Update the priority.
-        root.remainingExpirationTime = expirationTime;
-      }
-    }
-  }
-
-  function findHighestPriorityRoot() {
-    let highestPriorityWork = NoWork;
-    let highestPriorityRoot = null;
-    if (lastScheduledRoot !== null) {
-      let previousScheduledRoot = lastScheduledRoot;
-      let root = firstScheduledRoot;
-      while (root !== null) {
-        const remainingExpirationTime = root.remainingExpirationTime;
-        if (remainingExpirationTime === NoWork) {
-          // This root no longer has work. Remove it from the scheduler.
-
-          // TODO: This check is redudant, but Flow is confused by the branch
-          // below where we set lastScheduledRoot to null, even though we break
-          // from the loop right after.
+        if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
           invariant(
-            previousScheduledRoot !== null && lastScheduledRoot !== null,
-            'Should have a previous and last root. This error is likely ' +
-              'caused by a bug in React. Please file an issue.',
+            false,
+            'Maximum update depth exceeded. This can happen when a ' +
+              'component repeatedly calls setState inside ' +
+              'componentWillUpdate or componentDidUpdate. React limits ' +
+              'the number of nested updates to prevent infinite loops.',
           );
-          if (root === root.nextScheduledRoot) {
-            // This is the only root in the list.
-            root.nextScheduledRoot = null;
-            firstScheduledRoot = lastScheduledRoot = null;
-            break;
-          } else if (root === firstScheduledRoot) {
-            // This is the first root in the list.
-            const next = root.nextScheduledRoot;
-            firstScheduledRoot = next;
-            lastScheduledRoot.nextScheduledRoot = next;
-            root.nextScheduledRoot = null;
-          } else if (root === lastScheduledRoot) {
-            // This is the last root in the list.
-            lastScheduledRoot = previousScheduledRoot;
-            lastScheduledRoot.nextScheduledRoot = firstScheduledRoot;
-            root.nextScheduledRoot = null;
-            break;
-          } else {
-            previousScheduledRoot.nextScheduledRoot = root.nextScheduledRoot;
-            root.nextScheduledRoot = null;
-          }
-          root = previousScheduledRoot.nextScheduledRoot;
-        } else {
-          if (
-            highestPriorityWork === NoWork ||
-            remainingExpirationTime < highestPriorityWork
-          ) {
-            // Update the priority, if it's higher
-            highestPriorityWork = remainingExpirationTime;
-            highestPriorityRoot = root;
-          }
-          if (root === lastScheduledRoot) {
-            break;
-          }
-          previousScheduledRoot = root;
-          root = root.nextScheduledRoot;
         }
-      }
-    }
-
-    // If the next root is the same as the previous root, this is a nested
-    // update. To prevent an infinite loop, increment the nested update count.
-    const previousFlushedRoot = nextFlushedRoot;
-    if (
-      previousFlushedRoot !== null &&
-      previousFlushedRoot === highestPriorityRoot &&
-      highestPriorityWork === Sync
-    ) {
-      nestedUpdateCount++;
-    } else {
-      // Reset whenever we switch roots.
-      nestedUpdateCount = 0;
-    }
-    nextFlushedRoot = highestPriorityRoot;
-    nextFlushedExpirationTime = highestPriorityWork;
-  }
-
-  function performAsyncWork(dl) {
-    performWork(NoWork, true, dl);
-  }
-
-  function performSyncWork() {
-    performWork(Sync, false, null);
-  }
-
-  function performWork(
-    minExpirationTime: ExpirationTime,
-    isAsync: boolean,
-    dl: Deadline | null,
-  ) {
-    deadline = dl;
-
-    // Keep working on roots until there's no more work, or until the we reach
-    // the deadline.
-    findHighestPriorityRoot();
-
-    if (enableProfilerTimer) {
-      resumeActualRenderTimerIfPaused();
-    }
-
-    if (enableUserTimingAPI && deadline !== null) {
-      const didExpire = nextFlushedExpirationTime < recalculateCurrentTime();
-      const timeout = expirationTimeToMs(nextFlushedExpirationTime);
-      stopRequestCallbackTimer(didExpire, timeout);
-    }
-
-    if (isAsync) {
-      while (
-        nextFlushedRoot !== null &&
-        nextFlushedExpirationTime !== NoWork &&
-        (minExpirationTime === NoWork ||
-          minExpirationTime >= nextFlushedExpirationTime) &&
-        (!deadlineDidExpire ||
-          recalculateCurrentTime() >= nextFlushedExpirationTime)
-      ) {
-        recalculateCurrentTime();
-        performWorkOnRoot(
-          nextFlushedRoot,
-          nextFlushedExpirationTime,
-          !deadlineDidExpire,
-        );
-        findHighestPriorityRoot();
-      }
-    } else {
-      while (
-        nextFlushedRoot !== null &&
-        nextFlushedExpirationTime !== NoWork &&
-        (minExpirationTime === NoWork ||
-          minExpirationTime >= nextFlushedExpirationTime)
-      ) {
-        performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, false);
-        findHighestPriorityRoot();
-      }
-    }
-
-    // We're done flushing work. Either we ran out of time in this callback,
-    // or there's no more work left with sufficient priority.
-
-    // If we're inside a callback, set this to false since we just completed it.
-    if (deadline !== null) {
-      callbackExpirationTime = NoWork;
-      callbackID = -1;
-    }
-    // If there's work left over, schedule a new callback.
-    if (nextFlushedExpirationTime !== NoWork) {
-      scheduleCallbackWithExpiration(nextFlushedExpirationTime);
-    }
-
-    // Clean-up.
-    deadline = null;
-    deadlineDidExpire = false;
-
-    finishRendering();
-  }
-
-  function flushRoot(root: FiberRoot, expirationTime: ExpirationTime) {
-    invariant(
-      !isRendering,
-      'work.commit(): Cannot commit while already rendering. This likely ' +
-        'means you attempted to commit from inside a lifecycle method.',
-    );
-    // Perform work on root as if the given expiration time is the current time.
-    // This has the effect of synchronously flushing all work up to and
-    // including the given time.
-    nextFlushedRoot = root;
-    nextFlushedExpirationTime = expirationTime;
-    performWorkOnRoot(root, expirationTime, false);
-    // Flush any sync work that was scheduled by lifecycles
-    performSyncWork();
-    finishRendering();
-  }
-
-  function finishRendering() {
-    nestedUpdateCount = 0;
-
-    if (completedBatches !== null) {
-      const batches = completedBatches;
-      completedBatches = null;
-      for (let i = 0; i < batches.length; i++) {
-        const batch = batches[i];
-        try {
-          batch._onComplete();
-        } catch (error) {
-          if (!hasUnhandledError) {
-            hasUnhandledError = true;
-            unhandledError = error;
-          }
-        }
-      }
-    }
-
-    if (hasUnhandledError) {
-      const error = unhandledError;
-      unhandledError = null;
-      hasUnhandledError = false;
-      throw error;
-    }
-  }
-
-  function performWorkOnRoot(
-    root: FiberRoot,
-    expirationTime: ExpirationTime,
-    isAsync: boolean,
-  ) {
-    invariant(
-      !isRendering,
-      'performWorkOnRoot was called recursively. This error is likely caused ' +
-        'by a bug in React. Please file an issue.',
-    );
-
-    isRendering = true;
-
-    // Check if this is async work or sync/expired work.
-    if (!isAsync) {
-      // Flush sync work.
-      let finishedWork = root.finishedWork;
-      if (finishedWork !== null) {
-        // This root is already complete. We can commit it.
-        completeRoot(root, finishedWork, expirationTime);
       } else {
-        root.finishedWork = null;
-        finishedWork = renderRoot(root, expirationTime, false);
-        if (finishedWork !== null) {
-          // We've completed the root. Commit it.
-          completeRoot(root, finishedWork, expirationTime);
-        }
-      }
-    } else {
-      // Flush async work.
-      let finishedWork = root.finishedWork;
-      if (finishedWork !== null) {
-        // This root is already complete. We can commit it.
-        completeRoot(root, finishedWork, expirationTime);
-      } else {
-        root.finishedWork = null;
-        finishedWork = renderRoot(root, expirationTime, true);
-        if (finishedWork !== null) {
-          // We've completed the root. Check the deadline one more time
-          // before committing.
-          if (!shouldYield()) {
-            // Still time left. Commit the root.
-            completeRoot(root, finishedWork, expirationTime);
-          } else {
-            // There's no time left. Mark this root as complete. We'll come
-            // back and commit it later.
-            root.finishedWork = finishedWork;
-
-            if (enableProfilerTimer) {
-              // If we didn't finish, pause the "actual" render timer.
-              // We'll restart it when we resume work.
-              pauseActualRenderTimerIfRunning();
-            }
+        if (__DEV__) {
+          if (fiber.tag === ClassComponent) {
+            warnAboutUpdateOnUnmounted(fiber);
           }
         }
-      }
-    }
-
-    isRendering = false;
-  }
-
-  function completeRoot(
-    root: FiberRoot,
-    finishedWork: Fiber,
-    expirationTime: ExpirationTime,
-  ): void {
-    // Check if there's a batch that matches this expiration time.
-    const firstBatch = root.firstBatch;
-    if (firstBatch !== null && firstBatch._expirationTime <= expirationTime) {
-      if (completedBatches === null) {
-        completedBatches = [firstBatch];
-      } else {
-        completedBatches.push(firstBatch);
-      }
-      if (firstBatch._defer) {
-        // This root is blocked from committing by a batch. Unschedule it until
-        // we receive another update.
-        root.finishedWork = finishedWork;
-        root.remainingExpirationTime = NoWork;
         return;
       }
     }
+    node = node.return;
+  }
+}
 
-    // Commit the root.
-    root.finishedWork = null;
-    root.remainingExpirationTime = commitRoot(finishedWork);
+function recalculateCurrentTime(): ExpirationTime {
+  // Subtract initial time so it fits inside 32bits
+  mostRecentCurrentTimeMs = now() - originalStartTimeMs;
+  mostRecentCurrentTime = msToExpirationTime(mostRecentCurrentTimeMs);
+  return mostRecentCurrentTime;
+}
+
+function deferredUpdates<A>(fn: () => A): A {
+  const previousExpirationContext = expirationContext;
+  const currentTime = recalculateCurrentTime();
+  expirationContext = computeAsyncExpiration(currentTime);
+  try {
+    return fn();
+  } finally {
+    expirationContext = previousExpirationContext;
+  }
+}
+function syncUpdates<A, B, C0, D, R>(
+  fn: (A, B, C0, D) => R,
+  a: A,
+  b: B,
+  c: C0,
+  d: D,
+): R {
+  const previousExpirationContext = expirationContext;
+  expirationContext = Sync;
+  try {
+    return fn(a, b, c, d);
+  } finally {
+    expirationContext = previousExpirationContext;
+  }
+}
+
+// TODO: Everything below this is written as if it has been lifted to the
+// renderers. I'll do this in a follow-up.
+
+// Linked-list of roots
+let firstScheduledRoot: FiberRoot | null = null;
+let lastScheduledRoot: FiberRoot | null = null;
+
+let callbackExpirationTime: ExpirationTime = NoWork;
+let callbackID: number = -1;
+let isRendering: boolean = false;
+let nextFlushedRoot: FiberRoot | null = null;
+let nextFlushedExpirationTime: ExpirationTime = NoWork;
+let lowestPendingInteractiveExpirationTime: ExpirationTime = NoWork;
+let deadlineDidExpire: boolean = false;
+let hasUnhandledError: boolean = false;
+let unhandledError: mixed | null = null;
+let deadline: Deadline | null = null;
+
+let isBatchingUpdates: boolean = false;
+let isUnbatchingUpdates: boolean = false;
+let isBatchingInteractiveUpdates: boolean = false;
+
+let completedBatches: Array<Batch> | null = null;
+
+// Use these to prevent an infinite loop of nested updates
+const NESTED_UPDATE_LIMIT = 1000;
+let nestedUpdateCount: number = 0;
+
+const timeHeuristicForUnitOfWork = 1;
+
+function scheduleCallbackWithExpiration(expirationTime) {
+  if (callbackExpirationTime !== NoWork) {
+    // A callback is already scheduled. Check its expiration time (timeout).
+    if (expirationTime > callbackExpirationTime) {
+      // Existing callback has sufficient timeout. Exit.
+      return;
+    } else {
+      // Existing callback has insufficient timeout. Cancel and schedule a
+      // new one.
+      cancelDeferredCallback(callbackID);
+    }
+    // The request callback timer is already running. Don't start a new one.
+  } else {
+    startRequestCallbackTimer();
   }
 
-  // When working on async work, the reconciler asks the renderer if it should
-  // yield execution. For DOM, we implement this with requestIdleCallback.
-  function shouldYield() {
-    if (deadline === null) {
-      return false;
-    }
-    if (deadline.timeRemaining() > timeHeuristicForUnitOfWork) {
-      // Disregard deadline.didTimeout. Only expired work should be flushed
-      // during a timeout. This path is only hit for non-expired work.
-      return false;
-    }
-    deadlineDidExpire = true;
-    return true;
+  // Compute a timeout for the given expiration time.
+  const currentMs = now() - originalStartTimeMs;
+  const expirationMs = expirationTimeToMs(expirationTime);
+  const timeout = expirationMs - currentMs;
+
+  callbackExpirationTime = expirationTime;
+  callbackID = scheduleDeferredCallback(performAsyncWork, {timeout});
+}
+
+function requestRetry(root: FiberRoot, expirationTime: ExpirationTime) {
+  if (
+    root.remainingExpirationTime === NoWork ||
+    root.remainingExpirationTime < expirationTime
+  ) {
+    // For a retry, only update the remaining expiration time if it has a
+    // *lower priority* than the existing value. This is because, on a retry,
+    // we should attempt to coalesce as much as possible.
+    requestWork(root, expirationTime);
+  }
+}
+
+// requestWork is called by the scheduler whenever a root receives an update.
+// It's up to the renderer to call renderRoot at some point in the future.
+function requestWork(root: FiberRoot, expirationTime: ExpirationTime) {
+  addRootToSchedule(root, expirationTime);
+
+  if (isRendering) {
+    // Prevent reentrancy. Remaining work will be scheduled at the end of
+    // the currently rendering batch.
+    return;
   }
 
-  function onUncaughtError(error) {
-    invariant(
-      nextFlushedRoot !== null,
-      'Should be working on a root. This error is likely caused by a bug in ' +
-        'React. Please file an issue.',
-    );
-    // Unschedule this root so we don't work on it again until there's
-    // another update.
-    nextFlushedRoot.remainingExpirationTime = NoWork;
-    if (!hasUnhandledError) {
-      hasUnhandledError = true;
-      unhandledError = error;
+  if (isBatchingUpdates) {
+    // Flush work at the end of the batch.
+    if (isUnbatchingUpdates) {
+      // ...unless we're inside unbatchedUpdates, in which case we should
+      // flush it now.
+      nextFlushedRoot = root;
+      nextFlushedExpirationTime = Sync;
+      performWorkOnRoot(root, Sync, false);
+    }
+    return;
+  }
+
+  // TODO: Get rid of Sync and use current time?
+  if (expirationTime === Sync) {
+    performSyncWork();
+  } else {
+    scheduleCallbackWithExpiration(expirationTime);
+  }
+}
+
+function addRootToSchedule(root: FiberRoot, expirationTime: ExpirationTime) {
+  // Add the root to the schedule.
+  // Check if this root is already part of the schedule.
+  if (root.nextScheduledRoot === null) {
+    // This root is not already scheduled. Add it.
+    root.remainingExpirationTime = expirationTime;
+    if (lastScheduledRoot === null) {
+      firstScheduledRoot = lastScheduledRoot = root;
+      root.nextScheduledRoot = root;
+    } else {
+      lastScheduledRoot.nextScheduledRoot = root;
+      lastScheduledRoot = root;
+      lastScheduledRoot.nextScheduledRoot = firstScheduledRoot;
+    }
+  } else {
+    // This root is already scheduled, but its priority may have increased.
+    const remainingExpirationTime = root.remainingExpirationTime;
+    if (
+      remainingExpirationTime === NoWork ||
+      expirationTime < remainingExpirationTime
+    ) {
+      // Update the priority.
+      root.remainingExpirationTime = expirationTime;
+    }
+  }
+}
+
+function findHighestPriorityRoot() {
+  let highestPriorityWork = NoWork;
+  let highestPriorityRoot = null;
+  if (lastScheduledRoot !== null) {
+    let previousScheduledRoot = lastScheduledRoot;
+    let root = firstScheduledRoot;
+    while (root !== null) {
+      const remainingExpirationTime = root.remainingExpirationTime;
+      if (remainingExpirationTime === NoWork) {
+        // This root no longer has work. Remove it from the scheduler.
+
+        // TODO: This check is redudant, but Flow is confused by the branch
+        // below where we set lastScheduledRoot to null, even though we break
+        // from the loop right after.
+        invariant(
+          previousScheduledRoot !== null && lastScheduledRoot !== null,
+          'Should have a previous and last root. This error is likely ' +
+            'caused by a bug in React. Please file an issue.',
+        );
+        if (root === root.nextScheduledRoot) {
+          // This is the only root in the list.
+          root.nextScheduledRoot = null;
+          firstScheduledRoot = lastScheduledRoot = null;
+          break;
+        } else if (root === firstScheduledRoot) {
+          // This is the first root in the list.
+          const next = root.nextScheduledRoot;
+          firstScheduledRoot = next;
+          lastScheduledRoot.nextScheduledRoot = next;
+          root.nextScheduledRoot = null;
+        } else if (root === lastScheduledRoot) {
+          // This is the last root in the list.
+          lastScheduledRoot = previousScheduledRoot;
+          lastScheduledRoot.nextScheduledRoot = firstScheduledRoot;
+          root.nextScheduledRoot = null;
+          break;
+        } else {
+          previousScheduledRoot.nextScheduledRoot = root.nextScheduledRoot;
+          root.nextScheduledRoot = null;
+        }
+        root = previousScheduledRoot.nextScheduledRoot;
+      } else {
+        if (
+          highestPriorityWork === NoWork ||
+          remainingExpirationTime < highestPriorityWork
+        ) {
+          // Update the priority, if it's higher
+          highestPriorityWork = remainingExpirationTime;
+          highestPriorityRoot = root;
+        }
+        if (root === lastScheduledRoot) {
+          break;
+        }
+        previousScheduledRoot = root;
+        root = root.nextScheduledRoot;
+      }
     }
   }
 
-  function onBlock(remainingExpirationTime: ExpirationTime) {
-    invariant(
-      nextFlushedRoot !== null,
-      'Should be working on a root. This error is likely caused by a bug in ' +
-        'React. Please file an issue.',
-    );
-    // This root was blocked. Unschedule it until there's another update.
-    nextFlushedRoot.remainingExpirationTime = remainingExpirationTime;
+  // If the next root is the same as the previous root, this is a nested
+  // update. To prevent an infinite loop, increment the nested update count.
+  const previousFlushedRoot = nextFlushedRoot;
+  if (
+    previousFlushedRoot !== null &&
+    previousFlushedRoot === highestPriorityRoot &&
+    highestPriorityWork === Sync
+  ) {
+    nestedUpdateCount++;
+  } else {
+    // Reset whenever we switch roots.
+    nestedUpdateCount = 0;
+  }
+  nextFlushedRoot = highestPriorityRoot;
+  nextFlushedExpirationTime = highestPriorityWork;
+}
+
+function performAsyncWork(dl) {
+  performWork(NoWork, true, dl);
+}
+
+function performSyncWork() {
+  performWork(Sync, false, null);
+}
+
+function performWork(
+  minExpirationTime: ExpirationTime,
+  isAsync: boolean,
+  dl: Deadline | null,
+) {
+  deadline = dl;
+
+  // Keep working on roots until there's no more work, or until the we reach
+  // the deadline.
+  findHighestPriorityRoot();
+
+  if (enableProfilerTimer) {
+    resumeActualRenderTimerIfPaused();
   }
 
-  // TODO: Batching should be implemented at the renderer level, not inside
-  // the reconciler.
-  function batchedUpdates<A, R>(fn: (a: A) => R, a: A): R {
-    const previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = true;
+  if (enableUserTimingAPI && deadline !== null) {
+    const didExpire = nextFlushedExpirationTime < recalculateCurrentTime();
+    const timeout = expirationTimeToMs(nextFlushedExpirationTime);
+    stopRequestCallbackTimer(didExpire, timeout);
+  }
+
+  if (isAsync) {
+    while (
+      nextFlushedRoot !== null &&
+      nextFlushedExpirationTime !== NoWork &&
+      (minExpirationTime === NoWork ||
+        minExpirationTime >= nextFlushedExpirationTime) &&
+      (!deadlineDidExpire ||
+        recalculateCurrentTime() >= nextFlushedExpirationTime)
+    ) {
+      recalculateCurrentTime();
+      performWorkOnRoot(
+        nextFlushedRoot,
+        nextFlushedExpirationTime,
+        !deadlineDidExpire,
+      );
+      findHighestPriorityRoot();
+    }
+  } else {
+    while (
+      nextFlushedRoot !== null &&
+      nextFlushedExpirationTime !== NoWork &&
+      (minExpirationTime === NoWork ||
+        minExpirationTime >= nextFlushedExpirationTime)
+    ) {
+      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, false);
+      findHighestPriorityRoot();
+    }
+  }
+
+  // We're done flushing work. Either we ran out of time in this callback,
+  // or there's no more work left with sufficient priority.
+
+  // If we're inside a callback, set this to false since we just completed it.
+  if (deadline !== null) {
+    callbackExpirationTime = NoWork;
+    callbackID = -1;
+  }
+  // If there's work left over, schedule a new callback.
+  if (nextFlushedExpirationTime !== NoWork) {
+    scheduleCallbackWithExpiration(nextFlushedExpirationTime);
+  }
+
+  // Clean-up.
+  deadline = null;
+  deadlineDidExpire = false;
+
+  finishRendering();
+}
+
+function flushRoot(root: FiberRoot, expirationTime: ExpirationTime) {
+  invariant(
+    !isRendering,
+    'work.commit(): Cannot commit while already rendering. This likely ' +
+      'means you attempted to commit from inside a lifecycle method.',
+  );
+  // Perform work on root as if the given expiration time is the current time.
+  // This has the effect of synchronously flushing all work up to and
+  // including the given time.
+  nextFlushedRoot = root;
+  nextFlushedExpirationTime = expirationTime;
+  performWorkOnRoot(root, expirationTime, false);
+  // Flush any sync work that was scheduled by lifecycles
+  performSyncWork();
+  finishRendering();
+}
+
+function finishRendering() {
+  nestedUpdateCount = 0;
+
+  if (completedBatches !== null) {
+    const batches = completedBatches;
+    completedBatches = null;
+    for (let i = 0; i < batches.length; i++) {
+      const batch = batches[i];
+      try {
+        batch._onComplete();
+      } catch (error) {
+        if (!hasUnhandledError) {
+          hasUnhandledError = true;
+          unhandledError = error;
+        }
+      }
+    }
+  }
+
+  if (hasUnhandledError) {
+    const error = unhandledError;
+    unhandledError = null;
+    hasUnhandledError = false;
+    throw error;
+  }
+}
+
+function performWorkOnRoot(
+  root: FiberRoot,
+  expirationTime: ExpirationTime,
+  isAsync: boolean,
+) {
+  invariant(
+    !isRendering,
+    'performWorkOnRoot was called recursively. This error is likely caused ' +
+      'by a bug in React. Please file an issue.',
+  );
+
+  isRendering = true;
+
+  // Check if this is async work or sync/expired work.
+  if (!isAsync) {
+    // Flush sync work.
+    let finishedWork = root.finishedWork;
+    if (finishedWork !== null) {
+      // This root is already complete. We can commit it.
+      completeRoot(root, finishedWork, expirationTime);
+    } else {
+      root.finishedWork = null;
+      finishedWork = renderRoot(root, expirationTime, false);
+      if (finishedWork !== null) {
+        // We've completed the root. Commit it.
+        completeRoot(root, finishedWork, expirationTime);
+      }
+    }
+  } else {
+    // Flush async work.
+    let finishedWork = root.finishedWork;
+    if (finishedWork !== null) {
+      // This root is already complete. We can commit it.
+      completeRoot(root, finishedWork, expirationTime);
+    } else {
+      root.finishedWork = null;
+      finishedWork = renderRoot(root, expirationTime, true);
+      if (finishedWork !== null) {
+        // We've completed the root. Check the deadline one more time
+        // before committing.
+        if (!shouldYield()) {
+          // Still time left. Commit the root.
+          completeRoot(root, finishedWork, expirationTime);
+        } else {
+          // There's no time left. Mark this root as complete. We'll come
+          // back and commit it later.
+          root.finishedWork = finishedWork;
+
+          if (enableProfilerTimer) {
+            // If we didn't finish, pause the "actual" render timer.
+            // We'll restart it when we resume work.
+            pauseActualRenderTimerIfRunning();
+          }
+        }
+      }
+    }
+  }
+
+  isRendering = false;
+}
+
+function completeRoot(
+  root: FiberRoot,
+  finishedWork: Fiber,
+  expirationTime: ExpirationTime,
+): void {
+  // Check if there's a batch that matches this expiration time.
+  const firstBatch = root.firstBatch;
+  if (firstBatch !== null && firstBatch._expirationTime <= expirationTime) {
+    if (completedBatches === null) {
+      completedBatches = [firstBatch];
+    } else {
+      completedBatches.push(firstBatch);
+    }
+    if (firstBatch._defer) {
+      // This root is blocked from committing by a batch. Unschedule it until
+      // we receive another update.
+      root.finishedWork = finishedWork;
+      root.remainingExpirationTime = NoWork;
+      return;
+    }
+  }
+
+  // Commit the root.
+  root.finishedWork = null;
+  root.remainingExpirationTime = commitRoot(finishedWork);
+}
+
+// When working on async work, the reconciler asks the renderer if it should
+// yield execution. For DOM, we implement this with requestIdleCallback.
+function shouldYield() {
+  if (deadline === null) {
+    return false;
+  }
+  if (deadline.timeRemaining() > timeHeuristicForUnitOfWork) {
+    // Disregard deadline.didTimeout. Only expired work should be flushed
+    // during a timeout. This path is only hit for non-expired work.
+    return false;
+  }
+  deadlineDidExpire = true;
+  return true;
+}
+
+function onUncaughtError(error: mixed) {
+  invariant(
+    nextFlushedRoot !== null,
+    'Should be working on a root. This error is likely caused by a bug in ' +
+      'React. Please file an issue.',
+  );
+  // Unschedule this root so we don't work on it again until there's
+  // another update.
+  nextFlushedRoot.remainingExpirationTime = NoWork;
+  if (!hasUnhandledError) {
+    hasUnhandledError = true;
+    unhandledError = error;
+  }
+}
+
+function onBlock(remainingExpirationTime: ExpirationTime) {
+  invariant(
+    nextFlushedRoot !== null,
+    'Should be working on a root. This error is likely caused by a bug in ' +
+      'React. Please file an issue.',
+  );
+  // This root was blocked. Unschedule it until there's another update.
+  nextFlushedRoot.remainingExpirationTime = remainingExpirationTime;
+}
+
+// TODO: Batching should be implemented at the renderer level, not inside
+// the reconciler.
+function batchedUpdates<A, R>(fn: (a: A) => R, a: A): R {
+  const previousIsBatchingUpdates = isBatchingUpdates;
+  isBatchingUpdates = true;
+  try {
+    return fn(a);
+  } finally {
+    isBatchingUpdates = previousIsBatchingUpdates;
+    if (!isBatchingUpdates && !isRendering) {
+      performSyncWork();
+    }
+  }
+}
+
+// TODO: Batching should be implemented at the renderer level, not inside
+// the reconciler.
+function unbatchedUpdates<A, R>(fn: (a: A) => R, a: A): R {
+  if (isBatchingUpdates && !isUnbatchingUpdates) {
+    isUnbatchingUpdates = true;
     try {
       return fn(a);
     } finally {
-      isBatchingUpdates = previousIsBatchingUpdates;
-      if (!isBatchingUpdates && !isRendering) {
-        performSyncWork();
-      }
+      isUnbatchingUpdates = false;
     }
   }
+  return fn(a);
+}
 
-  // TODO: Batching should be implemented at the renderer level, not inside
-  // the reconciler.
-  function unbatchedUpdates<A, R>(fn: (a: A) => R, a: A): R {
-    if (isBatchingUpdates && !isUnbatchingUpdates) {
-      isUnbatchingUpdates = true;
-      try {
-        return fn(a);
-      } finally {
-        isUnbatchingUpdates = false;
-      }
-    }
-    return fn(a);
+// TODO: Batching should be implemented at the renderer level, not within
+// the reconciler.
+function flushSync<A, R>(fn: (a: A) => R, a: A): R {
+  invariant(
+    !isRendering,
+    'flushSync was called from inside a lifecycle method. It cannot be ' +
+      'called when React is already rendering.',
+  );
+  const previousIsBatchingUpdates = isBatchingUpdates;
+  isBatchingUpdates = true;
+  try {
+    return syncUpdates(fn, a);
+  } finally {
+    isBatchingUpdates = previousIsBatchingUpdates;
+    performSyncWork();
   }
+}
 
-  // TODO: Batching should be implemented at the renderer level, not within
-  // the reconciler.
-  function flushSync<A, R>(fn: (a: A) => R, a: A): R {
-    invariant(
-      !isRendering,
-      'flushSync was called from inside a lifecycle method. It cannot be ' +
-        'called when React is already rendering.',
-    );
-    const previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = true;
-    try {
-      return syncUpdates(fn, a);
-    } finally {
-      isBatchingUpdates = previousIsBatchingUpdates;
+function interactiveUpdates<A, B, R>(fn: (A, B) => R, a: A, b: B): R {
+  if (isBatchingInteractiveUpdates) {
+    return fn(a, b);
+  }
+  // If there are any pending interactive updates, synchronously flush them.
+  // This needs to happen before we read any handlers, because the effect of
+  // the previous event may influence which handlers are called during
+  // this event.
+  if (
+    !isBatchingUpdates &&
+    !isRendering &&
+    lowestPendingInteractiveExpirationTime !== NoWork
+  ) {
+    // Synchronously flush pending interactive updates.
+    performWork(lowestPendingInteractiveExpirationTime, false, null);
+    lowestPendingInteractiveExpirationTime = NoWork;
+  }
+  const previousIsBatchingInteractiveUpdates = isBatchingInteractiveUpdates;
+  const previousIsBatchingUpdates = isBatchingUpdates;
+  isBatchingInteractiveUpdates = true;
+  isBatchingUpdates = true;
+  try {
+    return fn(a, b);
+  } finally {
+    isBatchingInteractiveUpdates = previousIsBatchingInteractiveUpdates;
+    isBatchingUpdates = previousIsBatchingUpdates;
+    if (!isBatchingUpdates && !isRendering) {
       performSyncWork();
     }
   }
-
-  function interactiveUpdates<A, B, R>(fn: (A, B) => R, a: A, b: B): R {
-    if (isBatchingInteractiveUpdates) {
-      return fn(a, b);
-    }
-    // If there are any pending interactive updates, synchronously flush them.
-    // This needs to happen before we read any handlers, because the effect of
-    // the previous event may influence which handlers are called during
-    // this event.
-    if (
-      !isBatchingUpdates &&
-      !isRendering &&
-      lowestPendingInteractiveExpirationTime !== NoWork
-    ) {
-      // Synchronously flush pending interactive updates.
-      performWork(lowestPendingInteractiveExpirationTime, false, null);
-      lowestPendingInteractiveExpirationTime = NoWork;
-    }
-    const previousIsBatchingInteractiveUpdates = isBatchingInteractiveUpdates;
-    const previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingInteractiveUpdates = true;
-    isBatchingUpdates = true;
-    try {
-      return fn(a, b);
-    } finally {
-      isBatchingInteractiveUpdates = previousIsBatchingInteractiveUpdates;
-      isBatchingUpdates = previousIsBatchingUpdates;
-      if (!isBatchingUpdates && !isRendering) {
-        performSyncWork();
-      }
-    }
-  }
-
-  function flushInteractiveUpdates() {
-    if (!isRendering && lowestPendingInteractiveExpirationTime !== NoWork) {
-      // Synchronously flush pending interactive updates.
-      performWork(lowestPendingInteractiveExpirationTime, false, null);
-      lowestPendingInteractiveExpirationTime = NoWork;
-    }
-  }
-
-  function flushControlled(fn: () => mixed): void {
-    const previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = true;
-    try {
-      syncUpdates(fn);
-    } finally {
-      isBatchingUpdates = previousIsBatchingUpdates;
-      if (!isBatchingUpdates && !isRendering) {
-        performWork(Sync, false, null);
-      }
-    }
-  }
-
-  return {
-    recalculateCurrentTime,
-    computeExpirationForFiber,
-    scheduleWork,
-    requestWork,
-    flushRoot,
-    batchedUpdates,
-    unbatchedUpdates,
-    flushSync,
-    flushControlled,
-    deferredUpdates,
-    syncUpdates,
-    interactiveUpdates,
-    flushInteractiveUpdates,
-    computeUniqueAsyncExpiration,
-    legacyContext,
-  };
 }
+
+function flushInteractiveUpdates() {
+  if (!isRendering && lowestPendingInteractiveExpirationTime !== NoWork) {
+    // Synchronously flush pending interactive updates.
+    performWork(lowestPendingInteractiveExpirationTime, false, null);
+    lowestPendingInteractiveExpirationTime = NoWork;
+  }
+}
+
+function flushControlled(fn: () => mixed): void {
+  const previousIsBatchingUpdates = isBatchingUpdates;
+  isBatchingUpdates = true;
+  try {
+    syncUpdates(fn);
+  } finally {
+    isBatchingUpdates = previousIsBatchingUpdates;
+    if (!isBatchingUpdates && !isRendering) {
+      performWork(Sync, false, null);
+    }
+  }
+}
+
+export {
+  recalculateCurrentTime,
+  computeExpirationForFiber,
+  captureCommitPhaseError,
+  onUncaughtError,
+  suspendRoot,
+  retrySuspendedRoot,
+  markLegacyErrorBoundaryAsFailed,
+  isAlreadyFailedLegacyErrorBoundary,
+  scheduleWork,
+  requestWork,
+  flushRoot,
+  batchedUpdates,
+  unbatchedUpdates,
+  flushSync,
+  flushControlled,
+  deferredUpdates,
+  syncUpdates,
+  interactiveUpdates,
+  flushInteractiveUpdates,
+  computeUniqueAsyncExpiration,
+};
diff --git a/packages/react-reconciler/src/ReactFiberStack.js b/packages/react-reconciler/src/ReactFiberStack.js
index abf2a475b1..9c45e11d1f 100644
--- a/packages/react-reconciler/src/ReactFiberStack.js
+++ b/packages/react-reconciler/src/ReactFiberStack.js
@@ -15,100 +15,88 @@ export type StackCursor<T> = {
   current: T,
 };
 
-export type Stack = {
-  createCursor<T>(defaultValue: T): StackCursor<T>,
-  isEmpty(): boolean,
-  push<T>(cursor: StackCursor<T>, value: T, fiber: Fiber): void,
-  pop<T>(cursor: StackCursor<T>, fiber: Fiber): void,
+const valueStack: Array<any> = [];
 
-  // DEV only
-  checkThatStackIsEmpty(): void,
-  resetStackAfterFatalErrorInDev(): void,
-};
+let fiberStack: Array<Fiber | null>;
 
-export default function(): Stack {
-  const valueStack: Array<any> = [];
+if (__DEV__) {
+  fiberStack = [];
+}
 
-  let fiberStack: Array<Fiber | null>;
-
-  if (__DEV__) {
-    fiberStack = [];
-  }
-
-  let index = -1;
-
-  function createCursor<T>(defaultValue: T): StackCursor<T> {
-    return {
-      current: defaultValue,
-    };
-  }
-
-  function isEmpty(): boolean {
-    return index === -1;
-  }
-
-  function pop<T>(cursor: StackCursor<T>, fiber: Fiber): void {
-    if (index < 0) {
-      if (__DEV__) {
-        warning(false, 'Unexpected pop.');
-      }
-      return;
-    }
-
-    if (__DEV__) {
-      if (fiber !== fiberStack[index]) {
-        warning(false, 'Unexpected Fiber popped.');
-      }
-    }
-
-    cursor.current = valueStack[index];
-
-    valueStack[index] = null;
-
-    if (__DEV__) {
-      fiberStack[index] = null;
-    }
-
-    index--;
-  }
-
-  function push<T>(cursor: StackCursor<T>, value: T, fiber: Fiber): void {
-    index++;
-
-    valueStack[index] = cursor.current;
-
-    if (__DEV__) {
-      fiberStack[index] = fiber;
-    }
-
-    cursor.current = value;
-  }
-
-  function checkThatStackIsEmpty() {
-    if (__DEV__) {
-      if (index !== -1) {
-        warning(
-          false,
-          'Expected an empty stack. Something was not reset properly.',
-        );
-      }
-    }
-  }
-
-  function resetStackAfterFatalErrorInDev() {
-    if (__DEV__) {
-      index = -1;
-      valueStack.length = 0;
-      fiberStack.length = 0;
-    }
-  }
+let index = -1;
 
+function createCursor<T>(defaultValue: T): StackCursor<T> {
   return {
-    createCursor,
-    isEmpty,
-    pop,
-    push,
-    checkThatStackIsEmpty,
-    resetStackAfterFatalErrorInDev,
+    current: defaultValue,
   };
 }
+
+function isEmpty(): boolean {
+  return index === -1;
+}
+
+function pop<T>(cursor: StackCursor<T>, fiber: Fiber): void {
+  if (index < 0) {
+    if (__DEV__) {
+      warning(false, 'Unexpected pop.');
+    }
+    return;
+  }
+
+  if (__DEV__) {
+    if (fiber !== fiberStack[index]) {
+      warning(false, 'Unexpected Fiber popped.');
+    }
+  }
+
+  cursor.current = valueStack[index];
+
+  valueStack[index] = null;
+
+  if (__DEV__) {
+    fiberStack[index] = null;
+  }
+
+  index--;
+}
+
+function push<T>(cursor: StackCursor<T>, value: T, fiber: Fiber): void {
+  index++;
+
+  valueStack[index] = cursor.current;
+
+  if (__DEV__) {
+    fiberStack[index] = fiber;
+  }
+
+  cursor.current = value;
+}
+
+function checkThatStackIsEmpty() {
+  if (__DEV__) {
+    if (index !== -1) {
+      warning(
+        false,
+        'Expected an empty stack. Something was not reset properly.',
+      );
+    }
+  }
+}
+
+function resetStackAfterFatalErrorInDev() {
+  if (__DEV__) {
+    index = -1;
+    valueStack.length = 0;
+    fiberStack.length = 0;
+  }
+}
+
+export {
+  createCursor,
+  isEmpty,
+  pop,
+  push,
+  // DEV only:
+  checkThatStackIsEmpty,
+  resetStackAfterFatalErrorInDev,
+};
diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index 31bb8a258b..b4be270162 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -7,27 +7,13 @@
  * @flow
  */
 
-import type {HostConfig} from 'react-reconciler';
 import type {Fiber} from './ReactFiber';
 import type {FiberRoot} from './ReactFiberRoot';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
-import type {HostContext} from './ReactFiberHostContext';
-import type {LegacyContext} from './ReactFiberContext';
-import type {NewContext} from './ReactFiberNewContext';
 import type {CapturedValue} from './ReactCapturedValue';
-import type {ProfilerTimer} from './ReactProfilerTimer';
 import type {Update} from './ReactUpdateQueue';
 import type {Thenable} from './ReactFiberScheduler';
 
-import {createCapturedValue} from './ReactCapturedValue';
-import {
-  enqueueCapturedUpdate,
-  createUpdate,
-  enqueueUpdate,
-  CaptureUpdate,
-} from './ReactUpdateQueue';
-import {logError} from './ReactFiberCommitWork';
-
 import {
   ClassComponent,
   HostRoot,
@@ -49,238 +35,252 @@ import {
   enableSuspense,
 } from 'shared/ReactFeatureFlags';
 
+import {createCapturedValue} from './ReactCapturedValue';
+import {
+  enqueueCapturedUpdate,
+  createUpdate,
+  enqueueUpdate,
+  CaptureUpdate,
+} from './ReactUpdateQueue';
+import {logError} from './ReactFiberCommitWork';
 import {Never, Sync, expirationTimeToMs} from './ReactFiberExpirationTime';
+import {popHostContainer, popHostContext} from './ReactFiberHostContext';
+import {
+  popContextProvider as popLegacyContextProvider,
+  popTopLevelContextObject as popTopLevelLegacyContextObject,
+} from './ReactFiberContext';
+import {popProvider} from './ReactFiberNewContext';
+import {
+  resumeActualRenderTimerIfPaused,
+  recordElapsedActualRenderTime,
+} from './ReactProfilerTimer';
+import {
+  suspendRoot,
+  onUncaughtError,
+  markLegacyErrorBoundaryAsFailed,
+  isAlreadyFailedLegacyErrorBoundary,
+  recalculateCurrentTime,
+  computeExpirationForFiber,
+  scheduleWork,
+  retrySuspendedRoot,
+} from './ReactFiberScheduler';
 
-export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
-  config: HostConfig<T, P, I, TI, HI, PI, C, CC, CX, PL>,
-  hostContext: HostContext<C, CX>,
-  legacyContext: LegacyContext,
-  newContext: NewContext,
-  scheduleWork: (fiber: Fiber, expirationTime: ExpirationTime) => void,
-  computeExpirationForFiber: (
-    startTime: ExpirationTime,
-    fiber: Fiber,
-  ) => ExpirationTime,
-  recalculateCurrentTime: () => ExpirationTime,
-  markLegacyErrorBoundaryAsFailed: (instance: mixed) => void,
-  isAlreadyFailedLegacyErrorBoundary: (instance: mixed) => boolean,
-  onUncaughtError: (error: mixed) => void,
-  profilerTimer: ProfilerTimer,
-  suspendRoot: (
-    root: FiberRoot,
-    thenable: Thenable,
-    timeoutMs: number,
-    suspendedTime: ExpirationTime,
-  ) => void,
-  retrySuspendedRoot: (root: FiberRoot, suspendedTime: ExpirationTime) => void,
-) {
-  const {popHostContainer, popHostContext} = hostContext;
-  const {
-    popContextProvider: popLegacyContextProvider,
-    popTopLevelContextObject: popTopLevelLegacyContextObject,
-  } = legacyContext;
-  const {popProvider} = newContext;
-  const {
-    resumeActualRenderTimerIfPaused,
-    recordElapsedActualRenderTime,
-  } = profilerTimer;
+function createRootErrorUpdate(
+  fiber: Fiber,
+  errorInfo: CapturedValue<mixed>,
+  expirationTime: ExpirationTime,
+): Update<null> {
+  const update = createUpdate(expirationTime);
+  // Unmount the root by rendering null.
+  update.tag = CaptureUpdate;
+  // Caution: React DevTools currently depends on this property
+  // being called "element".
+  update.payload = {element: null};
+  const error = errorInfo.value;
+  update.callback = () => {
+    onUncaughtError(error);
+    logError(fiber, errorInfo);
+  };
+  return update;
+}
 
-  function createRootErrorUpdate(
-    fiber: Fiber,
-    errorInfo: CapturedValue<mixed>,
-    expirationTime: ExpirationTime,
-  ): Update<null> {
-    const update = createUpdate(expirationTime);
-    // Unmount the root by rendering null.
-    update.tag = CaptureUpdate;
-    // Caution: React DevTools currently depends on this property
-    // being called "element".
-    update.payload = {element: null};
-    const error = errorInfo.value;
-    update.callback = () => {
-      onUncaughtError(error);
-      logError(fiber, errorInfo);
-    };
-    return update;
-  }
-
-  function createClassErrorUpdate(
-    fiber: Fiber,
-    errorInfo: CapturedValue<mixed>,
-    expirationTime: ExpirationTime,
-  ): Update<mixed> {
-    const update = createUpdate(expirationTime);
-    update.tag = CaptureUpdate;
-    const getDerivedStateFromCatch = fiber.type.getDerivedStateFromCatch;
-    if (
-      enableGetDerivedStateFromCatch &&
-      typeof getDerivedStateFromCatch === 'function'
-    ) {
-      const error = errorInfo.value;
-      update.payload = () => {
-        return getDerivedStateFromCatch(error);
-      };
-    }
-
-    const inst = fiber.stateNode;
-    if (inst !== null && typeof inst.componentDidCatch === 'function') {
-      update.callback = function callback() {
-        if (
-          !enableGetDerivedStateFromCatch ||
-          getDerivedStateFromCatch !== 'function'
-        ) {
-          // To preserve the preexisting retry behavior of error boundaries,
-          // we keep track of which ones already failed during this batch.
-          // This gets reset before we yield back to the browser.
-          // TODO: Warn in strict mode if getDerivedStateFromCatch is
-          // not defined.
-          markLegacyErrorBoundaryAsFailed(this);
-        }
-        const error = errorInfo.value;
-        const stack = errorInfo.stack;
-        logError(fiber, errorInfo);
-        this.componentDidCatch(error, {
-          componentStack: stack !== null ? stack : '',
-        });
-      };
-    }
-    return update;
-  }
-
-  function schedulePing(finishedWork) {
-    // Once the promise resolves, we should try rendering the non-
-    // placeholder state again.
-    const currentTime = recalculateCurrentTime();
-    const expirationTime = computeExpirationForFiber(currentTime, finishedWork);
-    const recoveryUpdate = createUpdate(expirationTime);
-    enqueueUpdate(finishedWork, recoveryUpdate, expirationTime);
-    scheduleWork(finishedWork, expirationTime);
-  }
-
-  function throwException(
-    root: FiberRoot,
-    returnFiber: Fiber,
-    sourceFiber: Fiber,
-    value: mixed,
-    renderIsExpired: boolean,
-    renderExpirationTime: ExpirationTime,
-    currentTimeMs: number,
+function createClassErrorUpdate(
+  fiber: Fiber,
+  errorInfo: CapturedValue<mixed>,
+  expirationTime: ExpirationTime,
+): Update<mixed> {
+  const update = createUpdate(expirationTime);
+  update.tag = CaptureUpdate;
+  const getDerivedStateFromCatch = fiber.type.getDerivedStateFromCatch;
+  if (
+    enableGetDerivedStateFromCatch &&
+    typeof getDerivedStateFromCatch === 'function'
   ) {
-    // The source fiber did not complete.
-    sourceFiber.effectTag |= Incomplete;
-    // Its effect list is no longer valid.
-    sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+    const error = errorInfo.value;
+    update.payload = () => {
+      return getDerivedStateFromCatch(error);
+    };
+  }
 
-    if (
-      enableSuspense &&
-      value !== null &&
-      typeof value === 'object' &&
-      typeof value.then === 'function'
-    ) {
-      // This is a thenable.
-      const thenable: Thenable = (value: any);
-
-      const expirationTimeMs = expirationTimeToMs(renderExpirationTime);
-      const startTimeMs = expirationTimeMs - 5000;
-      let elapsedMs = currentTimeMs - startTimeMs;
-      if (elapsedMs < 0) {
-        elapsedMs = 0;
+  const inst = fiber.stateNode;
+  if (inst !== null && typeof inst.componentDidCatch === 'function') {
+    update.callback = function callback() {
+      if (
+        !enableGetDerivedStateFromCatch ||
+        getDerivedStateFromCatch !== 'function'
+      ) {
+        // To preserve the preexisting retry behavior of error boundaries,
+        // we keep track of which ones already failed during this batch.
+        // This gets reset before we yield back to the browser.
+        // TODO: Warn in strict mode if getDerivedStateFromCatch is
+        // not defined.
+        markLegacyErrorBoundaryAsFailed(this);
       }
-      const remainingTimeMs = expirationTimeMs - currentTimeMs;
+      const error = errorInfo.value;
+      const stack = errorInfo.stack;
+      logError(fiber, errorInfo);
+      this.componentDidCatch(error, {
+        componentStack: stack !== null ? stack : '',
+      });
+    };
+  }
+  return update;
+}
 
-      // Find the earliest timeout of all the timeouts in the ancestor path.
-      // TODO: Alternatively, we could store the earliest timeout on the context
-      // stack, rather than searching on every suspend.
-      let workInProgress = returnFiber;
-      let earliestTimeoutMs = -1;
-      searchForEarliestTimeout: do {
-        if (workInProgress.tag === TimeoutComponent) {
-          const current = workInProgress.alternate;
-          if (current !== null && current.memoizedState === true) {
-            // A parent Timeout already committed in a placeholder state. We
-            // need to handle this promise immediately. In other words, we
-            // should never suspend inside a tree that already expired.
+function schedulePing(finishedWork) {
+  // Once the promise resolves, we should try rendering the non-
+  // placeholder state again.
+  const currentTime = recalculateCurrentTime();
+  const expirationTime = computeExpirationForFiber(currentTime, finishedWork);
+  const recoveryUpdate = createUpdate(expirationTime);
+  enqueueUpdate(finishedWork, recoveryUpdate, expirationTime);
+  scheduleWork(finishedWork, expirationTime);
+}
+
+function throwException(
+  root: FiberRoot,
+  returnFiber: Fiber,
+  sourceFiber: Fiber,
+  value: mixed,
+  renderIsExpired: boolean,
+  renderExpirationTime: ExpirationTime,
+  currentTimeMs: number,
+) {
+  // The source fiber did not complete.
+  sourceFiber.effectTag |= Incomplete;
+  // Its effect list is no longer valid.
+  sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+
+  if (
+    enableSuspense &&
+    value !== null &&
+    typeof value === 'object' &&
+    typeof value.then === 'function'
+  ) {
+    // This is a thenable.
+    const thenable: Thenable = (value: any);
+
+    const expirationTimeMs = expirationTimeToMs(renderExpirationTime);
+    const startTimeMs = expirationTimeMs - 5000;
+    let elapsedMs = currentTimeMs - startTimeMs;
+    if (elapsedMs < 0) {
+      elapsedMs = 0;
+    }
+    const remainingTimeMs = expirationTimeMs - currentTimeMs;
+
+    // Find the earliest timeout of all the timeouts in the ancestor path.
+    // TODO: Alternatively, we could store the earliest timeout on the context
+    // stack, rather than searching on every suspend.
+    let workInProgress = returnFiber;
+    let earliestTimeoutMs = -1;
+    searchForEarliestTimeout: do {
+      if (workInProgress.tag === TimeoutComponent) {
+        const current = workInProgress.alternate;
+        if (current !== null && current.memoizedState === true) {
+          // A parent Timeout already committed in a placeholder state. We
+          // need to handle this promise immediately. In other words, we
+          // should never suspend inside a tree that already expired.
+          earliestTimeoutMs = 0;
+          break searchForEarliestTimeout;
+        }
+        let timeoutPropMs = workInProgress.pendingProps.ms;
+        if (typeof timeoutPropMs === 'number') {
+          if (timeoutPropMs <= 0) {
             earliestTimeoutMs = 0;
             break searchForEarliestTimeout;
+          } else if (
+            earliestTimeoutMs === -1 ||
+            timeoutPropMs < earliestTimeoutMs
+          ) {
+            earliestTimeoutMs = timeoutPropMs;
           }
-          let timeoutPropMs = workInProgress.pendingProps.ms;
-          if (typeof timeoutPropMs === 'number') {
-            if (timeoutPropMs <= 0) {
-              earliestTimeoutMs = 0;
-              break searchForEarliestTimeout;
-            } else if (
-              earliestTimeoutMs === -1 ||
-              timeoutPropMs < earliestTimeoutMs
-            ) {
-              earliestTimeoutMs = timeoutPropMs;
+        } else if (earliestTimeoutMs === -1) {
+          earliestTimeoutMs = remainingTimeMs;
+        }
+      }
+      workInProgress = workInProgress.return;
+    } while (workInProgress !== null);
+
+    // Compute the remaining time until the timeout.
+    const msUntilTimeout = earliestTimeoutMs - elapsedMs;
+
+    if (renderExpirationTime === Never || msUntilTimeout > 0) {
+      // There's still time remaining.
+      suspendRoot(root, thenable, msUntilTimeout, renderExpirationTime);
+      const onResolveOrReject = () => {
+        retrySuspendedRoot(root, renderExpirationTime);
+      };
+      thenable.then(onResolveOrReject, onResolveOrReject);
+      return;
+    } else {
+      // No time remaining. Need to fallback to placeholder.
+      // Find the nearest timeout that can be retried.
+      workInProgress = returnFiber;
+      do {
+        switch (workInProgress.tag) {
+          case HostRoot: {
+            // The root expired, but no fallback was provided. Throw a
+            // helpful error.
+            const message =
+              renderExpirationTime === Sync
+                ? 'A synchronous update was suspended, but no fallback UI ' +
+                  'was provided.'
+                : 'An update was suspended for longer than the timeout, ' +
+                  'but no fallback UI was provided.';
+            value = new Error(message);
+            break;
+          }
+          case TimeoutComponent: {
+            if ((workInProgress.effectTag & DidCapture) === NoEffect) {
+              workInProgress.effectTag |= ShouldCapture;
+              const onResolveOrReject = schedulePing.bind(null, workInProgress);
+              thenable.then(onResolveOrReject, onResolveOrReject);
+              return;
             }
-          } else if (earliestTimeoutMs === -1) {
-            earliestTimeoutMs = remainingTimeMs;
+            // Already captured during this render. Continue to the next
+            // Timeout ancestor.
+            break;
           }
         }
         workInProgress = workInProgress.return;
       } while (workInProgress !== null);
-
-      // Compute the remaining time until the timeout.
-      const msUntilTimeout = earliestTimeoutMs - elapsedMs;
-
-      if (renderExpirationTime === Never || msUntilTimeout > 0) {
-        // There's still time remaining.
-        suspendRoot(root, thenable, msUntilTimeout, renderExpirationTime);
-        const onResolveOrReject = () => {
-          retrySuspendedRoot(root, renderExpirationTime);
-        };
-        thenable.then(onResolveOrReject, onResolveOrReject);
-        return;
-      } else {
-        // No time remaining. Need to fallback to placeholder.
-        // Find the nearest timeout that can be retried.
-        workInProgress = returnFiber;
-        do {
-          switch (workInProgress.tag) {
-            case HostRoot: {
-              // The root expired, but no fallback was provided. Throw a
-              // helpful error.
-              const message =
-                renderExpirationTime === Sync
-                  ? 'A synchronous update was suspended, but no fallback UI ' +
-                    'was provided.'
-                  : 'An update was suspended for longer than the timeout, ' +
-                    'but no fallback UI was provided.';
-              value = new Error(message);
-              break;
-            }
-            case TimeoutComponent: {
-              if ((workInProgress.effectTag & DidCapture) === NoEffect) {
-                workInProgress.effectTag |= ShouldCapture;
-                const onResolveOrReject = schedulePing.bind(
-                  null,
-                  workInProgress,
-                );
-                thenable.then(onResolveOrReject, onResolveOrReject);
-                return;
-              }
-              // Already captured during this render. Continue to the next
-              // Timeout ancestor.
-              break;
-            }
-          }
-          workInProgress = workInProgress.return;
-        } while (workInProgress !== null);
-      }
     }
+  }
 
-    // We didn't find a boundary that could handle this type of exception. Start
-    // over and traverse parent path again, this time treating the exception
-    // as an error.
-    value = createCapturedValue(value, sourceFiber);
-    let workInProgress = returnFiber;
-    do {
-      switch (workInProgress.tag) {
-        case HostRoot: {
-          const errorInfo = value;
+  // We didn't find a boundary that could handle this type of exception. Start
+  // over and traverse parent path again, this time treating the exception
+  // as an error.
+  value = createCapturedValue(value, sourceFiber);
+  let workInProgress = returnFiber;
+  do {
+    switch (workInProgress.tag) {
+      case HostRoot: {
+        const errorInfo = value;
+        workInProgress.effectTag |= ShouldCapture;
+        const update = createRootErrorUpdate(
+          workInProgress,
+          errorInfo,
+          renderExpirationTime,
+        );
+        enqueueCapturedUpdate(workInProgress, update, renderExpirationTime);
+        return;
+      }
+      case ClassComponent:
+        // Capture and retry
+        const errorInfo = value;
+        const ctor = workInProgress.type;
+        const instance = workInProgress.stateNode;
+        if (
+          (workInProgress.effectTag & DidCapture) === NoEffect &&
+          ((typeof ctor.getDerivedStateFromCatch === 'function' &&
+            enableGetDerivedStateFromCatch) ||
+            (instance !== null &&
+              typeof instance.componentDidCatch === 'function' &&
+              !isAlreadyFailedLegacyErrorBoundary(instance)))
+        ) {
           workInProgress.effectTag |= ShouldCapture;
-          const update = createRootErrorUpdate(
+          // Schedule the error boundary to re-render using updated state
+          const update = createClassErrorUpdate(
             workInProgress,
             errorInfo,
             renderExpirationTime,
@@ -288,123 +288,99 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
           enqueueCapturedUpdate(workInProgress, update, renderExpirationTime);
           return;
         }
-        case ClassComponent:
-          // Capture and retry
-          const errorInfo = value;
-          const ctor = workInProgress.type;
-          const instance = workInProgress.stateNode;
-          if (
-            (workInProgress.effectTag & DidCapture) === NoEffect &&
-            ((typeof ctor.getDerivedStateFromCatch === 'function' &&
-              enableGetDerivedStateFromCatch) ||
-              (instance !== null &&
-                typeof instance.componentDidCatch === 'function' &&
-                !isAlreadyFailedLegacyErrorBoundary(instance)))
-          ) {
-            workInProgress.effectTag |= ShouldCapture;
-            // Schedule the error boundary to re-render using updated state
-            const update = createClassErrorUpdate(
-              workInProgress,
-              errorInfo,
-              renderExpirationTime,
-            );
-            enqueueCapturedUpdate(workInProgress, update, renderExpirationTime);
-            return;
-          }
-          break;
-        default:
-          break;
-      }
-      workInProgress = workInProgress.return;
-    } while (workInProgress !== null);
-  }
-
-  function unwindWork(
-    workInProgress: Fiber,
-    renderIsExpired: boolean,
-    renderExpirationTime: ExpirationTime,
-  ) {
-    switch (workInProgress.tag) {
-      case ClassComponent: {
-        popLegacyContextProvider(workInProgress);
-        const effectTag = workInProgress.effectTag;
-        if (effectTag & ShouldCapture) {
-          workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
-          return workInProgress;
-        }
-        return null;
-      }
-      case HostRoot: {
-        popHostContainer(workInProgress);
-        popTopLevelLegacyContextObject(workInProgress);
-        const effectTag = workInProgress.effectTag;
-        if (effectTag & ShouldCapture) {
-          workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
-          return workInProgress;
-        }
-        return null;
-      }
-      case HostComponent: {
-        popHostContext(workInProgress);
-        return null;
-      }
-      case TimeoutComponent: {
-        const effectTag = workInProgress.effectTag;
-        if (effectTag & ShouldCapture) {
-          workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
-          return workInProgress;
-        }
-        return null;
-      }
-      case HostPortal:
-        popHostContainer(workInProgress);
-        return null;
-      case ContextProvider:
-        popProvider(workInProgress);
-        return null;
-      default:
-        return null;
-    }
-  }
-
-  function unwindInterruptedWork(interruptedWork: Fiber) {
-    switch (interruptedWork.tag) {
-      case ClassComponent: {
-        popLegacyContextProvider(interruptedWork);
-        break;
-      }
-      case HostRoot: {
-        popHostContainer(interruptedWork);
-        popTopLevelLegacyContextObject(interruptedWork);
-        break;
-      }
-      case HostComponent: {
-        popHostContext(interruptedWork);
-        break;
-      }
-      case HostPortal:
-        popHostContainer(interruptedWork);
-        break;
-      case ContextProvider:
-        popProvider(interruptedWork);
-        break;
-      case Profiler:
-        if (enableProfilerTimer) {
-          // Resume in case we're picking up on work that was paused.
-          resumeActualRenderTimerIfPaused();
-          recordElapsedActualRenderTime(interruptedWork);
-        }
         break;
       default:
         break;
     }
-  }
-
-  return {
-    throwException,
-    unwindWork,
-    unwindInterruptedWork,
-    createRootErrorUpdate,
-    createClassErrorUpdate,
-  };
+    workInProgress = workInProgress.return;
+  } while (workInProgress !== null);
 }
+
+function unwindWork(
+  workInProgress: Fiber,
+  renderIsExpired: boolean,
+  renderExpirationTime: ExpirationTime,
+) {
+  switch (workInProgress.tag) {
+    case ClassComponent: {
+      popLegacyContextProvider(workInProgress);
+      const effectTag = workInProgress.effectTag;
+      if (effectTag & ShouldCapture) {
+        workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
+        return workInProgress;
+      }
+      return null;
+    }
+    case HostRoot: {
+      popHostContainer(workInProgress);
+      popTopLevelLegacyContextObject(workInProgress);
+      const effectTag = workInProgress.effectTag;
+      if (effectTag & ShouldCapture) {
+        workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
+        return workInProgress;
+      }
+      return null;
+    }
+    case HostComponent: {
+      popHostContext(workInProgress);
+      return null;
+    }
+    case TimeoutComponent: {
+      const effectTag = workInProgress.effectTag;
+      if (effectTag & ShouldCapture) {
+        workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
+        return workInProgress;
+      }
+      return null;
+    }
+    case HostPortal:
+      popHostContainer(workInProgress);
+      return null;
+    case ContextProvider:
+      popProvider(workInProgress);
+      return null;
+    default:
+      return null;
+  }
+}
+
+function unwindInterruptedWork(interruptedWork: Fiber) {
+  switch (interruptedWork.tag) {
+    case ClassComponent: {
+      popLegacyContextProvider(interruptedWork);
+      break;
+    }
+    case HostRoot: {
+      popHostContainer(interruptedWork);
+      popTopLevelLegacyContextObject(interruptedWork);
+      break;
+    }
+    case HostComponent: {
+      popHostContext(interruptedWork);
+      break;
+    }
+    case HostPortal:
+      popHostContainer(interruptedWork);
+      break;
+    case ContextProvider:
+      popProvider(interruptedWork);
+      break;
+    case Profiler:
+      if (enableProfilerTimer) {
+        // Resume in case we're picking up on work that was paused.
+        resumeActualRenderTimerIfPaused();
+        recordElapsedActualRenderTime(interruptedWork);
+      }
+      break;
+    default:
+      break;
+  }
+}
+
+export {
+  throwException,
+  unwindWork,
+  unwindInterruptedWork,
+  createRootErrorUpdate,
+  createClassErrorUpdate,
+};
diff --git a/packages/react-reconciler/src/ReactProfilerTimer.js b/packages/react-reconciler/src/ReactProfilerTimer.js
index d192bc1e91..9fd7544c52 100644
--- a/packages/react-reconciler/src/ReactProfilerTimer.js
+++ b/packages/react-reconciler/src/ReactProfilerTimer.js
@@ -12,6 +12,7 @@ import type {Fiber} from './ReactFiber';
 import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
 
 import warning from 'fbjs/lib/warning';
+import {now} from './ReactFiberHostConfig';
 
 /**
  * The "actual" render time is total time required to render the descendants of a Profiler component.
@@ -32,113 +33,124 @@ export type ProfilerTimer = {
   stopBaseRenderTimerIfRunning(): void,
 };
 
-export function createProfilerTimer(now: () => number): ProfilerTimer {
-  let fiberStack: Array<Fiber | null>;
+let fiberStack: Array<Fiber | null>;
 
-  if (__DEV__) {
-    fiberStack = [];
+if (__DEV__) {
+  fiberStack = [];
+}
+
+let timerPausedAt: number = 0;
+let totalElapsedPauseTime: number = 0;
+
+function checkActualRenderTimeStackEmpty(): void {
+  if (!enableProfilerTimer) {
+    return;
   }
+  if (__DEV__) {
+    warning(
+      fiberStack.length === 0,
+      'Expected an empty stack. Something was not reset properly.',
+    );
+  }
+}
 
-  let timerPausedAt: number = 0;
-  let totalElapsedPauseTime: number = 0;
+function markActualRenderTimeStarted(fiber: Fiber): void {
+  if (!enableProfilerTimer) {
+    return;
+  }
+  if (__DEV__) {
+    fiberStack.push(fiber);
+  }
+  fiber.stateNode.startTime = now() - totalElapsedPauseTime;
+}
 
-  function checkActualRenderTimeStackEmpty(): void {
-    if (__DEV__) {
+function pauseActualRenderTimerIfRunning(): void {
+  if (!enableProfilerTimer) {
+    return;
+  }
+  if (timerPausedAt === 0) {
+    timerPausedAt = now();
+  }
+}
+
+function recordElapsedActualRenderTime(fiber: Fiber): void {
+  if (!enableProfilerTimer) {
+    return;
+  }
+  if (__DEV__) {
+    warning(fiber === fiberStack.pop(), 'Unexpected Fiber popped.');
+  }
+  fiber.stateNode.duration +=
+    now() - totalElapsedPauseTime - fiber.stateNode.startTime;
+}
+
+function resetActualRenderTimer(): void {
+  if (!enableProfilerTimer) {
+    return;
+  }
+  totalElapsedPauseTime = 0;
+}
+
+function resumeActualRenderTimerIfPaused(): void {
+  if (!enableProfilerTimer) {
+    return;
+  }
+  if (timerPausedAt > 0) {
+    totalElapsedPauseTime += now() - timerPausedAt;
+    timerPausedAt = 0;
+  }
+}
+
+/**
+ * The "base" render time is the duration of the “begin” phase of work for a particular fiber.
+ * This time is measured and stored on each fiber.
+ * The time for all sibling fibers are accumulated and stored on their parent during the "complete" phase.
+ * If a fiber bails out (sCU false) then its "base" timer is cancelled and the fiber is not updated.
+ */
+
+let baseStartTime: number = -1;
+
+function recordElapsedBaseRenderTimeIfRunning(fiber: Fiber): void {
+  if (!enableProfilerTimer) {
+    return;
+  }
+  if (baseStartTime !== -1) {
+    fiber.selfBaseTime = now() - baseStartTime;
+  }
+}
+
+function startBaseRenderTimer(): void {
+  if (!enableProfilerTimer) {
+    return;
+  }
+  if (__DEV__) {
+    if (baseStartTime !== -1) {
       warning(
-        fiberStack.length === 0,
-        'Expected an empty stack. Something was not reset properly.',
+        false,
+        'Cannot start base timer that is already running. ' +
+          'This error is likely caused by a bug in React. ' +
+          'Please file an issue.',
       );
     }
   }
-
-  function markActualRenderTimeStarted(fiber: Fiber): void {
-    if (__DEV__) {
-      fiberStack.push(fiber);
-    }
-    fiber.stateNode.startTime = now() - totalElapsedPauseTime;
-  }
-
-  function pauseActualRenderTimerIfRunning(): void {
-    if (timerPausedAt === 0) {
-      timerPausedAt = now();
-    }
-  }
-
-  function recordElapsedActualRenderTime(fiber: Fiber): void {
-    if (__DEV__) {
-      warning(fiber === fiberStack.pop(), 'Unexpected Fiber popped.');
-    }
-    fiber.stateNode.duration +=
-      now() - totalElapsedPauseTime - fiber.stateNode.startTime;
-  }
-
-  function resetActualRenderTimer(): void {
-    totalElapsedPauseTime = 0;
-  }
-
-  function resumeActualRenderTimerIfPaused(): void {
-    if (timerPausedAt > 0) {
-      totalElapsedPauseTime += now() - timerPausedAt;
-      timerPausedAt = 0;
-    }
-  }
-
-  /**
-   * The "base" render time is the duration of the “begin” phase of work for a particular fiber.
-   * This time is measured and stored on each fiber.
-   * The time for all sibling fibers are accumulated and stored on their parent during the "complete" phase.
-   * If a fiber bails out (sCU false) then its "base" timer is cancelled and the fiber is not updated.
-   */
-
-  let baseStartTime: number = -1;
-
-  function recordElapsedBaseRenderTimeIfRunning(fiber: Fiber): void {
-    if (baseStartTime !== -1) {
-      fiber.selfBaseTime = now() - baseStartTime;
-    }
-  }
-
-  function startBaseRenderTimer(): void {
-    if (__DEV__) {
-      if (baseStartTime !== -1) {
-        warning(
-          false,
-          'Cannot start base timer that is already running. ' +
-            'This error is likely caused by a bug in React. ' +
-            'Please file an issue.',
-        );
-      }
-    }
-    baseStartTime = now();
-  }
-
-  function stopBaseRenderTimerIfRunning(): void {
-    baseStartTime = -1;
-  }
-
-  if (enableProfilerTimer) {
-    return {
-      checkActualRenderTimeStackEmpty,
-      markActualRenderTimeStarted,
-      pauseActualRenderTimerIfRunning,
-      recordElapsedActualRenderTime,
-      resetActualRenderTimer,
-      resumeActualRenderTimerIfPaused,
-      recordElapsedBaseRenderTimeIfRunning,
-      startBaseRenderTimer,
-      stopBaseRenderTimerIfRunning,
-    };
-  } else {
-    return {
-      checkActualRenderTimeStackEmpty(): void {},
-      markActualRenderTimeStarted(fiber: Fiber): void {},
-      pauseActualRenderTimerIfRunning(): void {},
-      recordElapsedActualRenderTime(fiber: Fiber): void {},
-      resetActualRenderTimer(): void {},
-      resumeActualRenderTimerIfPaused(): void {},
-      recordElapsedBaseRenderTimeIfRunning(fiber: Fiber): void {},
-      startBaseRenderTimer(): void {},
-      stopBaseRenderTimerIfRunning(): void {},
-    };
-  }
+  baseStartTime = now();
 }
+
+function stopBaseRenderTimerIfRunning(): void {
+  if (!enableProfilerTimer) {
+    return;
+  }
+  baseStartTime = -1;
+}
+
+export {
+  checkActualRenderTimeStackEmpty,
+  markActualRenderTimeStarted,
+  pauseActualRenderTimerIfRunning,
+  recordElapsedActualRenderTime,
+  resetActualRenderTimer,
+  resumeActualRenderTimerIfPaused,
+  recordElapsedBaseRenderTimeIfRunning,
+  startBaseRenderTimer,
+  stopBaseRenderTimerIfRunning,
+};
diff --git a/packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.js b/packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.js
index 6fb85bad98..feb732a170 100644
--- a/packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.js
+++ b/packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.js
@@ -46,11 +46,10 @@ describe('ReactFiberHostContext', () => {
       now: function() {
         return 0;
       },
-      mutation: {
-        appendChildToContainer: function() {
-          return null;
-        },
+      appendChildToContainer: function() {
+        return null;
       },
+      supportsMutation: true,
     });
 
     const container = Renderer.createContainer(/* root: */ null);
@@ -95,11 +94,10 @@ describe('ReactFiberHostContext', () => {
       now: function() {
         return 0;
       },
-      mutation: {
-        appendChildToContainer: function() {
-          return null;
-        },
+      appendChildToContainer: function() {
+        return null;
       },
+      supportsMutation: true,
     });
 
     const container = Renderer.createContainer(rootContext);
diff --git a/packages/react-reconciler/src/__tests__/ReactPersistent-test.internal.js b/packages/react-reconciler/src/__tests__/ReactPersistent-test.js
similarity index 90%
rename from packages/react-reconciler/src/__tests__/ReactPersistent-test.internal.js
rename to packages/react-reconciler/src/__tests__/ReactPersistent-test.js
index 1757e95a78..289646b2b9 100644
--- a/packages/react-reconciler/src/__tests__/ReactPersistent-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactPersistent-test.js
@@ -12,22 +12,26 @@
 
 let React;
 let ReactNoopPersistent;
-let ReactPortal;
 
 describe('ReactPersistent', () => {
   beforeEach(() => {
     jest.resetModules();
 
-    const ReactFeatureFlags = require('shared/ReactFeatureFlags');
-    ReactFeatureFlags.enableMutableReconciler = false;
-    ReactFeatureFlags.enablePersistentReconciler = true;
-    ReactFeatureFlags.enableNoopReconciler = false;
-
     React = require('react');
     ReactNoopPersistent = require('react-noop-renderer/persistent');
-    ReactPortal = require('shared/ReactPortal');
   });
 
+  // Inlined from shared folder so we can run this test on a bundle.
+  function createPortal(children, containerInfo, implementation, key) {
+    return {
+      $$typeof: Symbol.for('react.portal'),
+      key: key == null ? null : '' + key,
+      children,
+      containerInfo,
+      implementation,
+    };
+  }
+
   function render(element) {
     ReactNoopPersistent.render(element);
   }
@@ -160,11 +164,7 @@ describe('ReactPersistent', () => {
     }
     const portalContainer = {rootID: 'persistent-portal-test', children: []};
     const emptyPortalChildSet = portalContainer.children;
-    render(
-      <Parent>
-        {ReactPortal.createPortal(<Child />, portalContainer, null)}
-      </Parent>,
-    );
+    render(<Parent>{createPortal(<Child />, portalContainer, null)}</Parent>);
     ReactNoopPersistent.flush();
 
     expect(emptyPortalChildSet).toEqual([]);
@@ -176,11 +176,7 @@ describe('ReactPersistent', () => {
 
     render(
       <Parent>
-        {ReactPortal.createPortal(
-          <Child>Hello {'World'}</Child>,
-          portalContainer,
-          null,
-        )}
+        {createPortal(<Child>Hello {'World'}</Child>, portalContainer, null)}
       </Parent>,
     );
     ReactNoopPersistent.flush();
diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.art.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.art.js
new file mode 100644
index 0000000000..3f357d017a
--- /dev/null
+++ b/packages/react-reconciler/src/forks/ReactFiberHostConfig.art.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from 'react-art/src/ReactARTHostConfig';
diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js
new file mode 100644
index 0000000000..dc989aec71
--- /dev/null
+++ b/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js
@@ -0,0 +1,110 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+// This is a host config that's used for the `react-reconciler` package on npm.
+// It is only used by third-party renderers.
+//
+// Its API lets you pass the host config as an argument.
+// However, inside the `react-reconciler` we treat host config as a module.
+// This file is a shim between two worlds.
+//
+// It works because the `react-reconciler` bundle is wrapped in something like:
+//
+// module.exports = function ($$$config) {
+//   /* reconciler code */
+// }
+//
+// So `$$$config` looks like a global variable, but it's
+// really an argument to a top-level wrapping function.
+
+declare var $$$hostConfig: any;
+export opaque type Type = mixed; // eslint-disable-line no-undef
+export opaque type Props = mixed; // eslint-disable-line no-undef
+export opaque type Container = mixed; // eslint-disable-line no-undef
+export opaque type Instance = mixed; // eslint-disable-line no-undef
+export opaque type TextInstance = mixed; // eslint-disable-line no-undef
+export opaque type HydratableInstance = mixed; // eslint-disable-line no-undef
+export opaque type PublicInstance = mixed; // eslint-disable-line no-undef
+export opaque type HostContext = mixed; // eslint-disable-line no-undef
+export opaque type UpdatePayload = mixed; // eslint-disable-line no-undef
+export opaque type ChildSet = mixed; // eslint-disable-line no-undef
+
+export const getPublicInstance = $$$hostConfig.getPublicInstance;
+export const getRootHostContext = $$$hostConfig.getRootHostContext;
+export const getChildHostContext = $$$hostConfig.getChildHostContext;
+export const prepareForCommit = $$$hostConfig.prepareForCommit;
+export const resetAfterCommit = $$$hostConfig.resetAfterCommit;
+export const createInstance = $$$hostConfig.createInstance;
+export const appendInitialChild = $$$hostConfig.appendInitialChild;
+export const finalizeInitialChildren = $$$hostConfig.finalizeInitialChildren;
+export const prepareUpdate = $$$hostConfig.prepareUpdate;
+export const shouldSetTextContent = $$$hostConfig.shouldSetTextContent;
+export const shouldDeprioritizeSubtree =
+  $$$hostConfig.shouldDeprioritizeSubtree;
+export const createTextInstance = $$$hostConfig.createTextInstance;
+export const scheduleDeferredCallback = $$$hostConfig.scheduleDeferredCallback;
+export const cancelDeferredCallback = $$$hostConfig.cancelDeferredCallback;
+export const now = $$$hostConfig.now;
+export const isPrimaryRenderer = $$$hostConfig.isPrimaryRenderer;
+export const supportsMutation = $$$hostConfig.supportsMutation;
+export const supportsPersistence = $$$hostConfig.supportsPersistence;
+export const supportsHydration = $$$hostConfig.supportsHydration;
+
+// -------------------
+//      Mutation
+//     (optional)
+// -------------------
+export const appendChild = $$$hostConfig.appendChild;
+export const appendChildToContainer = $$$hostConfig.appendChildToContainer;
+export const commitTextUpdate = $$$hostConfig.commitTextUpdate;
+export const commitMount = $$$hostConfig.commitMount;
+export const commitUpdate = $$$hostConfig.commitUpdate;
+export const insertBefore = $$$hostConfig.insertBefore;
+export const insertInContainerBefore = $$$hostConfig.insertInContainerBefore;
+export const removeChild = $$$hostConfig.removeChild;
+export const removeChildFromContainer = $$$hostConfig.removeChildFromContainer;
+export const resetTextContent = $$$hostConfig.resetTextContent;
+
+// -------------------
+//     Persistence
+//     (optional)
+// -------------------
+export const cloneInstance = $$$hostConfig.cloneInstance;
+export const createContainerChildSet = $$$hostConfig.createContainerChildSet;
+export const appendChildToContainerChildSet =
+  $$$hostConfig.appendChildToContainerChildSet;
+export const finalizeContainerChildren =
+  $$$hostConfig.finalizeContainerChildren;
+export const replaceContainerChildren = $$$hostConfig.replaceContainerChildren;
+
+// -------------------
+//     Hydration
+//     (optional)
+// -------------------
+export const canHydrateInstance = $$$hostConfig.canHydrateInstance;
+export const canHydrateTextInstance = $$$hostConfig.canHydrateTextInstance;
+export const getNextHydratableSibling = $$$hostConfig.getNextHydratableSibling;
+export const getFirstHydratableChild = $$$hostConfig.getFirstHydratableChild;
+export const hydrateInstance = $$$hostConfig.hydrateInstance;
+export const hydrateTextInstance = $$$hostConfig.hydrateTextInstance;
+export const didNotMatchHydratedContainerTextInstance =
+  $$$hostConfig.didNotMatchHydratedContainerTextInstance;
+export const didNotMatchHydratedTextInstance =
+  $$$hostConfig.didNotMatchHydratedTextInstance;
+export const didNotHydrateContainerInstance =
+  $$$hostConfig.didNotHydrateContainerInstance;
+export const didNotHydrateInstance = $$$hostConfig.didNotHydrateInstance;
+export const didNotFindHydratableContainerInstance =
+  $$$hostConfig.didNotFindHydratableContainerInstance;
+export const didNotFindHydratableContainerTextInstance =
+  $$$hostConfig.didNotFindHydratableContainerTextInstance;
+export const didNotFindHydratableInstance =
+  $$$hostConfig.didNotFindHydratableInstance;
+export const didNotFindHydratableTextInstance =
+  $$$hostConfig.didNotFindHydratableTextInstance;
diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom.js
new file mode 100644
index 0000000000..73667973a1
--- /dev/null
+++ b/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from 'react-dom/src/client/ReactDOMHostConfig';
diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.fabric.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.fabric.js
new file mode 100644
index 0000000000..7c047fa48c
--- /dev/null
+++ b/packages/react-reconciler/src/forks/ReactFiberHostConfig.fabric.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from 'react-native-renderer/src/ReactFabricHostConfig';
diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.native.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.native.js
new file mode 100644
index 0000000000..f85cedc796
--- /dev/null
+++ b/packages/react-reconciler/src/forks/ReactFiberHostConfig.native.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from 'react-native-renderer/src/ReactNativeHostConfig';
diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.test.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.test.js
new file mode 100644
index 0000000000..dea83f7ad1
--- /dev/null
+++ b/packages/react-reconciler/src/forks/ReactFiberHostConfig.test.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from 'react-test-renderer/src/ReactTestHostConfig';
diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index 9e20c6048a..d1c6eab14d 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -30,7 +30,7 @@
 // layout, paint and other browser work is counted against the available time.
 // The frame rate is dynamically adjusted.
 
-import type {Deadline} from 'react-reconciler';
+import type {Deadline} from 'react-reconciler/src/ReactFiberScheduler';
 type FrameCallbackType = Deadline => void;
 type CallbackConfigType = {|
   scheduledCallback: FrameCallbackType,
diff --git a/packages/react-test-renderer/src/ReactTestHostConfig.js b/packages/react-test-renderer/src/ReactTestHostConfig.js
index ef7c6c927c..560011ab65 100644
--- a/packages/react-test-renderer/src/ReactTestHostConfig.js
+++ b/packages/react-test-renderer/src/ReactTestHostConfig.js
@@ -11,6 +11,13 @@ import emptyObject from 'fbjs/lib/emptyObject';
 
 import * as TestRendererScheduling from './ReactTestRendererScheduling';
 
+export type Type = string;
+export type Props = Object;
+export type Container = {|
+  children: Array<Instance | TextInstance>,
+  createNodeMock: Function,
+  tag: 'CONTAINER',
+|};
 export type Instance = {|
   type: string,
   props: Object,
@@ -18,23 +25,22 @@ export type Instance = {|
   rootContainerInstance: Container,
   tag: 'INSTANCE',
 |};
-
 export type TextInstance = {|
   text: string,
   tag: 'TEXT',
 |};
-
-type Container = {|
-  children: Array<Instance | TextInstance>,
-  createNodeMock: Function,
-  tag: 'CONTAINER',
-|};
-
-type Props = Object;
+export type HydratableInstance = Instance | TextInstance;
+export type PublicInstance = Instance | TextInstance;
+export type HostContext = Object;
+export type UpdatePayload = Object;
+export type ChildSet = void; // Unused
 
 const UPDATE_SIGNAL = {};
 
-function getPublicInstance(inst: Instance | TextInstance): * {
+export * from 'shared/HostConfigWithNoPersistence';
+export * from 'shared/HostConfigWithNoHydration';
+
+export function getPublicInstance(inst: Instance | TextInstance): * {
   switch (inst.tag) {
     case 'INSTANCE':
       const createNodeMock = inst.rootContainerInstance.createNodeMock;
@@ -47,7 +53,7 @@ function getPublicInstance(inst: Instance | TextInstance): * {
   }
 }
 
-function appendChild(
+export function appendChild(
   parentInstance: Instance | Container,
   child: Instance | TextInstance,
 ): void {
@@ -58,7 +64,7 @@ function appendChild(
   parentInstance.children.push(child);
 }
 
-function insertBefore(
+export function insertBefore(
   parentInstance: Instance | Container,
   child: Instance | TextInstance,
   beforeChild: Instance | TextInstance,
@@ -71,7 +77,7 @@ function insertBefore(
   parentInstance.children.splice(beforeIndex, 0, child);
 }
 
-function removeChild(
+export function removeChild(
   parentInstance: Instance | Container,
   child: Instance | TextInstance,
 ): void {
@@ -79,140 +85,144 @@ function removeChild(
   parentInstance.children.splice(index, 1);
 }
 
-const ReactTestHostConfig = {
-  getRootHostContext() {
-    return emptyObject;
-  },
+export function getRootHostContext(
+  rootContainerInstance: Container,
+): HostContext {
+  return emptyObject;
+}
 
-  getChildHostContext() {
-    return emptyObject;
-  },
+export function getChildHostContext(
+  parentHostContext: HostContext,
+  type: string,
+  rootContainerInstance: Container,
+): HostContext {
+  return emptyObject;
+}
 
-  prepareForCommit(): void {
-    // noop
-  },
+export function prepareForCommit(containerInfo: Container): void {
+  // noop
+}
 
-  resetAfterCommit(): void {
-    // noop
-  },
+export function resetAfterCommit(containerInfo: Container): void {
+  // noop
+}
 
-  createInstance(
-    type: string,
-    props: Props,
-    rootContainerInstance: Container,
-    hostContext: Object,
-    internalInstanceHandle: Object,
-  ): Instance {
-    return {
-      type,
-      props,
-      children: [],
-      rootContainerInstance,
-      tag: 'INSTANCE',
-    };
-  },
+export function createInstance(
+  type: string,
+  props: Props,
+  rootContainerInstance: Container,
+  hostContext: Object,
+  internalInstanceHandle: Object,
+): Instance {
+  return {
+    type,
+    props,
+    children: [],
+    rootContainerInstance,
+    tag: 'INSTANCE',
+  };
+}
 
-  appendInitialChild(
-    parentInstance: Instance,
-    child: Instance | TextInstance,
-  ): void {
-    const index = parentInstance.children.indexOf(child);
-    if (index !== -1) {
-      parentInstance.children.splice(index, 1);
-    }
-    parentInstance.children.push(child);
-  },
+export function appendInitialChild(
+  parentInstance: Instance,
+  child: Instance | TextInstance,
+): void {
+  const index = parentInstance.children.indexOf(child);
+  if (index !== -1) {
+    parentInstance.children.splice(index, 1);
+  }
+  parentInstance.children.push(child);
+}
 
-  finalizeInitialChildren(
-    testElement: Instance,
-    type: string,
-    props: Props,
-    rootContainerInstance: Container,
-  ): boolean {
-    return false;
-  },
+export function finalizeInitialChildren(
+  testElement: Instance,
+  type: string,
+  props: Props,
+  rootContainerInstance: Container,
+  hostContext: Object,
+): boolean {
+  return false;
+}
 
-  prepareUpdate(
-    testElement: Instance,
-    type: string,
-    oldProps: Props,
-    newProps: Props,
-    rootContainerInstance: Container,
-    hostContext: Object,
-  ): null | {} {
-    return UPDATE_SIGNAL;
-  },
+export function prepareUpdate(
+  testElement: Instance,
+  type: string,
+  oldProps: Props,
+  newProps: Props,
+  rootContainerInstance: Container,
+  hostContext: Object,
+): null | {} {
+  return UPDATE_SIGNAL;
+}
 
-  shouldSetTextContent(type: string, props: Props): boolean {
-    return false;
-  },
+export function shouldSetTextContent(type: string, props: Props): boolean {
+  return false;
+}
 
-  shouldDeprioritizeSubtree(type: string, props: Props): boolean {
-    return false;
-  },
+export function shouldDeprioritizeSubtree(type: string, props: Props): boolean {
+  return false;
+}
 
-  createTextInstance(
-    text: string,
-    rootContainerInstance: Container,
-    hostContext: Object,
-    internalInstanceHandle: Object,
-  ): TextInstance {
-    return {
-      text,
-      tag: 'TEXT',
-    };
-  },
+export function createTextInstance(
+  text: string,
+  rootContainerInstance: Container,
+  hostContext: Object,
+  internalInstanceHandle: Object,
+): TextInstance {
+  return {
+    text,
+    tag: 'TEXT',
+  };
+}
 
-  getPublicInstance,
+export const isPrimaryRenderer = true;
+// This approach enables `now` to be mocked by tests,
+// Even after the reconciler has initialized and read host config values.
+export const now = () => TestRendererScheduling.nowImplementation();
+export const scheduleDeferredCallback =
+  TestRendererScheduling.scheduleDeferredCallback;
+export const cancelDeferredCallback =
+  TestRendererScheduling.cancelDeferredCallback;
 
-  scheduleDeferredCallback: TestRendererScheduling.scheduleDeferredCallback,
-  cancelDeferredCallback: TestRendererScheduling.cancelDeferredCallback,
-  // This approach enables `now` to be mocked by tests,
-  // Even after the reconciler has initialized and read host config values.
-  now: () => TestRendererScheduling.nowImplementation(),
+// -------------------
+//     Mutation
+// -------------------
 
-  isPrimaryRenderer: true,
+export const supportsMutation = true;
 
-  mutation: {
-    commitUpdate(
-      instance: Instance,
-      updatePayload: {},
-      type: string,
-      oldProps: Props,
-      newProps: Props,
-      internalInstanceHandle: Object,
-    ): void {
-      instance.type = type;
-      instance.props = newProps;
-    },
+export function commitUpdate(
+  instance: Instance,
+  updatePayload: {},
+  type: string,
+  oldProps: Props,
+  newProps: Props,
+  internalInstanceHandle: Object,
+): void {
+  instance.type = type;
+  instance.props = newProps;
+}
 
-    commitMount(
-      instance: Instance,
-      type: string,
-      newProps: Props,
-      internalInstanceHandle: Object,
-    ): void {
-      // noop
-    },
+export function commitMount(
+  instance: Instance,
+  type: string,
+  newProps: Props,
+  internalInstanceHandle: Object,
+): void {
+  // noop
+}
 
-    commitTextUpdate(
-      textInstance: TextInstance,
-      oldText: string,
-      newText: string,
-    ): void {
-      textInstance.text = newText;
-    },
-    resetTextContent(testElement: Instance): void {
-      // noop
-    },
+export function commitTextUpdate(
+  textInstance: TextInstance,
+  oldText: string,
+  newText: string,
+): void {
+  textInstance.text = newText;
+}
 
-    appendChild: appendChild,
-    appendChildToContainer: appendChild,
-    insertBefore: insertBefore,
-    insertInContainerBefore: insertBefore,
-    removeChild: removeChild,
-    removeChildFromContainer: removeChild,
-  },
-};
+export function resetTextContent(testElement: Instance): void {
+  // noop
+}
 
-export default ReactTestHostConfig;
+export const appendChildToContainer = appendChild;
+export const insertInContainerBefore = insertBefore;
+export const removeChildFromContainer = removeChild;
diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js
index 029c260580..ad612d6dde 100644
--- a/packages/react-test-renderer/src/ReactTestRenderer.js
+++ b/packages/react-test-renderer/src/ReactTestRenderer.js
@@ -11,7 +11,7 @@ import type {Fiber} from 'react-reconciler/src/ReactFiber';
 import type {FiberRoot} from 'react-reconciler/src/ReactFiberRoot';
 import type {Instance, TextInstance} from './ReactTestHostConfig';
 
-import ReactFiberReconciler from 'react-reconciler';
+import * as TestRenderer from 'react-reconciler/inline.test';
 import {batchedUpdates} from 'events/ReactGenericBatching';
 import {findCurrentFiberUsingSlowPath} from 'react-reconciler/reflection';
 import {
@@ -30,7 +30,7 @@ import {
 } from 'shared/ReactTypeOfWork';
 import invariant from 'fbjs/lib/invariant';
 
-import ReactTestHostConfig from './ReactTestHostConfig';
+import * as ReactTestHostConfig from './ReactTestHostConfig';
 import * as TestRendererScheduling from './ReactTestRendererScheduling';
 
 type TestRendererOptions = {
@@ -54,8 +54,6 @@ type FindOptions = $Shape<{
 
 export type Predicate = (node: ReactTestInstance) => ?boolean;
 
-const TestRenderer = ReactFiberReconciler(ReactTestHostConfig);
-
 const defaultTestOptions = {
   createNodeMock: function() {
     return null;
diff --git a/packages/react-test-renderer/src/ReactTestRendererScheduling.js b/packages/react-test-renderer/src/ReactTestRendererScheduling.js
index dfa7616a3b..8638c0e760 100644
--- a/packages/react-test-renderer/src/ReactTestRendererScheduling.js
+++ b/packages/react-test-renderer/src/ReactTestRendererScheduling.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {Deadline} from 'react-reconciler/src/ReactFiberReconciler';
+import type {Deadline} from 'react-reconciler/src/ReactFiberScheduler';
 
 // Current virtual time
 export let nowImplementation = () => 0;
diff --git a/packages/shared/HostConfigWithNoHydration.js b/packages/shared/HostConfigWithNoHydration.js
new file mode 100644
index 0000000000..9458bd50ae
--- /dev/null
+++ b/packages/shared/HostConfigWithNoHydration.js
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import invariant from 'fbjs/lib/invariant';
+
+// Renderers that don't support hydration
+// can re-export everything from this module.
+
+function shim(...args: any) {
+  invariant(
+    false,
+    'The current renderer does not support hyration. ' +
+      'This error is likely caused by a bug in React. ' +
+      'Please file an issue.',
+  );
+}
+
+// Hydration (when unsupported)
+export const supportsHydration = false;
+export const canHydrateInstance = shim;
+export const canHydrateTextInstance = shim;
+export const getNextHydratableSibling = shim;
+export const getFirstHydratableChild = shim;
+export const hydrateInstance = shim;
+export const hydrateTextInstance = shim;
+export const didNotMatchHydratedContainerTextInstance = shim;
+export const didNotMatchHydratedTextInstance = shim;
+export const didNotHydrateContainerInstance = shim;
+export const didNotHydrateInstance = shim;
+export const didNotFindHydratableContainerInstance = shim;
+export const didNotFindHydratableContainerTextInstance = shim;
+export const didNotFindHydratableInstance = shim;
+export const didNotFindHydratableTextInstance = shim;
diff --git a/packages/shared/HostConfigWithNoMutation.js b/packages/shared/HostConfigWithNoMutation.js
new file mode 100644
index 0000000000..5bce3c671d
--- /dev/null
+++ b/packages/shared/HostConfigWithNoMutation.js
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import invariant from 'fbjs/lib/invariant';
+
+// Renderers that don't support mutation
+// can re-export everything from this module.
+
+function shim(...args: any) {
+  invariant(
+    false,
+    'The current renderer does not support mutation. ' +
+      'This error is likely caused by a bug in React. ' +
+      'Please file an issue.',
+  );
+}
+
+// Mutation (when unsupported)
+export const supportsMutation = false;
+export const appendChild = shim;
+export const appendChildToContainer = shim;
+export const commitTextUpdate = shim;
+export const commitMount = shim;
+export const commitUpdate = shim;
+export const insertBefore = shim;
+export const insertInContainerBefore = shim;
+export const removeChild = shim;
+export const removeChildFromContainer = shim;
+export const resetTextContent = shim;
diff --git a/packages/shared/HostConfigWithNoPersistence.js b/packages/shared/HostConfigWithNoPersistence.js
new file mode 100644
index 0000000000..83e845d6e7
--- /dev/null
+++ b/packages/shared/HostConfigWithNoPersistence.js
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import invariant from 'fbjs/lib/invariant';
+
+// Renderers that don't support persistence
+// can re-export everything from this module.
+
+function shim(...args: any) {
+  invariant(
+    false,
+    'The current renderer does not support persistence. ' +
+      'This error is likely caused by a bug in React. ' +
+      'Please file an issue.',
+  );
+}
+
+// Persistence (when unsupported)
+export const supportsPersistence = false;
+export const cloneInstance = shim;
+export const createContainerChildSet = shim;
+export const appendChildToContainerChildSet = shim;
+export const finalizeContainerChildren = shim;
+export const replaceContainerChildren = shim;
diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
index e5863ab9a7..c4618b5528 100644
--- a/packages/shared/ReactFeatureFlags.js
+++ b/packages/shared/ReactFeatureFlags.js
@@ -12,12 +12,6 @@ import invariant from 'fbjs/lib/invariant';
 // Exports ReactDOM.createRoot
 export const enableUserTimingAPI = __DEV__;
 
-// Mutating mode (React DOM, React ART, React Native):
-export const enableMutatingReconciler = true;
-// Experimental noop mode (currently unused):
-export const enableNoopReconciler = false;
-// Experimental persistent mode (Fabric):
-export const enablePersistentReconciler = false;
 // Experimental error-boundary API that can recover from errors within a single
 // render phase
 export const enableGetDerivedStateFromCatch = false;
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
index cd5c6f115e..cdfe7dd3d6 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
@@ -20,11 +20,6 @@ export const enableSuspense = false;
 export const warnAboutDeprecatedLifecycles = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableProfilerTimer = __DEV__;
-
-// React Fabric uses persistent reconciler.
-export const enableMutatingReconciler = false;
-export const enableNoopReconciler = false;
-export const enablePersistentReconciler = true;
 export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
 // Only used in www builds.
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
index aa9dc6dd4c..ece21aa11f 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
@@ -20,11 +20,6 @@ export const enableSuspense = false;
 export const warnAboutDeprecatedLifecycles = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableProfilerTimer = false;
-
-// React Fabric uses persistent reconciler.
-export const enableMutatingReconciler = false;
-export const enableNoopReconciler = false;
-export const enablePersistentReconciler = true;
 export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
 // Only used in www builds.
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js
index a98a2fe144..874d62ae11 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js
@@ -26,9 +26,6 @@ export const {
 
 // The rest of the flags are static for better dead code elimination.
 export const enableUserTimingAPI = __DEV__;
-export const enableMutatingReconciler = true;
-export const enableNoopReconciler = false;
-export const enablePersistentReconciler = false;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js
index 425709c924..6b435c6bdf 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js
@@ -16,9 +16,6 @@ export const debugRenderPhaseSideEffects = false;
 export const debugRenderPhaseSideEffectsForStrictMode = false;
 export const enableGetDerivedStateFromCatch = false;
 export const enableSuspense = false;
-export const enableMutatingReconciler = true;
-export const enableNoopReconciler = false;
-export const enablePersistentReconciler = false;
 export const enableUserTimingAPI = __DEV__;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const warnAboutDeprecatedLifecycles = false;
diff --git a/packages/shared/forks/ReactFeatureFlags.persistent.js b/packages/shared/forks/ReactFeatureFlags.persistent.js
index ecb19ad1bc..6d8f9f3c42 100644
--- a/packages/shared/forks/ReactFeatureFlags.persistent.js
+++ b/packages/shared/forks/ReactFeatureFlags.persistent.js
@@ -22,12 +22,6 @@ export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableProfilerTimer = false;
 export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
-// react-reconciler/persistent entry point
-// uses a persistent reconciler.
-export const enableMutatingReconciler = false;
-export const enableNoopReconciler = false;
-export const enablePersistentReconciler = true;
-
 // Only used in www builds.
 export function addUserTimingListener() {
   invariant(false, 'Not implemented.');
diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
index 7aad93e150..dc7823de21 100644
--- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js
+++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
@@ -19,9 +19,6 @@ export const enableGetDerivedStateFromCatch = false;
 export const enableSuspense = false;
 export const warnAboutDeprecatedLifecycles = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = false;
-export const enableMutatingReconciler = true;
-export const enableNoopReconciler = false;
-export const enablePersistentReconciler = false;
 export const enableProfilerTimer = false;
 export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js
index 725ff1c5e5..ddc82b3db0 100644
--- a/packages/shared/forks/ReactFeatureFlags.www.js
+++ b/packages/shared/forks/ReactFeatureFlags.www.js
@@ -24,11 +24,6 @@ export const {
 
 // The rest of the flags are static for better dead code elimination.
 
-// The www bundles only use the mutating reconciler.
-export const enableMutatingReconciler = true;
-export const enableNoopReconciler = false;
-export const enablePersistentReconciler = false;
-
 // In www, we have experimental support for gathering data
 // from User Timing API calls in production. By default, we
 // only emit performance.mark/measure calls in __DEV__. But if
diff --git a/scripts/flow/config/flowconfig b/scripts/flow/config/flowconfig
index 6484737582..b0e77d36f6 100644
--- a/scripts/flow/config/flowconfig
+++ b/scripts/flow/config/flowconfig
@@ -30,6 +30,9 @@ esproposal.class_static_fields=enable
 esproposal.class_instance_fields=enable
 unsafe.enable_getters_and_setters=true
 
+# Substituted by createFlowConfig.js:
+%REACT_RENDERER_FLOW_OPTIONS%
+
 munge_underscores=false
 
 suppress_type=$FlowIssue
diff --git a/scripts/flow/createFlowConfigs.js b/scripts/flow/createFlowConfigs.js
index ab31dc4cbb..a633a686f6 100644
--- a/scripts/flow/createFlowConfigs.js
+++ b/scripts/flow/createFlowConfigs.js
@@ -1,15 +1,35 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
 'use strict';
 
 const chalk = require('chalk');
 const fs = require('fs');
 const mkdirp = require('mkdirp');
-const {typedRenderers} = require('./typedRenderers');
+const inlinedHostConfigs = require('../shared/inlinedHostConfigs');
 
-const config = fs.readFileSync(__dirname + '/config/flowconfig');
+const configTemplate = fs
+  .readFileSync(__dirname + '/config/flowconfig')
+  .toString();
 
-function writeConfig(folder) {
+function writeConfig(renderer) {
+  const folder = __dirname + '/' + renderer;
   mkdirp.sync(folder);
 
+  const config = configTemplate.replace(
+    '%REACT_RENDERER_FLOW_OPTIONS%',
+    `
+module.name_mapper='react-reconciler/inline.${renderer}$$' -> 'react-reconciler/inline-typed'
+module.name_mapper='ReactFiberHostConfig$$' -> 'forks/ReactFiberHostConfig.${renderer}'
+    `.trim(),
+  );
+
   const disclaimer = `
 # ---------------------------------------------------------------#
 # NOTE: this file is generated.                                  #
@@ -39,6 +59,8 @@ ${disclaimer}
 
 // Write multiple configs in different folders
 // so that we can run those checks in parallel if we want.
-typedRenderers.forEach(renderer => {
-  writeConfig(__dirname + '/' + renderer);
+inlinedHostConfigs.forEach(rendererInfo => {
+  if (rendererInfo.isFlowTyped) {
+    writeConfig(rendererInfo.shortName);
+  }
 });
diff --git a/scripts/flow/runFlow.js b/scripts/flow/runFlow.js
index 61a2cb85db..a187c6a375 100644
--- a/scripts/flow/runFlow.js
+++ b/scripts/flow/runFlow.js
@@ -1,3 +1,10 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 'use strict';
 
 const chalk = require('chalk');
@@ -8,9 +15,9 @@ require('./createFlowConfigs');
 async function runFlow(renderer, args) {
   return new Promise(resolve => {
     console.log(
-      'Running Flow for the ' + chalk.cyan(renderer) + ' renderer...',
+      'Running Flow on the ' + chalk.yellow(renderer) + ' renderer...',
     );
-    let cmd = '../../../node_modules/.bin/flow';
+    let cmd = __dirname + '/../../node_modules/.bin/flow';
     if (process.platform === 'win32') {
       cmd = cmd.replace(/\//g, '\\') + '.cmd';
     }
@@ -30,7 +37,6 @@ async function runFlow(renderer, args) {
         console.log(
           'Flow passed for the ' + chalk.green(renderer) + ' renderer',
         );
-        console.log();
         resolve();
       }
     });
diff --git a/scripts/flow/typedRenderers.js b/scripts/flow/typedRenderers.js
deleted file mode 100644
index ded6a1200d..0000000000
--- a/scripts/flow/typedRenderers.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-exports.typedRenderers = ['dom', 'fabric', 'native', 'test'];
diff --git a/scripts/jest/config.base.js b/scripts/jest/config.base.js
new file mode 100644
index 0000000000..d3436e1ea4
--- /dev/null
+++ b/scripts/jest/config.base.js
@@ -0,0 +1,23 @@
+'use strict';
+
+module.exports = {
+  haste: {
+    hasteImplModulePath: require.resolve('./noHaste.js'),
+  },
+  modulePathIgnorePatterns: [
+    '<rootDir>/scripts/rollup/shims/',
+    '<rootDir>/scripts/bench/',
+  ],
+  transform: {
+    '.*': require.resolve('./preprocessor.js'),
+  },
+  setupFiles: [require.resolve('./setupEnvironment.js')],
+  setupTestFrameworkScriptFile: require.resolve('./setupTests.js'),
+  // Only include files directly in __tests__, not in nested folders.
+  testRegex: '/__tests__/[^/]*(\\.js|\\.coffee|[^d]\\.ts)$',
+  moduleFileExtensions: ['js', 'json', 'node', 'coffee', 'ts'],
+  rootDir: process.cwd(),
+  roots: ['<rootDir>/packages', '<rootDir>/scripts'],
+  collectCoverageFrom: ['packages/**/*.js'],
+  timers: 'fake',
+};
diff --git a/scripts/jest/config.build.js b/scripts/jest/config.build.js
index c4e7444c92..7ad1cf68b6 100644
--- a/scripts/jest/config.build.js
+++ b/scripts/jest/config.build.js
@@ -2,7 +2,7 @@
 
 const {readdirSync, statSync} = require('fs');
 const {join} = require('path');
-const sourceConfig = require('./config.source');
+const baseConfig = require('./config.base');
 
 // Find all folders in packages/* with package.json
 const packagesRoot = join(__dirname, '..', '..', 'packages');
@@ -24,7 +24,7 @@ packages.forEach(name => {
   ] = `<rootDir>/build/node_modules/${name}/$1`;
 });
 
-module.exports = Object.assign({}, sourceConfig, {
+module.exports = Object.assign({}, baseConfig, {
   // Redirect imports to the compiled bundles
   moduleNameMapper,
   // Don't run bundle tests on blacklisted -test.internal.* files
diff --git a/scripts/jest/config.source.js b/scripts/jest/config.source.js
index d3436e1ea4..7da7238dcc 100644
--- a/scripts/jest/config.source.js
+++ b/scripts/jest/config.source.js
@@ -1,23 +1,10 @@
 'use strict';
 
-module.exports = {
-  haste: {
-    hasteImplModulePath: require.resolve('./noHaste.js'),
-  },
-  modulePathIgnorePatterns: [
-    '<rootDir>/scripts/rollup/shims/',
-    '<rootDir>/scripts/bench/',
+const baseConfig = require('./config.base');
+
+module.exports = Object.assign({}, baseConfig, {
+  setupFiles: [
+    ...baseConfig.setupFiles,
+    require.resolve('./setupHostConfigs.js'),
   ],
-  transform: {
-    '.*': require.resolve('./preprocessor.js'),
-  },
-  setupFiles: [require.resolve('./setupEnvironment.js')],
-  setupTestFrameworkScriptFile: require.resolve('./setupTests.js'),
-  // Only include files directly in __tests__, not in nested folders.
-  testRegex: '/__tests__/[^/]*(\\.js|\\.coffee|[^d]\\.ts)$',
-  moduleFileExtensions: ['js', 'json', 'node', 'coffee', 'ts'],
-  rootDir: process.cwd(),
-  roots: ['<rootDir>/packages', '<rootDir>/scripts'],
-  collectCoverageFrom: ['packages/**/*.js'],
-  timers: 'fake',
-};
+});
diff --git a/scripts/jest/setupEnvironment.js b/scripts/jest/setupEnvironment.js
index fb0ff69296..36013adf19 100644
--- a/scripts/jest/setupEnvironment.js
+++ b/scripts/jest/setupEnvironment.js
@@ -45,3 +45,9 @@ if (typeof window !== 'undefined') {
     }
   });
 }
+
+// Preserve the empty object identity across module resets.
+// This is needed for some tests that rely on string refs
+// but reset modules between loading different renderers.
+const obj = require.requireActual('fbjs/lib/emptyObject');
+jest.mock('fbjs/lib/emptyObject', () => obj);
diff --git a/scripts/jest/setupHostConfigs.js b/scripts/jest/setupHostConfigs.js
new file mode 100644
index 0000000000..56a797bcfb
--- /dev/null
+++ b/scripts/jest/setupHostConfigs.js
@@ -0,0 +1,39 @@
+'use strict';
+
+const inlinedHostConfigs = require('../shared/inlinedHostConfigs');
+
+// When testing the custom renderer code path through `react-reconciler`,
+// turn the export into a function, and use the argument as host config.
+const shimHostConfigPath = 'react-reconciler/src/ReactFiberHostConfig';
+jest.mock('react-reconciler', () => {
+  return config => {
+    jest.mock(shimHostConfigPath, () => config);
+    return require.requireActual('react-reconciler');
+  };
+});
+jest.mock('react-reconciler/persistent', () => {
+  return config => {
+    jest.mock(shimHostConfigPath, () => config);
+    return require.requireActual('react-reconciler/persistent');
+  };
+});
+
+// But for inlined host configs (such as React DOM, Native, etc), we
+// mock their named entry points to establish a host config mapping.
+inlinedHostConfigs.forEach(rendererInfo => {
+  if (rendererInfo.shortName === 'custom') {
+    // There is no inline entry point for the custom renderers.
+    // Instead, it's handled by the generic `react-reconciler` entry point above.
+    return;
+  }
+  jest.mock(`react-reconciler/inline.${rendererInfo.shortName}`, () => {
+    jest.mock(shimHostConfigPath, () =>
+      require.requireActual(
+        `react-reconciler/src/forks/ReactFiberHostConfig.${
+          rendererInfo.shortName
+        }.js`
+      )
+    );
+    return require.requireActual('react-reconciler');
+  });
+});
diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index fec233d9c2..6522031ac1 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -207,7 +207,7 @@ function getPlugins(
   modulesToStub
 ) {
   const findAndRecordErrorCodes = extractErrorCodes(errorCodeOpts);
-  const forks = Modules.getForks(bundleType, entry);
+  const forks = Modules.getForks(bundleType, entry, moduleType);
   const isProduction = isProductionBundleType(bundleType);
   const isInGlobalScope = bundleType === UMD_DEV || bundleType === UMD_PROD;
   const isFBBundle = bundleType === FB_WWW_DEV || bundleType === FB_WWW_PROD;
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index baad2fd0b0..5040550885 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -29,6 +29,7 @@ const moduleTypes = {
   RENDERER: 'RENDERER',
   RENDERER_UTILS: 'RENDERER_UTILS',
   RECONCILER: 'RECONCILER',
+  NON_FIBER_RENDERER: 'NON_FIBER_RENDERER',
 };
 
 // React
@@ -39,6 +40,8 @@ const RENDERER = moduleTypes.RENDERER;
 const RENDERER_UTILS = moduleTypes.RENDERER_UTILS;
 // Standalone reconciler for third-party renderers.
 const RECONCILER = moduleTypes.RECONCILER;
+// Non-Fiber implementations like SSR and Shallow renderers.
+const NON_FIBER_RENDERER = moduleTypes.NON_FIBER_RENDERER;
 
 const bundles = [
   /******* Isomorphic *******/
@@ -113,7 +116,7 @@ const bundles = [
       FB_WWW_DEV,
       FB_WWW_PROD,
     ],
-    moduleType: RENDERER,
+    moduleType: NON_FIBER_RENDERER,
     entry: 'react-dom/server.browser',
     global: 'ReactDOMServer',
     externals: ['react'],
@@ -122,7 +125,7 @@ const bundles = [
   {
     label: 'dom-server-node',
     bundleTypes: [NODE_DEV, NODE_PROD],
-    moduleType: RENDERER,
+    moduleType: NON_FIBER_RENDERER,
     entry: 'react-dom/server.node',
     externals: ['react', 'stream'],
   },
@@ -246,7 +249,7 @@ const bundles = [
   {
     label: 'test-shallow',
     bundleTypes: [FB_WWW_DEV, NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
-    moduleType: RENDERER,
+    moduleType: NON_FIBER_RENDERER,
     entry: 'react-test-renderer/shallow',
     global: 'ReactShallowRenderer',
     externals: ['react'],
diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js
index 7df244733f..b2d526946e 100644
--- a/scripts/rollup/forks.js
+++ b/scripts/rollup/forks.js
@@ -1,6 +1,8 @@
 'use strict';
 
 const bundleTypes = require('./bundles').bundleTypes;
+const moduleTypes = require('./bundles').moduleTypes;
+const inlinedHostConfigs = require('../shared/inlinedHostConfigs');
 
 const UMD_DEV = bundleTypes.UMD_DEV;
 const UMD_PROD = bundleTypes.UMD_PROD;
@@ -10,6 +12,8 @@ const RN_OSS_DEV = bundleTypes.RN_OSS_DEV;
 const RN_OSS_PROD = bundleTypes.RN_OSS_PROD;
 const RN_FB_DEV = bundleTypes.RN_FB_DEV;
 const RN_FB_PROD = bundleTypes.RN_FB_PROD;
+const RENDERER = moduleTypes.RENDERER;
+const RECONCILER = moduleTypes.RECONCILER;
 
 // If you need to replace a file with another file for a specific environment,
 // add it to this list with the logic for choosing the right replacement.
@@ -143,6 +147,33 @@ const forks = Object.freeze({
     }
   },
 
+  'react-reconciler/src/ReactFiberHostConfig': (
+    bundleType,
+    entry,
+    dependencies,
+    moduleType
+  ) => {
+    if (dependencies.indexOf('react-reconciler') !== -1) {
+      return null;
+    }
+    if (moduleType !== RENDERER && moduleType !== RECONCILER) {
+      return null;
+    }
+    // eslint-disable-next-line no-for-of-loops/no-for-of-loops
+    for (let rendererInfo of inlinedHostConfigs) {
+      if (rendererInfo.entryPoints.indexOf(entry) !== -1) {
+        return `react-reconciler/src/forks/ReactFiberHostConfig.${
+          rendererInfo.shortName
+        }.js`;
+      }
+    }
+    throw new Error(
+      'Expected ReactFiberHostConfig to always be replaced with a shim, but ' +
+        `found no mention of "${entry}" entry point in ./scripts/shared/inlinedHostConfigs.js. ` +
+        'Did you mean to add it there to associate it with a specific renderer?'
+    );
+  },
+
   // We wrap top-level listeners into guards on www.
   'react-dom/src/events/EventListener': (bundleType, entry) => {
     switch (bundleType) {
diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js
index afba71e68d..598d7aa85e 100644
--- a/scripts/rollup/modules.js
+++ b/scripts/rollup/modules.js
@@ -56,11 +56,16 @@ function getDependencies(bundleType, entry) {
 }
 
 // Hijacks some modules for optimization and integration reasons.
-function getForks(bundleType, entry) {
+function getForks(bundleType, entry, moduleType) {
   const forksForBundle = {};
   Object.keys(forks).forEach(srcModule => {
     const dependencies = getDependencies(bundleType, entry);
-    const targetModule = forks[srcModule](bundleType, entry, dependencies);
+    const targetModule = forks[srcModule](
+      bundleType,
+      entry,
+      dependencies,
+      moduleType
+    );
     if (targetModule === null) {
       return;
     }
diff --git a/scripts/rollup/wrappers.js b/scripts/rollup/wrappers.js
index 26c2dfdd50..b195b8b25c 100644
--- a/scripts/rollup/wrappers.js
+++ b/scripts/rollup/wrappers.js
@@ -56,7 +56,8 @@ ${license}
 'use strict';
 
 ${
-      globalName === 'ReactNoopRenderer'
+      globalName === 'ReactNoopRenderer' ||
+      globalName === 'ReactNoopRendererPersistent'
         ? // React Noop needs regenerator runtime because it uses
           // generators but GCC doesn't handle them in the output.
           // So we use Babel for them.
@@ -79,7 +80,8 @@ ${source}
 ${license}
  */
 ${
-      globalName === 'ReactNoopRenderer'
+      globalName === 'ReactNoopRenderer' ||
+      globalName === 'ReactNoopRendererPersistent'
         ? // React Noop needs regenerator runtime because it uses
           // generators but GCC doesn't handle them in the output.
           // So we use Babel for them.
@@ -200,14 +202,11 @@ ${license}
 'use strict';
 
 if (process.env.NODE_ENV !== "production") {
-  // This is a hacky way to ensure third party renderers don't share
-  // top-level module state inside the reconciler. Ideally we should
-  // remove this hack by putting all top-level state into the closures
-  // and then forbidding adding more of it in the reconciler.
-  var $$$reconciler;
-  module.exports = function(config) {
+  module.exports = function $$$reconciler($$$hostConfig) {
 ${source}
-    return ($$$reconciler || ($$$reconciler = module.exports))(config);
+    var $$$renderer = module.exports;
+    module.exports = $$$reconciler;
+    return $$$renderer;
   };
 }`;
   },
@@ -219,10 +218,11 @@ ${source}
  *
 ${license}
  */
-var $$$reconciler;
-module.exports = function(config) {
+module.exports = function $$$reconciler($$$hostConfig) {
 ${source}
-  return ($$$reconciler || ($$$reconciler = module.exports))(config);
+    var $$$renderer = module.exports;
+    module.exports = $$$reconciler;
+    return $$$renderer;
 };`;
   },
 };
diff --git a/scripts/shared/inlinedHostConfigs.js b/scripts/shared/inlinedHostConfigs.js
new file mode 100644
index 0000000000..998988689c
--- /dev/null
+++ b/scripts/shared/inlinedHostConfigs.js
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+'use strict';
+
+module.exports = [
+  {
+    shortName: 'dom',
+    entryPoints: ['react-dom'],
+    isFlowTyped: true,
+  },
+  {
+    shortName: 'art',
+    entryPoints: ['react-art'],
+    isFlowTyped: false, // TODO: type it.
+  },
+  {
+    shortName: 'native',
+    entryPoints: ['react-native-renderer'],
+    isFlowTyped: true,
+  },
+  {
+    shortName: 'fabric',
+    entryPoints: ['react-native-renderer/fabric'],
+    isFlowTyped: true,
+  },
+  {
+    shortName: 'test',
+    entryPoints: ['react-test-renderer'],
+    isFlowTyped: true,
+  },
+  {
+    shortName: 'custom',
+    entryPoints: ['react-reconciler', 'react-reconciler/persistent'],
+    isFlowTyped: true,
+  },
+];
diff --git a/scripts/tasks/flow-ci.js b/scripts/tasks/flow-ci.js
index 1d7444eb7a..1b50641738 100644
--- a/scripts/tasks/flow-ci.js
+++ b/scripts/tasks/flow-ci.js
@@ -12,12 +12,15 @@ process.on('unhandledRejection', err => {
 });
 
 const runFlow = require('../flow/runFlow');
-const {typedRenderers} = require('../flow/typedRenderers');
+const inlinedHostConfigs = require('../shared/inlinedHostConfigs');
 
 async function checkAll() {
   // eslint-disable-next-line no-for-of-loops/no-for-of-loops
-  for (let renderer of typedRenderers) {
-    await runFlow(renderer, ['check']);
+  for (let rendererInfo of inlinedHostConfigs) {
+    if (rendererInfo.isFlowTyped) {
+      await runFlow(rendererInfo.shortName, ['check']);
+      console.log();
+    }
   }
 }
 
diff --git a/scripts/tasks/flow.js b/scripts/tasks/flow.js
index 4c587432c1..f07998286a 100644
--- a/scripts/tasks/flow.js
+++ b/scripts/tasks/flow.js
@@ -13,21 +13,25 @@ process.on('unhandledRejection', err => {
 
 const chalk = require('chalk');
 const runFlow = require('../flow/runFlow');
-const {typedRenderers} = require('../flow/typedRenderers');
+const inlinedHostConfigs = require('../shared/inlinedHostConfigs');
 
 // This script is using `flow status` for a quick check with a server.
 // Use it for local development.
 
-const primaryRenderer = process.argv[2];
-if (typedRenderers.indexOf(primaryRenderer) === -1) {
+const primaryRenderer = inlinedHostConfigs.find(
+  info => info.isFlowTyped && info.shortName === process.argv[2]
+);
+if (!primaryRenderer) {
   console.log(
     'The ' +
       chalk.red('yarn flow') +
       ' command now requires you to pick a primary renderer:'
   );
   console.log();
-  typedRenderers.forEach(renderer => {
-    console.log('  * ' + chalk.cyan('yarn flow ' + renderer));
+  inlinedHostConfigs.forEach(rendererInfo => {
+    if (rendererInfo.isFlowTyped) {
+      console.log('  * ' + chalk.cyan('yarn flow ' + rendererInfo.shortName));
+    }
   });
   console.log();
   console.log('If you are not sure, run ' + chalk.green('yarn flow dom') + '.');
@@ -45,4 +49,4 @@ if (typedRenderers.indexOf(primaryRenderer) === -1) {
   process.exit(1);
 }
 
-runFlow(primaryRenderer, ['status']);
+runFlow(primaryRenderer.shortName, ['status']);

From 397d6115b7a09f92d4df49ded6e412b5e7ddd859 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Sat, 19 May 2018 13:54:44 +0100
Subject: [PATCH 087/277] Temporarily disable Flow on AppVeyor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I think it runs out of memory. I’ll reenable if we can bump the limit.
---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index f82fb5c7d9..79dc791af6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,7 +30,7 @@ install:
 test_script:
   - node --version
   - yarn lint
-  - yarn flow-ci
+#  - yarn flow-ci (seems like we need more memory for it)
   - yarn build
   - yarn test
   - yarn prettier

From 9bed4a6aee557e2f7425705c64e49369125cceeb Mon Sep 17 00:00:00 2001
From: Sophie Alpert <git@sophiebits.com>
Date: Sat, 19 May 2018 17:29:41 -0700
Subject: [PATCH 088/277] https in reactProdInvariant text (#12869)

---
 .../shared/__tests__/reactProdInvariant-test.internal.js    | 6 +++---
 packages/shared/reactProdInvariant.js                       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/shared/__tests__/reactProdInvariant-test.internal.js b/packages/shared/__tests__/reactProdInvariant-test.internal.js
index 34dbf78330..0c3add70af 100644
--- a/packages/shared/__tests__/reactProdInvariant-test.internal.js
+++ b/packages/shared/__tests__/reactProdInvariant-test.internal.js
@@ -39,7 +39,7 @@ describe('reactProdInvariant', () => {
       reactProdInvariant(124, 'foo', 'bar');
     }).toThrowError(
       'Minified React error #124; visit ' +
-        'http://reactjs.org/docs/error-decoder.html?invariant=124&args[]=foo&args[]=bar' +
+        'https://reactjs.org/docs/error-decoder.html?invariant=124&args[]=foo&args[]=bar' +
         ' for the full message or use the non-minified dev environment' +
         ' for full errors and additional helpful warnings.',
     );
@@ -48,7 +48,7 @@ describe('reactProdInvariant', () => {
       reactProdInvariant(20);
     }).toThrowError(
       'Minified React error #20; visit ' +
-        'http://reactjs.org/docs/error-decoder.html?invariant=20' +
+        'https://reactjs.org/docs/error-decoder.html?invariant=20' +
         ' for the full message or use the non-minified dev environment' +
         ' for full errors and additional helpful warnings.',
     );
@@ -57,7 +57,7 @@ describe('reactProdInvariant', () => {
       reactProdInvariant(77, '<div>', '&?bar');
     }).toThrowError(
       'Minified React error #77; visit ' +
-        'http://reactjs.org/docs/error-decoder.html?invariant=77&args[]=%3Cdiv%3E&args[]=%26%3Fbar' +
+        'https://reactjs.org/docs/error-decoder.html?invariant=77&args[]=%3Cdiv%3E&args[]=%26%3Fbar' +
         ' for the full message or use the non-minified dev environment' +
         ' for full errors and additional helpful warnings.',
     );
diff --git a/packages/shared/reactProdInvariant.js b/packages/shared/reactProdInvariant.js
index 92764573fe..476e440d54 100644
--- a/packages/shared/reactProdInvariant.js
+++ b/packages/shared/reactProdInvariant.js
@@ -19,7 +19,7 @@ import invariant from 'fbjs/lib/invariant';
  */
 function reactProdInvariant(code: string): void {
   const argCount = arguments.length - 1;
-  let url = 'http://reactjs.org/docs/error-decoder.html?invariant=' + code;
+  let url = 'https://reactjs.org/docs/error-decoder.html?invariant=' + code;
   for (let argIdx = 0; argIdx < argCount; argIdx++) {
     url += '&args[]=' + encodeURIComponent(arguments[argIdx + 1]);
   }

From d7b9b4921b9f5bd12500df9b9f164caa4bcd75eb Mon Sep 17 00:00:00 2001
From: "Kevin (Kun) \"Kassimo\" Qian" <kevinkassimo@gmail.com>
Date: Sun, 20 May 2018 04:01:00 -0700
Subject: [PATCH 089/277] Fix react native example links in README of
 'react-reconciler' (#12871)

---
 packages/react-reconciler/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-reconciler/README.md b/packages/react-reconciler/README.md
index 5398c3c5a3..256f466a7f 100644
--- a/packages/react-reconciler/README.md
+++ b/packages/react-reconciler/README.md
@@ -32,7 +32,7 @@ module.exports = RendererPublicAPI;
 
 * [React ART](https://github.com/facebook/react/blob/master/packages/react-art/src/ReactART.js)
 * [React DOM](https://github.com/facebook/react/blob/master/packages/react-dom/src/client/ReactDOM.js)
-* [React Native](https://github.com/facebook/react/blob/master/packages/react-native-renderer/src/ReactNativeFiberRenderer.js)
+* [React Native](https://github.com/facebook/react/blob/master/packages/react-native-renderer/src/ReactNativeRenderer.js)
 
 If these links break please file an issue and we’ll fix them. They intentionally link to the latest versions since the API is still evolving.
 

From 089d2deb20741c57784f9fd9d88146965245e650 Mon Sep 17 00:00:00 2001
From: Kevin Lamping <klamping@gmail.com>
Date: Sun, 20 May 2018 15:03:51 -0500
Subject: [PATCH 090/277] add netlify toml file (#12350)

---
 netlify.toml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 netlify.toml

diff --git a/netlify.toml b/netlify.toml
new file mode 100644
index 0000000000..5d62cd1c6a
--- /dev/null
+++ b/netlify.toml
@@ -0,0 +1,9 @@
+[build]
+  base    = ""
+  publish = "fixtures/dom/build"
+  command = "yarn build --type=UMD_DEV && cd fixtures/dom/ && yarn && yarn prestart && yarn build"
+
+[[redirects]]
+  from = "/*"
+  to = "/index.html"
+  status = 200

From 0442e8275f02d500cdc2e8b8b703286a67d7ad1d Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 21 May 2018 15:38:35 +0100
Subject: [PATCH 091/277] Add a clear error when renderers clash in tests
 (#12867)

---
 scripts/jest/setupHostConfigs.js | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/scripts/jest/setupHostConfigs.js b/scripts/jest/setupHostConfigs.js
index 56a797bcfb..b018f42d92 100644
--- a/scripts/jest/setupHostConfigs.js
+++ b/scripts/jest/setupHostConfigs.js
@@ -27,13 +27,32 @@ inlinedHostConfigs.forEach(rendererInfo => {
     return;
   }
   jest.mock(`react-reconciler/inline.${rendererInfo.shortName}`, () => {
-    jest.mock(shimHostConfigPath, () =>
-      require.requireActual(
+    let hasImportedShimmedConfig = false;
+
+    // We want the reconciler to pick up the host config for this renderer.
+    jest.mock(shimHostConfigPath, () => {
+      hasImportedShimmedConfig = true;
+      return require.requireActual(
         `react-reconciler/src/forks/ReactFiberHostConfig.${
           rendererInfo.shortName
         }.js`
-      )
-    );
-    return require.requireActual('react-reconciler');
+      );
+    });
+
+    const renderer = require.requireActual('react-reconciler');
+    // If the shimmed config factory function above has not run,
+    // it means this test file loads more than one renderer
+    // but doesn't reset modules between them. This won't work.
+    if (!hasImportedShimmedConfig) {
+      throw new Error(
+        `Could not import the "${rendererInfo.shortName}" renderer ` +
+          `in this suite because another renderer has already been ` +
+          `loaded earlier. Call jest.resetModules() before importing any ` +
+          `of the following entry points:\n\n` +
+          rendererInfo.entryPoints.map(entry => `  * ${entry}`)
+      );
+    }
+
+    return renderer;
   });
 });

From dc3b144f4162087665f62f4fdac69549181ce310 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 21 May 2018 15:38:46 +0100
Subject: [PATCH 092/277] Treat Rollup "warnings" as errors (#12868)

---
 scripts/rollup/build.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index 6522031ac1..5303c77419 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -420,10 +420,6 @@ async function createBundle(bundle, bundleType) {
 }
 
 function handleRollupWarning(warning) {
-  if (warning.code === 'UNRESOLVED_IMPORT') {
-    console.error(warning.message);
-    process.exit(1);
-  }
   if (warning.code === 'UNUSED_EXTERNAL_IMPORT') {
     const match = warning.message.match(/external module '([^']+)'/);
     if (!match || typeof match[1] !== 'string') {
@@ -445,7 +441,20 @@ function handleRollupWarning(warning) {
     // Don't warn. We will remove side effectless require() in a later pass.
     return;
   }
-  console.warn(warning.message || warning);
+
+  if (typeof warning.code === 'string') {
+    // This is a warning coming from Rollup itself.
+    // These tend to be important (e.g. clashes in namespaced exports)
+    // so we'll fail the build on any of them.
+    console.error();
+    console.error(warning.message || warning);
+    console.error();
+    process.exit(1);
+  } else {
+    // The warning is from one of the plugins.
+    // Maybe it's not important, so just print it.
+    console.warn(warning.message || warning);
+  }
 }
 
 function handleRollupError(error) {

From 12c8a88cd9a6cc7309e5fc566ba5672aab0b78a9 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 21 May 2018 16:17:11 +0100
Subject: [PATCH 093/277] Update Jest (#12874)

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

diff --git a/package.json b/package.json
index 520222adcf..b1b187b9ed 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "babel-code-frame": "^6.26.0",
     "babel-core": "^6.0.0",
     "babel-eslint": "^8.0.0",
-    "babel-jest": "^22.0.6",
+    "babel-jest": "^22.4.4",
     "babel-plugin-check-es2015-constants": "^6.5.0",
     "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-syntax-trailing-function-commas": "^6.5.0",
@@ -69,8 +69,8 @@
     "gzip-js": "~0.3.2",
     "gzip-size": "^3.0.0",
     "jasmine-check": "^1.0.0-rc.0",
-    "jest": "^22.0.6",
-    "jest-diff": "^22.1.0",
+    "jest": "^22.4.4",
+    "jest-diff": "^22.4.3",
     "merge-stream": "^1.0.0",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
diff --git a/yarn.lock b/yarn.lock
index 2488a5f252..710312cbeb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -578,12 +578,12 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-jest@^22.0.6:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.4.3.tgz#4b7a0b6041691bbd422ab49b3b73654a49a6627a"
+babel-jest@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.4.4.tgz#977259240420e227444ebe49e226a61e49ea659d"
   dependencies:
     babel-plugin-istanbul "^4.1.5"
-    babel-preset-jest "^22.4.3"
+    babel-preset-jest "^22.4.4"
 
 babel-messages@^6.23.0:
   version "6.23.0"
@@ -628,9 +628,9 @@ babel-plugin-istanbul@^4.1.5:
     istanbul-lib-instrument "^1.10.1"
     test-exclude "^4.2.1"
 
-babel-plugin-jest-hoist@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.3.tgz#7d8bcccadc2667f96a0dcc6afe1891875ee6c14a"
+babel-plugin-jest-hoist@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.4.tgz#b9851906eab34c7bf6f8c895a2b08bea1a844c0b"
 
 babel-plugin-jscript@^1.0.4:
   version "1.0.4"
@@ -897,11 +897,11 @@ babel-preset-flow@^6.23.0:
   dependencies:
     babel-plugin-transform-flow-strip-types "^6.22.0"
 
-babel-preset-jest@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-22.4.3.tgz#e92eef9813b7026ab4ca675799f37419b5a44156"
+babel-preset-jest@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-22.4.4.tgz#ec9fbd8bcd7dfd24b8b5320e0e688013235b7c39"
   dependencies:
-    babel-plugin-jest-hoist "^22.4.3"
+    babel-plugin-jest-hoist "^22.4.4"
     babel-plugin-syntax-object-rest-spread "^6.13.0"
 
 babel-preset-react@^6.5.0:
@@ -2155,6 +2155,10 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+exit@^0.1.2:
+  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"
@@ -2185,16 +2189,16 @@ expand-tilde@^1.2.2:
   dependencies:
     os-homedir "^1.0.1"
 
-expect@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-22.0.6.tgz#69e1761ecb5ba354513e546e6187beda79e18078"
+expect@^22.4.0:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-22.4.3.tgz#d5a29d0a0e1fb2153557caef2674d4547e914674"
   dependencies:
     ansi-styles "^3.2.0"
-    jest-diff "^22.0.6"
-    jest-get-type "^22.0.6"
-    jest-matcher-utils "^22.0.6"
-    jest-message-util "^22.0.6"
-    jest-regex-util "^22.0.6"
+    jest-diff "^22.4.3"
+    jest-get-type "^22.4.3"
+    jest-matcher-utils "^22.4.3"
+    jest-message-util "^22.4.3"
+    jest-regex-util "^22.4.3"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
@@ -3005,6 +3009,13 @@ ignore@^3.3.3:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
 
+import-local@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+  dependencies:
+    pkg-dir "^2.0.0"
+    resolve-cwd "^2.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -3455,40 +3466,43 @@ jasmine-check@^1.0.0-rc.0:
   dependencies:
     testcheck "^1.0.0-rc"
 
-jest-changed-files@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-22.0.6.tgz#fca38cf4c89920c66aad1707e91d25bbea238875"
+jest-changed-files@^22.2.0:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-22.4.3.tgz#8882181e022c38bd46a2e4d18d44d19d90a90fb2"
   dependencies:
     throat "^4.0.0"
 
-jest-cli@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.0.6.tgz#a2f1e5e094c42b29d22815463ae57f4d07e292ac"
+jest-cli@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.4.4.tgz#68cd2a2aae983adb1e6638248ca21082fd6d9e90"
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
+    exit "^0.1.2"
     glob "^7.1.2"
     graceful-fs "^4.1.11"
+    import-local "^1.0.0"
     is-ci "^1.0.10"
     istanbul-api "^1.1.14"
     istanbul-lib-coverage "^1.1.1"
     istanbul-lib-instrument "^1.8.0"
     istanbul-lib-source-maps "^1.2.1"
-    jest-changed-files "^22.0.6"
-    jest-config "^22.0.6"
-    jest-environment-jsdom "^22.0.6"
-    jest-get-type "^22.0.6"
-    jest-haste-map "^22.0.6"
-    jest-message-util "^22.0.6"
-    jest-regex-util "^22.0.6"
-    jest-resolve-dependencies "^22.0.6"
-    jest-runner "^22.0.6"
-    jest-runtime "^22.0.6"
-    jest-snapshot "^22.0.6"
-    jest-util "^22.0.6"
-    jest-worker "^22.0.6"
+    jest-changed-files "^22.2.0"
+    jest-config "^22.4.4"
+    jest-environment-jsdom "^22.4.1"
+    jest-get-type "^22.1.0"
+    jest-haste-map "^22.4.2"
+    jest-message-util "^22.4.0"
+    jest-regex-util "^22.1.0"
+    jest-resolve-dependencies "^22.1.0"
+    jest-runner "^22.4.4"
+    jest-runtime "^22.4.4"
+    jest-snapshot "^22.4.0"
+    jest-util "^22.4.1"
+    jest-validate "^22.4.4"
+    jest-worker "^22.2.2"
     micromatch "^2.3.11"
-    node-notifier "^5.1.2"
+    node-notifier "^5.2.1"
     realpath-native "^1.0.0"
     rimraf "^2.5.4"
     slash "^1.0.0"
@@ -3497,113 +3511,105 @@ jest-cli@^22.0.6:
     which "^1.2.12"
     yargs "^10.0.3"
 
-jest-config@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.0.6.tgz#8af116784df189b98ed6fd6c307bce4181f7f012"
+jest-config@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.4.4.tgz#72a521188720597169cd8b4ff86934ef5752d86a"
   dependencies:
     chalk "^2.0.1"
     glob "^7.1.1"
-    jest-environment-jsdom "^22.0.6"
-    jest-environment-node "^22.0.6"
-    jest-get-type "^22.0.6"
-    jest-jasmine2 "^22.0.6"
-    jest-regex-util "^22.0.6"
-    jest-resolve "^22.0.6"
-    jest-util "^22.0.6"
-    jest-validate "^22.0.6"
-    pretty-format "^22.0.6"
-
-jest-diff@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.0.6.tgz#38c07187324564ecf6389a980a2f0e86e7e79890"
-  dependencies:
-    chalk "^2.0.1"
-    diff "^3.2.0"
-    jest-get-type "^22.0.6"
-    pretty-format "^22.0.6"
-
-jest-diff@^22.1.0:
-  version "22.1.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.1.0.tgz#0fad9d96c87b453896bf939df3dc8aac6919ac38"
-  dependencies:
-    chalk "^2.0.1"
-    diff "^3.2.0"
+    jest-environment-jsdom "^22.4.1"
+    jest-environment-node "^22.4.1"
     jest-get-type "^22.1.0"
-    pretty-format "^22.1.0"
+    jest-jasmine2 "^22.4.4"
+    jest-regex-util "^22.1.0"
+    jest-resolve "^22.4.2"
+    jest-util "^22.4.1"
+    jest-validate "^22.4.4"
+    pretty-format "^22.4.0"
 
-jest-docblock@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.0.6.tgz#f187fb2c67eec0999e569d563092125283084f9e"
+jest-diff@^22.4.0, jest-diff@^22.4.3:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.4.3.tgz#e18cc3feff0aeef159d02310f2686d4065378030"
+  dependencies:
+    chalk "^2.0.1"
+    diff "^3.2.0"
+    jest-get-type "^22.4.3"
+    pretty-format "^22.4.3"
+
+jest-docblock@^22.4.0, jest-docblock@^22.4.3:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.4.3.tgz#50886f132b42b280c903c592373bb6e93bb68b19"
   dependencies:
     detect-newline "^2.1.0"
 
-jest-environment-jsdom@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.0.6.tgz#243f3fa7167a1f293410aec8d3eb12ab8de4f748"
+jest-environment-jsdom@^22.4.1:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz#d67daa4155e33516aecdd35afd82d4abf0fa8a1e"
   dependencies:
-    jest-mock "^22.0.6"
-    jest-util "^22.0.6"
+    jest-mock "^22.4.3"
+    jest-util "^22.4.3"
     jsdom "^11.5.1"
 
-jest-environment-node@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.0.6.tgz#4f34ac4c0591297aceefa6a93421360bd56e5a74"
+jest-environment-node@^22.4.1:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.4.3.tgz#54c4eaa374c83dd52a9da8759be14ebe1d0b9129"
   dependencies:
-    jest-mock "^22.0.6"
-    jest-util "^22.0.6"
-
-jest-get-type@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.0.6.tgz#301fbc0760779fdbad37b6e3239a3c1811aa75cb"
+    jest-mock "^22.4.3"
+    jest-util "^22.4.3"
 
 jest-get-type@^22.1.0:
   version "22.1.0"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.1.0.tgz#4e90af298ed6181edc85d2da500dbd2753e0d5a9"
 
-jest-haste-map@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.0.6.tgz#198d665f65e1c484fef106a3c970c5b47903647e"
+jest-get-type@^22.4.3:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
+
+jest-haste-map@^22.4.2:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.4.3.tgz#25842fa2ba350200767ac27f658d58b9d5c2e20b"
   dependencies:
     fb-watchman "^2.0.0"
     graceful-fs "^4.1.11"
-    jest-docblock "^22.0.6"
-    jest-worker "^22.0.6"
+    jest-docblock "^22.4.3"
+    jest-serializer "^22.4.3"
+    jest-worker "^22.4.3"
     micromatch "^2.3.11"
     sane "^2.0.0"
 
-jest-jasmine2@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.0.6.tgz#db9eae709978a8d67a52f7b90d74cab7301107f5"
+jest-jasmine2@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.4.4.tgz#c55f92c961a141f693f869f5f081a79a10d24e23"
   dependencies:
-    callsites "^2.0.0"
     chalk "^2.0.1"
     co "^4.6.0"
-    expect "^22.0.6"
+    expect "^22.4.0"
     graceful-fs "^4.1.11"
     is-generator-fn "^1.0.0"
-    jest-diff "^22.0.6"
-    jest-matcher-utils "^22.0.6"
-    jest-message-util "^22.0.6"
-    jest-snapshot "^22.0.6"
+    jest-diff "^22.4.0"
+    jest-matcher-utils "^22.4.0"
+    jest-message-util "^22.4.0"
+    jest-snapshot "^22.4.0"
+    jest-util "^22.4.1"
     source-map-support "^0.5.0"
 
-jest-leak-detector@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-22.0.6.tgz#e983e6fca0959f095cd5b39df2a9a8c956f45988"
+jest-leak-detector@^22.4.0:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-22.4.3.tgz#2b7b263103afae8c52b6b91241a2de40117e5b35"
   dependencies:
-    pretty-format "^22.0.6"
+    pretty-format "^22.4.3"
 
-jest-matcher-utils@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.0.6.tgz#55675242b2af1de913f44e00aa4d68a38d349b07"
+jest-matcher-utils@^22.4.0, jest-matcher-utils@^22.4.3:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz#4632fe428ebc73ebc194d3c7b65d37b161f710ff"
   dependencies:
     chalk "^2.0.1"
-    jest-get-type "^22.0.6"
-    pretty-format "^22.0.6"
+    jest-get-type "^22.4.3"
+    pretty-format "^22.4.3"
 
-jest-message-util@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.0.6.tgz#2b30edce5131a9358f529ad66ff84835ba4ed457"
+jest-message-util@^22.4.0, jest-message-util@^22.4.3:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.4.3.tgz#cf3d38aafe4befddbfc455e57d65d5239e399eb7"
   dependencies:
     "@babel/code-frame" "^7.0.0-beta.35"
     chalk "^2.0.1"
@@ -3611,57 +3617,60 @@ jest-message-util@^22.0.6:
     slash "^1.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.0.6.tgz#0d1f51ec2bf1e72cd58e79cb76f587e6397306ec"
+jest-mock@^22.4.3:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.4.3.tgz#f63ba2f07a1511772cdc7979733397df770aabc7"
 
-jest-regex-util@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-22.0.6.tgz#cd01d33c5993340f5d61be09b270773787a41d88"
+jest-regex-util@^22.1.0, jest-regex-util@^22.4.3:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-22.4.3.tgz#a826eb191cdf22502198c5401a1fc04de9cef5af"
 
-jest-resolve-dependencies@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-22.0.6.tgz#dd976f0a9c2874d32edf4876b0a965cef48d479b"
+jest-resolve-dependencies@^22.1.0:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-22.4.3.tgz#e2256a5a846732dc3969cb72f3c9ad7725a8195e"
   dependencies:
-    jest-regex-util "^22.0.6"
+    jest-regex-util "^22.4.3"
 
-jest-resolve@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.0.6.tgz#29d7aa425adb9aae7aa5ae157483dffba724e52b"
+jest-resolve@^22.4.2:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.4.3.tgz#0ce9d438c8438229aa9b916968ec6b05c1abb4ea"
   dependencies:
     browser-resolve "^1.11.2"
     chalk "^2.0.1"
 
-jest-runner@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.0.6.tgz#1986ee82b7968d21f04c402e5b67e3da71496f19"
+jest-runner@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.4.4.tgz#dfca7b7553e0fa617e7b1291aeb7ce83e540a907"
   dependencies:
-    jest-config "^22.0.6"
-    jest-docblock "^22.0.6"
-    jest-haste-map "^22.0.6"
-    jest-jasmine2 "^22.0.6"
-    jest-leak-detector "^22.0.6"
-    jest-message-util "^22.0.6"
-    jest-runtime "^22.0.6"
-    jest-util "^22.0.6"
-    jest-worker "^22.0.6"
+    exit "^0.1.2"
+    jest-config "^22.4.4"
+    jest-docblock "^22.4.0"
+    jest-haste-map "^22.4.2"
+    jest-jasmine2 "^22.4.4"
+    jest-leak-detector "^22.4.0"
+    jest-message-util "^22.4.0"
+    jest-runtime "^22.4.4"
+    jest-util "^22.4.1"
+    jest-worker "^22.2.2"
     throat "^4.0.0"
 
-jest-runtime@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.0.6.tgz#827c35e706adfc22e685de733ba3ab78cda72bfc"
+jest-runtime@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.4.4.tgz#9ba7792fc75582a5be0f79af6f8fe8adea314048"
   dependencies:
     babel-core "^6.0.0"
-    babel-jest "^22.0.6"
+    babel-jest "^22.4.4"
     babel-plugin-istanbul "^4.1.5"
     chalk "^2.0.1"
     convert-source-map "^1.4.0"
+    exit "^0.1.2"
     graceful-fs "^4.1.11"
-    jest-config "^22.0.6"
-    jest-haste-map "^22.0.6"
-    jest-regex-util "^22.0.6"
-    jest-resolve "^22.0.6"
-    jest-util "^22.0.6"
+    jest-config "^22.4.4"
+    jest-haste-map "^22.4.2"
+    jest-regex-util "^22.1.0"
+    jest-resolve "^22.4.2"
+    jest-util "^22.4.1"
+    jest-validate "^22.4.4"
     json-stable-stringify "^1.0.1"
     micromatch "^2.3.11"
     realpath-native "^1.0.0"
@@ -3670,49 +3679,55 @@ jest-runtime@^22.0.6:
     write-file-atomic "^2.1.0"
     yargs "^10.0.3"
 
-jest-snapshot@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.0.6.tgz#30c1f85b6f050891c4a2060d807a3d65a594591c"
+jest-serializer@^22.4.3:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-22.4.3.tgz#a679b81a7f111e4766235f4f0c46d230ee0f7436"
+
+jest-snapshot@^22.4.0:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.4.3.tgz#b5c9b42846ffb9faccb76b841315ba67887362d2"
   dependencies:
     chalk "^2.0.1"
-    jest-diff "^22.0.6"
-    jest-matcher-utils "^22.0.6"
+    jest-diff "^22.4.3"
+    jest-matcher-utils "^22.4.3"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    pretty-format "^22.0.6"
+    pretty-format "^22.4.3"
 
-jest-util@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.0.6.tgz#539b3f21f4e2e458bb38719aa0e417109fe31657"
+jest-util@^22.4.1, jest-util@^22.4.3:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.4.3.tgz#c70fec8eec487c37b10b0809dc064a7ecf6aafac"
   dependencies:
     callsites "^2.0.0"
     chalk "^2.0.1"
     graceful-fs "^4.1.11"
     is-ci "^1.0.10"
-    jest-message-util "^22.0.6"
-    jest-validate "^22.0.6"
+    jest-message-util "^22.4.3"
     mkdirp "^0.5.1"
+    source-map "^0.6.0"
 
-jest-validate@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.0.6.tgz#48c6972f154fa4abe20d0686a9b819d142740167"
+jest-validate@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.4.4.tgz#1dd0b616ef46c995de61810d85f57119dbbcec4d"
   dependencies:
     chalk "^2.0.1"
-    jest-get-type "^22.0.6"
+    jest-config "^22.4.4"
+    jest-get-type "^22.1.0"
     leven "^2.1.0"
-    pretty-format "^22.0.6"
+    pretty-format "^22.4.0"
 
-jest-worker@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.0.6.tgz#1998ac7ab24a6eee4deddec76efe7742f2651504"
+jest-worker@^22.2.2, jest-worker@^22.4.3:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.4.3.tgz#5c421417cba1c0abf64bf56bd5fb7968d79dd40b"
   dependencies:
     merge-stream "^1.0.1"
 
-jest@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-22.0.6.tgz#0d0d3bdc402c43cf5a3eae58a55cff6da8b6820f"
+jest@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-22.4.4.tgz#ffb36c9654b339a13e10b3d4b338eb3e9d49f6eb"
   dependencies:
-    jest-cli "^22.0.6"
+    import-local "^1.0.0"
+    jest-cli "^22.4.4"
 
 js-tokens@1.0.1:
   version "1.0.1"
@@ -4309,14 +4324,14 @@ node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
 
-node-notifier@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.1.2.tgz#2fa9e12605fa10009d44549d6fcd8a63dde0e4ff"
+node-notifier@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.2.1.tgz#fa313dd08f5517db0e2502e5758d664ac69f9dea"
   dependencies:
     growly "^1.3.0"
-    semver "^5.3.0"
-    shellwords "^0.1.0"
-    which "^1.2.12"
+    semver "^5.4.1"
+    shellwords "^0.1.1"
+    which "^1.3.0"
 
 node-pre-gyp@^0.6.36:
   version "0.6.36"
@@ -4687,6 +4702,12 @@ pinpoint@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pinpoint/-/pinpoint-1.1.0.tgz#0cf7757a6977f1bf7f6a32207b709e377388e874"
 
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  dependencies:
+    find-up "^2.1.0"
+
 platform@^1.1.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.4.tgz#6f0fb17edaaa48f21442b3a975c063130f1c3ebd"
@@ -4719,16 +4740,9 @@ prettier@^1.0.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.8.1.tgz#91064d778c08c85ac1cbe6b23195c34310d039f9"
 
-pretty-format@^22.0.6:
-  version "22.0.6"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.0.6.tgz#bbb78e38445f263c2d3b9e281f4b844380990720"
-  dependencies:
-    ansi-regex "^3.0.0"
-    ansi-styles "^3.2.0"
-
-pretty-format@^22.1.0:
-  version "22.1.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.1.0.tgz#2277605b40ed4529ae4db51ff62f4be817647914"
+pretty-format@^22.4.0, pretty-format@^22.4.3:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.4.3.tgz#f873d780839a9c02e9664c8a082e9ee79eaac16f"
   dependencies:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
@@ -5200,6 +5214,12 @@ require-uncached@^1.0.3:
     caller-path "^0.1.0"
     resolve-from "^1.0.0"
 
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  dependencies:
+    resolve-from "^3.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"
@@ -5211,6 +5231,10 @@ resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -5399,7 +5423,7 @@ sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -5447,9 +5471,9 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
-shellwords@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.0.tgz#66afd47b6a12932d9071cbfd98a52e785cd0ba14"
+shellwords@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
@@ -5556,7 +5580,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.6, source-map@^0.5.7, source-map@~0.5.6:
+source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -5564,10 +5588,6 @@ source-map@^0.5.3, source-map@~0.5.0, 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.5.1, source-map@~0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
 source-map@^0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -6236,7 +6256,7 @@ which@^1.2.12, which@^1.2.8:
   dependencies:
     isexe "^2.0.0"
 
-which@^1.2.9:
+which@^1.2.9, which@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:

From 13003654e79f9fa65ee833afeec86d668f35d31d Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Mon, 21 May 2018 09:49:22 -0700
Subject: [PATCH 094/277] Pass "start time" and "commit time" to Profiler
 callback (#12852)

* Added start time parameter to Profiler onRender callback
* Profiler also captures commit time
* Only init Profiler stateNode if enableProfilerTimer feature flag enabled
---
 packages/react-reconciler/src/ReactFiber.js   |  11 +-
 .../src/ReactFiberCommitWork.js               |   3 +
 .../src/ReactFiberScheduler.js                |   5 +
 .../src/ReactProfilerTimer.js                 |  52 +++-
 .../__tests__/ReactProfiler-test.internal.js  | 264 ++++++++++++------
 5 files changed, 234 insertions(+), 101 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js
index 93371c60d1..d27a5b6a13 100644
--- a/packages/react-reconciler/src/ReactFiber.js
+++ b/packages/react-reconciler/src/ReactFiber.js
@@ -460,10 +460,13 @@ export function createFiberFromProfiler(
   const fiber = createFiber(Profiler, pendingProps, key, mode | ProfileMode);
   fiber.type = REACT_PROFILER_TYPE;
   fiber.expirationTime = expirationTime;
-  fiber.stateNode = {
-    duration: 0,
-    startTime: 0,
-  };
+  if (enableProfilerTimer) {
+    fiber.stateNode = {
+      elapsedPauseTimeAtStart: 0,
+      duration: 0,
+      startTime: 0,
+    };
+  }
 
   return fiber;
 }
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index 9c492b9b79..8f5fa74a5c 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -20,6 +20,7 @@ import type {ExpirationTime} from './ReactFiberExpirationTime';
 import type {CapturedValue, CapturedError} from './ReactCapturedValue';
 
 import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
+import {getCommitTime} from './ReactProfilerTimer';
 import {
   ClassComponent,
   HostRoot,
@@ -807,6 +808,8 @@ function commitWork(current: Fiber | null, finishedWork: Fiber): void {
           current === null ? 'mount' : 'update',
           finishedWork.stateNode.duration,
           finishedWork.treeBaseTime,
+          finishedWork.stateNode.startTime,
+          getCommitTime(),
         );
 
         // Reset actualTime after successful commit.
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 43f71c6213..da32034b08 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -104,6 +104,7 @@ import {popHostContext, popHostContainer} from './ReactFiberHostContext';
 import {
   checkActualRenderTimeStackEmpty,
   pauseActualRenderTimerIfRunning,
+  recordCommitTime,
   recordElapsedBaseRenderTimeIfRunning,
   resetActualRenderTimer,
   resumeActualRenderTimerIfPaused,
@@ -566,6 +567,10 @@ function commitRoot(finishedWork: Fiber): ExpirationTime {
   }
   stopCommitSnapshotEffectsTimer();
 
+  if (enableProfilerTimer) {
+    recordCommitTime();
+  }
+
   // Commit all the side-effects within a tree. We'll do this in two passes.
   // The first pass performs all the host insertions, updates, deletions and
   // ref unmounts.
diff --git a/packages/react-reconciler/src/ReactProfilerTimer.js b/packages/react-reconciler/src/ReactProfilerTimer.js
index 9fd7544c52..bbe1c9bdea 100644
--- a/packages/react-reconciler/src/ReactProfilerTimer.js
+++ b/packages/react-reconciler/src/ReactProfilerTimer.js
@@ -14,6 +14,33 @@ import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
 import warning from 'fbjs/lib/warning';
 import {now} from './ReactFiberHostConfig';
 
+export type ProfilerTimer = {
+  checkActualRenderTimeStackEmpty(): void,
+  getCommitTime(): number,
+  markActualRenderTimeStarted(fiber: Fiber): void,
+  pauseActualRenderTimerIfRunning(): void,
+  recordElapsedActualRenderTime(fiber: Fiber): void,
+  resetActualRenderTimer(): void,
+  resumeActualRenderTimerIfPaused(): void,
+  recordCommitTime(): void,
+  recordElapsedBaseRenderTimeIfRunning(fiber: Fiber): void,
+  startBaseRenderTimer(): void,
+  stopBaseRenderTimerIfRunning(): void,
+};
+
+let commitTime: number = 0;
+
+function getCommitTime(): number {
+  return commitTime;
+}
+
+function recordCommitTime(): void {
+  if (!enableProfilerTimer) {
+    return;
+  }
+  commitTime = now();
+}
+
 /**
  * The "actual" render time is total time required to render the descendants of a Profiler component.
  * This time is stored as a stack, since Profilers can be nested.
@@ -21,18 +48,6 @@ import {now} from './ReactFiberHostConfig';
  * It is paused (and accumulated) in the event of an interruption or an aborted render.
  */
 
-export type ProfilerTimer = {
-  checkActualRenderTimeStackEmpty(): void,
-  markActualRenderTimeStarted(fiber: Fiber): void,
-  pauseActualRenderTimerIfRunning(): void,
-  recordElapsedActualRenderTime(fiber: Fiber): void,
-  resetActualRenderTimer(): void,
-  resumeActualRenderTimerIfPaused(): void,
-  recordElapsedBaseRenderTimeIfRunning(fiber: Fiber): void,
-  startBaseRenderTimer(): void,
-  stopBaseRenderTimerIfRunning(): void,
-};
-
 let fiberStack: Array<Fiber | null>;
 
 if (__DEV__) {
@@ -61,7 +76,9 @@ function markActualRenderTimeStarted(fiber: Fiber): void {
   if (__DEV__) {
     fiberStack.push(fiber);
   }
-  fiber.stateNode.startTime = now() - totalElapsedPauseTime;
+  const stateNode = fiber.stateNode;
+  stateNode.elapsedPauseTimeAtStart = totalElapsedPauseTime;
+  stateNode.startTime = now();
 }
 
 function pauseActualRenderTimerIfRunning(): void {
@@ -80,8 +97,11 @@ function recordElapsedActualRenderTime(fiber: Fiber): void {
   if (__DEV__) {
     warning(fiber === fiberStack.pop(), 'Unexpected Fiber popped.');
   }
-  fiber.stateNode.duration +=
-    now() - totalElapsedPauseTime - fiber.stateNode.startTime;
+  const stateNode = fiber.stateNode;
+  stateNode.duration +=
+    now() -
+    (totalElapsedPauseTime - stateNode.elapsedPauseTimeAtStart) -
+    stateNode.startTime;
 }
 
 function resetActualRenderTimer(): void {
@@ -145,8 +165,10 @@ function stopBaseRenderTimerIfRunning(): void {
 
 export {
   checkActualRenderTimeStackEmpty,
+  getCommitTime,
   markActualRenderTimeStarted,
   pauseActualRenderTimerIfRunning,
+  recordCommitTime,
   recordElapsedActualRenderTime,
   resetActualRenderTimer,
   resumeActualRenderTimerIfPaused,
diff --git a/packages/react/src/__tests__/ReactProfiler-test.internal.js b/packages/react/src/__tests__/ReactProfiler-test.internal.js
index f3b12109b6..3e27588816 100644
--- a/packages/react/src/__tests__/ReactProfiler-test.internal.js
+++ b/packages/react/src/__tests__/ReactProfiler-test.internal.js
@@ -177,14 +177,18 @@ describe('Profiler', () => {
         </div>,
       );
 
-      // Should only be called twice, for normal expiration time purposes.
+      // Should only be called three times:
+      // Twice for normal expiration time purposes,
+      // And once to capture the commit time.
       // No additional calls from ProfilerTimer are expected.
-      expect(mockNow).toHaveBeenCalledTimes(2);
+      expect(mockNow).toHaveBeenCalledTimes(3);
     });
 
     it('logs render times for both mount and update', () => {
       const callback = jest.fn();
 
+      advanceTimeBy(5); // 0 -> 5
+
       const renderer = ReactTestRenderer.create(
         <React.unstable_Profiler id="test" onRender={callback}>
           <AdvanceTime />
@@ -195,14 +199,18 @@ describe('Profiler', () => {
 
       let [call] = callback.mock.calls;
 
-      expect(call).toHaveLength(4);
+      expect(call).toHaveLength(6);
       expect(call[0]).toBe('test');
       expect(call[1]).toBe('mount');
-      expect(call[2]).toBe(10); // "actual" time
-      expect(call[3]).toBe(10); // "base" time
+      expect(call[2]).toBe(10); // actual time
+      expect(call[3]).toBe(10); // base time
+      expect(call[4]).toBe(5); // start time
+      expect(call[5]).toBe(15); // commit time
 
       callback.mockReset();
 
+      advanceTimeBy(20); // 15 -> 35
+
       renderer.update(
         <React.unstable_Profiler id="test" onRender={callback}>
           <AdvanceTime />
@@ -213,16 +221,20 @@ describe('Profiler', () => {
 
       [call] = callback.mock.calls;
 
-      expect(call).toHaveLength(4);
+      expect(call).toHaveLength(6);
       expect(call[0]).toBe('test');
       expect(call[1]).toBe('update');
-      expect(call[2]).toBe(10); // "actual" time
-      expect(call[3]).toBe(10); // "base" time
+      expect(call[2]).toBe(10); // actual time
+      expect(call[3]).toBe(10); // base time
+      expect(call[4]).toBe(35); // start time
+      expect(call[5]).toBe(45); // commit time
     });
 
     it('includes render times of nested Profilers in their parent times', () => {
       const callback = jest.fn();
 
+      advanceTimeBy(5); // 0 -> 5
+
       ReactTestRenderer.create(
         <React.Fragment>
           <React.unstable_Profiler id="parent" onRender={callback}>
@@ -243,15 +255,21 @@ describe('Profiler', () => {
       expect(parentCall[0]).toBe('parent');
 
       // Parent times should include child times
-      expect(childCall[2]).toBe(20); // "actual" time
-      expect(childCall[3]).toBe(20); // "base" time
-      expect(parentCall[2]).toBe(30); // "actual" time
-      expect(parentCall[3]).toBe(30); // "base" time
+      expect(childCall[2]).toBe(20); // actual time
+      expect(childCall[3]).toBe(20); // base time
+      expect(childCall[4]).toBe(15); // start time
+      expect(childCall[5]).toBe(35); // commit time
+      expect(parentCall[2]).toBe(30); // actual time
+      expect(parentCall[3]).toBe(30); // base time
+      expect(parentCall[4]).toBe(5); // start time
+      expect(parentCall[5]).toBe(35); // commit time
     });
 
     it('tracks sibling Profilers separately', () => {
       const callback = jest.fn();
 
+      advanceTimeBy(5); // 0 -> 5
+
       ReactTestRenderer.create(
         <React.Fragment>
           <React.unstable_Profiler id="first" onRender={callback}>
@@ -270,15 +288,21 @@ describe('Profiler', () => {
       expect(secondCall[0]).toBe('second');
 
       // Parent times should include child times
-      expect(firstCall[2]).toBe(20); // "actual" time
-      expect(firstCall[3]).toBe(20); // "base" time
-      expect(secondCall[2]).toBe(5); // "actual" time
-      expect(secondCall[3]).toBe(5); // "base" time
+      expect(firstCall[2]).toBe(20); // actual time
+      expect(firstCall[3]).toBe(20); // base time
+      expect(firstCall[4]).toBe(5); // start time
+      expect(firstCall[5]).toBe(30); // commit time
+      expect(secondCall[2]).toBe(5); // actual time
+      expect(secondCall[3]).toBe(5); // base time
+      expect(secondCall[4]).toBe(25); // start time
+      expect(secondCall[5]).toBe(30); // commit time
     });
 
     it('does not include time spent outside of profile root', () => {
       const callback = jest.fn();
 
+      advanceTimeBy(5); // 0 -> 5
+
       ReactTestRenderer.create(
         <React.Fragment>
           <AdvanceTime byAmount={20} />
@@ -293,8 +317,10 @@ describe('Profiler', () => {
 
       const [call] = callback.mock.calls;
       expect(call[0]).toBe('test');
-      expect(call[2]).toBe(5); // "actual" time
-      expect(call[3]).toBe(5); // "base" time
+      expect(call[2]).toBe(5); // actual time
+      expect(call[3]).toBe(5); // base time
+      expect(call[4]).toBe(25); // start time
+      expect(call[5]).toBe(50); // commit time
     });
 
     it('is not called when blocked by sCU false', () => {
@@ -347,23 +373,27 @@ describe('Profiler', () => {
       expect(callback.mock.calls[1][0]).toBe('outer');
     });
 
-    it('decreases "actual" time but not "base" time when sCU prevents an update', () => {
+    it('decreases actual time but not base time when sCU prevents an update', () => {
       const callback = jest.fn();
 
+      advanceTimeBy(5); // 0 -> 5
+
       const renderer = ReactTestRenderer.create(
         <React.unstable_Profiler id="test" onRender={callback}>
-          <AdvanceTime>
-            <AdvanceTime shouldComponentUpdate={false} />
+          <AdvanceTime byAmount={10}>
+            <AdvanceTime byAmount={10} shouldComponentUpdate={false} />
           </AdvanceTime>
         </React.unstable_Profiler>,
       );
 
       expect(callback).toHaveBeenCalledTimes(1);
 
+      advanceTimeBy(30); // 25 -> 55
+
       renderer.update(
         <React.unstable_Profiler id="test" onRender={callback}>
-          <AdvanceTime>
-            <AdvanceTime shouldComponentUpdate={false} />
+          <AdvanceTime byAmount={10}>
+            <AdvanceTime byAmount={10} shouldComponentUpdate={false} />
           </AdvanceTime>
         </React.unstable_Profiler>,
       );
@@ -373,12 +403,16 @@ describe('Profiler', () => {
       const [mountCall, updateCall] = callback.mock.calls;
 
       expect(mountCall[1]).toBe('mount');
-      expect(mountCall[2]).toBe(20); // "actual" time
-      expect(mountCall[3]).toBe(20); // "base" time
+      expect(mountCall[2]).toBe(20); // actual time
+      expect(mountCall[3]).toBe(20); // base time
+      expect(mountCall[4]).toBe(5); // start time
+      expect(mountCall[5]).toBe(25); // commit time
 
       expect(updateCall[1]).toBe('update');
-      expect(updateCall[2]).toBe(10); // "actual" time
-      expect(updateCall[3]).toBe(20); // "base" time
+      expect(updateCall[2]).toBe(10); // actual time
+      expect(updateCall[3]).toBe(20); // base time
+      expect(updateCall[4]).toBe(55); // start time
+      expect(updateCall[5]).toBe(65); // commit time
     });
 
     it('includes time spent in render phase lifecycles', () => {
@@ -400,12 +434,16 @@ describe('Profiler', () => {
 
       const callback = jest.fn();
 
+      advanceTimeBy(5); // 0 -> 5
+
       const renderer = ReactTestRenderer.create(
         <React.unstable_Profiler id="test" onRender={callback}>
           <WithLifecycles />
         </React.unstable_Profiler>,
       );
 
+      advanceTimeBy(15); // 13 -> 28
+
       renderer.update(
         <React.unstable_Profiler id="test" onRender={callback}>
           <WithLifecycles />
@@ -417,16 +455,20 @@ describe('Profiler', () => {
       const [mountCall, updateCall] = callback.mock.calls;
 
       expect(mountCall[1]).toBe('mount');
-      expect(mountCall[2]).toBe(8); // "actual" time
-      expect(mountCall[3]).toBe(8); // "base" time
+      expect(mountCall[2]).toBe(8); // actual time
+      expect(mountCall[3]).toBe(8); // base time
+      expect(mountCall[4]).toBe(5); // start time
+      expect(mountCall[5]).toBe(13); // commit time
 
       expect(updateCall[1]).toBe('update');
-      expect(updateCall[2]).toBe(15); // "actual" time
-      expect(updateCall[3]).toBe(15); // "base" time
+      expect(updateCall[2]).toBe(15); // actual time
+      expect(updateCall[3]).toBe(15); // base time
+      expect(updateCall[4]).toBe(28); // start time
+      expect(updateCall[5]).toBe(43); // commit time
     });
 
     describe('with regard to interruptions', () => {
-      it('should accumulate "actual" time after a scheduling interruptions', () => {
+      it('should accumulate actual time after a scheduling interruptions', () => {
         const callback = jest.fn();
 
         const Yield = ({renderTime}) => {
@@ -435,6 +477,8 @@ describe('Profiler', () => {
           return null;
         };
 
+        advanceTimeBy(5); // 0 -> 5
+
         // Render partially, but run out of time before completing.
         const renderer = ReactTestRenderer.create(
           <React.unstable_Profiler id="test" onRender={callback}>
@@ -453,8 +497,11 @@ describe('Profiler', () => {
 
         // Verify that logged times include both durations above.
         expect(callback).toHaveBeenCalledTimes(1);
-        expect(callback.mock.calls[0][2]).toBe(5); // "actual" time
-        expect(callback.mock.calls[0][3]).toBe(5); // "base" time
+        const [call] = callback.mock.calls;
+        expect(call[2]).toBe(5); // actual time
+        expect(call[3]).toBe(5); // base time
+        expect(call[4]).toBe(5); // start time
+        expect(call[5]).toBe(10); // commit time
       });
 
       it('should not include time between frames', () => {
@@ -466,6 +513,8 @@ describe('Profiler', () => {
           return null;
         };
 
+        advanceTimeBy(5); // 0 -> 5
+
         // Render partially, but don't finish.
         // This partial render should take 5ms of simulated time.
         const renderer = ReactTestRenderer.create(
@@ -484,7 +533,7 @@ describe('Profiler', () => {
         expect(callback).toHaveBeenCalledTimes(0);
 
         // Simulate time moving forward while frame is paused.
-        advanceTimeBy(50);
+        advanceTimeBy(50); // 10 -> 60
 
         // Flush the remaninig work,
         // Which should take an additional 10ms of simulated time.
@@ -493,14 +542,18 @@ describe('Profiler', () => {
 
         const [innerCall, outerCall] = callback.mock.calls;
 
-        // Verify that the "actual" time includes all work times,
+        // Verify that the actual time includes all work times,
         // But not the time that elapsed between frames.
         expect(innerCall[0]).toBe('inner');
-        expect(innerCall[2]).toBe(17); // "actual" time
-        expect(innerCall[3]).toBe(17); // "base" time
+        expect(innerCall[2]).toBe(17); // actual time
+        expect(innerCall[3]).toBe(17); // base time
+        expect(innerCall[4]).toBe(70); // start time
+        expect(innerCall[5]).toBe(87); // commit time
         expect(outerCall[0]).toBe('outer');
-        expect(outerCall[2]).toBe(32); // "actual" time
-        expect(outerCall[3]).toBe(32); // "base" time
+        expect(outerCall[2]).toBe(32); // actual time
+        expect(outerCall[3]).toBe(32); // base time
+        expect(outerCall[4]).toBe(5); // start time
+        expect(outerCall[5]).toBe(87); // commit time
       });
 
       it('should report the expected times when a high-priority update replaces an in-progress initial render', () => {
@@ -512,6 +565,8 @@ describe('Profiler', () => {
           return null;
         };
 
+        advanceTimeBy(5); // 0 -> 5
+
         // Render a partially update, but don't finish.
         // This partial render should take 10ms of simulated time.
         const renderer = ReactTestRenderer.create(
@@ -525,7 +580,7 @@ describe('Profiler', () => {
         expect(callback).toHaveBeenCalledTimes(0);
 
         // Simulate time moving forward while frame is paused.
-        advanceTimeBy(100);
+        advanceTimeBy(100); // 15 -> 115
 
         // Interrupt with higher priority work.
         // The interrupted work simulates an additional 5ms of time.
@@ -540,11 +595,13 @@ describe('Profiler', () => {
         ).toEqual(['Yield:5']);
 
         // The initial work was thrown away in this case,
-        // So the "actual" and "base" times should only include the final rendered tree times.
+        // So the actual and base times should only include the final rendered tree times.
         expect(callback).toHaveBeenCalledTimes(1);
         let call = callback.mock.calls[0];
-        expect(call[2]).toBe(5); // "actual" time
-        expect(call[3]).toBe(5); // "base" time
+        expect(call[2]).toBe(5); // actual time
+        expect(call[3]).toBe(5); // base time
+        expect(call[4]).toBe(115); // start time
+        expect(call[5]).toBe(120); // commit time
 
         callback.mockReset();
 
@@ -562,6 +619,8 @@ describe('Profiler', () => {
           return null;
         };
 
+        advanceTimeBy(5); // 0 -> 5
+
         const renderer = ReactTestRenderer.create(
           <React.unstable_Profiler id="test" onRender={callback}>
             <Yield renderTime={6} />
@@ -571,15 +630,19 @@ describe('Profiler', () => {
         );
 
         // Render everything initially.
-        // This should take 21 seconds of "actual" and "base" time.
+        // This should take 21 seconds of actual and base time.
         expect(renderer.unstable_flushAll()).toEqual(['Yield:6', 'Yield:15']);
         expect(callback).toHaveBeenCalledTimes(1);
         let call = callback.mock.calls[0];
-        expect(call[2]).toBe(21); // "actual" time
-        expect(call[3]).toBe(21); // "base" time
+        expect(call[2]).toBe(21); // actual time
+        expect(call[3]).toBe(21); // base time
+        expect(call[4]).toBe(5); // start time
+        expect(call[5]).toBe(26); // commit time
 
         callback.mockReset();
 
+        advanceTimeBy(30); // 26 -> 56
+
         // Render a partially update, but don't finish.
         // This partial render should take 3ms of simulated time.
         renderer.update(
@@ -595,7 +658,7 @@ describe('Profiler', () => {
         expect(callback).toHaveBeenCalledTimes(0);
 
         // Simulate time moving forward while frame is paused.
-        advanceTimeBy(100);
+        advanceTimeBy(100); // 59 -> 159
 
         // Render another 5ms of simulated time.
         expect(renderer.unstable_flushThrough(['Yield:5'])).toEqual([
@@ -604,7 +667,7 @@ describe('Profiler', () => {
         expect(callback).toHaveBeenCalledTimes(0);
 
         // Simulate time moving forward while frame is paused.
-        advanceTimeBy(100);
+        advanceTimeBy(100); // 164 -> 264
 
         // Interrupt with higher priority work.
         // The interrupted work simulates an additional 11ms of time.
@@ -618,12 +681,14 @@ describe('Profiler', () => {
           }),
         ).toEqual(['Yield:11']);
 
-        // Verify that the "actual" time includes all three durations above.
-        // And the "base" time includes only the final rendered tree times.
+        // Verify that the actual time includes all three durations above.
+        // And the base time includes only the final rendered tree times.
         expect(callback).toHaveBeenCalledTimes(1);
         call = callback.mock.calls[0];
-        expect(call[2]).toBe(19); // "actual" time
-        expect(call[3]).toBe(11); // "base" time
+        expect(call[2]).toBe(19); // actual time
+        expect(call[3]).toBe(11); // base time
+        expect(call[4]).toBe(264); // start time
+        expect(call[5]).toBe(275); // commit time
 
         // Verify no more unexpected callbacks from low priority work
         expect(renderer.unstable_flushAll()).toEqual([]);
@@ -660,6 +725,8 @@ describe('Profiler', () => {
           }
         }
 
+        advanceTimeBy(5); // 0 -> 5
+
         const renderer = ReactTestRenderer.create(
           <React.unstable_Profiler id="test" onRender={callback} foo="1">
             <FirstComponent />
@@ -669,8 +736,8 @@ describe('Profiler', () => {
         );
 
         // Render everything initially.
-        // This simulates a total of 14ms of "actual" render time.
-        // The "base" render time is also 14ms for the initial render.
+        // This simulates a total of 14ms of actual render time.
+        // The base render time is also 14ms for the initial render.
         expect(renderer.unstable_flushAll()).toEqual([
           'FirstComponent:1',
           'Yield:4',
@@ -679,13 +746,17 @@ describe('Profiler', () => {
         ]);
         expect(callback).toHaveBeenCalledTimes(1);
         let call = callback.mock.calls[0];
-        expect(call[2]).toBe(14); // "actual" time
-        expect(call[3]).toBe(14); // "base" time
+        expect(call[2]).toBe(14); // actual time
+        expect(call[3]).toBe(14); // base time
+        expect(call[4]).toBe(5); // start time
+        expect(call[5]).toBe(19); // commit time
 
         callback.mockClear();
 
+        advanceTimeBy(100); // 19 -> 119
+
         // Render a partially update, but don't finish.
-        // This partial render will take 10ms of "actual" render time.
+        // This partial render will take 10ms of actual render time.
         first.setState({renderTime: 10});
         expect(renderer.unstable_flushThrough(['FirstComponent:10'])).toEqual([
           'FirstComponent:10',
@@ -693,38 +764,45 @@ describe('Profiler', () => {
         expect(callback).toHaveBeenCalledTimes(0);
 
         // Simulate time moving forward while frame is paused.
-        advanceTimeBy(100);
+        advanceTimeBy(100); // 129 -> 229
 
         // Interrupt with higher priority work.
-        // This simulates a total of 37ms of "actual" render time.
+        // This simulates a total of 37ms of actual render time.
         expect(
           renderer.unstable_flushSync(() => second.setState({renderTime: 30})),
         ).toEqual(['SecondComponent:30', 'Yield:7']);
 
-        // Verify that the "actual" time includes time spent in the both renders so far (10ms and 37ms).
-        // The "base" time should include the more recent times for the SecondComponent subtree,
+        // Verify that the actual time includes time spent in the both renders so far (10ms and 37ms).
+        // The base time should include the more recent times for the SecondComponent subtree,
         // As well as the original times for the FirstComponent subtree.
         expect(callback).toHaveBeenCalledTimes(1);
         call = callback.mock.calls[0];
-        expect(call[2]).toBe(47); // "actual" time
-        expect(call[3]).toBe(42); // "base" time
+        expect(call[2]).toBe(47); // actual time
+        expect(call[3]).toBe(42); // base time
+        expect(call[4]).toBe(229); // start time
+        expect(call[5]).toBe(266); // commit time
 
         callback.mockClear();
 
+        // Simulate time moving forward while frame is paused.
+        advanceTimeBy(100); // 266 -> 366
+
         // Resume the original low priority update, with rebased state.
-        // This simulates a total of 14ms of "actual" render time,
+        // This simulates a total of 14ms of actual render time,
         // And does not include the original (interrupted) 10ms.
-        // The tree contains 42ms of "base" render time at this point,
+        // The tree contains 42ms of base render time at this point,
         // Reflecting the most recent (longer) render durations.
-        // TODO: This "actual" time should decrease by 10ms once the scheduler supports resuming.
+        // TODO: This actual time should decrease by 10ms once the scheduler supports resuming.
         expect(renderer.unstable_flushAll()).toEqual([
           'FirstComponent:10',
           'Yield:4',
         ]);
         expect(callback).toHaveBeenCalledTimes(1);
         call = callback.mock.calls[0];
-        expect(call[2]).toBe(14); // "actual" time
-        expect(call[3]).toBe(51); // "base" time
+        expect(call[2]).toBe(14); // actual time
+        expect(call[3]).toBe(51); // base time
+        expect(call[4]).toBe(366); // start time
+        expect(call[5]).toBe(380); // commit time
       });
 
       [true, false].forEach(flagEnabled => {
@@ -740,7 +818,7 @@ describe('Profiler', () => {
             mockNowForTests();
           });
 
-          it('should accumulate "actual" time after an error handled by componentDidCatch()', () => {
+          it('should accumulate actual time after an error handled by componentDidCatch()', () => {
             const callback = jest.fn();
 
             const ThrowsError = () => {
@@ -763,6 +841,8 @@ describe('Profiler', () => {
               }
             }
 
+            advanceTimeBy(5); // 0 -> 5
+
             ReactTestRenderer.create(
               <React.unstable_Profiler id="test" onRender={callback}>
                 <ErrorBoundary>
@@ -780,21 +860,29 @@ describe('Profiler', () => {
             // The initial mount only includes the ErrorBoundary (which takes 2ms)
             // But it spends time rendering all of the failed subtree also.
             expect(mountCall[1]).toBe('mount');
-            // "actual" time includes: 2 (ErrorBoundary) + 5 (AdvanceTime) + 10 (ThrowsError)
+            // actual time includes: 2 (ErrorBoundary) + 5 (AdvanceTime) + 10 (ThrowsError)
             // If replayFailedUnitOfWorkWithInvokeGuardedCallback is enbaled, ThrowsError is replayed.
             expect(mountCall[2]).toBe(flagEnabled && __DEV__ ? 27 : 17);
-            // "base" time includes: 2 (ErrorBoundary)
+            // base time includes: 2 (ErrorBoundary)
             expect(mountCall[3]).toBe(2);
+            // start time
+            expect(mountCall[4]).toBe(5);
+            // commit time
+            expect(mountCall[5]).toBe(flagEnabled && __DEV__ ? 32 : 22);
 
             // The update includes the ErrorBoundary and its fallback child
             expect(updateCall[1]).toBe('update');
-            // "actual" time includes: 2 (ErrorBoundary) + 20 (AdvanceTime)
+            // actual time includes: 2 (ErrorBoundary) + 20 (AdvanceTime)
             expect(updateCall[2]).toBe(22);
-            // "base" time includes: 2 (ErrorBoundary) + 20 (AdvanceTime)
+            // base time includes: 2 (ErrorBoundary) + 20 (AdvanceTime)
             expect(updateCall[3]).toBe(22);
+            // start time
+            expect(updateCall[4]).toBe(flagEnabled && __DEV__ ? 32 : 22);
+            // commit time
+            expect(updateCall[5]).toBe(flagEnabled && __DEV__ ? 54 : 44);
           });
 
-          it('should accumulate "actual" time after an error handled by getDerivedStateFromCatch()', () => {
+          it('should accumulate actual time after an error handled by getDerivedStateFromCatch()', () => {
             const callback = jest.fn();
 
             const ThrowsError = () => {
@@ -817,6 +905,8 @@ describe('Profiler', () => {
               }
             }
 
+            advanceTimeBy(5); // 0 -> 5
+
             ReactTestRenderer.create(
               <React.unstable_Profiler id="test" onRender={callback}>
                 <ErrorBoundary>
@@ -832,14 +922,18 @@ describe('Profiler', () => {
             let [mountCall] = callback.mock.calls;
 
             // The initial mount includes the ErrorBoundary's error state,
-            // But i also spends "actual" time rendering UI that fails and isn't included.
+            // But i also spends actual time rendering UI that fails and isn't included.
             expect(mountCall[1]).toBe('mount');
-            // "actual" time includes: 2 (ErrorBoundary) + 5 (AdvanceTime) + 10 (ThrowsError)
+            // actual time includes: 2 (ErrorBoundary) + 5 (AdvanceTime) + 10 (ThrowsError)
             // Then the re-render: 2 (ErrorBoundary) + 20 (AdvanceTime)
             // If replayFailedUnitOfWorkWithInvokeGuardedCallback is enbaled, ThrowsError is replayed.
             expect(mountCall[2]).toBe(flagEnabled && __DEV__ ? 49 : 39);
-            // "base" time includes: 2 (ErrorBoundary) + 20 (AdvanceTime)
+            // base time includes: 2 (ErrorBoundary) + 20 (AdvanceTime)
             expect(mountCall[3]).toBe(22);
+            // start time
+            expect(mountCall[4]).toBe(5);
+            // commit time
+            expect(mountCall[5]).toBe(flagEnabled && __DEV__ ? 54 : 44);
           });
         });
       });
@@ -848,6 +942,8 @@ describe('Profiler', () => {
     it('reflects the most recently rendered id value', () => {
       const callback = jest.fn();
 
+      advanceTimeBy(5); // 0 -> 5
+
       const renderer = ReactTestRenderer.create(
         <React.unstable_Profiler id="one" onRender={callback}>
           <AdvanceTime byAmount={2} />
@@ -856,6 +952,8 @@ describe('Profiler', () => {
 
       expect(callback).toHaveBeenCalledTimes(1);
 
+      advanceTimeBy(20); // 7 -> 27
+
       renderer.update(
         <React.unstable_Profiler id="two" onRender={callback}>
           <AdvanceTime byAmount={1} />
@@ -868,13 +966,15 @@ describe('Profiler', () => {
 
       expect(mountCall[0]).toBe('one');
       expect(mountCall[1]).toBe('mount');
-      expect(mountCall[2]).toBe(2); // "actual" time
-      expect(mountCall[3]).toBe(2); // "base" time
+      expect(mountCall[2]).toBe(2); // actual time
+      expect(mountCall[3]).toBe(2); // base time
+      expect(mountCall[4]).toBe(5); // start time
 
       expect(updateCall[0]).toBe('two');
       expect(updateCall[1]).toBe('update');
-      expect(updateCall[2]).toBe(1); // "actual" time
-      expect(updateCall[3]).toBe(1); // "base" time
+      expect(updateCall[2]).toBe(1); // actual time
+      expect(updateCall[3]).toBe(1); // base time
+      expect(updateCall[4]).toBe(27); // start time
     });
   });
 });

From dd5fad29616f706f484938663e93aaadd2a5e594 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 21 May 2018 17:54:48 +0100
Subject: [PATCH 095/277] Update Flow to 0.70 (#12875)

* Update Flow to 0.70

* Remove unnecessary condition

* Fix wrong assertion

* Strict check
---
 package.json                                  |  2 +-
 packages/react-dom/src/client/ReactDOM.js     |  2 ++
 .../src/client/ReactDOMFiberComponent.js      | 12 ++++++++--
 .../src/client/ReactDOMHostConfig.js          |  1 +
 .../src/client/inputValueTracking.js          |  7 +++---
 .../react-dom/src/events/TapEventPlugin.js    |  9 ++++----
 .../react-native-renderer/src/ReactFabric.js  |  6 +++--
 .../src/ReactNativeFrameScheduling.js         |  5 +++--
 .../src/ReactNativeRenderer.js                |  4 ++--
 .../src/createReactNoop.js                    |  2 +-
 .../react-reconciler/src/ReactChildFiber.js   | 22 +++++++++----------
 .../react-reconciler/src/ReactFiberContext.js |  2 +-
 .../react-scheduler/src/ReactScheduler.js     | 18 +++++++++++----
 .../src/ReactTestRenderer.js                  |  2 +-
 scripts/flow/config/flowconfig                |  3 +--
 yarn.lock                                     |  6 ++---
 16 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/package.json b/package.json
index b1b187b9ed..bd408294ed 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "fbjs": "^0.8.16",
     "fbjs-scripts": "^0.6.0",
     "filesize": "^3.5.6",
-    "flow-bin": "^0.61.0",
+    "flow-bin": "^0.72.0",
     "flow-coverage-report": "^0.4.0",
     "git-branch": "^0.3.0",
     "glob": "^6.0.4",
diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js
index 4526bcf316..d65f09641e 100644
--- a/packages/react-dom/src/client/ReactDOM.js
+++ b/packages/react-dom/src/client/ReactDOM.js
@@ -53,9 +53,11 @@ let didWarnAboutUnstableCreatePortal = false;
 if (__DEV__) {
   if (
     typeof Map !== 'function' ||
+    // $FlowIssue Flow incorrectly thinks Map has no prototype
     Map.prototype == null ||
     typeof Map.prototype.forEach !== 'function' ||
     typeof Set !== 'function' ||
+    // $FlowIssue Flow incorrectly thinks Set has no prototype
     Set.prototype == null ||
     typeof Set.prototype.clear !== 'function' ||
     typeof Set.prototype.forEach !== 'function'
diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js
index 4c3c7a9c1d..3c9e802b6e 100644
--- a/packages/react-dom/src/client/ReactDOMFiberComponent.js
+++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js
@@ -432,7 +432,11 @@ export function setInitialProperties(
   const isCustomComponentTag = isCustomComponent(tag, rawProps);
   if (__DEV__) {
     validatePropertiesInDevelopment(tag, rawProps);
-    if (isCustomComponentTag && !didWarnShadyDOM && domElement.shadyRoot) {
+    if (
+      isCustomComponentTag &&
+      !didWarnShadyDOM &&
+      (domElement: any).shadyRoot
+    ) {
       warning(
         false,
         '%s is using shady DOM. Using shady DOM with React can ' +
@@ -820,7 +824,11 @@ export function diffHydratedProperties(
     suppressHydrationWarning = rawProps[SUPPRESS_HYDRATION_WARNING] === true;
     isCustomComponentTag = isCustomComponent(tag, rawProps);
     validatePropertiesInDevelopment(tag, rawProps);
-    if (isCustomComponentTag && !didWarnShadyDOM && domElement.shadyRoot) {
+    if (
+      isCustomComponentTag &&
+      !didWarnShadyDOM &&
+      (domElement: any).shadyRoot
+    ) {
       warning(
         false,
         '%s is using shady DOM. Using shady DOM with React can ' +
diff --git a/packages/react-dom/src/client/ReactDOMHostConfig.js b/packages/react-dom/src/client/ReactDOMHostConfig.js
index 15385db2ee..9d06c8f268 100644
--- a/packages/react-dom/src/client/ReactDOMHostConfig.js
+++ b/packages/react-dom/src/client/ReactDOMHostConfig.js
@@ -30,6 +30,7 @@ export type Props = {
   children?: mixed,
   hidden?: boolean,
   suppressHydrationWarning?: boolean,
+  dangerouslySetInnerHTML?: mixed,
 };
 export type Container = Element | Document;
 export type Instance = Element;
diff --git a/packages/react-dom/src/client/inputValueTracking.js b/packages/react-dom/src/client/inputValueTracking.js
index 732a77beee..4ccc80ac85 100644
--- a/packages/react-dom/src/client/inputValueTracking.js
+++ b/packages/react-dom/src/client/inputValueTracking.js
@@ -63,20 +63,21 @@ function trackValueOnNode(node: any): ?ValueTracker {
   // (needed for certain tests that spyOn input values and Safari)
   if (
     node.hasOwnProperty(valueField) ||
+    typeof descriptor === 'undefined' ||
     typeof descriptor.get !== 'function' ||
     typeof descriptor.set !== 'function'
   ) {
     return;
   }
-
+  const {get, set} = descriptor;
   Object.defineProperty(node, valueField, {
     configurable: true,
     get: function() {
-      return descriptor.get.call(this);
+      return get.call(this);
     },
     set: function(value) {
       currentValue = '' + value;
-      descriptor.set.call(this, value);
+      set.call(this, value);
     },
   });
   // We could've passed this the first time
diff --git a/packages/react-dom/src/events/TapEventPlugin.js b/packages/react-dom/src/events/TapEventPlugin.js
index e1baab05ea..9c4aab6e6c 100644
--- a/packages/react-dom/src/events/TapEventPlugin.js
+++ b/packages/react-dom/src/events/TapEventPlugin.js
@@ -119,10 +119,11 @@ const pointerEvents = [
   TOP_POINTER_UP,
 ];
 
-const dependencies = [TOP_MOUSE_DOWN, TOP_MOUSE_MOVE, TOP_MOUSE_UP].concat(
-  touchEvents,
-  pointerEvents,
-);
+const dependencies: Array<TopLevelType> = [
+  TOP_MOUSE_DOWN,
+  TOP_MOUSE_MOVE,
+  TOP_MOUSE_UP,
+].concat(touchEvents, pointerEvents);
 
 const eventTypes = {
   touchTap: {
diff --git a/packages/react-native-renderer/src/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js
index 757212fe20..3f0146d4c1 100644
--- a/packages/react-native-renderer/src/ReactFabric.js
+++ b/packages/react-native-renderer/src/ReactFabric.js
@@ -63,9 +63,11 @@ function findNodeHandle(componentOrHandle: any): ?number {
   if (hostInstance == null) {
     return hostInstance;
   }
-  if (hostInstance.canonical) {
+  // TODO: the code is right but the types here are wrong.
+  // https://github.com/facebook/react/pull/12863
+  if ((hostInstance: any).canonical) {
     // Fabric
-    return (hostInstance.canonical: any)._nativeTag;
+    return (hostInstance: any).canonical._nativeTag;
   }
   return hostInstance._nativeTag;
 }
diff --git a/packages/react-native-renderer/src/ReactNativeFrameScheduling.js b/packages/react-native-renderer/src/ReactNativeFrameScheduling.js
index ee88fcf5fa..f4dd2b2e3f 100644
--- a/packages/react-native-renderer/src/ReactNativeFrameScheduling.js
+++ b/packages/react-native-renderer/src/ReactNativeFrameScheduling.js
@@ -49,12 +49,13 @@ function scheduleDeferredCallback(
 ): number {
   // We assume only one callback is scheduled at a time b'c that's how Fiber works.
   scheduledCallback = callback;
-  return setTimeout(setTimeoutCallback, 1);
+  const timeoutId = setTimeout(setTimeoutCallback, 1);
+  return (timeoutId: any); // Timeouts are always numbers on RN
 }
 
 function cancelDeferredCallback(callbackID: number) {
   scheduledCallback = null;
-  clearTimeout(callbackID);
+  clearTimeout((callbackID: any)); // Timeouts are always numbers on RN
 }
 
 export {now, scheduleDeferredCallback, cancelDeferredCallback};
diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js
index a66548fdc9..50d63de4fa 100644
--- a/packages/react-native-renderer/src/ReactNativeRenderer.js
+++ b/packages/react-native-renderer/src/ReactNativeRenderer.js
@@ -66,9 +66,9 @@ function findNodeHandle(componentOrHandle: any): ?number {
   if (hostInstance == null) {
     return hostInstance;
   }
-  if (hostInstance.canonical) {
+  if ((hostInstance: any).canonical) {
     // Fabric
-    return (hostInstance.canonical: any)._nativeTag;
+    return (hostInstance: any).canonical._nativeTag;
   }
   return hostInstance._nativeTag;
 }
diff --git a/packages/react-noop-renderer/src/createReactNoop.js b/packages/react-noop-renderer/src/createReactNoop.js
index 950f0deec2..873dc88799 100644
--- a/packages/react-noop-renderer/src/createReactNoop.js
+++ b/packages/react-noop-renderer/src/createReactNoop.js
@@ -23,7 +23,7 @@ import emptyObject from 'fbjs/lib/emptyObject';
 import expect from 'expect';
 
 type Container = {rootID: string, children: Array<Instance | TextInstance>};
-type Props = {prop: any, hidden?: boolean};
+type Props = {prop: any, hidden?: boolean, children?: mixed};
 type Instance = {|
   type: string,
   id: number,
diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js
index d3140340c2..ae19577aa2 100644
--- a/packages/react-reconciler/src/ReactChildFiber.js
+++ b/packages/react-reconciler/src/ReactChildFiber.js
@@ -151,6 +151,7 @@ function coerceRef(
       if (
         current !== null &&
         current.ref !== null &&
+        typeof current.ref === 'function' &&
         current.ref._stringRef === stringRef
       ) {
         return current.ref;
@@ -901,18 +902,15 @@ function ChildReconciler(shouldTrackSideEffects) {
 
     if (__DEV__) {
       // Warn about using Maps as children
-      if (typeof newChildrenIterable.entries === 'function') {
-        const possibleMap = (newChildrenIterable: any);
-        if (possibleMap.entries === iteratorFn) {
-          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',
-            getCurrentFiberStackAddendum(),
-          );
-          didWarnAboutMaps = true;
-        }
+      if ((newChildrenIterable: any).entries === iteratorFn) {
+        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',
+          getCurrentFiberStackAddendum(),
+        );
+        didWarnAboutMaps = true;
       }
 
       // First, validate keys.
diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js
index edbe7b2fa5..8faf154642 100644
--- a/packages/react-reconciler/src/ReactFiberContext.js
+++ b/packages/react-reconciler/src/ReactFiberContext.js
@@ -137,7 +137,7 @@ function pushTopLevelContextObject(
   didChange: boolean,
 ): void {
   invariant(
-    contextStackCursor.cursor == null,
+    contextStackCursor.current === emptyObject,
     'Unexpected context found on stack. ' +
       'This error is likely caused by a bug in React. Please file an issue.',
   );
diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index d1c6eab14d..9da8fd975d 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -60,14 +60,20 @@ let scheduleWork: (
   callback: FrameCallbackType,
   options?: {timeout: number},
 ) => number;
-let cancelScheduledWork: (callbackID: number) => void;
+let cancelScheduledWork: (callbackId: number) => void;
 
 if (!ExecutionEnvironment.canUseDOM) {
+  let callbackIdCounter = 0;
+  // Timeouts are objects in Node.
+  // For consistency, we'll use numbers in the public API anyway.
+  const timeoutIds: {[number]: TimeoutID} = {};
+
   scheduleWork = function(
     callback: FrameCallbackType,
     options?: {timeout: number},
   ): number {
-    return setTimeout(() => {
+    const callbackId = callbackIdCounter++;
+    const timeoutId = setTimeout(() => {
       callback({
         timeRemaining() {
           return Infinity;
@@ -75,9 +81,13 @@ if (!ExecutionEnvironment.canUseDOM) {
         didTimeout: false,
       });
     });
+    timeoutIds[callbackId] = timeoutId;
+    return callbackId;
   };
-  cancelScheduledWork = function(timeoutID: number) {
-    clearTimeout(timeoutID);
+  cancelScheduledWork = function(callbackId: number) {
+    const timeoutId = timeoutIds[callbackId];
+    delete timeoutIds[callbackId];
+    clearTimeout(timeoutId);
   };
 } else {
   // We keep callbacks in a queue.
diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js
index ad612d6dde..3fff46d818 100644
--- a/packages/react-test-renderer/src/ReactTestRenderer.js
+++ b/packages/react-test-renderer/src/ReactTestRenderer.js
@@ -414,7 +414,7 @@ const ReactTestRendererFiber = {
     const entry = {
       root: undefined, // makes flow happy
       // we define a 'getter' for 'root' below using 'Object.defineProperty'
-      toJSON() {
+      toJSON(): Array<ReactTestRendererNode> | ReactTestRendererNode | null {
         if (root == null || root.current == null || container == null) {
           return null;
         }
diff --git a/scripts/flow/config/flowconfig b/scripts/flow/config/flowconfig
index b0e77d36f6..cd0c4af1b1 100644
--- a/scripts/flow/config/flowconfig
+++ b/scripts/flow/config/flowconfig
@@ -28,7 +28,6 @@ untyped-type-import=error
 [options]
 esproposal.class_static_fields=enable
 esproposal.class_instance_fields=enable
-unsafe.enable_getters_and_setters=true
 
 # Substituted by createFlowConfig.js:
 %REACT_RENDERER_FLOW_OPTIONS%
@@ -46,4 +45,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.61.0
\ No newline at end of file
+^0.72.0
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 710312cbeb..6ddc40c4f5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2420,9 +2420,9 @@ flow-annotation-check@1.3.1:
     glob "7.1.1"
     load-pkg "^3.0.1"
 
-flow-bin@^0.61.0:
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.61.0.tgz#d0473a8c35dbbf4de573823f4932124397d32d35"
+flow-bin@^0.72.0:
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.72.0.tgz#12051180fb2db7ccb728fefe67c77e955e92a44d"
 
 flow-coverage-report@^0.4.0:
   version "0.4.0"

From 60853f09f35ebece5b4a152b2f52544cb6dbfc8d Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 21 May 2018 18:53:00 +0100
Subject: [PATCH 096/277] Try to reenable Flow on Windows CI

We should have more memory now
---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 79dc791af6..f82fb5c7d9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,7 +30,7 @@ install:
 test_script:
   - node --version
   - yarn lint
-#  - yarn flow-ci (seems like we need more memory for it)
+  - yarn flow-ci
   - yarn build
   - yarn test
   - yarn prettier

From ad27845ccd4fe34189514db23b645d7ab2213496 Mon Sep 17 00:00:00 2001
From: Sophie Alpert <git@sophiebits.com>
Date: Mon, 21 May 2018 17:47:56 -0700
Subject: [PATCH 097/277] Fix double-firing submit events (#12877)

We were adding a listener at the root when we weren't meant to. Blames to e96dc140599363029bd05565d58bcd4a432db370.

This now alerts once (at FORM) instead of twice (at FORM, #document):

```
var Hello = class extends React.Component {
  render() {
    return (
      <form onSubmit={(e) => {e.preventDefault(); alert('hi ' + e.nativeEvent.currentTarget.nodeName);}}>
        <button>hi</button>
      </form>
    );
  }
};
```
---
 packages/react-dom/src/events/ReactBrowserEventEmitter.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/react-dom/src/events/ReactBrowserEventEmitter.js b/packages/react-dom/src/events/ReactBrowserEventEmitter.js
index 0a2742a654..d3291263ec 100644
--- a/packages/react-dom/src/events/ReactBrowserEventEmitter.js
+++ b/packages/react-dom/src/events/ReactBrowserEventEmitter.js
@@ -13,7 +13,9 @@ import {
   TOP_CANCEL,
   TOP_CLOSE,
   TOP_FOCUS,
+  TOP_RESET,
   TOP_SCROLL,
+  TOP_SUBMIT,
 } from './DOMTopLevelEventTypes';
 import {
   setEnabled,
@@ -147,7 +149,7 @@ export function listenTo(
           trapCapturedEvent(TOP_CLOSE, mountAt);
         }
         isListening[TOP_CLOSE] = true;
-      } else {
+      } else if (dependency !== TOP_SUBMIT && dependency !== TOP_RESET) {
         trapBubbledEvent(dependency, mountAt);
       }
 

From 33289b530c6bdd596290b19d392925b933ea7a7b Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Tue, 22 May 2018 08:03:55 -0700
Subject: [PATCH 098/277] Tests and fixes for 'timing out' behavior (#12858)

**what is the change?:**
Test coverage checking that callbacks are called when they time out.

This test surfaced a bug and this commit includes the fix.

I want to refine this approach, but basically we can simulate time outs
by controlling the return value of 'now()' and the argument passed to
the rAF callback.

Next we will write a browser fixture to further test this against real
browser APIs.

**why make this change?:**
Better tests will keep this module working smoothly while we continue
refactoring and improving it.

**test plan:**
Run the new tests, see that it fails without the bug fix.
---
 .../react-scheduler/src/ReactScheduler.js     |   5 +-
 .../src/__tests__/ReactScheduler-test.js      | 122 +++++++++++++++++-
 2 files changed, 122 insertions(+), 5 deletions(-)

diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index 9da8fd975d..f48d2142a9 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -276,7 +276,10 @@ if (!ExecutionEnvironment.canUseDOM) {
     if (options != null && typeof options.timeout === 'number') {
       timeoutTime = now() + options.timeout;
     }
-    if (timeoutTime > nextSoonestTimeoutTime) {
+    if (
+      nextSoonestTimeoutTime === -1 ||
+      (timeoutTime !== -1 && timeoutTime < nextSoonestTimeoutTime)
+    ) {
       nextSoonestTimeoutTime = timeoutTime;
     }
 
diff --git a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
index d178336c3d..299f5a85f1 100644
--- a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
+++ b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
@@ -12,28 +12,43 @@
 let ReactScheduler;
 
 describe('ReactScheduler', () => {
+  let rAFCallbacks = [];
   let postMessageCallback;
   let postMessageEvents = [];
 
   function drainPostMessageQueue() {
+    // default to this falling about 15 ms before next frame
+    currentTime = startOfLatestFrame + frameSize - 15;
     if (postMessageCallback) {
       while (postMessageEvents.length) {
         postMessageCallback(postMessageEvents.shift());
       }
     }
   }
+  function runRAFCallbacks() {
+    startOfLatestFrame += frameSize;
+    currentTime = startOfLatestFrame;
+    rAFCallbacks.forEach(cb => cb());
+    rAFCallbacks = [];
+  }
   function advanceAll() {
-    jest.runAllTimers();
+    runRAFCallbacks();
     drainPostMessageQueue();
   }
+
+  let frameSize = 33;
+  let startOfLatestFrame = Date.now();
+  let currentTime = Date.now();
+
   beforeEach(() => {
     // TODO pull this into helper method, reduce repetition.
     // mock the browser APIs which are used in react-scheduler:
     // - requestAnimationFrame should pass the DOMHighResTimeStamp argument
     // - calling 'window.postMessage' should actually fire postmessage handlers
+    // - Date.now should return the correct thing
     global.requestAnimationFrame = function(cb) {
-      return setTimeout(() => {
-        cb(Date.now());
+      return rAFCallbacks.push(() => {
+        cb(startOfLatestFrame);
       });
     };
     const originalAddEventListener = global.addEventListener;
@@ -50,6 +65,9 @@ describe('ReactScheduler', () => {
       const postMessageEvent = {source: window, data: messageKey};
       postMessageEvents.push(postMessageEvent);
     };
+    global.Date.now = function() {
+      return currentTime;
+    };
     jest.resetModules();
     ReactScheduler = require('react-scheduler');
   });
@@ -102,7 +120,7 @@ describe('ReactScheduler', () => {
         scheduleWork(callbackA);
         // initially waits to call the callback
         expect(callbackLog).toEqual([]);
-        jest.runAllTimers();
+        runRAFCallbacks();
         // this should schedule work *after* the requestAnimationFrame but before the message handler
         scheduleWork(callbackB);
         expect(callbackLog).toEqual([]);
@@ -208,6 +226,102 @@ describe('ReactScheduler', () => {
         expect(callbackLog).toEqual(['A0', 'B', 'A1']);
       });
     });
+
+    describe('when callbacks time out: ', () => {
+      // USEFUL INFO:
+      // startOfLatestFrame is a global that goes up every time rAF runs
+      // currentTime defaults to startOfLatestFrame inside rAF callback
+      // and currentTime defaults to 15 before next frame inside idleTick
+
+      describe('when there is no more time left in the frame', () => {
+        it('calls any callback which has timed out, waits for others', () => {
+          const {scheduleWork} = ReactScheduler;
+          startOfLatestFrame = 1000000000000;
+          currentTime = startOfLatestFrame - 10;
+          const callbackLog = [];
+          // simple case of one callback which times out, another that won't.
+          const callbackA = jest.fn(() => callbackLog.push('A'));
+          const callbackB = jest.fn(() => callbackLog.push('B'));
+          const callbackC = jest.fn(() => callbackLog.push('C'));
+
+          scheduleWork(callbackA); // won't time out
+          scheduleWork(callbackB, {timeout: 100}); // times out later
+          scheduleWork(callbackC, {timeout: 2}); // will time out fast
+
+          runRAFCallbacks(); // runs rAF callback
+          // push time ahead a bit so that we have no idle time
+          startOfLatestFrame += 16;
+          drainPostMessageQueue(); // runs postMessage callback, idleTick
+
+          // callbackC should have timed out
+          expect(callbackLog).toEqual(['C']);
+
+          runRAFCallbacks(); // runs rAF callback
+          // push time ahead a bit so that we have no idle time
+          startOfLatestFrame += 16;
+          drainPostMessageQueue(); // runs postMessage callback, idleTick
+
+          // callbackB should have timed out
+          expect(callbackLog).toEqual(['C', 'B']);
+
+          runRAFCallbacks(); // runs rAF callback
+          drainPostMessageQueue(); // runs postMessage callback, idleTick
+
+          // we should have run callbackA in the idle time
+          expect(callbackLog).toEqual(['C', 'B', 'A']);
+        });
+      });
+
+      describe('when there is some time left in the frame', () => {
+        it('calls timed out callbacks and then any more pending callbacks, defers others if time runs out', () => {
+          // TODO first call timed out callbacks
+          // then any non-timed out callbacks if there is time
+          const {scheduleWork} = ReactScheduler;
+          startOfLatestFrame = 1000000000000;
+          currentTime = startOfLatestFrame - 10;
+          const callbackLog = [];
+          // simple case of one callback which times out, others that won't.
+          const callbackA = jest.fn(() => {
+            callbackLog.push('A');
+            // time passes, causing us to run out of idle time
+            currentTime += 25;
+          });
+          const callbackB = jest.fn(() => callbackLog.push('B'));
+          const callbackC = jest.fn(() => callbackLog.push('C'));
+          const callbackD = jest.fn(() => callbackLog.push('D'));
+
+          scheduleWork(callbackA); // won't time out
+          scheduleWork(callbackB, {timeout: 100}); // times out later
+          scheduleWork(callbackC, {timeout: 2}); // will time out fast
+          scheduleWork(callbackD); // won't time out
+
+          advanceAll(); // runs rAF and postMessage callbacks
+
+          // callbackC should have timed out
+          // we should have had time to call A also, then we run out of time
+          expect(callbackLog).toEqual(['C', 'A']);
+
+          runRAFCallbacks(); // runs rAF callback
+          // push time ahead a bit so that we have no idle time
+          startOfLatestFrame += 16;
+          drainPostMessageQueue(); // runs postMessage callback, idleTick
+
+          // callbackB should have timed out
+          // but we should not run callbackD because we have no idle time
+          expect(callbackLog).toEqual(['C', 'A', 'B']);
+
+          advanceAll(); // runs rAF and postMessage callbacks
+
+          // we should have run callbackD in the idle time
+          expect(callbackLog).toEqual(['C', 'A', 'B', 'D']);
+
+          advanceAll(); // runs rAF and postMessage callbacks
+
+          // we should not have run anything again, nothing is scheduled
+          expect(callbackLog).toEqual(['C', 'A', 'B', 'D']);
+        });
+      });
+    });
   });
 
   describe('cancelScheduledWork', () => {

From 7c0aca289d2ae6444e70753287602222701b1703 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Tue, 22 May 2018 08:16:59 -0700
Subject: [PATCH 099/277] Rollup freeze: false (#12879)

* Tell Rollup not to freeze bundles
* Only freeze bundles for DEV builds
---
 scripts/rollup/build.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index 5303c77419..ba1ee434f6 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -122,13 +122,22 @@ function getBabelConfig(updateBabelOptions, bundleType, filename) {
   }
 }
 
-function getRollupOutputOptions(outputPath, format, globals, globalName) {
+function getRollupOutputOptions(
+  outputPath,
+  format,
+  globals,
+  globalName,
+  bundleType
+) {
+  const isProduction = isProductionBundleType(bundleType);
+
   return Object.assign(
     {},
     {
       file: outputPath,
       format,
       globals,
+      freeze: !isProduction,
       interop: false,
       name: globalName,
       sourcemap: false,
@@ -401,7 +410,8 @@ async function createBundle(bundle, bundleType) {
     mainOutputPath,
     format,
     peerGlobals,
-    bundle.global
+    bundle.global,
+    bundleType
   );
 
   console.log(`${chalk.bgYellow.black(' BUILDING ')} ${logKey}`);

From e8857918422b5ce8505ba5ce4a2d153e509c17a1 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 22 May 2018 19:50:36 +0100
Subject: [PATCH 100/277] Fix a regression that caused us to listen to extra
 events at the top (#12878)

* Rewrite to a switch

I find it a bit easier to follow than many comparison conditions.

* Remove unnecessary assignments

They are being assigned below anyway. This is likely a copypasta from the FOCUS/BLUR special case (which *does* need those assignments).

* Unify "cancel" and "close" cases

Their logic is identical.

* Don't listen to media events at the top

* Add a unit test for double-invoking form events

* Remove an unused case and document it in a test

The case I added was wrong (just like including this event in the top level list was always wrong).

In fact it never bubbles, even for <img>. And since we don't special case it in the <img> event
attachment logic when we create it, we never supported <img onLoadStart> at all.

We could fix it. But Chrome doesn't support it either: https://bugs.chromium.org/p/chromium/issues/detail?id=458851.
Nobody asked us for it yet. And supporting it would require attaching an extra listener to every <img>.

So maybe we don't need it? Let's document the existing state of things.

* Add a test verifying we don't attach unnecessary listeners

* Add a comment

* Add a test for submit (bubbles: false)
---
 .../__tests__/ReactDOMEventListener-test.js   | 161 ++++++++++++++++++
 .../src/events/DOMTopLevelEventTypes.js       |   3 +
 .../src/events/ReactBrowserEventEmitter.js    |  58 ++++---
 3 files changed, 200 insertions(+), 22 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js b/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js
index 8f11847aac..5c2ff8c591 100644
--- a/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js
@@ -217,4 +217,165 @@ describe('ReactDOMEventListener', () => {
     expect(mouseOut.mock.calls[0][0]).toEqual(instance.getInner());
     document.body.removeChild(container);
   });
+
+  // Regression test for https://github.com/facebook/react/pull/12877
+  it('should not fire form events twice', () => {
+    const container = document.createElement('div');
+    document.body.appendChild(container);
+
+    const formRef = React.createRef();
+    const inputRef = React.createRef();
+
+    const handleInvalid = jest.fn();
+    const handleReset = jest.fn();
+    const handleSubmit = jest.fn();
+    ReactDOM.render(
+      <form ref={formRef} onReset={handleReset} onSubmit={handleSubmit}>
+        <input ref={inputRef} onInvalid={handleInvalid} />
+      </form>,
+      container,
+    );
+
+    inputRef.current.dispatchEvent(
+      new Event('invalid', {
+        // https://developer.mozilla.org/en-US/docs/Web/Events/invalid
+        bubbles: false,
+      }),
+    );
+    expect(handleInvalid).toHaveBeenCalledTimes(1);
+
+    formRef.current.dispatchEvent(
+      new Event('reset', {
+        // https://developer.mozilla.org/en-US/docs/Web/Events/reset
+        bubbles: true,
+      }),
+    );
+    expect(handleReset).toHaveBeenCalledTimes(1);
+
+    formRef.current.dispatchEvent(
+      new Event('submit', {
+        // https://developer.mozilla.org/en-US/docs/Web/Events/submit
+        bubbles: true,
+      }),
+    );
+    expect(handleSubmit).toHaveBeenCalledTimes(1);
+
+    formRef.current.dispatchEvent(
+      new Event('submit', {
+        // Might happen on older browsers.
+        bubbles: true,
+      }),
+    );
+    expect(handleSubmit).toHaveBeenCalledTimes(2); // It already fired in this test.
+
+    document.body.removeChild(container);
+  });
+
+  it('should dispatch loadstart only for media elements', () => {
+    const container = document.createElement('div');
+    document.body.appendChild(container);
+
+    const imgRef = React.createRef();
+    const videoRef = React.createRef();
+
+    const handleImgLoadStart = jest.fn();
+    const handleVideoLoadStart = jest.fn();
+    ReactDOM.render(
+      <div>
+        <img ref={imgRef} onLoadStart={handleImgLoadStart} />
+        <video ref={videoRef} onLoadStart={handleVideoLoadStart} />
+      </div>,
+      container,
+    );
+
+    // Note for debugging: loadstart currently doesn't fire in Chrome.
+    // https://bugs.chromium.org/p/chromium/issues/detail?id=458851
+    imgRef.current.dispatchEvent(
+      new ProgressEvent('loadstart', {
+        bubbles: false,
+      }),
+    );
+    // Historically, we happened to not support onLoadStart
+    // on <img>, and this test documents that lack of support.
+    // If we decide to support it in the future, we should change
+    // this line to expect 1 call. Note that fixing this would
+    // be simple but would require attaching a handler to each
+    // <img>. So far nobody asked us for it.
+    expect(handleImgLoadStart).toHaveBeenCalledTimes(0);
+
+    videoRef.current.dispatchEvent(
+      new ProgressEvent('loadstart', {
+        bubbles: false,
+      }),
+    );
+    expect(handleVideoLoadStart).toHaveBeenCalledTimes(1);
+
+    document.body.removeChild(container);
+  });
+
+  it('should not attempt to listen to unnecessary events on the top level', () => {
+    const container = document.createElement('div');
+    document.body.appendChild(container);
+
+    const videoRef = React.createRef();
+    const handleVideoPlay = jest.fn(); // We'll test this one.
+    const mediaEvents = {
+      onAbort() {},
+      onCanPlay() {},
+      onCanPlayThrough() {},
+      onDurationChange() {},
+      onEmptied() {},
+      onEncrypted() {},
+      onEnded() {},
+      onError() {},
+      onLoadedData() {},
+      onLoadedMetadata() {},
+      onLoadStart() {},
+      onPause() {},
+      onPlay() {},
+      onPlaying() {},
+      onProgress() {},
+      onRateChange() {},
+      onSeeked() {},
+      onSeeking() {},
+      onStalled() {},
+      onSuspend() {},
+      onTimeUpdate() {},
+      onVolumeChange() {},
+      onWaiting() {},
+    };
+
+    const originalAddEventListener = document.addEventListener;
+    document.addEventListener = function(type) {
+      throw new Error(
+        `Did not expect to add a top-level listener for the "${type}" event.`,
+      );
+    };
+
+    try {
+      // We expect that mounting this tree will
+      // *not* attach handlers for any top-level events.
+      ReactDOM.render(
+        <div>
+          <video ref={videoRef} {...mediaEvents} onPlay={handleVideoPlay} />
+          <audio {...mediaEvents}>
+            <source {...mediaEvents} />
+          </audio>
+          <form onReset={() => {}} onSubmit={() => {}} />
+        </div>,
+        container,
+      );
+
+      // Also verify dispatching one of them works
+      videoRef.current.dispatchEvent(
+        new Event('play', {
+          bubbles: false,
+        }),
+      );
+      expect(handleVideoPlay).toHaveBeenCalledTimes(1);
+    } finally {
+      document.addEventListener = originalAddEventListener;
+      document.body.removeChild(container);
+    }
+  });
 });
diff --git a/packages/react-dom/src/events/DOMTopLevelEventTypes.js b/packages/react-dom/src/events/DOMTopLevelEventTypes.js
index 298afec9c9..dc526a0ef0 100644
--- a/packages/react-dom/src/events/DOMTopLevelEventTypes.js
+++ b/packages/react-dom/src/events/DOMTopLevelEventTypes.js
@@ -148,6 +148,9 @@ export const TOP_VOLUME_CHANGE = unsafeCastStringToDOMTopLevelType(
 export const TOP_WAITING = unsafeCastStringToDOMTopLevelType('waiting');
 export const TOP_WHEEL = unsafeCastStringToDOMTopLevelType('wheel');
 
+// List of events that need to be individually attached to media elements.
+// Note that events in this list will *not* be listened to at the top level
+// unless they're explicitly whitelisted in `ReactBrowserEventEmitter.listenTo`.
 export const mediaEventTypes = [
   TOP_ABORT,
   TOP_CAN_PLAY,
diff --git a/packages/react-dom/src/events/ReactBrowserEventEmitter.js b/packages/react-dom/src/events/ReactBrowserEventEmitter.js
index d3291263ec..3dd2e452f5 100644
--- a/packages/react-dom/src/events/ReactBrowserEventEmitter.js
+++ b/packages/react-dom/src/events/ReactBrowserEventEmitter.js
@@ -13,9 +13,12 @@ import {
   TOP_CANCEL,
   TOP_CLOSE,
   TOP_FOCUS,
+  TOP_INVALID,
   TOP_RESET,
   TOP_SCROLL,
   TOP_SUBMIT,
+  getRawEventName,
+  mediaEventTypes,
 } from './DOMTopLevelEventTypes';
 import {
   setEnabled,
@@ -130,29 +133,40 @@ export function listenTo(
   for (let i = 0; i < dependencies.length; i++) {
     const dependency = dependencies[i];
     if (!(isListening.hasOwnProperty(dependency) && isListening[dependency])) {
-      if (dependency === TOP_SCROLL) {
-        trapCapturedEvent(TOP_SCROLL, mountAt);
-      } else if (dependency === TOP_FOCUS || dependency === TOP_BLUR) {
-        trapCapturedEvent(TOP_FOCUS, mountAt);
-        trapCapturedEvent(TOP_BLUR, mountAt);
-
-        // to make sure blur and focus event listeners are only attached once
-        isListening[TOP_BLUR] = true;
-        isListening[TOP_FOCUS] = true;
-      } else if (dependency === TOP_CANCEL) {
-        if (isEventSupported('cancel', true)) {
-          trapCapturedEvent(TOP_CANCEL, mountAt);
-        }
-        isListening[TOP_CANCEL] = true;
-      } else if (dependency === TOP_CLOSE) {
-        if (isEventSupported('close', true)) {
-          trapCapturedEvent(TOP_CLOSE, mountAt);
-        }
-        isListening[TOP_CLOSE] = true;
-      } else if (dependency !== TOP_SUBMIT && dependency !== TOP_RESET) {
-        trapBubbledEvent(dependency, mountAt);
+      switch (dependency) {
+        case TOP_SCROLL:
+          trapCapturedEvent(TOP_SCROLL, mountAt);
+          break;
+        case TOP_FOCUS:
+        case TOP_BLUR:
+          trapCapturedEvent(TOP_FOCUS, mountAt);
+          trapCapturedEvent(TOP_BLUR, mountAt);
+          // We set the flag for a single dependency later in this function,
+          // but this ensures we mark both as attached rather than just one.
+          isListening[TOP_BLUR] = true;
+          isListening[TOP_FOCUS] = true;
+          break;
+        case TOP_CANCEL:
+        case TOP_CLOSE:
+          if (isEventSupported(getRawEventName(dependency), true)) {
+            trapCapturedEvent(dependency, mountAt);
+          }
+          break;
+        case TOP_INVALID:
+        case TOP_SUBMIT:
+        case TOP_RESET:
+          // We listen to them on the target DOM elements.
+          // Some of them bubble so we don't want them to fire twice.
+          break;
+        default:
+          // By default, listen on the top level to all non-media events.
+          // Media events don't bubble so adding the listener wouldn't do anything.
+          const isMediaEvent = mediaEventTypes.indexOf(dependency) !== -1;
+          if (!isMediaEvent) {
+            trapBubbledEvent(dependency, mountAt);
+          }
+          break;
       }
-
       isListening[dependency] = true;
     }
   }

From 7350358374036c0834ea6b69cea7491abbbb1af0 Mon Sep 17 00:00:00 2001
From: Chang Yan <cyan.binary@gmail.com>
Date: Tue, 22 May 2018 15:38:02 -0700
Subject: [PATCH 101/277] add legacy context API warning in strict mode
 (#12849)

* add legacy context APIs warning in strict mode

* refactor if statement and the warning message

* add other flags for type check

* add component stack tree and refactor wording

* fix the nits
---
 .../src/ReactFiberClassComponent.js           |  5 ++
 .../src/ReactFiberScheduler.js                |  5 ++
 .../src/ReactStrictModeWarnings.js            | 68 ++++++++++++++++++
 .../ReactStrictMode-test.internal.js          | 69 +++++++++++++++++++
 packages/shared/ReactFeatureFlags.js          |  3 +
 .../ReactFeatureFlags.native-fabric-fb.js     |  1 +
 .../ReactFeatureFlags.native-fabric-oss.js    |  1 +
 .../forks/ReactFeatureFlags.native-fb.js      |  1 +
 .../forks/ReactFeatureFlags.native-oss.js     |  1 +
 .../forks/ReactFeatureFlags.persistent.js     |  1 +
 .../forks/ReactFeatureFlags.test-renderer.js  |  1 +
 .../shared/forks/ReactFeatureFlags.www.js     |  1 +
 .../react-native-fb/ReactFeatureFlags.js      |  1 +
 13 files changed, 158 insertions(+)

diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js
index af1f409aa2..56219535e4 100644
--- a/packages/react-reconciler/src/ReactFiberClassComponent.js
+++ b/packages/react-reconciler/src/ReactFiberClassComponent.js
@@ -668,6 +668,11 @@ function mountClassInstance(
         workInProgress,
         instance,
       );
+
+      ReactStrictModeWarnings.recordLegacyContextWarning(
+        workInProgress,
+        instance,
+      );
     }
 
     if (warnAboutDeprecatedLifecycles) {
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index da32034b08..87f97dcc61 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -42,6 +42,7 @@ import {
   enableUserTimingAPI,
   replayFailedUnitOfWorkWithInvokeGuardedCallback,
   warnAboutDeprecatedLifecycles,
+  warnAboutLegacyContextAPI,
 } from 'shared/ReactFeatureFlags';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'fbjs/lib/invariant';
@@ -440,6 +441,10 @@ function commitAllLifeCycles(
     if (warnAboutDeprecatedLifecycles) {
       ReactStrictModeWarnings.flushPendingDeprecationWarnings();
     }
+
+    if (warnAboutLegacyContextAPI) {
+      ReactStrictModeWarnings.flushLegacyContextWarning();
+    }
   }
   while (nextEffect !== null) {
     const effectTag = nextEffect.effectTag;
diff --git a/packages/react-reconciler/src/ReactStrictModeWarnings.js b/packages/react-reconciler/src/ReactStrictModeWarnings.js
index 8887bec3c9..92fb1f1b13 100644
--- a/packages/react-reconciler/src/ReactStrictModeWarnings.js
+++ b/packages/react-reconciler/src/ReactStrictModeWarnings.js
@@ -21,6 +21,8 @@ type LIFECYCLE =
   | 'UNSAFE_componentWillUpdate';
 type LifecycleToComponentsMap = {[lifecycle: LIFECYCLE]: Array<Fiber>};
 type FiberToLifecycleMap = Map<Fiber, LifecycleToComponentsMap>;
+type FiberArray = Array<Fiber>;
+type FiberToFiberComponentsMap = Map<Fiber, FiberArray>;
 
 const ReactStrictModeWarnings = {
   discardPendingWarnings(): void {},
@@ -28,6 +30,8 @@ const ReactStrictModeWarnings = {
   flushPendingUnsafeLifecycleWarnings(): void {},
   recordDeprecationWarnings(fiber: Fiber, instance: any): void {},
   recordUnsafeLifecycleWarnings(fiber: Fiber, instance: any): void {},
+  recordLegacyContextWarning(fiber: Fiber, instance: any): void {},
+  flushLegacyContextWarning(): void {},
 };
 
 if (__DEV__) {
@@ -41,10 +45,12 @@ if (__DEV__) {
   let pendingComponentWillReceivePropsWarnings: Array<Fiber> = [];
   let pendingComponentWillUpdateWarnings: Array<Fiber> = [];
   let pendingUnsafeLifecycleWarnings: FiberToLifecycleMap = new Map();
+  let pendingLegacyContextWarning: FiberToFiberComponentsMap = new Map();
 
   // Tracks components we have already warned about.
   const didWarnAboutDeprecatedLifecycles = new Set();
   const didWarnAboutUnsafeLifecycles = new Set();
+  const didWarnAboutLegacyContext = new Set();
 
   const setToSortedString = set => {
     const array = [];
@@ -59,6 +65,7 @@ if (__DEV__) {
     pendingComponentWillReceivePropsWarnings = [];
     pendingComponentWillUpdateWarnings = [];
     pendingUnsafeLifecycleWarnings = new Map();
+    pendingLegacyContextWarning = new Map();
   };
 
   ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = () => {
@@ -289,6 +296,67 @@ if (__DEV__) {
       });
     }
   };
+
+  ReactStrictModeWarnings.recordLegacyContextWarning = (
+    fiber: Fiber,
+    instance: any,
+  ) => {
+    const strictRoot = findStrictRoot(fiber);
+    if (strictRoot === null) {
+      warning(
+        false,
+        'Expected to find a StrictMode component in a strict mode tree. ' +
+          'This error is likely caused by a bug in React. Please file an issue.',
+      );
+      return;
+    }
+
+    // Dedup strategy: Warn once per component.
+    if (didWarnAboutLegacyContext.has(fiber.type)) {
+      return;
+    }
+
+    let warningsForRoot = pendingLegacyContextWarning.get(strictRoot);
+
+    if (
+      typeof instance.getChildContext === 'function' ||
+      fiber.type.contextTypes != null ||
+      fiber.type.childContextTypes != null
+    ) {
+      if (warningsForRoot === undefined) {
+        warningsForRoot = [];
+        pendingLegacyContextWarning.set(strictRoot, warningsForRoot);
+      }
+      warningsForRoot.push(fiber);
+    }
+  };
+
+  ReactStrictModeWarnings.flushLegacyContextWarning = () => {
+    ((pendingLegacyContextWarning: any): FiberToFiberComponentsMap).forEach(
+      (fiberArray: FiberArray, strictRoot) => {
+        const uniqueNames = new Set();
+        fiberArray.forEach(fiber => {
+          uniqueNames.add(getComponentName(fiber) || 'Component');
+          didWarnAboutLegacyContext.add(fiber.type);
+        });
+
+        const sortedNames = setToSortedString(uniqueNames);
+        const strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
+          strictRoot,
+        );
+
+        warning(
+          false,
+          'Legacy context API has been detected within a strict-mode tree: %s' +
+            '\n\nPlease update the following components: %s' +
+            '\n\nLearn more about this warning here:' +
+            '\nhttps://fb.me/react-strict-mode-warnings',
+          strictRootComponentStack,
+          sortedNames,
+        );
+      },
+    );
+  };
 }
 
 export default ReactStrictModeWarnings;
diff --git a/packages/react/src/__tests__/ReactStrictMode-test.internal.js b/packages/react/src/__tests__/ReactStrictMode-test.internal.js
index 9236ae7754..56b5e9e530 100644
--- a/packages/react/src/__tests__/ReactStrictMode-test.internal.js
+++ b/packages/react/src/__tests__/ReactStrictMode-test.internal.js
@@ -12,6 +12,7 @@
 let React;
 let ReactFeatureFlags;
 let ReactTestRenderer;
+let PropTypes;
 
 describe('ReactStrictMode', () => {
   describe('debugRenderPhaseSideEffects', () => {
@@ -805,4 +806,72 @@ describe('ReactStrictMode', () => {
       renderer.update(<OuterComponent />);
     });
   });
+
+  describe('context legacy', () => {
+    beforeEach(() => {
+      jest.resetModules();
+      React = require('react');
+      ReactTestRenderer = require('react-test-renderer');
+      PropTypes = require('prop-types');
+      ReactFeatureFlags = require('shared/ReactFeatureFlags');
+      ReactFeatureFlags.warnAboutLegacyContextAPI = true;
+    });
+
+    it('should warn if the legacy context API have been used in strict mode', () => {
+      class LegacyContextProvider extends React.Component {
+        getChildContext() {
+          return {color: 'purple'};
+        }
+
+        render() {
+          return <LegacyContextConsumer />;
+        }
+      }
+
+      LegacyContextProvider.childContextTypes = {
+        color: PropTypes.string,
+      };
+
+      class LegacyContextConsumer extends React.Component {
+        render() {
+          return null;
+        }
+      }
+
+      const {StrictMode} = React;
+
+      class Root extends React.Component {
+        render() {
+          return (
+            <div>
+              <StrictMode>
+                <LegacyContextProvider />
+              </StrictMode>
+            </div>
+          );
+        }
+      }
+
+      LegacyContextConsumer.contextTypes = {
+        color: PropTypes.string,
+      };
+
+      let rendered;
+
+      expect(() => {
+        rendered = ReactTestRenderer.create(<Root />);
+      }).toWarnDev(
+        'Warning: Legacy context API has been detected within a strict-mode tree: ' +
+          '\n    in div (at **)' +
+          '\n    in Root (at **)' +
+          '\n\nPlease update the following components: LegacyContextConsumer, LegacyContextProvider' +
+          '\n\nLearn more about this warning here:' +
+          '\nhttps://fb.me/react-strict-mode-warnings',
+      );
+
+      // Dedupe
+      rendered = ReactTestRenderer.create(<Root />);
+      rendered.update(<Root />);
+    });
+  });
 });
diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
index c4618b5528..91ebce8c09 100644
--- a/packages/shared/ReactFeatureFlags.js
+++ b/packages/shared/ReactFeatureFlags.js
@@ -33,6 +33,9 @@ export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 // Warn about deprecated, async-unsafe lifecycles; relates to RFC #6:
 export const warnAboutDeprecatedLifecycles = false;
 
+// Warn about legacy context API
+export const warnAboutLegacyContextAPI = false;
+
 // Gather advanced timing metrics for Profiler subtrees.
 export const enableProfilerTimer = __DEV__;
 
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
index cdfe7dd3d6..5fc79cc55d 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
@@ -18,6 +18,7 @@ export const enableUserTimingAPI = __DEV__;
 export const enableGetDerivedStateFromCatch = false;
 export const enableSuspense = false;
 export const warnAboutDeprecatedLifecycles = false;
+export const warnAboutLegacyContextAPI = __DEV__;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableProfilerTimer = __DEV__;
 export const fireGetDerivedStateFromPropsOnStateUpdates = true;
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
index ece21aa11f..f80827ef02 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
@@ -18,6 +18,7 @@ export const enableUserTimingAPI = __DEV__;
 export const enableGetDerivedStateFromCatch = false;
 export const enableSuspense = false;
 export const warnAboutDeprecatedLifecycles = false;
+export const warnAboutLegacyContextAPI = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableProfilerTimer = false;
 export const fireGetDerivedStateFromPropsOnStateUpdates = true;
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js
index 874d62ae11..086518d9f3 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js
@@ -26,6 +26,7 @@ export const {
 
 // The rest of the flags are static for better dead code elimination.
 export const enableUserTimingAPI = __DEV__;
+export const warnAboutLegacyContextAPI = __DEV__;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js
index 6b435c6bdf..0eb9c58b4e 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js
@@ -19,6 +19,7 @@ export const enableSuspense = false;
 export const enableUserTimingAPI = __DEV__;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const warnAboutDeprecatedLifecycles = false;
+export const warnAboutLegacyContextAPI = false;
 export const enableProfilerTimer = __DEV__;
 export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
diff --git a/packages/shared/forks/ReactFeatureFlags.persistent.js b/packages/shared/forks/ReactFeatureFlags.persistent.js
index 6d8f9f3c42..06c1014dd7 100644
--- a/packages/shared/forks/ReactFeatureFlags.persistent.js
+++ b/packages/shared/forks/ReactFeatureFlags.persistent.js
@@ -18,6 +18,7 @@ export const enableUserTimingAPI = __DEV__;
 export const enableGetDerivedStateFromCatch = false;
 export const enableSuspense = false;
 export const warnAboutDeprecatedLifecycles = false;
+export const warnAboutLegacyContextAPI = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableProfilerTimer = false;
 export const fireGetDerivedStateFromPropsOnStateUpdates = true;
diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
index dc7823de21..b8e0cbcea1 100644
--- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js
+++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
@@ -18,6 +18,7 @@ export const enableUserTimingAPI = __DEV__;
 export const enableGetDerivedStateFromCatch = false;
 export const enableSuspense = false;
 export const warnAboutDeprecatedLifecycles = false;
+export const warnAboutLegacyContextAPI = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = false;
 export const enableProfilerTimer = false;
 export const fireGetDerivedStateFromPropsOnStateUpdates = true;
diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js
index ddc82b3db0..0923924957 100644
--- a/packages/shared/forks/ReactFeatureFlags.www.js
+++ b/packages/shared/forks/ReactFeatureFlags.www.js
@@ -23,6 +23,7 @@ export const {
 } = require('ReactFeatureFlags');
 
 // The rest of the flags are static for better dead code elimination.
+export const warnAboutLegacyContextAPI = __DEV__;
 
 // In www, we have experimental support for gathering data
 // from User Timing API calls in production. By default, we
diff --git a/scripts/rollup/shims/react-native-fb/ReactFeatureFlags.js b/scripts/rollup/shims/react-native-fb/ReactFeatureFlags.js
index ea5c5ba0f1..4f639fac17 100644
--- a/scripts/rollup/shims/react-native-fb/ReactFeatureFlags.js
+++ b/scripts/rollup/shims/react-native-fb/ReactFeatureFlags.js
@@ -14,6 +14,7 @@ const ReactFeatureFlags = {
   debugRenderPhaseSideEffects: false,
   debugRenderPhaseSideEffectsForStrictMode: false,
   warnAboutDeprecatedLifecycles: true,
+  warnAboutLegacyContextAPI: true,
 };
 
 module.exports = ReactFeatureFlags;

From c601f7a64640290af85c9f0e33c78480656b46bc Mon Sep 17 00:00:00 2001
From: Chang Yan <cyan.binary@gmail.com>
Date: Tue, 22 May 2018 15:39:40 -0700
Subject: [PATCH 102/277] add siblings Timeout components test case (#12862)

---
 .../__tests__/ReactSuspense-test.internal.js  | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
index e834ca5eda..21e7eef299 100644
--- a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
@@ -139,6 +139,53 @@ describe('ReactSuspense', () => {
     expect(ReactNoop.getChildren()).toEqual([span('A'), span('B')]);
   });
 
+  it('suspends siblings and later recovers each independently', async () => {
+    // Render two sibling Timeout components
+    ReactNoop.render(
+      <Fragment>
+        <Fallback timeout={1000} placeholder={<Text text="Loading A..." />}>
+          <AsyncText text="A" ms={5000} />
+        </Fallback>
+        <Fallback timeout={3000} placeholder={<Text text="Loading B..." />}>
+          <AsyncText text="B" ms={6000} />
+        </Fallback>
+      </Fragment>,
+    );
+    expect(ReactNoop.flush()).toEqual(['Suspend! [A]', 'Suspend! [B]']);
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Advance time by enough to timeout both components and commit their placeholders
+    ReactNoop.expire(4000);
+    await advanceTimers(4000);
+
+    expect(ReactNoop.flush()).toEqual([
+      'Suspend! [A]',
+      'Loading A...',
+      'Suspend! [B]',
+      'Loading B...',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([
+      span('Loading A...'),
+      span('Loading B...'),
+    ]);
+
+    // Advance time by enough that the first Timeout's promise resolves
+    // and switches back to the normal view. The second Timeout should still show the placeholder
+    ReactNoop.expire(1000);
+    await advanceTimers(1000);
+
+    expect(ReactNoop.flush()).toEqual(['Promise resolved [A]', 'A']);
+    expect(ReactNoop.getChildren()).toEqual([span('A'), span('Loading B...')]);
+
+    // Advance time by enough that the second Timeout's promise resolves
+    // and switches back to the normal view
+    ReactNoop.expire(1000);
+    await advanceTimers(1000);
+
+    expect(ReactNoop.flush()).toEqual(['Promise resolved [B]', 'B']);
+    expect(ReactNoop.getChildren()).toEqual([span('A'), span('B')]);
+  });
+
   it('continues rendering siblings after suspending', async () => {
     ReactNoop.render(
       <Fallback>

From d1be01f079ed20b06bc76a0e66eb0d2c615e3aad Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 23 May 2018 16:40:35 +0100
Subject: [PATCH 103/277] Add upcoming 16.4.0 changelog

---
 CHANGELOG.md | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9b92031fc..dc8dc38651 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,44 @@
     Changes that have landed in master but are not yet released.
     Click to see more.
   </summary>
+
+### React
+
+* Add a new experimental `React.unstable_Profiler` component for measuring performance. ([@bvaughn](https://github.com/bvaughn) in [#12745](https://github.com/facebook/react/pull/12745))
+
+### React DOM
+
+* Add support for the Pointer Events specification. ([@philipp-spiess](https://github.com/philipp-spiess) in [#12507](https://github.com/facebook/react/pull/12507))
+* Call `getDerivedFromProps()` regardless of why rendering happened. ([@acdlite](https://github.com/acdlite) in [#12600](https://github.com/facebook/react/pull/12600) and [#12802](https://github.com/facebook/react/pull/12802))
+* Fix a bug that prevented context propagation in some cases. ([@gaearon](https://github.com/gaearon) in [#12708](https://github.com/facebook/react/pull/12708))
+* Fix re-rendering of components using `forwardRef()` on a deeper `setState()`. ([@gaearon](https://github.com/gaearon) in [#12690](https://github.com/facebook/react/pull/12690))
+* Fix some attributes incorrectly getting removed from custom element nodes. ([@airamrguez](https://github.com/airamrguez) in [#12702](https://github.com/facebook/react/pull/12702))
+* Fix context providers to not bail out on children if there's a legacy context provider above. ([@gaearon](https://github.com/gaearon) in [#12586](https://github.com/facebook/react/pull/12586))
+* Add the ability to specify `propTypes` on a context provider component. ([@nicolevy](https://github.com/nicolevy) in [#12658](https://github.com/facebook/react/pull/12658))
+* Fix a false positive warning when using `react-lifecycles-compat` in `<StrictMode>`. ([@bvaughn](https://github.com/bvaughn) in [#12644](https://github.com/facebook/react/pull/12644))
+* Warn when the `forwardRef()` render function has `propTypes` or `defaultProps`. ([@bvaughn](https://github.com/bvaughn) in [#12644](https://github.com/facebook/react/pull/12644))
+* Improve how `forwardRef()` and context consumers are displayed in the component stack. ([@sophiebits](https://github.com/sophiebits) in [#12777](https://github.com/facebook/react/pull/12777))
+* Change internal event names. This can break third-party packages that rely on React internals in unsupported ways. ([@philipp-spiess](https://github.com/philipp-spiess) in [#12629](https://github.com/facebook/react/pull/12629))
+
+### React Test Renderer
+
+* Fix the `getDerivedStateFromProps()` support to match the new React DOM behavior. ([@koba04](https://github.com/koba04) in [#12676](https://github.com/facebook/react/pull/12676))
+* Fix a `testInstance.parent` crash when the parent is a fragment or another special node. ([@gaearon](https://github.com/gaearon) in [#12813](https://github.com/facebook/react/pull/12813))
+* `forwardRef()` components are now discoverable by the test renderer traversal methods. ([@gaearon](https://github.com/gaearon) in [#12725](https://github.com/facebook/react/pull/12725))
+* Shallow renderer now ignores `setState()` updaters that return `null` or `undefined`. ([@koba04](https://github.com/koba04) in [#12756](https://github.com/facebook/react/pull/12756))
+
+### React ART
+
+* Fix reading context provided from the tree managed by React DOM. ([@acdlite](https://github.com/acdlite) in [#12779](https://github.com/facebook/react/pull/12779))
+
+### React Call Return (Experimental)
+
+* This experiment was deleted because it was affecting the bundle size and the API wasn't good enough. It's likely to come back in the future in some other form. ([@gaearon](https://github.com/gaearon) in [#12820](https://github.com/facebook/react/pull/12820))
+
+### React Reconciler (Experimental)
+
+* The [new host config shape](https://github.com/facebook/react/blob/c601f7a64640290af85c9f0e33c78480656b46bc/packages/react-noop-renderer/src/createReactNoop.js#L82-L285) is flat and doesn't use nested objects. ([@gaearon](https://github.com/gaearon) in [#12792](https://github.com/facebook/react/pull/12792))
+
 </details>
 
 ## 16.3.2 (April 16, 2018)

From 6f4fb4a05937b2d27ea38cddc9104859adbf12eb Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 23 May 2018 17:04:42 +0100
Subject: [PATCH 104/277] Tweak the changelog

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc8dc38651..e03a03e946 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,12 +7,12 @@
 
 ### React
 
-* Add a new experimental `React.unstable_Profiler` component for measuring performance. ([@bvaughn](https://github.com/bvaughn) in [#12745](https://github.com/facebook/react/pull/12745))
+* Add a new [experimental](https://github.com/reactjs/rfcs/pull/51) `React.unstable_Profiler` component for measuring performance. ([@bvaughn](https://github.com/bvaughn) in [#12745](https://github.com/facebook/react/pull/12745))
 
 ### React DOM
 
 * Add support for the Pointer Events specification. ([@philipp-spiess](https://github.com/philipp-spiess) in [#12507](https://github.com/facebook/react/pull/12507))
-* Call `getDerivedFromProps()` regardless of why rendering happened. ([@acdlite](https://github.com/acdlite) in [#12600](https://github.com/facebook/react/pull/12600) and [#12802](https://github.com/facebook/react/pull/12802))
+* Properly call `getDerivedFromProps()` regardless of the reason for re-rendering. ([@acdlite](https://github.com/acdlite) in [#12600](https://github.com/facebook/react/pull/12600) and [#12802](https://github.com/facebook/react/pull/12802))
 * Fix a bug that prevented context propagation in some cases. ([@gaearon](https://github.com/gaearon) in [#12708](https://github.com/facebook/react/pull/12708))
 * Fix re-rendering of components using `forwardRef()` on a deeper `setState()`. ([@gaearon](https://github.com/gaearon) in [#12690](https://github.com/facebook/react/pull/12690))
 * Fix some attributes incorrectly getting removed from custom element nodes. ([@airamrguez](https://github.com/airamrguez) in [#12702](https://github.com/facebook/react/pull/12702))

From 3df157480a543e626ac90b13d923c439e69724d0 Mon Sep 17 00:00:00 2001
From: Toru Kobayashi <koba0004@gmail.com>
Date: Thu, 24 May 2018 01:47:23 +0900
Subject: [PATCH 105/277] Fix a typo (#12889)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e03a03e946..9d211a7cd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 ### React DOM
 
 * Add support for the Pointer Events specification. ([@philipp-spiess](https://github.com/philipp-spiess) in [#12507](https://github.com/facebook/react/pull/12507))
-* Properly call `getDerivedFromProps()` regardless of the reason for re-rendering. ([@acdlite](https://github.com/acdlite) in [#12600](https://github.com/facebook/react/pull/12600) and [#12802](https://github.com/facebook/react/pull/12802))
+* Properly call `getDerivedStateFromProps()` regardless of the reason for re-rendering. ([@acdlite](https://github.com/acdlite) in [#12600](https://github.com/facebook/react/pull/12600) and [#12802](https://github.com/facebook/react/pull/12802))
 * Fix a bug that prevented context propagation in some cases. ([@gaearon](https://github.com/gaearon) in [#12708](https://github.com/facebook/react/pull/12708))
 * Fix re-rendering of components using `forwardRef()` on a deeper `setState()`. ([@gaearon](https://github.com/gaearon) in [#12690](https://github.com/facebook/react/pull/12690))
 * Fix some attributes incorrectly getting removed from custom element nodes. ([@airamrguez](https://github.com/airamrguez) in [#12702](https://github.com/facebook/react/pull/12702))

From fe747a51c1fdedd87c4e9e281441f2d8d04e02b3 Mon Sep 17 00:00:00 2001
From: Toru Kobayashi <koba0004@gmail.com>
Date: Thu, 24 May 2018 02:39:20 +0900
Subject: [PATCH 106/277] Add React.Timeout to getComponentName (#12890)

---
 packages/shared/getComponentName.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/shared/getComponentName.js b/packages/shared/getComponentName.js
index b79a2d1c9b..ac4f872d44 100644
--- a/packages/shared/getComponentName.js
+++ b/packages/shared/getComponentName.js
@@ -18,6 +18,7 @@ import {
   REACT_PROFILER_TYPE,
   REACT_PROVIDER_TYPE,
   REACT_STRICT_MODE_TYPE,
+  REACT_TIMEOUT_TYPE,
 } from 'shared/ReactSymbols';
 
 function getComponentName(fiber: Fiber): string | null {
@@ -43,6 +44,8 @@ function getComponentName(fiber: Fiber): string | null {
       return 'Context.Provider';
     case REACT_STRICT_MODE_TYPE:
       return 'StrictMode';
+    case REACT_TIMEOUT_TYPE:
+      return 'Timeout';
   }
   if (typeof type === 'object' && type !== null) {
     switch (type.$$typeof) {

From 53852a887bc67c760264bf8c34a8c95fa9ab099d Mon Sep 17 00:00:00 2001
From: Chang Yan <cyan.binary@gmail.com>
Date: Wed, 23 May 2018 14:16:39 -0700
Subject: [PATCH 107/277] add functional components warning about legacy
 context api (#12892)

---
 .../src/ReactFiberBeginWork.js                |  6 ++++
 .../src/ReactStrictModeWarnings.js            |  4 +--
 .../ReactStrictMode-test.internal.js          | 31 +++++++++++++++++--
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 53ea870e67..ad1189d402 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -48,6 +48,7 @@ import {
 } from 'shared/ReactFeatureFlags';
 import invariant from 'fbjs/lib/invariant';
 import getComponentName from 'shared/getComponentName';
+import ReactStrictModeWarnings from './ReactStrictModeWarnings';
 import warning from 'fbjs/lib/warning';
 import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
 import {cancelWorkTimer} from './ReactDebugFiberPerf';
@@ -600,6 +601,11 @@ function mountIndeterminateComponent(
         didWarnAboutBadClass[componentName] = true;
       }
     }
+
+    if (workInProgress.mode & StrictMode) {
+      ReactStrictModeWarnings.recordLegacyContextWarning(workInProgress, null);
+    }
+
     ReactCurrentOwner.current = workInProgress;
     value = fn(props, context);
   } else {
diff --git a/packages/react-reconciler/src/ReactStrictModeWarnings.js b/packages/react-reconciler/src/ReactStrictModeWarnings.js
index 92fb1f1b13..9ca543583c 100644
--- a/packages/react-reconciler/src/ReactStrictModeWarnings.js
+++ b/packages/react-reconciler/src/ReactStrictModeWarnings.js
@@ -319,9 +319,9 @@ if (__DEV__) {
     let warningsForRoot = pendingLegacyContextWarning.get(strictRoot);
 
     if (
-      typeof instance.getChildContext === 'function' ||
       fiber.type.contextTypes != null ||
-      fiber.type.childContextTypes != null
+      fiber.type.childContextTypes != null ||
+      (instance !== null && typeof instance.getChildContext === 'function')
     ) {
       if (warningsForRoot === undefined) {
         warningsForRoot = [];
diff --git a/packages/react/src/__tests__/ReactStrictMode-test.internal.js b/packages/react/src/__tests__/ReactStrictMode-test.internal.js
index 56b5e9e530..10c53cc9ed 100644
--- a/packages/react/src/__tests__/ReactStrictMode-test.internal.js
+++ b/packages/react/src/__tests__/ReactStrictMode-test.internal.js
@@ -824,10 +824,28 @@ describe('ReactStrictMode', () => {
         }
 
         render() {
-          return <LegacyContextConsumer />;
+          return (
+            <div>
+              <LegacyContextConsumer />
+              <FunctionalLegacyContextConsumer />
+              <FactoryLegacyContextConsumer />
+            </div>
+          );
         }
       }
 
+      function FunctionalLegacyContextConsumer() {
+        return null;
+      }
+
+      function FactoryLegacyContextConsumer() {
+        return {
+          render() {
+            return null;
+          },
+        };
+      }
+
       LegacyContextProvider.childContextTypes = {
         color: PropTypes.string,
       };
@@ -856,6 +874,14 @@ describe('ReactStrictMode', () => {
         color: PropTypes.string,
       };
 
+      FunctionalLegacyContextConsumer.contextTypes = {
+        color: PropTypes.string,
+      };
+
+      FactoryLegacyContextConsumer.contextTypes = {
+        color: PropTypes.string,
+      };
+
       let rendered;
 
       expect(() => {
@@ -864,7 +890,8 @@ describe('ReactStrictMode', () => {
         'Warning: Legacy context API has been detected within a strict-mode tree: ' +
           '\n    in div (at **)' +
           '\n    in Root (at **)' +
-          '\n\nPlease update the following components: LegacyContextConsumer, LegacyContextProvider' +
+          '\n\nPlease update the following components: FactoryLegacyContextConsumer, ' +
+          'FunctionalLegacyContextConsumer, LegacyContextConsumer, LegacyContextProvider' +
           '\n\nLearn more about this warning here:' +
           '\nhttps://fb.me/react-strict-mode-warnings',
       );

From eca59ec1b326e1e3e722cbfe8b6361bd4d2ff66d Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Wed, 23 May 2018 17:26:46 -0700
Subject: [PATCH 108/277] Updating yarn.lock file for 16.4.0 release

---
 yarn.lock | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6ddc40c4f5..730cd08faf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2989,7 +2989,7 @@ iconv-lite@^0.4.17:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
-iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@^0.4.4:
   version "0.4.21"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
   dependencies:
@@ -2999,6 +2999,12 @@ iconv-lite@^0.4.5:
   version "0.4.16"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.16.tgz#65de3beeb39e2960d67f049f1634ffcbcde9014b"
 
+iconv-lite@~0.4.13:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
@@ -5397,7 +5403,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-safer-buffer@^2.1.0:
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
@@ -6064,8 +6070,8 @@ typescript@~1.8.10:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-1.8.10.tgz#b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e"
 
 ua-parser-js@^0.7.9:
-  version "0.7.17"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
+  version "0.7.18"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
 
 uglify-js@^2.6:
   version "2.8.22"

From d427a563d56bec6722f9d5f20001ea91ea3421d0 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Wed, 23 May 2018 17:30:33 -0700
Subject: [PATCH 109/277] Updating package versions for release 16.4.0

---
 package.json                                | 2 +-
 packages/create-subscription/package.json   | 2 +-
 packages/react-art/package.json             | 2 +-
 packages/react-dom/package.json             | 2 +-
 packages/react-is/package.json              | 2 +-
 packages/react-reconciler/package.json      | 2 +-
 packages/react-test-renderer/package.json   | 4 ++--
 packages/react/package.json                 | 2 +-
 packages/shared/ReactVersion.js             | 2 +-
 packages/simple-cache-provider/package.json | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index bd408294ed..55d232a520 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "16.3.2",
+  "version": "16.4.0",
   "workspaces": [
     "packages/*"
   ],
diff --git a/packages/create-subscription/package.json b/packages/create-subscription/package.json
index b929e5e357..c7126a2d79 100644
--- a/packages/create-subscription/package.json
+++ b/packages/create-subscription/package.json
@@ -1,7 +1,7 @@
 {
   "name": "create-subscription",
   "description": "utility for subscribing to external data sources inside React components",
-  "version": "16.3.2",
+  "version": "16.4.0",
   "repository": "facebook/react",
   "files": [
     "LICENSE",
diff --git a/packages/react-art/package.json b/packages/react-art/package.json
index 1e07d58df4..9198860c5f 100644
--- a/packages/react-art/package.json
+++ b/packages/react-art/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-art",
   "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).",
-  "version": "16.3.2",
+  "version": "16.4.0",
   "main": "index.js",
   "repository": "facebook/react",
   "keywords": [
diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
index abae326ba5..eb8cd5c390 100644
--- a/packages/react-dom/package.json
+++ b/packages/react-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dom",
-  "version": "16.3.2",
+  "version": "16.4.0",
   "description": "React package for working with the DOM.",
   "main": "index.js",
   "repository": "facebook/react",
diff --git a/packages/react-is/package.json b/packages/react-is/package.json
index f89c0e0945..96bfa33ad7 100644
--- a/packages/react-is/package.json
+++ b/packages/react-is/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-is",
-  "version": "16.3.2",
+  "version": "16.4.0",
   "description": "Brand checking of React Elements.",
   "main": "index.js",
   "repository": "facebook/react",
diff --git a/packages/react-reconciler/package.json b/packages/react-reconciler/package.json
index 05cc900b0d..3cd3fc3318 100644
--- a/packages/react-reconciler/package.json
+++ b/packages/react-reconciler/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-reconciler",
   "description": "React package for creating custom renderers.",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "keywords": [
     "react"
   ],
diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json
index 8455e0ab00..56c29b8833 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.3.2",
+  "version": "16.4.0",
   "description": "React package for snapshot testing.",
   "main": "index.js",
   "repository": "facebook/react",
@@ -18,7 +18,7 @@
     "fbjs": "^0.8.16",
     "object-assign": "^4.1.1",
     "prop-types": "^15.6.0",
-    "react-is": "^16.3.2"
+    "react-is": "^16.4.0"
   },
   "peerDependencies": {
     "react": "^16.0.0"
diff --git a/packages/react/package.json b/packages/react/package.json
index 42c037fdad..c08a6b108e 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -4,7 +4,7 @@
   "keywords": [
     "react"
   ],
-  "version": "16.3.2",
+  "version": "16.4.0",
   "homepage": "https://reactjs.org/",
   "bugs": "https://github.com/facebook/react/issues",
   "license": "MIT",
diff --git a/packages/shared/ReactVersion.js b/packages/shared/ReactVersion.js
index 88af4dea48..d0bd008b97 100644
--- a/packages/shared/ReactVersion.js
+++ b/packages/shared/ReactVersion.js
@@ -8,4 +8,4 @@
 'use strict';
 
 // TODO: this is special because it gets imported during build.
-module.exports = '16.3.2';
+module.exports = '16.4.0';
diff --git a/packages/simple-cache-provider/package.json b/packages/simple-cache-provider/package.json
index 242f5e45e0..9141280cd4 100644
--- a/packages/simple-cache-provider/package.json
+++ b/packages/simple-cache-provider/package.json
@@ -1,7 +1,7 @@
 {
   "name": "simple-cache-provider",
   "description": "A basic cache for React applications",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "repository": "facebook/react",
   "files": [
     "LICENSE",

From d31e753f89589fe080543a24fb732d5c0f263f62 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Wed, 23 May 2018 17:35:31 -0700
Subject: [PATCH 110/277] Update error codes for 16.4.0 release

---
 scripts/error-codes/codes.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/error-codes/codes.json b/scripts/error-codes/codes.json
index 4d190fe68f..eb64793ede 100644
--- a/scripts/error-codes/codes.json
+++ b/scripts/error-codes/codes.json
@@ -268,5 +268,11 @@
   "266": "A subscription must return an unsubscribe function.",
   "267": "React.cloneElement(...): The argument must be a React element, but you passed %s.",
   "268": "Argument appears to not be a ReactComponent. Keys: %s",
-  "269": "Profiler must specify an \"id\" string and \"onRender\" function as props"
+  "269": "Profiler must specify an \"id\" string and \"onRender\" function as props",
+  "270": "The current renderer does not support persistence. This error is likely caused by a bug in React. Please file an issue.",
+  "271": "Failed to replay rendering after an error. This is likely caused by a bug in React. Please file an issue with a reproducing case to help us find it.",
+  "272": "The current renderer does not support hyration. This error is likely caused by a bug in React. Please file an issue.",
+  "273": "Nesting of <View> within <Text> is not currently supported.",
+  "274": "Text strings must be rendered within a <Text> component.",
+  "275": "The current renderer does not support mutation. This error is likely caused by a bug in React. Please file an issue."
 }

From 8765d608935a81ba5019f6cde6dce3367d392f0c Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Wed, 23 May 2018 17:35:31 -0700
Subject: [PATCH 111/277] Update bundle sizes for 16.4.0 release

---
 scripts/rollup/results.json | 314 +++++++++++++++++++-----------------
 1 file changed, 164 insertions(+), 150 deletions(-)

diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index afe398d959..b04285dbe9 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -4,29 +4,29 @@
       "filename": "react.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react",
-      "size": 58796,
-      "gzip": 16346
+      "size": 58569,
+      "gzip": 16268
     },
     {
       "filename": "react.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react",
-      "size": 7279,
-      "gzip": 3082
+      "size": 7217,
+      "gzip": 3050
     },
     {
       "filename": "react.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react",
-      "size": 49211,
-      "gzip": 13949
+      "size": 48984,
+      "gzip": 13873
     },
     {
       "filename": "react.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react",
-      "size": 5781,
-      "gzip": 2502
+      "size": 5724,
+      "gzip": 2481
     },
     {
       "filename": "React-dev.js",
@@ -46,29 +46,29 @@
       "filename": "react-dom.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-dom",
-      "size": 657360,
-      "gzip": 151075
+      "size": 636515,
+      "gzip": 148265
     },
     {
       "filename": "react-dom.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-dom",
-      "size": 104902,
-      "gzip": 33416
+      "size": 95960,
+      "gzip": 31067
     },
     {
       "filename": "react-dom.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 641349,
-      "gzip": 146842
+      "size": 620506,
+      "gzip": 144162
     },
     {
       "filename": "react-dom.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
-      "size": 103269,
-      "gzip": 32503
+      "size": 94422,
+      "gzip": 30018
     },
     {
       "filename": "ReactDOM-dev.js",
@@ -88,29 +88,29 @@
       "filename": "react-dom-test-utils.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-dom",
-      "size": 41683,
-      "gzip": 11959
+      "size": 46355,
+      "gzip": 12768
     },
     {
       "filename": "react-dom-test-utils.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-dom",
-      "size": 10852,
-      "gzip": 4037
+      "size": 10653,
+      "gzip": 3918
     },
     {
       "filename": "react-dom-test-utils.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 36420,
-      "gzip": 10508
+      "size": 41092,
+      "gzip": 11309
     },
     {
       "filename": "react-dom-test-utils.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
-      "size": 10105,
-      "gzip": 3815
+      "size": 9913,
+      "gzip": 3697
     },
     {
       "filename": "ReactTestUtils-dev.js",
@@ -123,29 +123,29 @@
       "filename": "react-dom-unstable-native-dependencies.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-dom",
-      "size": 62645,
-      "gzip": 16407
+      "size": 62921,
+      "gzip": 16559
     },
     {
       "filename": "react-dom-unstable-native-dependencies.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-dom",
-      "size": 11592,
-      "gzip": 4008
+      "size": 11622,
+      "gzip": 4007
     },
     {
       "filename": "react-dom-unstable-native-dependencies.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 58207,
-      "gzip": 15121
+      "size": 58483,
+      "gzip": 15262
     },
     {
       "filename": "react-dom-unstable-native-dependencies.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
-      "size": 10915,
-      "gzip": 3762
+      "size": 10939,
+      "gzip": 3743
     },
     {
       "filename": "ReactDOMUnstableNativeDependencies-dev.js",
@@ -165,29 +165,29 @@
       "filename": "react-dom-server.browser.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-dom",
-      "size": 104020,
-      "gzip": 27181
+      "size": 103978,
+      "gzip": 27118
     },
     {
       "filename": "react-dom-server.browser.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-dom",
-      "size": 15593,
-      "gzip": 5959
+      "size": 15420,
+      "gzip": 5900
     },
     {
       "filename": "react-dom-server.browser.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 93064,
-      "gzip": 24867
+      "size": 93024,
+      "gzip": 24811
     },
     {
       "filename": "react-dom-server.browser.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
-      "size": 14939,
-      "gzip": 5692
+      "size": 14768,
+      "gzip": 5647
     },
     {
       "filename": "ReactDOMServer-dev.js",
@@ -207,43 +207,43 @@
       "filename": "react-dom-server.node.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 95032,
-      "gzip": 25427
+      "size": 94992,
+      "gzip": 25368
     },
     {
       "filename": "react-dom-server.node.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
-      "size": 15763,
-      "gzip": 5997
+      "size": 15592,
+      "gzip": 5946
     },
     {
       "filename": "react-art.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-art",
-      "size": 455628,
-      "gzip": 98884
+      "size": 413567,
+      "gzip": 92395
     },
     {
       "filename": "react-art.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-art",
-      "size": 94976,
-      "gzip": 28852
+      "size": 82648,
+      "gzip": 25481
     },
     {
       "filename": "react-art.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-art",
-      "size": 379675,
-      "gzip": 79763
+      "size": 337640,
+      "gzip": 73051
     },
     {
       "filename": "react-art.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-art",
-      "size": 58630,
-      "gzip": 17902
+      "size": 46153,
+      "gzip": 14348
     },
     {
       "filename": "ReactART-dev.js",
@@ -291,29 +291,29 @@
       "filename": "react-test-renderer.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-test-renderer",
-      "size": 385091,
-      "gzip": 80661
+      "size": 347431,
+      "gzip": 75093
     },
     {
       "filename": "react-test-renderer.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-test-renderer",
-      "size": 58378,
-      "gzip": 17695
+      "size": 46664,
+      "gzip": 14400
     },
     {
       "filename": "react-test-renderer.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-test-renderer",
-      "size": 375688,
-      "gzip": 77920
+      "size": 338042,
+      "gzip": 72285
     },
     {
       "filename": "react-test-renderer.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-test-renderer",
-      "size": 57578,
-      "gzip": 17367
+      "size": 45745,
+      "gzip": 13915
     },
     {
       "filename": "ReactTestRenderer-dev.js",
@@ -326,29 +326,29 @@
       "filename": "react-test-renderer-shallow.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-test-renderer",
-      "size": 24960,
-      "gzip": 6657
+      "size": 24959,
+      "gzip": 6661
     },
     {
       "filename": "react-test-renderer-shallow.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-test-renderer",
-      "size": 7384,
-      "gzip": 2418
+      "size": 7329,
+      "gzip": 2400
     },
     {
       "filename": "react-test-renderer-shallow.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-test-renderer",
-      "size": 14616,
-      "gzip": 3663
+      "size": 14765,
+      "gzip": 3695
     },
     {
       "filename": "react-test-renderer-shallow.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-test-renderer",
-      "size": 7321,
-      "gzip": 2401
+      "size": 7372,
+      "gzip": 2413
     },
     {
       "filename": "ReactShallowRenderer-dev.js",
@@ -361,57 +361,57 @@
       "filename": "react-noop-renderer.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-noop-renderer",
-      "size": 18791,
-      "gzip": 5222
+      "size": 18358,
+      "gzip": 4804
     },
     {
       "filename": "react-noop-renderer.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-noop-renderer",
-      "size": 6500,
-      "gzip": 2562
+      "size": 6829,
+      "gzip": 2631
     },
     {
       "filename": "react-reconciler.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-reconciler",
-      "size": 355226,
-      "gzip": 73207
+      "size": 331575,
+      "gzip": 70231
     },
     {
       "filename": "react-reconciler.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-reconciler",
-      "size": 50143,
-      "gzip": 15094
+      "size": 46245,
+      "gzip": 13814
     },
     {
       "filename": "react-reconciler-persistent.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-reconciler",
-      "size": 354412,
-      "gzip": 72892
+      "size": 330095,
+      "gzip": 69615
     },
     {
       "filename": "react-reconciler-persistent.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-reconciler",
-      "size": 49057,
-      "gzip": 14893
+      "size": 46256,
+      "gzip": 13819
     },
     {
       "filename": "react-reconciler-reflection.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-reconciler",
-      "size": 11698,
-      "gzip": 3601
+      "size": 11847,
+      "gzip": 3642
     },
     {
       "filename": "react-reconciler-reflection.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-reconciler",
-      "size": 2320,
-      "gzip": 1034
+      "size": 2312,
+      "gzip": 1027
     },
     {
       "filename": "react-call-return.development.js",
@@ -431,29 +431,29 @@
       "filename": "react-is.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-is",
-      "size": 4791,
-      "gzip": 1326
+      "size": 4785,
+      "gzip": 1323
     },
     {
       "filename": "react-is.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-is",
-      "size": 1937,
-      "gzip": 786
+      "size": 1933,
+      "gzip": 787
     },
     {
       "filename": "react-is.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-is",
-      "size": 4602,
-      "gzip": 1268
+      "size": 4596,
+      "gzip": 1264
     },
     {
       "filename": "react-is.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-is",
-      "size": 1886,
-      "gzip": 721
+      "size": 1881,
+      "gzip": 719
     },
     {
       "filename": "ReactIs-dev.js",
@@ -481,210 +481,210 @@
       "bundleType": "NODE_PROD",
       "packageName": "simple-cache-provider",
       "size": 1287,
-      "gzip": 650
+      "gzip": 651
     },
     {
       "filename": "create-subscription.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "create-subscription",
       "size": 5636,
-      "gzip": 1973
+      "gzip": 1970
     },
     {
       "filename": "create-subscription.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "create-subscription",
-      "size": 2599,
-      "gzip": 1240
+      "size": 2591,
+      "gzip": 1233
     },
     {
       "filename": "React-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react",
-      "size": 49318,
-      "gzip": 13556
+      "size": 49202,
+      "gzip": 13524
     },
     {
       "filename": "React-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react",
-      "size": 13793,
-      "gzip": 3864
+      "size": 13708,
+      "gzip": 3837
     },
     {
       "filename": "ReactDOM-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-dom",
-      "size": 667163,
-      "gzip": 149794
+      "size": 643334,
+      "gzip": 146983
     },
     {
       "filename": "ReactDOM-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-dom",
-      "size": 311309,
-      "gzip": 56436
+      "size": 280306,
+      "gzip": 52771
     },
     {
       "filename": "ReactTestUtils-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-dom",
-      "size": 37734,
-      "gzip": 10701
+      "size": 42513,
+      "gzip": 11507
     },
     {
       "filename": "ReactDOMUnstableNativeDependencies-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-dom",
-      "size": 58462,
-      "gzip": 14909
+      "size": 58699,
+      "gzip": 15042
     },
     {
       "filename": "ReactDOMUnstableNativeDependencies-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-dom",
-      "size": 26971,
-      "gzip": 5503
+      "size": 26877,
+      "gzip": 5467
     },
     {
       "filename": "ReactDOMServer-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-dom",
-      "size": 96693,
-      "gzip": 24675
+      "size": 96894,
+      "gzip": 24677
     },
     {
       "filename": "ReactDOMServer-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-dom",
-      "size": 32475,
-      "gzip": 7968
+      "size": 32142,
+      "gzip": 7900
     },
     {
       "filename": "ReactART-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-art",
-      "size": 388922,
-      "gzip": 79451
+      "size": 343294,
+      "gzip": 72413
     },
     {
       "filename": "ReactART-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-art",
-      "size": 191156,
-      "gzip": 31368
+      "size": 150369,
+      "gzip": 25956
     },
     {
       "filename": "ReactNativeRenderer-dev.js",
       "bundleType": "RN_FB_DEV",
       "packageName": "react-native-renderer",
-      "size": 499080,
-      "gzip": 106402
+      "size": 468415,
+      "gzip": 102416
     },
     {
       "filename": "ReactNativeRenderer-prod.js",
       "bundleType": "RN_FB_PROD",
       "packageName": "react-native-renderer",
-      "size": 241853,
-      "gzip": 40274
+      "size": 210769,
+      "gzip": 36828
     },
     {
       "filename": "ReactNativeRenderer-dev.js",
       "bundleType": "RN_OSS_DEV",
       "packageName": "react-native-renderer",
-      "size": 498734,
-      "gzip": 106325
+      "size": 468069,
+      "gzip": 102344
     },
     {
       "filename": "ReactNativeRenderer-prod.js",
       "bundleType": "RN_OSS_PROD",
       "packageName": "react-native-renderer",
-      "size": 227735,
-      "gzip": 38044
+      "size": 198322,
+      "gzip": 34717
     },
     {
       "filename": "ReactFabric-dev.js",
       "bundleType": "RN_FB_DEV",
       "packageName": "react-native-renderer",
-      "size": 481057,
-      "gzip": 101898
+      "size": 459114,
+      "gzip": 100116
     },
     {
       "filename": "ReactFabric-prod.js",
       "bundleType": "RN_FB_PROD",
       "packageName": "react-native-renderer",
-      "size": 212992,
-      "gzip": 35357
+      "size": 190386,
+      "gzip": 33327
     },
     {
       "filename": "ReactFabric-dev.js",
       "bundleType": "RN_OSS_DEV",
       "packageName": "react-native-renderer",
-      "size": 481093,
-      "gzip": 101917
+      "size": 459151,
+      "gzip": 100132
     },
     {
       "filename": "ReactFabric-prod.js",
       "bundleType": "RN_OSS_PROD",
       "packageName": "react-native-renderer",
-      "size": 213028,
-      "gzip": 35376
+      "size": 190422,
+      "gzip": 33346
     },
     {
       "filename": "ReactTestRenderer-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-test-renderer",
-      "size": 385220,
-      "gzip": 77735
+      "size": 344028,
+      "gzip": 71858
     },
     {
       "filename": "ReactShallowRenderer-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-test-renderer",
-      "size": 15371,
-      "gzip": 3790
+      "size": 15521,
+      "gzip": 3820
     },
     {
       "filename": "ReactIs-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-is",
-      "size": 4674,
-      "gzip": 1294
+      "size": 4669,
+      "gzip": 1292
     },
     {
       "filename": "ReactIs-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-is",
-      "size": 3760,
-      "gzip": 998
+      "size": 3756,
+      "gzip": 999
     },
     {
       "filename": "react-scheduler.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-scheduler",
-      "size": 13551,
-      "gzip": 4584
+      "size": 14094,
+      "gzip": 4681
     },
     {
       "filename": "react-scheduler.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-scheduler",
-      "size": 1979,
-      "gzip": 1032
+      "size": 2142,
+      "gzip": 1068
     },
     {
       "filename": "react-scheduler.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-scheduler",
-      "size": 13355,
-      "gzip": 4534
+      "size": 13898,
+      "gzip": 4632
     },
     {
       "filename": "react-scheduler.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-scheduler",
-      "size": 2068,
-      "gzip": 1051
+      "size": 2230,
+      "gzip": 1097
     },
     {
       "filename": "SimpleCacheProvider-dev.js",
@@ -699,6 +699,20 @@
       "packageName": "simple-cache-provider",
       "size": 2752,
       "gzip": 854
+    },
+    {
+      "filename": "react-noop-renderer-persistent.development.js",
+      "bundleType": "NODE_DEV",
+      "packageName": "react-noop-renderer",
+      "size": 18487,
+      "gzip": 4818
+    },
+    {
+      "filename": "react-noop-renderer-persistent.production.min.js",
+      "bundleType": "NODE_PROD",
+      "packageName": "react-noop-renderer",
+      "size": 6851,
+      "gzip": 2637
     }
   ]
 }
\ No newline at end of file

From fa7fa812c70084e139d13437fb204fcdf9152299 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Wed, 23 May 2018 18:20:27 -0700
Subject: [PATCH 112/277] Update CHANGELOG for 16.4.0

---
 CHANGELOG.md | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d211a7cd3..69f5807c34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,4 @@
-## [Unreleased]
-<details>
-  <summary>
-    Changes that have landed in master but are not yet released.
-    Click to see more.
-  </summary>
+## 16.4.0 (May 23, 2018)
 
 ### React
 
@@ -42,8 +37,6 @@
 
 * The [new host config shape](https://github.com/facebook/react/blob/c601f7a64640290af85c9f0e33c78480656b46bc/packages/react-noop-renderer/src/createReactNoop.js#L82-L285) is flat and doesn't use nested objects. ([@gaearon](https://github.com/gaearon) in [#12792](https://github.com/facebook/react/pull/12792))
 
-</details>
-
 ## 16.3.2 (April 16, 2018)
 
 ### React

From 345e0a71acc12fae78349b6036fa00dbf5300384 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Thu, 24 May 2018 10:27:23 -0700
Subject: [PATCH 113/277] Improve tests for 'schedule' module (#12880)

**what is the change?:**
Renamed some methods, and made a method to advance a frame in the test
environment.

**why make this change?:**
We often need to simulate a frame passing with some amount of idle time
or lack of idle time, and the new method makes it easier to write that
out.

**test plan:**
Run the updated tests.
Also temporarily tried breaking the scheduler and verified that the
tests will fail.

**issue:**
See internal task T29442940
---
 .../src/__tests__/ReactScheduler-test.js      | 62 ++++++++++---------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
index 299f5a85f1..5c7171bc18 100644
--- a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
+++ b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
@@ -10,15 +10,25 @@
 'use strict';
 
 let ReactScheduler;
+type FrameTimeoutConfigType = {
+  // should only specify one or the other
+  timeLeftInFrame: ?number,
+  timePastFrameDeadline: ?number,
+};
 
 describe('ReactScheduler', () => {
   let rAFCallbacks = [];
   let postMessageCallback;
   let postMessageEvents = [];
 
-  function drainPostMessageQueue() {
-    // default to this falling about 15 ms before next frame
-    currentTime = startOfLatestFrame + frameSize - 15;
+  function runPostMessageCallbacks(config: FrameTimeoutConfigType) {
+    let timeLeftInFrame = 0;
+    if (typeof config.timeLeftInFrame === 'number') {
+      timeLeftInFrame = config.timeLeftInFrame;
+    } else if (typeof config.timePastFrameDeadline === 'number') {
+      timeLeftInFrame = -1 * config.timePastFrameDeadline;
+    }
+    currentTime = startOfLatestFrame + frameSize - timeLeftInFrame;
     if (postMessageCallback) {
       while (postMessageEvents.length) {
         postMessageCallback(postMessageEvents.shift());
@@ -31,9 +41,9 @@ describe('ReactScheduler', () => {
     rAFCallbacks.forEach(cb => cb());
     rAFCallbacks = [];
   }
-  function advanceAll() {
+  function advanceOneFrame(config: FrameTimeoutConfigType = {}) {
     runRAFCallbacks();
-    drainPostMessageQueue();
+    runPostMessageCallbacks(config);
   }
 
   let frameSize = 33;
@@ -77,7 +87,7 @@ describe('ReactScheduler', () => {
       const {scheduleWork} = ReactScheduler;
       const cb = jest.fn();
       scheduleWork(cb);
-      advanceAll();
+      advanceOneFrame({timeLeftInFrame: 15});
       expect(cb.mock.calls.length).toBe(1);
       // should not have timed out and should include a timeRemaining method
       expect(cb.mock.calls[0][0].didTimeout).toBe(false);
@@ -97,7 +107,7 @@ describe('ReactScheduler', () => {
         scheduleWork(callbackB);
         expect(callbackLog).toEqual([]);
         // after a delay, calls as many callbacks as it has time for
-        advanceAll();
+        advanceOneFrame({timeLeftInFrame: 15});
         expect(callbackLog).toEqual(['A', 'B']);
         // callbackA should not have timed out and should include a timeRemaining method
         expect(callbackA.mock.calls[0][0].didTimeout).toBe(false);
@@ -125,16 +135,16 @@ describe('ReactScheduler', () => {
         scheduleWork(callbackB);
         expect(callbackLog).toEqual([]);
         // now it should drain the message queue and do all scheduled work
-        drainPostMessageQueue();
+        runPostMessageCallbacks({timeLeftInFrame: 15});
         expect(callbackLog).toEqual(['A', 'B']);
 
         // advances timers, now with an empty queue of work (to ensure they don't deadlock)
-        advanceAll();
+        advanceOneFrame({timeLeftInFrame: 15});
 
         // see if more work can be done now.
         scheduleWork(callbackC);
         expect(callbackLog).toEqual(['A', 'B']);
-        advanceAll();
+        advanceOneFrame({timeLeftInFrame: 15});
         expect(callbackLog).toEqual(['A', 'B', 'C']);
       });
 
@@ -163,7 +173,7 @@ describe('ReactScheduler', () => {
           expect(callbackLog).toEqual([]);
           // after a delay, calls the scheduled callbacks,
           // and also calls new callbacks scheduled by current callbacks
-          advanceAll();
+          advanceOneFrame({timeLeftInFrame: 15});
           expect(callbackLog).toEqual(['A', 'B', 'C']);
         },
       );
@@ -199,7 +209,7 @@ describe('ReactScheduler', () => {
         // initially waits to call the callback
         expect(callbackLog).toEqual([]);
         // while flushing callbacks, calls as many as it has time for
-        advanceAll();
+        advanceOneFrame({timeLeftInFrame: 15});
         expect(callbackLog).toEqual(['A', 'B', 'C', 'D', 'E', 'F']);
       });
 
@@ -222,7 +232,7 @@ describe('ReactScheduler', () => {
         scheduleWork(callbackB);
         expect(callbackLog).toEqual([]);
         // after a delay, calls the latest callback passed
-        advanceAll();
+        advanceOneFrame({timeLeftInFrame: 15});
         expect(callbackLog).toEqual(['A0', 'B', 'A1']);
       });
     });
@@ -248,24 +258,20 @@ describe('ReactScheduler', () => {
           scheduleWork(callbackB, {timeout: 100}); // times out later
           scheduleWork(callbackC, {timeout: 2}); // will time out fast
 
-          runRAFCallbacks(); // runs rAF callback
           // push time ahead a bit so that we have no idle time
-          startOfLatestFrame += 16;
-          drainPostMessageQueue(); // runs postMessage callback, idleTick
+          advanceOneFrame({timePastFrameDeadline: 16});
 
           // callbackC should have timed out
           expect(callbackLog).toEqual(['C']);
 
-          runRAFCallbacks(); // runs rAF callback
           // push time ahead a bit so that we have no idle time
-          startOfLatestFrame += 16;
-          drainPostMessageQueue(); // runs postMessage callback, idleTick
+          advanceOneFrame({timePastFrameDeadline: 16});
 
           // callbackB should have timed out
           expect(callbackLog).toEqual(['C', 'B']);
 
-          runRAFCallbacks(); // runs rAF callback
-          drainPostMessageQueue(); // runs postMessage callback, idleTick
+          // let's give ourselves some idle time now
+          advanceOneFrame({timeLeftInFrame: 16});
 
           // we should have run callbackA in the idle time
           expect(callbackLog).toEqual(['C', 'B', 'A']);
@@ -295,27 +301,25 @@ describe('ReactScheduler', () => {
           scheduleWork(callbackC, {timeout: 2}); // will time out fast
           scheduleWork(callbackD); // won't time out
 
-          advanceAll(); // runs rAF and postMessage callbacks
+          advanceOneFrame({timeLeftInFrame: 15}); // runs rAF and postMessage callbacks
 
           // callbackC should have timed out
           // we should have had time to call A also, then we run out of time
           expect(callbackLog).toEqual(['C', 'A']);
 
-          runRAFCallbacks(); // runs rAF callback
           // push time ahead a bit so that we have no idle time
-          startOfLatestFrame += 16;
-          drainPostMessageQueue(); // runs postMessage callback, idleTick
+          advanceOneFrame({timePastFrameDeadline: 16});
 
           // callbackB should have timed out
           // but we should not run callbackD because we have no idle time
           expect(callbackLog).toEqual(['C', 'A', 'B']);
 
-          advanceAll(); // runs rAF and postMessage callbacks
+          advanceOneFrame({timeLeftInFrame: 15}); // runs rAF and postMessage callbacks
 
           // we should have run callbackD in the idle time
           expect(callbackLog).toEqual(['C', 'A', 'B', 'D']);
 
-          advanceAll(); // runs rAF and postMessage callbacks
+          advanceOneFrame({timeLeftInFrame: 15}); // runs rAF and postMessage callbacks
 
           // we should not have run anything again, nothing is scheduled
           expect(callbackLog).toEqual(['C', 'A', 'B', 'D']);
@@ -331,7 +335,7 @@ describe('ReactScheduler', () => {
       const callbackId = scheduleWork(cb);
       expect(cb.mock.calls.length).toBe(0);
       cancelScheduledWork(callbackId);
-      advanceAll();
+      advanceOneFrame({timeLeftInFrame: 15});
       expect(cb.mock.calls.length).toBe(0);
     });
 
@@ -349,7 +353,7 @@ describe('ReactScheduler', () => {
         callbackBId = scheduleWork(callbackB);
         // Initially doesn't call anything
         expect(callbackLog).toEqual([]);
-        advanceAll();
+        advanceOneFrame({timeLeftInFrame: 15});
         // B should not get called because A cancelled B
         expect(callbackLog).toEqual(['A']);
         expect(callbackB.mock.calls.length).toBe(0);

From 76e07071a11cd6e4796ad846bc835a18c8f49647 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Thu, 24 May 2018 14:11:25 -0700
Subject: [PATCH 114/277] [scheduler] 2/n Adding 'schedule' fixture (#12884)

* Adding 'schedule' fixture

**what is the change?:**
We need to test the `schedule` module against real live browser APIs. As
a quick solution we're writing a fixture for using in manual testing.
Later we plan on adding automated browser testing, using this or a
similar fixture as the test page.

**why make this change?:**
To further solidify test coverage for `schedule` before making further
improvements/refactors to the module.

**test plan:**
`open fixtures/schedule/index.html` and inspect the results. It should
be clear that things pass.

We also temporarily broke the scheduler and verified that this fixture
demonstrates the problems.

**issue:**
Internal task T29442940

* Made fixture tests display red or green border depending on pass/fail

**what is the change?:**
Added red/green solid/dashed border for test results when using the
schedule fixture.

We also tweaked the timing of the last test because it was on the line
in terms of whether it passed or failed.

**why make this change?:**
To make it faster to use the fixture - it takes more time to read
through the results line by line and check that they match what is
expected.

**test plan:**
Looked at the fixture, and also tried modifying a test to show what it
looks like when something fails.
---
 fixtures/schedule/index.html                  | 293 ++++++++++++++++++
 .../src/__tests__/test_page.html              |  10 -
 2 files changed, 293 insertions(+), 10 deletions(-)
 create mode 100644 fixtures/schedule/index.html
 delete mode 100644 packages/react-scheduler/src/__tests__/test_page.html

diff --git a/fixtures/schedule/index.html b/fixtures/schedule/index.html
new file mode 100644
index 0000000000..24fd26aee9
--- /dev/null
+++ b/fixtures/schedule/index.html
@@ -0,0 +1,293 @@
+<!DOCTYPE html>
+<html style="width: 100%; height: 100%;">
+  <head>
+    <meta charset="utf-8">
+    <title>Schedule Test Page</title>
+  <style>
+    .correct {
+      border: solid green 2px;
+    }
+    .incorrect {
+      border: dashed red 2px;
+    }
+  </style>
+  </head>
+  <body>
+    <h1>Schedule Fixture</h1>
+    <p>
+      This fixture is for manual testing purposes, and the patterns used in
+      implementing it should not be used as a model. This is mainly for anyone
+      working on making changes to the `schedule` module.
+    </p>
+    <h2>Tests:</h2>
+    <ol>
+      <li>
+        <button onClick="runTestOne()">Run Test 1</button>
+        <p>Calls the callback with the frame when not blocked:</p>
+        <div><b>Expected:</b></div>
+        <div id="test-1-expected">
+        </div>
+        <div> -------------------------------------------------</div>
+        <div> If you see the same above and below it's correct.
+        <div> -------------------------------------------------</div>
+        <div><b>Actual:</b></div>
+        <div id="test-1"></div>
+      </li>
+      <li>
+        <p>Accepts multiple callbacks and calls within frame when not blocked</p>
+        <button onClick="runTestTwo()">Run Test 2</button>
+        <div><b>Expected:</b></div>
+        <div id="test-2-expected">
+        </div>
+        <div> -------------------------------------------------</div>
+        <div> If you see the same above and below it's correct.
+        <div> -------------------------------------------------</div>
+        <div><b>Actual:</b></div>
+        <div id="test-2"></div>
+      </li>
+      <li>
+        <p>Schedules callbacks in correct order when they use scheduleWork to schedule themselves</p>
+        <button onClick="runTestThree()">Run Test 3</button>
+        <div><b>Expected:</b></div>
+        <div id="test-3-expected">
+        </div>
+        <div> -------------------------------------------------</div>
+        <div> If you see the same above and below it's correct.
+        <div> -------------------------------------------------</div>
+        <div><b>Actual:</b></div>
+        <div id="test-3"></div>
+      </li>
+      <li>
+        <p>Calls timed out callbacks and then any more pending callbacks, defers others if time runs out</p>
+        <button onClick="runTestFour()">Run Test 4</button>
+        <div><b>Expected:</b></div>
+        <div id="test-4-expected">
+        </div>
+        <div> -------------------------------------------------</div>
+        <div> If you see the same above and below it's correct.
+        <div> -------------------------------------------------</div>
+        <div><b>Actual:</b></div>
+        <div id="test-4"></div>
+      </li>
+    </ol>
+    <script src="../../build/dist/react-scheduler.development.js"></script>
+    <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
+    <script type="text/babel">
+const {scheduleWork, cancelWork, now} = ReactScheduler;
+function displayTestResult(testNumber) {
+  const expectationNode = document.getElementById('test-' + testNumber + '-expected');
+  const resultNode = document.getElementById('test-' + testNumber);
+  resultNode.innerHTML = latestResults[testNumber - 1].join('<br />');
+  expectationNode.innerHTML = expectedResults[testNumber - 1].join('<br />');
+}
+function clearTestResult(testNumber) {
+  const resultNode = document.getElementById('test-' + testNumber);
+  resultNode.innerHTML = '';
+  latestResults[testNumber - 1] = [];
+}
+function updateTestResult(testNumber, textToAddToResult) {
+  latestResults[testNumber - 1].push(textToAddToResult);
+};
+function checkTestResult(testNumber) {
+
+  let correct = true;
+  const expected = expectedResults[testNumber - 1]; // zero indexing
+  const result = latestResults[testNumber - 1]; // zero indexing
+  if (expected.length !== result.length) {
+    correct = false;
+  } else {
+    for (let i = 0, len = expected.length; i < len; i++) {
+      if (expected[i] !== result[i]) {
+        correct = false;
+        break;
+      }
+    }
+  }
+  const currentClass = correct ? 'correct' : 'incorrect';
+  const previousClass = correct ? 'incorrect' : 'correct';
+  document.getElementById('test-' + testNumber).classList.remove(previousClass);
+  document.getElementById('test-' + testNumber).classList.add(currentClass);
+}
+function logWhenFramesStart(testNumber, cb) {
+  requestAnimationFrame(() => {
+    updateTestResult(testNumber, 'frame 1 started');
+    requestAnimationFrame(() => {
+      updateTestResult(testNumber, 'frame 2 started');
+      requestAnimationFrame(() => {
+        updateTestResult(testNumber, 'frame 3 started... we stop counting now.');
+        cb();
+      });
+    });
+  });
+}
+// push in results when we run the test
+const latestResults = [
+  // test 1
+  [
+  ],
+  // test 2
+  [
+  ],
+  // test 3
+  [
+  ],
+  // test 4
+  [
+  ],
+];
+
+const expectedResults = [
+  // test 1
+  [
+    'scheduled Cb1',
+    'frame 1 started',
+    'cb1 called with argument of {"didTimeout":false}',
+    'frame 2 started',
+    'frame 3 started... we stop counting now.',
+  ],
+  // test 2
+  [
+    'scheduled CbA',
+    'scheduled CbB',
+    'frame 1 started',
+    'cbA called with argument of {"didTimeout":false}',
+    'cbB called with argument of {"didTimeout":false}',
+    'frame 2 started',
+    'frame 3 started... we stop counting now.',
+  ],
+  // test 3
+  [
+    'scheduled CbA',
+    'scheduled CbB',
+    'frame 1 started',
+    'scheduled CbA again',
+    'cbA0 called with argument of {"didTimeout":false}',
+    'cbB called with argument of {"didTimeout":false}',
+    'cbA1 called with argument of {"didTimeout":false}',
+    'frame 2 started',
+    'frame 3 started... we stop counting now.',
+  ],
+  // test 4
+  [
+    'scheduled cbA',
+    'scheduled cbB',
+    'scheduled cbC',
+    'scheduled cbD',
+    'frame 1 started',
+    'cbC called with argument of {"didTimeout":true}',
+    'cbA called with argument of {"didTimeout":false}',
+    'cbA running and taking some time',
+    'frame 2 started',
+    'cbB called with argument of {"didTimeout":false}',
+    'cbD called with argument of {"didTimeout":false}',
+    'frame 3 started... we stop counting now.',
+  ],
+];
+function runTestOne() {
+  // Test 1
+  // Calls the callback with the frame when not blocked
+  clearTestResult(1);
+  const test1Log = [];
+  const cb1Arguments = [];
+  const cb1 = (x) => {
+    updateTestResult(1, 'cb1 called with argument of ' + JSON.stringify(x));
+  }
+  scheduleWork(cb1);
+  updateTestResult(1, 'scheduled Cb1');
+  logWhenFramesStart(1, () => {
+    displayTestResult(1);
+    checkTestResult(1);
+  });
+};
+
+function runTestTwo() {
+  // Test 2
+  // accepts multiple callbacks and calls within frame when not blocked
+  clearTestResult(2);
+  const cbA = (x) => {
+    updateTestResult(2, 'cbA called with argument of ' + JSON.stringify(x));
+  }
+  const cbB = (x) => {
+    updateTestResult(2, 'cbB called with argument of ' + JSON.stringify(x));
+  }
+  scheduleWork(cbA);
+  updateTestResult(2, 'scheduled CbA');
+  scheduleWork(cbB);
+  updateTestResult(2, 'scheduled CbB');
+  logWhenFramesStart(2, () => {
+    displayTestResult(2);
+    checkTestResult(2);
+  });
+}
+
+function runTestThree() {
+  // Test 3
+  // Schedules callbacks in correct order when they use scheduleWork to schedule themselves
+  clearTestResult(3);
+  let callbackAIterations = 0;
+  const cbA = (x) => {
+    if (callbackAIterations < 1) {
+      scheduleWork(cbA);
+      updateTestResult(3, 'scheduled CbA again');
+    }
+    updateTestResult(3, 'cbA' + callbackAIterations + ' called with argument of ' + JSON.stringify(x));
+    callbackAIterations++;
+  }
+  const cbB = (x) => {
+    updateTestResult(3, 'cbB called with argument of ' + JSON.stringify(x));
+  }
+  scheduleWork(cbA);
+  updateTestResult(3, 'scheduled CbA');
+  scheduleWork(cbB);
+  updateTestResult(3, 'scheduled CbB');
+  logWhenFramesStart(3, () => {
+    displayTestResult(3);
+    checkTestResult(3);
+  });
+}
+
+function waitForTimeToPass(timeInMs) {
+  const startTime = Date.now();
+  const endTime = startTime + timeInMs;
+  while (Date.now() < endTime) {
+    // wait...
+  }
+}
+
+function runTestFour() {
+  // Test 4
+  // Calls timed out callbacks and then any more pending callbacks, defers others if time runs out
+  clearTestResult(4);
+  const cbA = (x) => {
+    updateTestResult(4, 'cbA called with argument of ' + JSON.stringify(x));
+    updateTestResult(4, 'cbA running and taking some time');
+    waitForTimeToPass(35);
+  }
+  const cbB = (x) => {
+    updateTestResult(4, 'cbB called with argument of ' + JSON.stringify(x));
+  }
+  const cbC = (x) => {
+    updateTestResult(4, 'cbC called with argument of ' + JSON.stringify(x));
+  }
+  const cbD = (x) => {
+    updateTestResult(4, 'cbD called with argument of ' + JSON.stringify(x));
+  }
+  scheduleWork(cbA); // won't time out
+  updateTestResult(4, 'scheduled cbA');
+  scheduleWork(cbB, {timeout: 100}); // times out later
+  updateTestResult(4, 'scheduled cbB');
+  scheduleWork(cbC, {timeout: 2}); // will time out fast
+  updateTestResult(4, 'scheduled cbC');
+  scheduleWork(cbD); // won't time out
+  updateTestResult(4, 'scheduled cbD');
+
+  // should have run in order of C, A, B, D
+
+  logWhenFramesStart(4, () => {
+    displayTestResult(4);
+    checkTestResult(4);
+  });
+}
+    </script type="text/babel">
+  </body>
+</html>
diff --git a/packages/react-scheduler/src/__tests__/test_page.html b/packages/react-scheduler/src/__tests__/test_page.html
deleted file mode 100644
index 3b5af08b39..0000000000
--- a/packages/react-scheduler/src/__tests__/test_page.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html style="width: 100%; height: 100%; overflow: hidden">
-  <head>
-    <meta charset="utf-8">
-    <title>React Scheduler test page</title>
-  </head>
-  <body>
-    <h1>Hello World</h1>
-  </body>
-</html>

From 55787006710bd8ef89a01d60c4a9cfa58c71035d Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Fri, 25 May 2018 14:51:13 -0700
Subject: [PATCH 115/277] Record "actual" times for all Fibers within a
 Profiler tree (alt) (#12910)

* Moved actual time fields from Profiler stateNode to Fiber

* Record actual time for all Fibers within a ProfileMode tree

* Changed how profiler accumulates time

This change gives up on accumulating time across renders of different priority, but in exchange- simplifies how the commit phase (reset) code works, and perhaps also makes the profiling code more compatible with future resuming behavior
---
 packages/react-reconciler/src/ReactFiber.js   | 38 +++++++++++++++----
 .../src/ReactFiberBeginWork.js                | 18 ++++-----
 .../src/ReactFiberCommitWork.js               |  8 +---
 .../src/ReactFiberCompleteWork.js             | 11 ++++--
 .../src/ReactFiberScheduler.js                |  7 ++++
 .../src/ReactFiberUnwindWork.js               | 23 +++++++----
 .../src/ReactProfilerTimer.js                 | 22 ++++++-----
 .../__tests__/ReactProfiler-test.internal.js  | 38 ++++++++++++++++---
 8 files changed, 114 insertions(+), 51 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js
index d27a5b6a13..34ee91645d 100644
--- a/packages/react-reconciler/src/ReactFiber.js
+++ b/packages/react-reconciler/src/ReactFiber.js
@@ -152,8 +152,24 @@ export type Fiber = {|
   // memory if we need to.
   alternate: Fiber | null,
 
-  // Profiling metrics
+  // Time spent rendering this Fiber and its descendants for the current update.
+  // This tells us how well the tree makes use of sCU for memoization.
+  // This field is only set when the enableProfilerTimer flag is enabled.
+  actualDuration?: number,
+
+  // If the Fiber is currently active in the "render" phase,
+  // This marks the time at which the work began.
+  // This field is only set when the enableProfilerTimer flag is enabled.
+  actualStartTime?: number,
+
+  // Duration of the most recent render time for this Fiber.
+  // This value is not updated when we bailout for memoization purposes.
+  // This field is only set when the enableProfilerTimer flag is enabled.
   selfBaseTime?: number,
+
+  // Sum of base times for all descedents of this Fiber.
+  // This value bubbles up during the "complete" phase.
+  // This field is only set when the enableProfilerTimer flag is enabled.
   treeBaseTime?: number,
 
   // Conceptual aliases
@@ -211,6 +227,8 @@ function FiberNode(
   this.alternate = null;
 
   if (enableProfilerTimer) {
+    this.actualDuration = 0;
+    this.actualStartTime = 0;
     this.selfBaseTime = 0;
     this.treeBaseTime = 0;
   }
@@ -295,6 +313,15 @@ export function createWorkInProgress(
     workInProgress.nextEffect = null;
     workInProgress.firstEffect = null;
     workInProgress.lastEffect = null;
+
+    if (enableProfilerTimer) {
+      // We intentionally reset, rather than copy, actualDuration & actualStartTime.
+      // This prevents time from endlessly accumulating in new commits.
+      // This has the downside of resetting values for different priority renders,
+      // But works for yielding (the common case) and should support resuming.
+      workInProgress.actualDuration = 0;
+      workInProgress.actualStartTime = 0;
+    }
   }
 
   workInProgress.expirationTime = expirationTime;
@@ -460,13 +487,6 @@ export function createFiberFromProfiler(
   const fiber = createFiber(Profiler, pendingProps, key, mode | ProfileMode);
   fiber.type = REACT_PROFILER_TYPE;
   fiber.expirationTime = expirationTime;
-  if (enableProfilerTimer) {
-    fiber.stateNode = {
-      elapsedPauseTimeAtStart: 0,
-      duration: 0,
-      startTime: 0,
-    };
-  }
 
   return fiber;
 }
@@ -541,6 +561,8 @@ export function assignFiberPropertiesInDEV(
   target.expirationTime = source.expirationTime;
   target.alternate = source.alternate;
   if (enableProfilerTimer) {
+    target.actualDuration = source.actualDuration;
+    target.actualStartTime = source.actualStartTime;
     target.selfBaseTime = source.selfBaseTime;
     target.treeBaseTime = source.treeBaseTime;
   }
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index ad1189d402..135e85bb0b 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -61,7 +61,7 @@ import {
 } from './ReactChildFiber';
 import {processUpdateQueue} from './ReactUpdateQueue';
 import {NoWork, Never} from './ReactFiberExpirationTime';
-import {AsyncMode, StrictMode} from './ReactTypeOfMode';
+import {AsyncMode, ProfileMode, StrictMode} from './ReactTypeOfMode';
 import {
   shouldSetTextContent,
   shouldDeprioritizeSubtree,
@@ -214,11 +214,6 @@ function updateMode(current, workInProgress) {
 function updateProfiler(current, workInProgress) {
   const nextProps = workInProgress.pendingProps;
   if (enableProfilerTimer) {
-    // Start render timer here and push start time onto queue
-    markActualRenderTimeStarted(workInProgress);
-
-    // Let the "complete" phase know to stop the timer,
-    // And the scheduler to record the measured time.
     workInProgress.effectTag |= Update;
   }
   if (workInProgress.memoizedProps === nextProps) {
@@ -1111,11 +1106,6 @@ function bailoutOnLowPriority(current, workInProgress) {
     case ContextProvider:
       pushProvider(workInProgress);
       break;
-    case Profiler:
-      if (enableProfilerTimer) {
-        markActualRenderTimeStarted(workInProgress);
-      }
-      break;
   }
   // TODO: What if this is currently in progress?
   // How can that happen? How is this not being cloned?
@@ -1138,6 +1128,12 @@ function beginWork(
   workInProgress: Fiber,
   renderExpirationTime: ExpirationTime,
 ): Fiber | null {
+  if (enableProfilerTimer) {
+    if (workInProgress.mode & ProfileMode) {
+      markActualRenderTimeStarted(workInProgress);
+    }
+  }
+
   if (
     workInProgress.expirationTime === NoWork ||
     workInProgress.expirationTime > renderExpirationTime
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index 8f5fa74a5c..f9a3dce200 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -806,15 +806,11 @@ function commitWork(current: Fiber | null, finishedWork: Fiber): void {
         onRender(
           finishedWork.memoizedProps.id,
           current === null ? 'mount' : 'update',
-          finishedWork.stateNode.duration,
+          finishedWork.actualDuration,
           finishedWork.treeBaseTime,
-          finishedWork.stateNode.startTime,
+          finishedWork.actualStartTime,
           getCommitTime(),
         );
-
-        // Reset actualTime after successful commit.
-        // By default, we append to this time to account for errors and pauses.
-        finishedWork.stateNode.duration = 0;
       }
       return;
     }
diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js
index 8ed630b82d..d9b469c94d 100644
--- a/packages/react-reconciler/src/ReactFiberCompleteWork.js
+++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js
@@ -38,6 +38,7 @@ import {
   TimeoutComponent,
 } from 'shared/ReactTypeOfWork';
 import {Placement, Ref, Update} from 'shared/ReactTypeOfSideEffect';
+import {ProfileMode} from './ReactTypeOfMode';
 import invariant from 'fbjs/lib/invariant';
 
 import {
@@ -312,6 +313,13 @@ function completeWork(
   renderExpirationTime: ExpirationTime,
 ): Fiber | null {
   const newProps = workInProgress.pendingProps;
+
+  if (enableProfilerTimer) {
+    if (workInProgress.mode & ProfileMode) {
+      recordElapsedActualRenderTime(workInProgress);
+    }
+  }
+
   switch (workInProgress.tag) {
     case FunctionalComponent:
       return null;
@@ -489,9 +497,6 @@ function completeWork(
     case Mode:
       return null;
     case Profiler:
-      if (enableProfilerTimer) {
-        recordElapsedActualRenderTime(workInProgress);
-      }
       return null;
     case HostPortal:
       popHostContainer(workInProgress);
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 87f97dcc61..70bec86f55 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -106,6 +106,7 @@ import {
   checkActualRenderTimeStackEmpty,
   pauseActualRenderTimerIfRunning,
   recordCommitTime,
+  recordElapsedActualRenderTime,
   recordElapsedBaseRenderTimeIfRunning,
   resetActualRenderTimer,
   resumeActualRenderTimerIfPaused,
@@ -311,6 +312,10 @@ if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
       clearCaughtError();
 
       if (enableProfilerTimer) {
+        if (failedUnitOfWork.mode & ProfileMode) {
+          recordElapsedActualRenderTime(failedUnitOfWork);
+        }
+
         // Stop "base" render timer again (after the re-thrown error).
         stopBaseRenderTimerIfRunning();
       }
@@ -573,6 +578,8 @@ function commitRoot(finishedWork: Fiber): ExpirationTime {
   stopCommitSnapshotEffectsTimer();
 
   if (enableProfilerTimer) {
+    // Mark the current commit time to be shared by all Profilers in this batch.
+    // This enables them to be grouped later.
     recordCommitTime();
   }
 
diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index b4be270162..19bb46bfa5 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -20,7 +20,6 @@ import {
   HostComponent,
   HostPortal,
   ContextProvider,
-  Profiler,
   TimeoutComponent,
 } from 'shared/ReactTypeOfWork';
 import {
@@ -34,6 +33,7 @@ import {
   enableProfilerTimer,
   enableSuspense,
 } from 'shared/ReactFeatureFlags';
+import {ProfileMode} from './ReactTypeOfMode';
 
 import {createCapturedValue} from './ReactCapturedValue';
 import {
@@ -301,6 +301,12 @@ function unwindWork(
   renderIsExpired: boolean,
   renderExpirationTime: ExpirationTime,
 ) {
+  if (enableProfilerTimer) {
+    if (workInProgress.mode & ProfileMode) {
+      recordElapsedActualRenderTime(workInProgress);
+    }
+  }
+
   switch (workInProgress.tag) {
     case ClassComponent: {
       popLegacyContextProvider(workInProgress);
@@ -345,6 +351,14 @@ function unwindWork(
 }
 
 function unwindInterruptedWork(interruptedWork: Fiber) {
+  if (enableProfilerTimer) {
+    if (interruptedWork.mode & ProfileMode) {
+      // Resume in case we're picking up on work that was paused.
+      resumeActualRenderTimerIfPaused();
+      recordElapsedActualRenderTime(interruptedWork);
+    }
+  }
+
   switch (interruptedWork.tag) {
     case ClassComponent: {
       popLegacyContextProvider(interruptedWork);
@@ -365,13 +379,6 @@ function unwindInterruptedWork(interruptedWork: Fiber) {
     case ContextProvider:
       popProvider(interruptedWork);
       break;
-    case Profiler:
-      if (enableProfilerTimer) {
-        // Resume in case we're picking up on work that was paused.
-        resumeActualRenderTimerIfPaused();
-        recordElapsedActualRenderTime(interruptedWork);
-      }
-      break;
     default:
       break;
   }
diff --git a/packages/react-reconciler/src/ReactProfilerTimer.js b/packages/react-reconciler/src/ReactProfilerTimer.js
index bbe1c9bdea..7877d7d297 100644
--- a/packages/react-reconciler/src/ReactProfilerTimer.js
+++ b/packages/react-reconciler/src/ReactProfilerTimer.js
@@ -9,6 +9,7 @@
 
 import type {Fiber} from './ReactFiber';
 
+import getComponentName from 'shared/getComponentName';
 import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
 
 import warning from 'fbjs/lib/warning';
@@ -76,9 +77,10 @@ function markActualRenderTimeStarted(fiber: Fiber): void {
   if (__DEV__) {
     fiberStack.push(fiber);
   }
-  const stateNode = fiber.stateNode;
-  stateNode.elapsedPauseTimeAtStart = totalElapsedPauseTime;
-  stateNode.startTime = now();
+
+  fiber.actualDuration =
+    now() - ((fiber.actualDuration: any): number) - totalElapsedPauseTime;
+  fiber.actualStartTime = now();
 }
 
 function pauseActualRenderTimerIfRunning(): void {
@@ -95,13 +97,15 @@ function recordElapsedActualRenderTime(fiber: Fiber): void {
     return;
   }
   if (__DEV__) {
-    warning(fiber === fiberStack.pop(), 'Unexpected Fiber popped.');
+    warning(
+      fiber === fiberStack.pop(),
+      'Unexpected Fiber (%s) popped.',
+      getComponentName(fiber),
+    );
   }
-  const stateNode = fiber.stateNode;
-  stateNode.duration +=
-    now() -
-    (totalElapsedPauseTime - stateNode.elapsedPauseTimeAtStart) -
-    stateNode.startTime;
+
+  fiber.actualDuration =
+    now() - totalElapsedPauseTime - ((fiber.actualDuration: any): number);
 }
 
 function resetActualRenderTimer(): void {
diff --git a/packages/react/src/__tests__/ReactProfiler-test.internal.js b/packages/react/src/__tests__/ReactProfiler-test.internal.js
index 3e27588816..ccd3dc3be0 100644
--- a/packages/react/src/__tests__/ReactProfiler-test.internal.js
+++ b/packages/react/src/__tests__/ReactProfiler-test.internal.js
@@ -228,6 +228,28 @@ describe('Profiler', () => {
       expect(call[3]).toBe(10); // base time
       expect(call[4]).toBe(35); // start time
       expect(call[5]).toBe(45); // commit time
+
+      callback.mockReset();
+
+      advanceTimeBy(20); // 45 -> 65
+
+      renderer.update(
+        <React.unstable_Profiler id="test" onRender={callback}>
+          <AdvanceTime byAmount={4} />
+        </React.unstable_Profiler>,
+      );
+
+      expect(callback).toHaveBeenCalledTimes(1);
+
+      [call] = callback.mock.calls;
+
+      expect(call).toHaveLength(6);
+      expect(call[0]).toBe('test');
+      expect(call[1]).toBe('update');
+      expect(call[2]).toBe(4); // actual time
+      expect(call[3]).toBe(4); // base time
+      expect(call[4]).toBe(65); // start time
+      expect(call[5]).toBe(69); // commit time
     });
 
     it('includes render times of nested Profilers in their parent times', () => {
@@ -576,7 +598,9 @@ describe('Profiler', () => {
           </React.unstable_Profiler>,
           {unstable_isAsync: true},
         );
-        expect(renderer.unstable_flushThrough(['first'])).toEqual(['Yield:10']);
+        expect(renderer.unstable_flushThrough(['Yield:10'])).toEqual([
+          'Yield:10',
+        ]);
         expect(callback).toHaveBeenCalledTimes(0);
 
         // Simulate time moving forward while frame is paused.
@@ -681,11 +705,12 @@ describe('Profiler', () => {
           }),
         ).toEqual(['Yield:11']);
 
-        // Verify that the actual time includes all three durations above.
-        // And the base time includes only the final rendered tree times.
+        // The actual time should include only the most recent render,
+        // Because this lets us avoid a lot of commit phase reset complexity.
+        // The base time includes only the final rendered tree times.
         expect(callback).toHaveBeenCalledTimes(1);
         call = callback.mock.calls[0];
-        expect(call[2]).toBe(19); // actual time
+        expect(call[2]).toBe(11); // actual time
         expect(call[3]).toBe(11); // base time
         expect(call[4]).toBe(264); // start time
         expect(call[5]).toBe(275); // commit time
@@ -772,12 +797,13 @@ describe('Profiler', () => {
           renderer.unstable_flushSync(() => second.setState({renderTime: 30})),
         ).toEqual(['SecondComponent:30', 'Yield:7']);
 
-        // Verify that the actual time includes time spent in the both renders so far (10ms and 37ms).
+        // The actual time should include only the most recent render (37ms),
+        // Because this lets us avoid a lot of commit phase reset complexity.
         // The base time should include the more recent times for the SecondComponent subtree,
         // As well as the original times for the FirstComponent subtree.
         expect(callback).toHaveBeenCalledTimes(1);
         call = callback.mock.calls[0];
-        expect(call[2]).toBe(47); // actual time
+        expect(call[2]).toBe(37); // actual time
         expect(call[3]).toBe(42); // base time
         expect(call[4]).toBe(229); // start time
         expect(call[5]).toBe(266); // commit time

From f35d989bea2ee38c164c0cbb23cd300552e998f9 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Fri, 25 May 2018 14:53:24 -0700
Subject: [PATCH 116/277] TestRenderer warns if flushThrough is passed the
 wrong params (#12909)

TestRenderer throws if flushThrough is passed the expected yield values that don't match actual yield values.
---
 .../src/ReactTestRendererScheduling.js        | 17 ++++-
 .../__tests__/ReactTestRendererAsync-test.js  | 62 ++++++++++++++++++-
 2 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/packages/react-test-renderer/src/ReactTestRendererScheduling.js b/packages/react-test-renderer/src/ReactTestRendererScheduling.js
index 8638c0e760..b37f8c6b48 100644
--- a/packages/react-test-renderer/src/ReactTestRendererScheduling.js
+++ b/packages/react-test-renderer/src/ReactTestRendererScheduling.js
@@ -80,7 +80,22 @@ export function flushThrough(expectedValues: Array<mixed>): Array<mixed> {
   }
   if (yieldedValues === null) {
     // Always return an array.
-    return [];
+    yieldedValues = [];
+  }
+  for (let i = 0; i < expectedValues.length; i++) {
+    const expectedValue = `"${(expectedValues[i]: any)}"`;
+    const yieldedValue =
+      i < yieldedValues.length ? `"${(yieldedValues[i]: any)}"` : 'nothing';
+    if (yieldedValue !== expectedValue) {
+      const error = new Error(
+        `flushThrough expected to yield ${(expectedValue: any)}, but ${(yieldedValue: any)} was yielded`,
+      );
+      // Attach expected and yielded arrays,
+      // So the caller could pretty print the diff (if desired).
+      (error: any).expectedValues = expectedValues;
+      (error: any).actualValues = yieldedValues;
+      throw error;
+    }
   }
   return yieldedValues;
 }
diff --git a/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js b/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js
index 26a3de6746..e44bf0cb17 100644
--- a/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js
@@ -10,10 +10,16 @@
 
 'use strict';
 
-const React = require('react');
-const ReactTestRenderer = require('react-test-renderer');
+let React;
+let ReactTestRenderer;
 
 describe('ReactTestRendererAsync', () => {
+  beforeEach(() => {
+    jest.resetModules();
+    React = require('react');
+    ReactTestRenderer = require('react-test-renderer');
+  });
+
   it('flushAll flushes all work', () => {
     function Foo(props) {
       return props.children;
@@ -134,4 +140,56 @@ describe('ReactTestRendererAsync', () => {
     // Only the higher priority properties have been committed
     expect(renderer.toJSON()).toEqual(['A:2', 'B:2']);
   });
+
+  it('should error if flushThrough params dont match yielded values', () => {
+    const Yield = ({id}) => {
+      renderer.unstable_yield(id);
+      return id;
+    };
+
+    const renderer = ReactTestRenderer.create(
+      <div>
+        <Yield id="foo" />
+        <Yield id="bar" />
+        <Yield id="baz" />
+      </div>,
+      {
+        unstable_isAsync: true,
+      },
+    );
+
+    expect(() => renderer.unstable_flushThrough(['foo', 'baz'])).toThrow(
+      'flushThrough expected to yield "baz", but "bar" was yielded',
+    );
+  });
+
+  it('should error if flushThrough yields the wrong number of values', () => {
+    const Yield = ({id}) => {
+      renderer.unstable_yield(id);
+      return id;
+    };
+
+    const renderer = ReactTestRenderer.create(
+      <div>
+        <Yield id="foo" />
+      </div>,
+      {
+        unstable_isAsync: true,
+      },
+    );
+
+    expect(() => renderer.unstable_flushThrough(['foo', 'bar'])).toThrow(
+      'flushThrough expected to yield "bar", but nothing was yielded',
+    );
+  });
+
+  it('should error if flushThrough yields no values', () => {
+    const renderer = ReactTestRenderer.create(null, {
+      unstable_isAsync: true,
+    });
+
+    expect(() => renderer.unstable_flushThrough(['foo'])).toThrow(
+      'flushThrough expected to yield "foo", but nothing was yielded',
+    );
+  });
 });

From e7bd3d59a9502b4727982087b70d82693ebde7d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= <sebastian@calyptus.eu>
Date: Fri, 25 May 2018 21:17:37 -0700
Subject: [PATCH 117/277] No longer expose ReactNativeComponentTree (#12904)

---
 .../react-native-renderer/src/ReactFabric.js   |  2 --
 .../src/ReactNativeRenderer.js                 |  2 --
 .../src/ReactNativeTypes.js                    |  2 --
 .../react-native/ReactNativeComponentTree.js   | 18 ------------------
 4 files changed, 24 deletions(-)
 delete mode 100644 scripts/rollup/shims/react-native/ReactNativeComponentTree.js

diff --git a/packages/react-native-renderer/src/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js
index 3f0146d4c1..e4e663de72 100644
--- a/packages/react-native-renderer/src/ReactFabric.js
+++ b/packages/react-native-renderer/src/ReactFabric.js
@@ -116,8 +116,6 @@ const ReactFabric: ReactFabricType = {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
     // Used as a mixin in many createClass-based components
     NativeMethodsMixin: NativeMethodsMixin(findNodeHandle, findHostInstance),
-    // Used by react-native-github/Libraries/ components
-    ReactNativeComponentTree, // ScrollResponder
   },
 };
 
diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js
index 50d63de4fa..6ddc034282 100644
--- a/packages/react-native-renderer/src/ReactNativeRenderer.js
+++ b/packages/react-native-renderer/src/ReactNativeRenderer.js
@@ -138,8 +138,6 @@ const ReactNativeRenderer: ReactNativeType = {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
     // Used as a mixin in many createClass-based components
     NativeMethodsMixin: NativeMethodsMixin(findNodeHandle, findHostInstance),
-    // Used by react-native-github/Libraries/ components
-    ReactNativeComponentTree, // ScrollResponder
     computeComponentStackForErrorReporting,
   },
 };
diff --git a/packages/react-native-renderer/src/ReactNativeTypes.js b/packages/react-native-renderer/src/ReactNativeTypes.js
index c38b0b44eb..991aa338e7 100644
--- a/packages/react-native-renderer/src/ReactNativeTypes.js
+++ b/packages/react-native-renderer/src/ReactNativeTypes.js
@@ -89,7 +89,6 @@ export type NativeMethodsMixinType = {
 
 type SecretInternalsType = {
   NativeMethodsMixin: NativeMethodsMixinType,
-  ReactNativeComponentTree: any,
   computeComponentStackForErrorReporting(tag: number): string,
   // TODO (bvaughn) Decide which additional types to expose here?
   // And how much information to fill in for the above types.
@@ -97,7 +96,6 @@ type SecretInternalsType = {
 
 type SecretInternalsFabricType = {
   NativeMethodsMixin: NativeMethodsMixinType,
-  ReactNativeComponentTree: any,
 };
 
 /**
diff --git a/scripts/rollup/shims/react-native/ReactNativeComponentTree.js b/scripts/rollup/shims/react-native/ReactNativeComponentTree.js
deleted file mode 100644
index 702b621a5e..0000000000
--- a/scripts/rollup/shims/react-native/ReactNativeComponentTree.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @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;

From 61777a78f6f9d90bea6ecdab4038675010bd70db Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Sat, 26 May 2018 15:55:57 -0700
Subject: [PATCH 118/277] [scheduler] 3/n Use a linked list instead of map and
 queue for callback storage (#12893)

* [schedule] Use linked list instead of queue and map for storing cbs

NOTE: This PR depends on https://github.com/facebook/react/pull/12880
and https://github.com/facebook/react/pull/12884
Please review those first, and after they land Flarnie will rebase on
top of them.

---

**what is the change?:**
See title

**why make this change?:**
This seems to make the code simpler, and potentially saves space of
having an array and object around holding references to the callbacks.

**test plan:**
Run existing tests

* minor style improvements

* refactor conditionals in cancelScheduledWork for increased clarity

* Remove 'canUseDOM' condition and fix some flow issues w/callbackID type

**what is the change?:**
- Removed conditional which fell back to 'setTimeout' when the
environment doesn't have DOM. This appears to be an old polyfill used
for test environments and we don't use it any more.
- Fixed type definitions around the callbackID to be more accurate in
the scheduler itself, and more loose in the React code.

**why make this change?:**
To get Flow passing, simplify the scheduler code, make things accurate.

**test plan:**
Run tests and flow.

* Rewrite 'cancelScheduledWork' so that Flow accepts it

**what is the change?:**
Adding verification that 'previousCallbackConfig' and
'nextCallbackConfig' are not null before accessing properties on them.

Slightly concerned because this implementation relies on these
properties being untouched and correct on the config which is passed to
'cancelScheduledWork' but I guess we already rely heavily on that for
this whole approach. :\

**why make this change?:**
To get Flow passing.

Not sure why it passed earlier and in CI, but now it's not.

**test plan:**
`yarn flow dom` and other flow tests, lint, tests, etc.

* ran prettier

* Put back the fallback implementation of scheduler for node environment

**what is the change?:**
We had tried removing the fallback implementation of `scheduler` but
tests reminded us that this is important for supporting isomorphic uses
of React.

Long term we will move this out of the `schedule` module but for now
let's keep things simple.

**why make this change?:**
Keep things working!

**test plan:**
Ran tests and flow

* Shorten properties stored in objects by sheduler

**what is the change?:**
`previousScheduledCallback` -> `prev`
`nextScheduledCallback` -> `next`

**why make this change?:**
We want this package to be smaller, and less letters means less code
means smaller!

**test plan:**
ran existing tests

* further remove extra lines in scheduler
---
 .../src/ReactFiberScheduler.js                |  12 +-
 .../react-scheduler/src/ReactScheduler.js     | 196 +++++++++++-------
 .../src/ReactTestRendererScheduling.js        |   3 +-
 3 files changed, 134 insertions(+), 77 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 70bec86f55..dbd252a20e 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -1430,7 +1430,7 @@ let firstScheduledRoot: FiberRoot | null = null;
 let lastScheduledRoot: FiberRoot | null = null;
 
 let callbackExpirationTime: ExpirationTime = NoWork;
-let callbackID: number = -1;
+let callbackID: *;
 let isRendering: boolean = false;
 let nextFlushedRoot: FiberRoot | null = null;
 let nextFlushedExpirationTime: ExpirationTime = NoWork;
@@ -1459,9 +1459,11 @@ function scheduleCallbackWithExpiration(expirationTime) {
       // Existing callback has sufficient timeout. Exit.
       return;
     } else {
-      // Existing callback has insufficient timeout. Cancel and schedule a
-      // new one.
-      cancelDeferredCallback(callbackID);
+      if (callbackID !== null) {
+        // Existing callback has insufficient timeout. Cancel and schedule a
+        // new one.
+        cancelDeferredCallback(callbackID);
+      }
     }
     // The request callback timer is already running. Don't start a new one.
   } else {
@@ -1687,7 +1689,7 @@ function performWork(
   // If we're inside a callback, set this to false since we just completed it.
   if (deadline !== null) {
     callbackExpirationTime = NoWork;
-    callbackID = -1;
+    callbackID = null;
   }
   // If there's work left over, schedule a new callback.
   if (nextFlushedExpirationTime !== NoWork) {
diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index f48d2142a9..a17fa51128 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -35,11 +35,14 @@ type FrameCallbackType = Deadline => void;
 type CallbackConfigType = {|
   scheduledCallback: FrameCallbackType,
   timeoutTime: number,
-  callbackId: number, // used for cancelling
+  next: CallbackConfigType | null, // creating a linked list
+  prev: CallbackConfigType | null, // creating a linked list
 |};
 
-import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
+export type CallbackIdType = CallbackConfigType;
+
 import requestAnimationFrameForReact from 'shared/requestAnimationFrameForReact';
+import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
 
 const hasNativePerformanceNow =
   typeof performance === 'object' && typeof performance.now === 'function';
@@ -55,24 +58,26 @@ if (hasNativePerformanceNow) {
   };
 }
 
-// TODO: There's no way to cancel, because Fiber doesn't atm.
 let scheduleWork: (
   callback: FrameCallbackType,
   options?: {timeout: number},
-) => number;
-let cancelScheduledWork: (callbackId: number) => void;
+) => CallbackIdType;
+let cancelScheduledWork: (callbackId: CallbackIdType) => void;
 
 if (!ExecutionEnvironment.canUseDOM) {
-  let callbackIdCounter = 0;
-  // Timeouts are objects in Node.
-  // For consistency, we'll use numbers in the public API anyway.
-  const timeoutIds: {[number]: TimeoutID} = {};
+  const timeoutIds = new Map();
 
   scheduleWork = function(
     callback: FrameCallbackType,
     options?: {timeout: number},
-  ): number {
-    const callbackId = callbackIdCounter++;
+  ): CallbackIdType {
+    // keeping return type consistent
+    const callbackConfig = {
+      scheduledCallback: callback,
+      timeoutTime: 0,
+      next: null,
+      prev: null,
+    };
     const timeoutId = setTimeout(() => {
       callback({
         timeRemaining() {
@@ -81,34 +86,18 @@ if (!ExecutionEnvironment.canUseDOM) {
         didTimeout: false,
       });
     });
-    timeoutIds[callbackId] = timeoutId;
-    return callbackId;
+    timeoutIds.set(callback, timeoutId);
+    return callbackConfig;
   };
-  cancelScheduledWork = function(callbackId: number) {
-    const timeoutId = timeoutIds[callbackId];
-    delete timeoutIds[callbackId];
+  cancelScheduledWork = function(callbackId: CallbackIdType) {
+    const callback = callbackId.scheduledCallback;
+    const timeoutId = timeoutIds.get(callback);
+    timeoutIds.delete(callbackId);
     clearTimeout(timeoutId);
   };
 } else {
-  // We keep callbacks in a queue.
-  // Calling scheduleWork will push in a new callback at the end of the queue.
-  // When we get idle time, callbacks are removed from the front of the queue
-  // and called.
-  const pendingCallbacks: Array<CallbackConfigType> = [];
-
-  let callbackIdCounter = 0;
-  const getCallbackId = function(): number {
-    callbackIdCounter++;
-    return callbackIdCounter;
-  };
-
-  // When a callback is scheduled, we register it by adding it's id to this
-  // object.
-  // If the user calls 'cancelScheduledWork' with the id of that callback, it will be
-  // unregistered by removing the id from this object.
-  // Then we skip calling any callback which is not registered.
-  // This means cancelling is an O(1) time complexity instead of O(n).
-  const registeredCallbackIds: {[number]: boolean} = {};
+  let headOfPendingCallbacksLinkedList: CallbackConfigType | null = null;
+  let tailOfPendingCallbacksLinkedList: CallbackConfigType | null = null;
 
   // We track what the next soonest timeoutTime is, to be able to quickly tell
   // if none of the scheduled callbacks have timed out.
@@ -132,30 +121,13 @@ if (!ExecutionEnvironment.canUseDOM) {
     },
   };
 
-  const safelyCallScheduledCallback = function(
-    callback: FrameCallbackType,
-    callbackId: number,
-  ) {
-    if (!registeredCallbackIds[callbackId]) {
-      // ignore cancelled callbacks
-      return;
-    }
-    try {
-      callback(frameDeadlineObject);
-      // Avoid using 'catch' to keep errors easy to debug
-    } finally {
-      // always clean up the callbackId, even if the callback throws
-      delete registeredCallbackIds[callbackId];
-    }
-  };
-
   /**
    * Checks for timed out callbacks, runs them, and then checks again to see if
    * any more have timed out.
    * Keeps doing this until there are none which have currently timed out.
    */
   const callTimedOutCallbacks = function() {
-    if (pendingCallbacks.length === 0) {
+    if (headOfPendingCallbacksLinkedList === null) {
       return;
     }
 
@@ -176,14 +148,17 @@ if (!ExecutionEnvironment.canUseDOM) {
 
     // keep checking until we don't find any more timed out callbacks
     frameDeadlineObject.didTimeout = true;
-    for (let i = 0, len = pendingCallbacks.length; i < len; i++) {
-      const currentCallbackConfig = pendingCallbacks[i];
+    let currentCallbackConfig = headOfPendingCallbacksLinkedList;
+    while (currentCallbackConfig !== null) {
       const timeoutTime = currentCallbackConfig.timeoutTime;
       if (timeoutTime !== -1 && timeoutTime <= currentTime) {
         // it has timed out!
         // call it
         const callback = currentCallbackConfig.scheduledCallback;
-        safelyCallScheduledCallback(callback, currentCallbackConfig.callbackId);
+        // TODO: error handling
+        callback(frameDeadlineObject);
+        // remove it from linked list
+        cancelScheduledWork(currentCallbackConfig);
       } else {
         if (
           timeoutTime !== -1 &&
@@ -193,6 +168,7 @@ if (!ExecutionEnvironment.canUseDOM) {
           nextSoonestTimeoutTime = timeoutTime;
         }
       }
+      currentCallbackConfig = currentCallbackConfig.next;
     }
   };
 
@@ -208,7 +184,7 @@ if (!ExecutionEnvironment.canUseDOM) {
     }
     isIdleScheduled = false;
 
-    if (pendingCallbacks.length === 0) {
+    if (headOfPendingCallbacksLinkedList === null) {
       return;
     }
 
@@ -217,15 +193,28 @@ if (!ExecutionEnvironment.canUseDOM) {
 
     let currentTime = now();
     // Next, as long as we have idle time, try calling more callbacks.
-    while (frameDeadline - currentTime > 0 && pendingCallbacks.length > 0) {
-      const latestCallbackConfig = pendingCallbacks.shift();
+    while (
+      frameDeadline - currentTime > 0 &&
+      headOfPendingCallbacksLinkedList !== null
+    ) {
+      const latestCallbackConfig = headOfPendingCallbacksLinkedList;
+      // move head of list to next callback
+      headOfPendingCallbacksLinkedList = latestCallbackConfig.next;
+      if (headOfPendingCallbacksLinkedList !== null) {
+        headOfPendingCallbacksLinkedList.prev = null;
+      } else {
+        // if headOfPendingCallbacksLinkedList is null,
+        // then the list must be empty.
+        // make sure we set the tail to null as well.
+        tailOfPendingCallbacksLinkedList = null;
+      }
       frameDeadlineObject.didTimeout = false;
       const latestCallback = latestCallbackConfig.scheduledCallback;
-      const newCallbackId = latestCallbackConfig.callbackId;
-      safelyCallScheduledCallback(latestCallback, newCallbackId);
+      // TODO: before using this outside of React we need to add error handling
+      latestCallback(frameDeadlineObject);
       currentTime = now();
     }
-    if (pendingCallbacks.length > 0) {
+    if (headOfPendingCallbacksLinkedList !== null) {
       if (!isAnimationFrameScheduled) {
         // Schedule another animation callback so we retry later.
         isAnimationFrameScheduled = true;
@@ -271,7 +260,7 @@ if (!ExecutionEnvironment.canUseDOM) {
   scheduleWork = function(
     callback: FrameCallbackType,
     options?: {timeout: number},
-  ): number {
+  ): CallbackIdType /* CallbackConfigType */ {
     let timeoutTime = -1;
     if (options != null && typeof options.timeout === 'number') {
       timeoutTime = now() + options.timeout;
@@ -283,15 +272,27 @@ if (!ExecutionEnvironment.canUseDOM) {
       nextSoonestTimeoutTime = timeoutTime;
     }
 
-    const newCallbackId = getCallbackId();
-    const scheduledCallbackConfig = {
+    const scheduledCallbackConfig: CallbackConfigType = {
       scheduledCallback: callback,
-      callbackId: newCallbackId,
       timeoutTime,
+      prev: null,
+      next: null,
     };
-    pendingCallbacks.push(scheduledCallbackConfig);
+    if (headOfPendingCallbacksLinkedList === null) {
+      // Make this callback the head and tail of our list
+      headOfPendingCallbacksLinkedList = scheduledCallbackConfig;
+      tailOfPendingCallbacksLinkedList = scheduledCallbackConfig;
+    } else {
+      // Add latest callback as the new tail of the list
+      scheduledCallbackConfig.prev = tailOfPendingCallbacksLinkedList;
+      // renaming for clarity
+      const oldTailOfPendingCallbacksLinkedList = tailOfPendingCallbacksLinkedList;
+      if (oldTailOfPendingCallbacksLinkedList !== null) {
+        oldTailOfPendingCallbacksLinkedList.next = scheduledCallbackConfig;
+      }
+      tailOfPendingCallbacksLinkedList = scheduledCallbackConfig;
+    }
 
-    registeredCallbackIds[newCallbackId] = true;
     if (!isAnimationFrameScheduled) {
       // If rAF didn't already schedule one, we need to schedule a frame.
       // TODO: If this rAF doesn't materialize because the browser throttles, we
@@ -300,11 +301,64 @@ if (!ExecutionEnvironment.canUseDOM) {
       isAnimationFrameScheduled = true;
       requestAnimationFrameForReact(animationTick);
     }
-    return newCallbackId;
+    return scheduledCallbackConfig;
   };
 
-  cancelScheduledWork = function(callbackId: number) {
-    delete registeredCallbackIds[callbackId];
+  cancelScheduledWork = function(
+    callbackConfig: CallbackIdType /* CallbackConfigType */,
+  ) {
+    /**
+     * There are four possible cases:
+     * - Head/nodeToRemove/Tail -> null
+     *   In this case we set Head and Tail to null.
+     * - Head -> ... middle nodes... -> Tail/nodeToRemove
+     *   In this case we point the middle.next to null and put middle as the new
+     *   Tail.
+     * - Head/nodeToRemove -> ...middle nodes... -> Tail
+     *   In this case we point the middle.prev at null and move the Head to
+     *   middle.
+     * - Head -> ... ?some nodes ... -> nodeToRemove -> ... ?some nodes ... -> Tail
+     *   In this case we point the Head.next to the Tail and the Tail.prev to
+     *   the Head.
+     */
+    const next = callbackConfig.next;
+    const prev = callbackConfig.prev;
+    if (next !== null) {
+      // we have a next
+
+      if (prev !== null) {
+        // we have a prev
+
+        // callbackConfig is somewhere in the middle of a list of 3 or more nodes.
+        prev.next = next;
+        next.prev = prev;
+        return;
+      } else {
+        // there is a next but not a previous one;
+        // callbackConfig is the head of a list of 2 or more other nodes.
+        next.prev = null;
+        headOfPendingCallbacksLinkedList = next;
+        return;
+      }
+    } else {
+      // there is no next callback config; this must the tail of the list
+
+      if (prev !== null) {
+        // we have a prev
+
+        // callbackConfig is the tail of a list of 2 or more other nodes.
+        prev.next = null;
+        tailOfPendingCallbacksLinkedList = prev;
+        return;
+      } else {
+        // there is no previous callback config;
+        // callbackConfig is the only thing in the linked list,
+        // so both head and tail point to it.
+        headOfPendingCallbacksLinkedList = null;
+        tailOfPendingCallbacksLinkedList = null;
+        return;
+      }
+    }
   };
 }
 
diff --git a/packages/react-test-renderer/src/ReactTestRendererScheduling.js b/packages/react-test-renderer/src/ReactTestRendererScheduling.js
index b37f8c6b48..cc446fe6b1 100644
--- a/packages/react-test-renderer/src/ReactTestRendererScheduling.js
+++ b/packages/react-test-renderer/src/ReactTestRendererScheduling.js
@@ -19,7 +19,8 @@ export function scheduleDeferredCallback(
   options?: {timeout: number},
 ): number {
   scheduledCallback = callback;
-  return 0;
+  const fakeCallbackId = 0;
+  return fakeCallbackId;
 }
 
 export function cancelDeferredCallback(timeoutID: number): void {

From a32f857ac78ad1b33c61e6fbd47ccd57f21155c2 Mon Sep 17 00:00:00 2001
From: Daniel Lo Nigro <daniel@dan.cx>
Date: Mon, 28 May 2018 11:52:42 -0700
Subject: [PATCH 119/277] Use --frozen-lockfile for Yarn in CI build (#12914)

CI builds should always use the `--frozen-lockfile` option. It will fail the build if the lockfile is out-of-date:

> If you need reproducible dependencies, which is usually the case with the continuous integration systems, you should pass --frozen-lockfile flag.

(https://yarnpkg.com/en/docs/cli/install/)
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 73a6ca773c..4be16be129 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,7 +29,7 @@ jobs:
 
       - run:
           name: Install Packages
-          command: yarn install
+          command: yarn install --frozen-lockfile
 
       - run:
           name: Test Packages

From aa85b0fd5ffc92de38720c29833a54c67285abfb Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Tue, 29 May 2018 00:03:15 +0200
Subject: [PATCH 120/277] Upgrade to Jest 23 (#12894)

* Upgrade to Jest 23 beta

* prefer `.toHaveBeenCalledTimes`

* 23 stable
---
 package.json                                  |    6 +-
 .../__tests__/DOMPropertyOperations-test.js   |    2 +-
 .../ReactBrowserEventEmitter-test.internal.js |   12 +-
 .../src/__tests__/ReactComponent-test.js      |    6 +-
 .../src/__tests__/ReactDOMComponent-test.js   |   54 +-
 .../__tests__/ReactDOMEventListener-test.js   |    8 +-
 .../src/__tests__/ReactDOMIframe-test.js      |    2 +-
 .../src/__tests__/ReactDOMInput-test.js       |   14 +-
 .../src/__tests__/ReactDOMTextarea-test.js    |    6 +-
 .../src/__tests__/ReactEmptyComponent-test.js |   73 +-
 .../src/__tests__/ReactMount-test.js          |   16 +-
 .../src/__tests__/ReactMultiChild-test.js     |   54 +-
 .../src/__tests__/ReactTestUtils-test.js      |   12 +-
 .../ReactDOMServerIntegrationTestUtils.js     |    2 +-
 .../__tests__/BeforeInputEventPlugin-test.js  |  156 +--
 .../__tests__/SelectEventPlugin-test.js       |    8 +-
 .../SimpleEventPlugin-test.internal.js        |   18 +-
 .../__tests__/ReactFabric-test.internal.js    |   22 +-
 .../ReactNativeEvents-test.internal.js        |   12 +-
 .../ReactNativeMount-test.internal.js         |   16 +-
 ...tIncrementalErrorHandling-test.internal.js |    4 +-
 ...ctIncrementalErrorLogging-test.internal.js |    2 +-
 .../ReactNewContext-test.internal.js          |    2 +-
 .../src/__tests__/ReactScheduler-test.js      |    8 +-
 .../__tests__/ReactShallowRenderer-test.js    |    4 +-
 .../react/src/__tests__/ReactChildren-test.js |   74 +-
 scripts/jest/matchers/toWarnDev.js            |   11 +-
 yarn.lock                                     | 1002 +++++------------
 28 files changed, 602 insertions(+), 1004 deletions(-)

diff --git a/package.json b/package.json
index 55d232a520..73c007dfa3 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "babel-code-frame": "^6.26.0",
     "babel-core": "^6.0.0",
     "babel-eslint": "^8.0.0",
-    "babel-jest": "^22.4.4",
+    "babel-jest": "^23.0.1",
     "babel-plugin-check-es2015-constants": "^6.5.0",
     "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-syntax-trailing-function-commas": "^6.5.0",
@@ -69,8 +69,8 @@
     "gzip-js": "~0.3.2",
     "gzip-size": "^3.0.0",
     "jasmine-check": "^1.0.0-rc.0",
-    "jest": "^22.4.4",
-    "jest-diff": "^22.4.3",
+    "jest": "^23.0.1",
+    "jest-diff": "^23.0.1",
     "merge-stream": "^1.0.0",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
diff --git a/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js b/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js
index 08874222d5..1fba16247e 100644
--- a/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js
+++ b/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js
@@ -123,7 +123,7 @@ describe('DOMPropertyOperations', () => {
       spyOnDevAndProd(container.firstChild, 'setAttribute');
       ReactDOM.render(<progress value={30} />, container);
       ReactDOM.render(<progress value="30" />, container);
-      expect(container.firstChild.setAttribute.calls.count()).toBe(2);
+      expect(container.firstChild.setAttribute).toHaveBeenCalledTimes(2);
     });
   });
 
diff --git a/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.internal.js b/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.internal.js
index d1fde4af6a..85d6e22dfb 100644
--- a/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.internal.js
+++ b/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.internal.js
@@ -151,17 +151,17 @@ describe('ReactBrowserEventEmitter', () => {
   it('should invoke a simple handler registered on a node', () => {
     registerSimpleTestHandler();
     ReactTestUtils.Simulate.click(CHILD);
-    expect(LISTENER.mock.calls.length).toBe(1);
+    expect(LISTENER).toHaveBeenCalledTimes(1);
   });
 
   it('should not invoke handlers if ReactBrowserEventEmitter is disabled', () => {
     registerSimpleTestHandler();
     ReactBrowserEventEmitter.setEnabled(false);
     ReactTestUtils.SimulateNative.click(CHILD);
-    expect(LISTENER.mock.calls.length).toBe(0);
+    expect(LISTENER).toHaveBeenCalledTimes(0);
     ReactBrowserEventEmitter.setEnabled(true);
     ReactTestUtils.SimulateNative.click(CHILD);
-    expect(LISTENER.mock.calls.length).toBe(1);
+    expect(LISTENER).toHaveBeenCalledTimes(1);
   });
 
   it('should bubble simply', () => {
@@ -301,7 +301,7 @@ describe('ReactBrowserEventEmitter', () => {
     putListener(CHILD, ON_CLICK_KEY, handleChildClick);
     putListener(PARENT, ON_CLICK_KEY, handleParentClick);
     ReactTestUtils.Simulate.click(CHILD);
-    expect(handleParentClick.mock.calls.length).toBe(1);
+    expect(handleParentClick).toHaveBeenCalledTimes(1);
   });
 
   it('should not invoke newly inserted handlers while bubbling', () => {
@@ -311,7 +311,7 @@ describe('ReactBrowserEventEmitter', () => {
     };
     putListener(CHILD, ON_CLICK_KEY, handleChildClick);
     ReactTestUtils.Simulate.click(CHILD);
-    expect(handleParentClick.mock.calls.length).toBe(0);
+    expect(handleParentClick).toHaveBeenCalledTimes(0);
   });
 
   it('should have mouse enter simulated by test utils', () => {
@@ -325,7 +325,7 @@ describe('ReactBrowserEventEmitter', () => {
     spyOnDevAndProd(EventTarget.prototype, 'addEventListener');
     ReactBrowserEventEmitter.listenTo(ON_CLICK_KEY, document);
     ReactBrowserEventEmitter.listenTo(ON_CLICK_KEY, document);
-    expect(EventTarget.prototype.addEventListener.calls.count()).toBe(1);
+    expect(EventTarget.prototype.addEventListener).toHaveBeenCalledTimes(1);
   });
 
   it('should work with event plugins without dependencies', () => {
diff --git a/packages/react-dom/src/__tests__/ReactComponent-test.js b/packages/react-dom/src/__tests__/ReactComponent-test.js
index 9c2d6447ff..37f3fc226a 100644
--- a/packages/react-dom/src/__tests__/ReactComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactComponent-test.js
@@ -387,11 +387,11 @@ describe('ReactComponent', () => {
     const callback = jest.fn();
     const container = document.createElement('div');
     ReactDOM.render(<div />, container, callback);
-    expect(callback.mock.calls.length).toBe(1);
+    expect(callback).toHaveBeenCalledTimes(1);
     ReactDOM.render(<div className="foo" />, container, callback);
-    expect(callback.mock.calls.length).toBe(2);
+    expect(callback).toHaveBeenCalledTimes(2);
     ReactDOM.render(<span />, container, callback);
-    expect(callback.mock.calls.length).toBe(3);
+    expect(callback).toHaveBeenCalledTimes(3);
   });
 
   it('throws usefully when rendering badly-typed elements', () => {
diff --git a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
index 0e2986a1f5..441545fc0a 100644
--- a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
@@ -738,28 +738,28 @@ describe('ReactDOMComponent', () => {
       node.removeAttribute.mockImplementation(nodeRemoveAttribute);
 
       ReactDOM.render(<div id="" />, container);
-      expect(node.setAttribute.mock.calls.length).toBe(0);
-      expect(node.removeAttribute.mock.calls.length).toBe(0);
+      expect(node.setAttribute).toHaveBeenCalledTimes(0);
+      expect(node.removeAttribute).toHaveBeenCalledTimes(0);
 
       ReactDOM.render(<div id="foo" />, container);
-      expect(node.setAttribute.mock.calls.length).toBe(1);
-      expect(node.removeAttribute.mock.calls.length).toBe(0);
+      expect(node.setAttribute).toHaveBeenCalledTimes(1);
+      expect(node.removeAttribute).toHaveBeenCalledTimes(0);
 
       ReactDOM.render(<div id="foo" />, container);
-      expect(node.setAttribute.mock.calls.length).toBe(1);
-      expect(node.removeAttribute.mock.calls.length).toBe(0);
+      expect(node.setAttribute).toHaveBeenCalledTimes(1);
+      expect(node.removeAttribute).toHaveBeenCalledTimes(0);
 
       ReactDOM.render(<div />, container);
-      expect(node.setAttribute.mock.calls.length).toBe(1);
-      expect(node.removeAttribute.mock.calls.length).toBe(1);
+      expect(node.setAttribute).toHaveBeenCalledTimes(1);
+      expect(node.removeAttribute).toHaveBeenCalledTimes(1);
 
       ReactDOM.render(<div id="" />, container);
-      expect(node.setAttribute.mock.calls.length).toBe(2);
-      expect(node.removeAttribute.mock.calls.length).toBe(1);
+      expect(node.setAttribute).toHaveBeenCalledTimes(2);
+      expect(node.removeAttribute).toHaveBeenCalledTimes(1);
 
       ReactDOM.render(<div />, container);
-      expect(node.setAttribute.mock.calls.length).toBe(2);
-      expect(node.removeAttribute.mock.calls.length).toBe(2);
+      expect(node.setAttribute).toHaveBeenCalledTimes(2);
+      expect(node.removeAttribute).toHaveBeenCalledTimes(2);
     });
 
     it('should not incur unnecessary DOM mutations for string properties', () => {
@@ -768,7 +768,7 @@ describe('ReactDOMComponent', () => {
 
       const node = container.firstChild;
 
-      const nodeValueSetter = jest.genMockFn();
+      const nodeValueSetter = jest.fn();
 
       const oldSetAttribute = node.setAttribute.bind(node);
       node.setAttribute = function(key, value) {
@@ -777,22 +777,22 @@ describe('ReactDOMComponent', () => {
       };
 
       ReactDOM.render(<div value="foo" />, container);
-      expect(nodeValueSetter.mock.calls.length).toBe(1);
+      expect(nodeValueSetter).toHaveBeenCalledTimes(1);
 
       ReactDOM.render(<div value="foo" />, container);
-      expect(nodeValueSetter.mock.calls.length).toBe(1);
+      expect(nodeValueSetter).toHaveBeenCalledTimes(1);
 
       ReactDOM.render(<div />, container);
-      expect(nodeValueSetter.mock.calls.length).toBe(1);
+      expect(nodeValueSetter).toHaveBeenCalledTimes(1);
 
       ReactDOM.render(<div value={null} />, container);
-      expect(nodeValueSetter.mock.calls.length).toBe(1);
+      expect(nodeValueSetter).toHaveBeenCalledTimes(1);
 
       ReactDOM.render(<div value="" />, container);
-      expect(nodeValueSetter.mock.calls.length).toBe(2);
+      expect(nodeValueSetter).toHaveBeenCalledTimes(2);
 
       ReactDOM.render(<div />, container);
-      expect(nodeValueSetter.mock.calls.length).toBe(2);
+      expect(nodeValueSetter).toHaveBeenCalledTimes(2);
     });
 
     it('should not incur unnecessary DOM mutations for boolean properties', () => {
@@ -812,16 +812,16 @@ describe('ReactDOMComponent', () => {
       });
 
       ReactDOM.render(<div checked={true} />, container);
-      expect(nodeValueSetter.mock.calls.length).toBe(0);
+      expect(nodeValueSetter).toHaveBeenCalledTimes(0);
 
       ReactDOM.render(<div />, container);
-      expect(nodeValueSetter.mock.calls.length).toBe(1);
+      expect(nodeValueSetter).toHaveBeenCalledTimes(1);
 
       ReactDOM.render(<div checked={false} />, container);
-      expect(nodeValueSetter.mock.calls.length).toBe(2);
+      expect(nodeValueSetter).toHaveBeenCalledTimes(2);
 
       ReactDOM.render(<div checked={true} />, container);
-      expect(nodeValueSetter.mock.calls.length).toBe(3);
+      expect(nodeValueSetter).toHaveBeenCalledTimes(3);
     });
 
     it('should ignore attribute whitelist for elements with the "is" attribute', () => {
@@ -850,9 +850,9 @@ describe('ReactDOMComponent', () => {
       ReactDOM.render(<div dir={null} />, container);
       ReactDOM.render(<div dir={undefined} />, container);
       ReactDOM.render(<div />, container);
-      expect(setter.mock.calls.length).toBe(0);
+      expect(setter).toHaveBeenCalledTimes(0);
       ReactDOM.render(<div dir="ltr" />, container);
-      expect(setter.mock.calls.length).toBe(1);
+      expect(setter).toHaveBeenCalledTimes(1);
     });
 
     it('handles multiple child updates without interference', () => {
@@ -984,7 +984,7 @@ describe('ReactDOMComponent', () => {
       container.getElementsByTagName('source')[0].dispatchEvent(errorEvent);
 
       if (__DEV__) {
-        expect(console.log.calls.count()).toBe(1);
+        expect(console.log).toHaveBeenCalledTimes(1);
         expect(console.log.calls.argsFor(0)[0]).toContain('onError called');
       }
     });
@@ -1315,7 +1315,7 @@ describe('ReactDOMComponent', () => {
       container.getElementsByTagName('image')[0].dispatchEvent(loadEvent);
 
       if (__DEV__) {
-        expect(console.log.calls.count()).toBe(2);
+        expect(console.log).toHaveBeenCalledTimes(2);
         expect(console.log.calls.argsFor(0)[0]).toContain('onError called');
         expect(console.log.calls.argsFor(1)[0]).toContain('onLoad called');
       }
diff --git a/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js b/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js
index 5c2ff8c591..f34688661c 100644
--- a/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js
@@ -61,7 +61,7 @@ describe('ReactDOMEventListener', () => {
       childNode.dispatchEvent(nativeEvent);
 
       expect(mouseOut).toBeCalled();
-      expect(mouseOut.mock.calls.length).toBe(2);
+      expect(mouseOut).toHaveBeenCalledTimes(2);
       expect(mouseOut.mock.calls[0][0]).toEqual(childNode);
       expect(mouseOut.mock.calls[1][0]).toEqual(parentNode);
 
@@ -97,7 +97,7 @@ describe('ReactDOMEventListener', () => {
       childNode.dispatchEvent(nativeEvent);
 
       expect(mouseOut).toBeCalled();
-      expect(mouseOut.mock.calls.length).toBe(3);
+      expect(mouseOut).toHaveBeenCalledTimes(3);
       expect(mouseOut.mock.calls[0][0]).toEqual(childNode);
       expect(mouseOut.mock.calls[1][0]).toEqual(parentNode);
       expect(mouseOut.mock.calls[2][0]).toEqual(grandParentNode);
@@ -169,7 +169,7 @@ describe('ReactDOMEventListener', () => {
       childNode.dispatchEvent(nativeEvent);
 
       // Child and parent should both call from event handlers.
-      expect(mock.mock.calls.length).toBe(2);
+      expect(mock).toHaveBeenCalledTimes(2);
       // The first call schedules a render of '1' into the 'Child'.
       // However, we're batching so it isn't flushed yet.
       expect(mock.mock.calls[0][0]).toBe('Child');
@@ -213,7 +213,7 @@ describe('ReactDOMEventListener', () => {
     instance.getInner().dispatchEvent(nativeEvent);
 
     expect(mouseOut).toBeCalled();
-    expect(mouseOut.mock.calls.length).toBe(1);
+    expect(mouseOut).toHaveBeenCalledTimes(1);
     expect(mouseOut.mock.calls[0][0]).toEqual(instance.getInner());
     document.body.removeChild(container);
   });
diff --git a/packages/react-dom/src/__tests__/ReactDOMIframe-test.js b/packages/react-dom/src/__tests__/ReactDOMIframe-test.js
index 074a1d96f2..97b07bb0b7 100644
--- a/packages/react-dom/src/__tests__/ReactDOMIframe-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMIframe-test.js
@@ -21,7 +21,7 @@ describe('ReactDOMIframe', () => {
   });
 
   it('should trigger load events', () => {
-    const onLoadSpy = jasmine.createSpy();
+    const onLoadSpy = jest.fn();
     let iframe = React.createElement('iframe', {onLoad: onLoadSpy});
     iframe = ReactTestUtils.renderIntoDocument(iframe);
 
diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index f5513557ec..4a3066a073 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -535,7 +535,7 @@ describe('ReactDOMInput', () => {
 
     const node = container.firstChild;
     let nodeValue = 'a';
-    const nodeValueSetter = jest.genMockFn();
+    const nodeValueSetter = jest.fn();
     Object.defineProperty(node, 'value', {
       get: function() {
         return nodeValue;
@@ -546,10 +546,10 @@ describe('ReactDOMInput', () => {
     });
 
     ReactDOM.render(<input value="a" onChange={() => {}} />, container);
-    expect(nodeValueSetter.mock.calls.length).toBe(0);
+    expect(nodeValueSetter).toHaveBeenCalledTimes(0);
 
     ReactDOM.render(<input value="b" onChange={() => {}} />, container);
-    expect(nodeValueSetter.mock.calls.length).toBe(1);
+    expect(nodeValueSetter).toHaveBeenCalledTimes(1);
   });
 
   it('should not incur unnecessary DOM mutations for numeric type conversion', () => {
@@ -558,7 +558,7 @@ describe('ReactDOMInput', () => {
 
     const node = container.firstChild;
     let nodeValue = '0';
-    const nodeValueSetter = jest.genMockFn();
+    const nodeValueSetter = jest.fn();
     Object.defineProperty(node, 'value', {
       get: function() {
         return nodeValue;
@@ -569,7 +569,7 @@ describe('ReactDOMInput', () => {
     });
 
     ReactDOM.render(<input value={0} onChange={() => {}} />, container);
-    expect(nodeValueSetter.mock.calls.length).toBe(0);
+    expect(nodeValueSetter).toHaveBeenCalledTimes(0);
   });
 
   it('should not incur unnecessary DOM mutations for the boolean type conversion', () => {
@@ -578,7 +578,7 @@ describe('ReactDOMInput', () => {
 
     const node = container.firstChild;
     let nodeValue = 'true';
-    const nodeValueSetter = jest.genMockFn();
+    const nodeValueSetter = jest.fn();
     Object.defineProperty(node, 'value', {
       get: function() {
         return nodeValue;
@@ -589,7 +589,7 @@ describe('ReactDOMInput', () => {
     });
 
     ReactDOM.render(<input value={true} onChange={() => {}} />, container);
-    expect(nodeValueSetter.mock.calls.length).toBe(0);
+    expect(nodeValueSetter).toHaveBeenCalledTimes(0);
   });
 
   it('should properly control a value of number `0`', () => {
diff --git a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
index 9ba7f06674..879be14fec 100644
--- a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
@@ -218,7 +218,7 @@ describe('ReactDOMTextarea', () => {
 
     const node = container.firstChild;
     let nodeValue = 'a';
-    const nodeValueSetter = jest.genMockFn();
+    const nodeValueSetter = jest.fn();
     Object.defineProperty(node, 'value', {
       get: function() {
         return nodeValue;
@@ -229,10 +229,10 @@ describe('ReactDOMTextarea', () => {
     });
 
     ReactDOM.render(<textarea value="a" onChange={emptyFunction} />, container);
-    expect(nodeValueSetter.mock.calls.length).toBe(0);
+    expect(nodeValueSetter).toHaveBeenCalledTimes(0);
 
     ReactDOM.render(<textarea value="b" onChange={emptyFunction} />, container);
-    expect(nodeValueSetter.mock.calls.length).toBe(1);
+    expect(nodeValueSetter).toHaveBeenCalledTimes(1);
   });
 
   it('should properly control a value of number `0`', () => {
diff --git a/packages/react-dom/src/__tests__/ReactEmptyComponent-test.js b/packages/react-dom/src/__tests__/ReactEmptyComponent-test.js
index be849a8e7f..be1f8a27db 100644
--- a/packages/react-dom/src/__tests__/ReactEmptyComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactEmptyComponent-test.js
@@ -24,7 +24,7 @@ describe('ReactEmptyComponent', () => {
     ReactDOM = require('react-dom');
     ReactTestUtils = require('react-dom/test-utils');
 
-    log = jasmine.createSpy();
+    log = jest.fn();
 
     TogglingComponent = class extends React.Component {
       state = {component: this.props.firstComponent};
@@ -91,11 +91,17 @@ describe('ReactEmptyComponent', () => {
     ReactTestUtils.renderIntoDocument(instance1);
     ReactTestUtils.renderIntoDocument(instance2);
 
-    expect(log.calls.count()).toBe(4);
-    expect(log.calls.argsFor(0)[0]).toBe(null);
-    expect(log.calls.argsFor(1)[0].tagName).toBe('DIV');
-    expect(log.calls.argsFor(2)[0].tagName).toBe('DIV');
-    expect(log.calls.argsFor(3)[0]).toBe(null);
+    expect(log).toHaveBeenCalledTimes(4);
+    expect(log).toHaveBeenNthCalledWith(1, null);
+    expect(log).toHaveBeenNthCalledWith(
+      2,
+      expect.objectContaining({tagName: 'DIV'}),
+    );
+    expect(log).toHaveBeenNthCalledWith(
+      3,
+      expect.objectContaining({tagName: 'DIV'}),
+    );
+    expect(log).toHaveBeenNthCalledWith(4, null);
   });
 
   it('should be able to switch in a list of children', () => {
@@ -111,13 +117,22 @@ describe('ReactEmptyComponent', () => {
       </div>,
     );
 
-    expect(log.calls.count()).toBe(6);
-    expect(log.calls.argsFor(0)[0]).toBe(null);
-    expect(log.calls.argsFor(1)[0]).toBe(null);
-    expect(log.calls.argsFor(2)[0]).toBe(null);
-    expect(log.calls.argsFor(3)[0].tagName).toBe('DIV');
-    expect(log.calls.argsFor(4)[0].tagName).toBe('DIV');
-    expect(log.calls.argsFor(5)[0].tagName).toBe('DIV');
+    expect(log).toHaveBeenCalledTimes(6);
+    expect(log).toHaveBeenNthCalledWith(1, null);
+    expect(log).toHaveBeenNthCalledWith(2, null);
+    expect(log).toHaveBeenNthCalledWith(3, null);
+    expect(log).toHaveBeenNthCalledWith(
+      4,
+      expect.objectContaining({tagName: 'DIV'}),
+    );
+    expect(log).toHaveBeenNthCalledWith(
+      5,
+      expect.objectContaining({tagName: 'DIV'}),
+    );
+    expect(log).toHaveBeenNthCalledWith(
+      6,
+      expect.objectContaining({tagName: 'DIV'}),
+    );
   });
 
   it('should distinguish between a script placeholder and an actual script tag', () => {
@@ -135,11 +150,17 @@ describe('ReactEmptyComponent', () => {
       ReactTestUtils.renderIntoDocument(instance2);
     }).not.toThrow();
 
-    expect(log.calls.count()).toBe(4);
-    expect(log.calls.argsFor(0)[0]).toBe(null);
-    expect(log.calls.argsFor(1)[0].tagName).toBe('SCRIPT');
-    expect(log.calls.argsFor(2)[0].tagName).toBe('SCRIPT');
-    expect(log.calls.argsFor(3)[0]).toBe(null);
+    expect(log).toHaveBeenCalledTimes(4);
+    expect(log).toHaveBeenNthCalledWith(1, null);
+    expect(log).toHaveBeenNthCalledWith(
+      2,
+      expect.objectContaining({tagName: 'SCRIPT'}),
+    );
+    expect(log).toHaveBeenNthCalledWith(
+      3,
+      expect.objectContaining({tagName: 'SCRIPT'}),
+    );
+    expect(log).toHaveBeenNthCalledWith(4, null);
   });
 
   it(
@@ -172,11 +193,17 @@ describe('ReactEmptyComponent', () => {
         ReactTestUtils.renderIntoDocument(instance2);
       }).not.toThrow();
 
-      expect(log.calls.count()).toBe(4);
-      expect(log.calls.argsFor(0)[0].tagName).toBe('DIV');
-      expect(log.calls.argsFor(1)[0]).toBe(null);
-      expect(log.calls.argsFor(2)[0]).toBe(null);
-      expect(log.calls.argsFor(3)[0].tagName).toBe('DIV');
+      expect(log).toHaveBeenCalledTimes(4);
+      expect(log).toHaveBeenNthCalledWith(
+        1,
+        expect.objectContaining({tagName: 'DIV'}),
+      );
+      expect(log).toHaveBeenNthCalledWith(2, null);
+      expect(log).toHaveBeenNthCalledWith(3, null);
+      expect(log).toHaveBeenNthCalledWith(
+        4,
+        expect.objectContaining({tagName: 'DIV'}),
+      );
     },
   );
 
diff --git a/packages/react-dom/src/__tests__/ReactMount-test.js b/packages/react-dom/src/__tests__/ReactMount-test.js
index 05265cbbe9..375e85b95b 100644
--- a/packages/react-dom/src/__tests__/ReactMount-test.js
+++ b/packages/react-dom/src/__tests__/ReactMount-test.js
@@ -91,25 +91,25 @@ describe('ReactMount', () => {
       }
     }
 
-    expect(mockMount.mock.calls.length).toBe(0);
-    expect(mockUnmount.mock.calls.length).toBe(0);
+    expect(mockMount).toHaveBeenCalledTimes(0);
+    expect(mockUnmount).toHaveBeenCalledTimes(0);
 
     ReactDOM.render(<Component text="orange" key="A" />, container);
     expect(container.firstChild.innerHTML).toBe('orange');
-    expect(mockMount.mock.calls.length).toBe(1);
-    expect(mockUnmount.mock.calls.length).toBe(0);
+    expect(mockMount).toHaveBeenCalledTimes(1);
+    expect(mockUnmount).toHaveBeenCalledTimes(0);
 
     // If we change the key, the component is unmounted and remounted
     ReactDOM.render(<Component text="green" key="B" />, container);
     expect(container.firstChild.innerHTML).toBe('green');
-    expect(mockMount.mock.calls.length).toBe(2);
-    expect(mockUnmount.mock.calls.length).toBe(1);
+    expect(mockMount).toHaveBeenCalledTimes(2);
+    expect(mockUnmount).toHaveBeenCalledTimes(1);
 
     // But if we don't change the key, the component instance is reused
     ReactDOM.render(<Component text="blue" key="B" />, container);
     expect(container.firstChild.innerHTML).toBe('blue');
-    expect(mockMount.mock.calls.length).toBe(2);
-    expect(mockUnmount.mock.calls.length).toBe(1);
+    expect(mockMount).toHaveBeenCalledTimes(2);
+    expect(mockUnmount).toHaveBeenCalledTimes(1);
   });
 
   it('should reuse markup if rendering to the same target twice', () => {
diff --git a/packages/react-dom/src/__tests__/ReactMultiChild-test.js b/packages/react-dom/src/__tests__/ReactMultiChild-test.js
index 7893382833..37c2e6305c 100644
--- a/packages/react-dom/src/__tests__/ReactMultiChild-test.js
+++ b/packages/react-dom/src/__tests__/ReactMultiChild-test.js
@@ -36,9 +36,9 @@ describe('ReactMultiChild', () => {
         }
       }
 
-      expect(mockMount.mock.calls.length).toBe(0);
-      expect(mockUpdate.mock.calls.length).toBe(0);
-      expect(mockUnmount.mock.calls.length).toBe(0);
+      expect(mockMount).toHaveBeenCalledTimes(0);
+      expect(mockUpdate).toHaveBeenCalledTimes(0);
+      expect(mockUnmount).toHaveBeenCalledTimes(0);
 
       ReactDOM.render(
         <div>
@@ -47,9 +47,9 @@ describe('ReactMultiChild', () => {
         container,
       );
 
-      expect(mockMount.mock.calls.length).toBe(1);
-      expect(mockUpdate.mock.calls.length).toBe(0);
-      expect(mockUnmount.mock.calls.length).toBe(0);
+      expect(mockMount).toHaveBeenCalledTimes(1);
+      expect(mockUpdate).toHaveBeenCalledTimes(0);
+      expect(mockUnmount).toHaveBeenCalledTimes(0);
 
       ReactDOM.render(
         <div>
@@ -58,9 +58,9 @@ describe('ReactMultiChild', () => {
         container,
       );
 
-      expect(mockMount.mock.calls.length).toBe(1);
-      expect(mockUpdate.mock.calls.length).toBe(1);
-      expect(mockUnmount.mock.calls.length).toBe(0);
+      expect(mockMount).toHaveBeenCalledTimes(1);
+      expect(mockUpdate).toHaveBeenCalledTimes(1);
+      expect(mockUnmount).toHaveBeenCalledTimes(0);
     });
 
     it('should replace children with different constructors', () => {
@@ -77,8 +77,8 @@ describe('ReactMultiChild', () => {
         }
       }
 
-      expect(mockMount.mock.calls.length).toBe(0);
-      expect(mockUnmount.mock.calls.length).toBe(0);
+      expect(mockMount).toHaveBeenCalledTimes(0);
+      expect(mockUnmount).toHaveBeenCalledTimes(0);
 
       ReactDOM.render(
         <div>
@@ -87,8 +87,8 @@ describe('ReactMultiChild', () => {
         container,
       );
 
-      expect(mockMount.mock.calls.length).toBe(1);
-      expect(mockUnmount.mock.calls.length).toBe(0);
+      expect(mockMount).toHaveBeenCalledTimes(1);
+      expect(mockUnmount).toHaveBeenCalledTimes(0);
 
       ReactDOM.render(
         <div>
@@ -97,8 +97,8 @@ describe('ReactMultiChild', () => {
         container,
       );
 
-      expect(mockMount.mock.calls.length).toBe(1);
-      expect(mockUnmount.mock.calls.length).toBe(1);
+      expect(mockMount).toHaveBeenCalledTimes(1);
+      expect(mockUnmount).toHaveBeenCalledTimes(1);
     });
 
     it('should NOT replace children with different owners', () => {
@@ -121,13 +121,13 @@ describe('ReactMultiChild', () => {
         }
       }
 
-      expect(mockMount.mock.calls.length).toBe(0);
-      expect(mockUnmount.mock.calls.length).toBe(0);
+      expect(mockMount).toHaveBeenCalledTimes(0);
+      expect(mockUnmount).toHaveBeenCalledTimes(0);
 
       ReactDOM.render(<WrapperComponent />, container);
 
-      expect(mockMount.mock.calls.length).toBe(1);
-      expect(mockUnmount.mock.calls.length).toBe(0);
+      expect(mockMount).toHaveBeenCalledTimes(1);
+      expect(mockUnmount).toHaveBeenCalledTimes(0);
 
       ReactDOM.render(
         <WrapperComponent>
@@ -136,8 +136,8 @@ describe('ReactMultiChild', () => {
         container,
       );
 
-      expect(mockMount.mock.calls.length).toBe(1);
-      expect(mockUnmount.mock.calls.length).toBe(0);
+      expect(mockMount).toHaveBeenCalledTimes(1);
+      expect(mockUnmount).toHaveBeenCalledTimes(0);
     });
 
     it('should replace children with different keys', () => {
@@ -154,8 +154,8 @@ describe('ReactMultiChild', () => {
         }
       }
 
-      expect(mockMount.mock.calls.length).toBe(0);
-      expect(mockUnmount.mock.calls.length).toBe(0);
+      expect(mockMount).toHaveBeenCalledTimes(0);
+      expect(mockUnmount).toHaveBeenCalledTimes(0);
 
       ReactDOM.render(
         <div>
@@ -164,8 +164,8 @@ describe('ReactMultiChild', () => {
         container,
       );
 
-      expect(mockMount.mock.calls.length).toBe(1);
-      expect(mockUnmount.mock.calls.length).toBe(0);
+      expect(mockMount).toHaveBeenCalledTimes(1);
+      expect(mockUnmount).toHaveBeenCalledTimes(0);
 
       ReactDOM.render(
         <div>
@@ -174,8 +174,8 @@ describe('ReactMultiChild', () => {
         container,
       );
 
-      expect(mockMount.mock.calls.length).toBe(2);
-      expect(mockUnmount.mock.calls.length).toBe(1);
+      expect(mockMount).toHaveBeenCalledTimes(2);
+      expect(mockUnmount).toHaveBeenCalledTimes(1);
     });
 
     it('should warn for duplicated array keys with component stack info', () => {
diff --git a/packages/react-dom/src/__tests__/ReactTestUtils-test.js b/packages/react-dom/src/__tests__/ReactTestUtils-test.js
index 5ca466bc5a..328eefe0b2 100644
--- a/packages/react-dom/src/__tests__/ReactTestUtils-test.js
+++ b/packages/react-dom/src/__tests__/ReactTestUtils-test.js
@@ -290,7 +290,7 @@ describe('ReactTestUtils', () => {
       ReactTestUtils.Simulate.change(node);
 
       expect(obj.handler).toHaveBeenCalledWith(
-        jasmine.objectContaining({target: node}),
+        expect.objectContaining({target: node}),
       );
     });
 
@@ -326,7 +326,7 @@ describe('ReactTestUtils', () => {
       ReactTestUtils.Simulate.change(node);
 
       expect(obj.handler).toHaveBeenCalledWith(
-        jasmine.objectContaining({target: node}),
+        expect.objectContaining({target: node}),
       );
     });
 
@@ -337,7 +337,7 @@ describe('ReactTestUtils', () => {
         }
       }
 
-      const handler = jasmine.createSpy('spy');
+      const handler = jest.fn().mockName('spy');
       const shallowRenderer = createRenderer();
       const result = shallowRenderer.render(
         <SomeComponent handleClick={handler} />,
@@ -358,7 +358,7 @@ describe('ReactTestUtils', () => {
         }
       }
 
-      const handler = jasmine.createSpy('spy');
+      const handler = jest.fn().mockName('spy');
       const container = document.createElement('div');
       const instance = ReactDOM.render(
         <SomeComponent handleClick={handler} />,
@@ -394,7 +394,7 @@ describe('ReactTestUtils', () => {
 
     it('should set the type of the event', () => {
       let event;
-      const stub = jest.genMockFn().mockImplementation(e => {
+      const stub = jest.fn().mockImplementation(e => {
         e.persist();
         event = e;
       });
@@ -431,7 +431,7 @@ describe('ReactTestUtils', () => {
       ReactTestUtils.Simulate.change(input);
 
       expect(onChange).toHaveBeenCalledWith(
-        jasmine.objectContaining({target: input}),
+        expect.objectContaining({target: input}),
       );
     });
   });
diff --git a/packages/react-dom/src/__tests__/utils/ReactDOMServerIntegrationTestUtils.js b/packages/react-dom/src/__tests__/utils/ReactDOMServerIntegrationTestUtils.js
index b9cae59979..a83e1ec181 100644
--- a/packages/react-dom/src/__tests__/utils/ReactDOMServerIntegrationTestUtils.js
+++ b/packages/react-dom/src/__tests__/utils/ReactDOMServerIntegrationTestUtils.js
@@ -63,7 +63,7 @@ module.exports = function(initModules) {
       }
     }
     if (__DEV__) {
-      expect(console.error.calls.count()).toBe(count);
+      expect(console.error).toHaveBeenCalledTimes(count);
     }
     return result;
   }
diff --git a/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js b/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js
index 6f2ca23346..a1380c3980 100644
--- a/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js
+++ b/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js
@@ -200,9 +200,9 @@ describe('BeforeInputEventPlugin', () => {
             spyOnBeforeInput,
             spyOnCompositionStart,
           }) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
-            expect(spyOnCompositionStart.mock.calls.length).toBe(1);
+            expect(spyOnCompositionStart).toHaveBeenCalledTimes(1);
             expect(compositionStartEvent.type).toBe('compositionstart');
             expect(compositionStartEvent.data).toBe('test');
           },
@@ -214,116 +214,116 @@ describe('BeforeInputEventPlugin', () => {
             spyOnBeforeInput,
             spyOnCompositionUpdate,
           }) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
-            expect(spyOnCompositionUpdate.mock.calls.length).toBe(1);
+            expect(spyOnCompositionUpdate).toHaveBeenCalledTimes(1);
             expect(compositionUpdateEvent.type).toBe('compositionupdate');
             expect(compositionUpdateEvent.data).toBe('test string');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('compositionend');
             expect(beforeInputEvent.data).toBe('test string 3');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('textInput');
             expect(beforeInputEvent.data).toBe('abcß');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keypress');
             expect(beforeInputEvent.data).toBe(' ');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('textInput');
             expect(beforeInputEvent.data).toBe('\uD83D\uDE0A');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
@@ -334,119 +334,119 @@ describe('BeforeInputEventPlugin', () => {
       assertions: [
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keypress');
             expect(beforeInputEvent.data).toBe('a');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keypress');
             expect(beforeInputEvent.data).toBe(' ');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keypress');
             expect(beforeInputEvent.data).toBe('c');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keypress');
             expect(beforeInputEvent.data).toBe('\uD83D\uDE0A');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
@@ -457,122 +457,122 @@ describe('BeforeInputEventPlugin', () => {
       assertions: [
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keypress');
             expect(beforeInputEvent.data).toBe('a');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keypress');
             expect(beforeInputEvent.data).toBe(' ');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keypress');
             expect(beforeInputEvent.data).toBe('c');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keypress');
             expect(beforeInputEvent.data).toBe('\uD83D\uDE0A');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keydown');
             expect(beforeInputEvent.data).toBe('bar');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keyup');
             expect(beforeInputEvent.data).toBe('BAR');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keypress');
             expect(beforeInputEvent.data).toBe('Bar');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
@@ -583,120 +583,120 @@ describe('BeforeInputEventPlugin', () => {
       assertions: [
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('compositionend');
             expect(beforeInputEvent.data).toBe('test string 3');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keypress');
             expect(beforeInputEvent.data).toBe('a');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keypress');
             expect(beforeInputEvent.data).toBe(' ');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keypress');
             expect(beforeInputEvent.data).toBe('c');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(1);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(1);
             expect(beforeInputEvent.type).toBe('keypress');
             expect(beforeInputEvent.data).toBe('\uD83D\uDE0A');
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
         {
           run: ({beforeInputEvent, spyOnBeforeInput}) => {
-            expect(spyOnBeforeInput.mock.calls.length).toBe(0);
+            expect(spyOnBeforeInput).toHaveBeenCalledTimes(0);
             expect(beforeInputEvent).toBeNull();
           },
         },
diff --git a/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js b/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js
index 2fcc983e0e..3ff0398f73 100644
--- a/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js
+++ b/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js
@@ -72,7 +72,7 @@ describe('SelectEventPlugin', () => {
     // Verify that it doesn't get "stuck" waiting for
     // a `mouseup` event that it has "missed" because
     // a top-level listener didn't exist yet.
-    expect(select.mock.calls.length).toBe(1);
+    expect(select).toHaveBeenCalledTimes(1);
   });
 
   it('should fire `onSelect` when a listener is present', () => {
@@ -95,17 +95,17 @@ describe('SelectEventPlugin', () => {
       cancelable: true,
     });
     node.dispatchEvent(nativeEvent);
-    expect(select.mock.calls.length).toBe(0);
+    expect(select).toHaveBeenCalledTimes(0);
 
     nativeEvent = new MouseEvent('mousedown', {
       bubbles: true,
       cancelable: true,
     });
     node.dispatchEvent(nativeEvent);
-    expect(select.mock.calls.length).toBe(0);
+    expect(select).toHaveBeenCalledTimes(0);
 
     nativeEvent = new MouseEvent('mouseup', {bubbles: true, cancelable: true});
     node.dispatchEvent(nativeEvent);
-    expect(select.mock.calls.length).toBe(1);
+    expect(select).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js b/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js
index dc6087e1d3..4020e69fd0 100644
--- a/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js
+++ b/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js
@@ -19,12 +19,12 @@ describe('SimpleEventPlugin', function() {
 
   function expectClickThru(element) {
     ReactTestUtils.SimulateNative.click(ReactDOM.findDOMNode(element));
-    expect(onClick.mock.calls.length).toBe(1);
+    expect(onClick).toHaveBeenCalledTimes(1);
   }
 
   function expectNoClickThru(element) {
     ReactTestUtils.SimulateNative.click(ReactDOM.findDOMNode(element));
-    expect(onClick.mock.calls.length).toBe(0);
+    expect(onClick).toHaveBeenCalledTimes(0);
   }
 
   function mounted(element) {
@@ -79,7 +79,7 @@ describe('SimpleEventPlugin', function() {
     const child = ReactDOM.findDOMNode(element).firstChild;
 
     ReactTestUtils.SimulateNative.click(child);
-    expect(onClick.mock.calls.length).toBe(1);
+    expect(onClick).toHaveBeenCalledTimes(1);
   });
 
   it('does not register a click when clicking a child of a disabled element', function() {
@@ -91,7 +91,7 @@ describe('SimpleEventPlugin', function() {
     const child = ReactDOM.findDOMNode(element).querySelector('span');
 
     ReactTestUtils.SimulateNative.click(child);
-    expect(onClick.mock.calls.length).toBe(0);
+    expect(onClick).toHaveBeenCalledTimes(0);
   });
 
   it('triggers click events for children of disabled elements', function() {
@@ -103,7 +103,7 @@ describe('SimpleEventPlugin', function() {
     const child = ReactDOM.findDOMNode(element).querySelector('span');
 
     ReactTestUtils.SimulateNative.click(child);
-    expect(onClick.mock.calls.length).toBe(1);
+    expect(onClick).toHaveBeenCalledTimes(1);
   });
 
   it('triggers parent captured click events when target is a child of a disabled elements', function() {
@@ -117,7 +117,7 @@ describe('SimpleEventPlugin', function() {
     const child = ReactDOM.findDOMNode(element).querySelector('span');
 
     ReactTestUtils.SimulateNative.click(child);
-    expect(onClick.mock.calls.length).toBe(1);
+    expect(onClick).toHaveBeenCalledTimes(1);
   });
 
   it('triggers captured click events for children of disabled elements', function() {
@@ -129,7 +129,7 @@ describe('SimpleEventPlugin', function() {
     const child = ReactDOM.findDOMNode(element).querySelector('span');
 
     ReactTestUtils.SimulateNative.click(child);
-    expect(onClick.mock.calls.length).toBe(1);
+    expect(onClick).toHaveBeenCalledTimes(1);
   });
 
   ['button', 'input', 'select', 'textarea'].forEach(function(tagName) {
@@ -467,7 +467,7 @@ describe('SimpleEventPlugin', function() {
 
       node.dispatchEvent(new MouseEvent('click'));
 
-      expect(onClick.mock.calls.length).toBe(0);
+      expect(onClick).toHaveBeenCalledTimes(0);
     });
 
     it('adds a local click listener to non-interactive elements', function() {
@@ -479,7 +479,7 @@ describe('SimpleEventPlugin', function() {
 
       node.dispatchEvent(new MouseEvent('click'));
 
-      expect(onClick.mock.calls.length).toBe(0);
+      expect(onClick).toHaveBeenCalledTimes(0);
     });
   });
 });
diff --git a/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js b/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js
index 5c4da3a4f8..d01a5a26f3 100644
--- a/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js
+++ b/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js
@@ -56,12 +56,12 @@ describe('ReactFabric', () => {
 
     ReactFabric.render(<View foo="foo" />, 11);
 
-    expect(FabricUIManager.createNode.mock.calls.length).toBe(1);
+    expect(FabricUIManager.createNode).toHaveBeenCalledTimes(1);
 
     ReactFabric.render(<View foo="bar" />, 11);
 
-    expect(FabricUIManager.createNode.mock.calls.length).toBe(1);
-    expect(FabricUIManager.cloneNodeWithNewProps.mock.calls.length).toBe(1);
+    expect(FabricUIManager.createNode).toHaveBeenCalledTimes(1);
+    expect(FabricUIManager.cloneNodeWithNewProps).toHaveBeenCalledTimes(1);
     expect(FabricUIManager.cloneNodeWithNewProps.mock.calls[0][0]).toBe(
       firstNode,
     );
@@ -93,24 +93,24 @@ describe('ReactFabric', () => {
     ReactFabric.render(<Text foo="b">1</Text>, 11);
     expect(FabricUIManager.cloneNode).not.toBeCalled();
     expect(FabricUIManager.cloneNodeWithNewChildren).not.toBeCalled();
-    expect(FabricUIManager.cloneNodeWithNewProps.mock.calls.length).toBe(1);
+    expect(FabricUIManager.cloneNodeWithNewProps).toHaveBeenCalledTimes(1);
     expect(FabricUIManager.cloneNodeWithNewChildrenAndProps).not.toBeCalled();
 
     // Only call cloneNode for the changed text (and no other properties).
     ReactFabric.render(<Text foo="b">2</Text>, 11);
     expect(FabricUIManager.cloneNode).not.toBeCalled();
-    expect(FabricUIManager.cloneNodeWithNewChildren.mock.calls.length).toBe(1);
-    expect(FabricUIManager.cloneNodeWithNewProps.mock.calls.length).toBe(1);
+    expect(FabricUIManager.cloneNodeWithNewChildren).toHaveBeenCalledTimes(1);
+    expect(FabricUIManager.cloneNodeWithNewProps).toHaveBeenCalledTimes(1);
     expect(FabricUIManager.cloneNodeWithNewChildrenAndProps).not.toBeCalled();
 
     // Call cloneNode for both changed text and properties.
     ReactFabric.render(<Text foo="c">3</Text>, 11);
     expect(FabricUIManager.cloneNode).not.toBeCalled();
-    expect(FabricUIManager.cloneNodeWithNewChildren.mock.calls.length).toBe(1);
-    expect(FabricUIManager.cloneNodeWithNewProps.mock.calls.length).toBe(1);
+    expect(FabricUIManager.cloneNodeWithNewChildren).toHaveBeenCalledTimes(1);
+    expect(FabricUIManager.cloneNodeWithNewProps).toHaveBeenCalledTimes(1);
     expect(
-      FabricUIManager.cloneNodeWithNewChildrenAndProps.mock.calls.length,
-    ).toBe(1);
+      FabricUIManager.cloneNodeWithNewChildrenAndProps,
+    ).toHaveBeenCalledTimes(1);
   });
 
   it('should only pass props diffs to FabricUIManager.cloneNode', () => {
@@ -186,7 +186,7 @@ describe('ReactFabric', () => {
       expect(UIManager.updateView).not.toBeCalled();
 
       viewRef.setNativeProps({foo: 'baz'});
-      expect(UIManager.updateView.mock.calls.length).toBe(1);
+      expect(UIManager.updateView).toHaveBeenCalledTimes(1);
     });
   });
 
diff --git a/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.internal.js b/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.internal.js
index 13fce4d77d..8f1a4863f5 100644
--- a/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.internal.js
+++ b/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.internal.js
@@ -74,14 +74,14 @@ beforeEach(() => {
 });
 
 it('fails if unknown/unsupported event types are dispatched', () => {
-  expect(RCTEventEmitter.register.mock.calls.length).toBe(1);
+  expect(RCTEventEmitter.register).toHaveBeenCalledTimes(1);
   const EventEmitter = RCTEventEmitter.register.mock.calls[0][0];
   const View = fakeRequireNativeComponent('View', {});
 
   ReactNative.render(<View onUnspecifiedEvent={() => {}} />, 1);
 
   expect(UIManager.__dumpHierarchyForJestTestsOnly()).toMatchSnapshot();
-  expect(UIManager.createView.mock.calls.length).toBe(1);
+  expect(UIManager.createView).toHaveBeenCalledTimes(1);
 
   const target = UIManager.createView.mock.calls[0][0];
 
@@ -95,7 +95,7 @@ it('fails if unknown/unsupported event types are dispatched', () => {
 });
 
 it('handles events', () => {
-  expect(RCTEventEmitter.register.mock.calls.length).toBe(1);
+  expect(RCTEventEmitter.register).toHaveBeenCalledTimes(1);
   const EventEmitter = RCTEventEmitter.register.mock.calls[0][0];
   const View = fakeRequireNativeComponent('View', {foo: true});
 
@@ -119,7 +119,7 @@ it('handles events', () => {
   );
 
   expect(UIManager.__dumpHierarchyForJestTestsOnly()).toMatchSnapshot();
-  expect(UIManager.createView.mock.calls.length).toBe(2);
+  expect(UIManager.createView).toHaveBeenCalledTimes(2);
 
   // Don't depend on the order of createView() calls.
   // Stack creates views outside-in; fiber creates them inside-out.
@@ -151,7 +151,7 @@ it('handles events', () => {
 });
 
 it('handles events on text nodes', () => {
-  expect(RCTEventEmitter.register.mock.calls.length).toBe(1);
+  expect(RCTEventEmitter.register).toHaveBeenCalledTimes(1);
   const EventEmitter = RCTEventEmitter.register.mock.calls[0][0];
   const Text = fakeRequireNativeComponent('RCTText', {});
 
@@ -188,7 +188,7 @@ it('handles events on text nodes', () => {
     1,
   );
 
-  expect(UIManager.createView.mock.calls.length).toBe(5);
+  expect(UIManager.createView).toHaveBeenCalledTimes(5);
 
   // Don't depend on the order of createView() calls.
   // Stack creates views outside-in; fiber creates them inside-out.
diff --git a/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.internal.js b/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.internal.js
index 60b5d79f5d..60b3a7ca6c 100644
--- a/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.internal.js
+++ b/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.internal.js
@@ -47,15 +47,15 @@ describe('ReactNative', () => {
 
     ReactNative.render(<View foo="foo" />, 11);
 
-    expect(UIManager.createView.mock.calls.length).toBe(1);
-    expect(UIManager.setChildren.mock.calls.length).toBe(1);
+    expect(UIManager.createView).toHaveBeenCalledTimes(1);
+    expect(UIManager.setChildren).toHaveBeenCalledTimes(1);
     expect(UIManager.manageChildren).not.toBeCalled();
     expect(UIManager.updateView).not.toBeCalled();
 
     ReactNative.render(<View foo="bar" />, 11);
 
-    expect(UIManager.createView.mock.calls.length).toBe(1);
-    expect(UIManager.setChildren.mock.calls.length).toBe(1);
+    expect(UIManager.createView).toHaveBeenCalledTimes(1);
+    expect(UIManager.setChildren).toHaveBeenCalledTimes(1);
     expect(UIManager.manageChildren).not.toBeCalled();
     expect(UIManager.updateView).toBeCalledWith(3, 'RCTView', {foo: 'bar'});
   });
@@ -75,15 +75,15 @@ describe('ReactNative', () => {
 
     // Only call updateView for the changed property (and not for text).
     ReactNative.render(<Text foo="b">1</Text>, 11);
-    expect(UIManager.updateView.mock.calls.length).toBe(1);
+    expect(UIManager.updateView).toHaveBeenCalledTimes(1);
 
     // Only call updateView for the changed text (and no other properties).
     ReactNative.render(<Text foo="b">2</Text>, 11);
-    expect(UIManager.updateView.mock.calls.length).toBe(2);
+    expect(UIManager.updateView).toHaveBeenCalledTimes(2);
 
     // Call updateView for both changed text and properties.
     ReactNative.render(<Text foo="c">3</Text>, 11);
-    expect(UIManager.updateView.mock.calls.length).toBe(4);
+    expect(UIManager.updateView).toHaveBeenCalledTimes(4);
   });
 
   it('should not call UIManager.updateView from setNativeProps for properties that have not changed', () => {
@@ -117,7 +117,7 @@ describe('ReactNative', () => {
       expect(UIManager.updateView).not.toBeCalled();
 
       viewRef.setNativeProps({foo: 'baz'});
-      expect(UIManager.updateView.mock.calls.length).toBe(1);
+      expect(UIManager.updateView).toHaveBeenCalledTimes(1);
     });
   });
 
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
index d7ce901500..1acaa64216 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
@@ -1198,12 +1198,12 @@ describe('ReactIncrementalErrorHandling', () => {
     expect(ReactNoop.getChildren()).toEqual([span('Caught an error: oops')]);
 
     if (__DEV__) {
-      expect(console.error.calls.count()).toBe(1);
+      expect(console.error).toHaveBeenCalledTimes(1);
       expect(console.error.calls.argsFor(0)[0]).toContain(
         'The above error occurred in the <BadRender> component:',
       );
     } else {
-      expect(console.error.calls.count()).toBe(1);
+      expect(console.error).toHaveBeenCalledTimes(1);
       expect(console.error.calls.argsFor(0)[0]).toBe(notAnError);
     }
   });
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorLogging-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorLogging-test.internal.js
index 06d84107d0..9b417309a6 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorLogging-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorLogging-test.internal.js
@@ -145,7 +145,7 @@ describe('ReactIncrementalErrorLogging', () => {
       expect(logCapturedErrorCalls.length).toBe(1);
 
       // The error thrown in logCapturedError should also be logged
-      expect(console.error.calls.count()).toBe(1);
+      expect(console.error).toHaveBeenCalledTimes(1);
       expect(console.error.calls.argsFor(0)[0].message).toContain(
         'logCapturedError error',
       );
diff --git a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
index 480b4b0021..95355e2a18 100644
--- a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
@@ -716,7 +716,7 @@ describe('ReactNewContext', () => {
     ReactNoop.flush();
 
     if (__DEV__) {
-      expect(console.error.calls.count()).toBe(1);
+      expect(console.error).toHaveBeenCalledTimes(1);
       expect(console.error.calls.argsFor(0)[0]).toContain(
         'calculateChangedBits: Expected the return value to be a 31-bit ' +
           'integer. Instead received: 4294967295',
diff --git a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
index 5c7171bc18..88c49289fd 100644
--- a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
+++ b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
@@ -88,7 +88,7 @@ describe('ReactScheduler', () => {
       const cb = jest.fn();
       scheduleWork(cb);
       advanceOneFrame({timeLeftInFrame: 15});
-      expect(cb.mock.calls.length).toBe(1);
+      expect(cb).toHaveBeenCalledTimes(1);
       // should not have timed out and should include a timeRemaining method
       expect(cb.mock.calls[0][0].didTimeout).toBe(false);
       expect(typeof cb.mock.calls[0][0].timeRemaining()).toBe('number');
@@ -333,10 +333,10 @@ describe('ReactScheduler', () => {
       const {scheduleWork, cancelScheduledWork} = ReactScheduler;
       const cb = jest.fn();
       const callbackId = scheduleWork(cb);
-      expect(cb.mock.calls.length).toBe(0);
+      expect(cb).toHaveBeenCalledTimes(0);
       cancelScheduledWork(callbackId);
       advanceOneFrame({timeLeftInFrame: 15});
-      expect(cb.mock.calls.length).toBe(0);
+      expect(cb).toHaveBeenCalledTimes(0);
     });
 
     describe('with multiple callbacks', () => {
@@ -356,7 +356,7 @@ describe('ReactScheduler', () => {
         advanceOneFrame({timeLeftInFrame: 15});
         // B should not get called because A cancelled B
         expect(callbackLog).toEqual(['A']);
-        expect(callbackB.mock.calls.length).toBe(0);
+        expect(callbackB).toHaveBeenCalledTimes(0);
       });
     });
   });
diff --git a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
index 5ff7eae701..eb8942a520 100644
--- a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
@@ -1237,12 +1237,12 @@ describe('ReactShallowRenderer', () => {
 
     shallowRenderer.render(<Component />);
 
-    expect(mockFn.mock.calls.length).toBe(2);
+    expect(mockFn).toHaveBeenCalledTimes(2);
 
     // Ensure the callback queue is cleared after the callbacks are invoked
     const mountedInstance = shallowRenderer.getMountedInstance();
     mountedInstance.setState({foo: 'bar'}, () => mockFn());
-    expect(mockFn.mock.calls.length).toBe(3);
+    expect(mockFn).toHaveBeenCalledTimes(3);
   });
 
   it('should call the setState callback even if shouldComponentUpdate = false', done => {
diff --git a/packages/react/src/__tests__/ReactChildren-test.js b/packages/react/src/__tests__/ReactChildren-test.js
index cf5edb52bd..841875fce3 100644
--- a/packages/react/src/__tests__/ReactChildren-test.js
+++ b/packages/react/src/__tests__/ReactChildren-test.js
@@ -21,7 +21,7 @@ describe('ReactChildren', () => {
 
   it('should support identity for simple', () => {
     const context = {};
-    const callback = jasmine.createSpy().and.callFake(function(kid, index) {
+    const callback = jest.fn().mockImplementation(function(kid, index) {
       expect(this).toBe(context);
       return kid;
     });
@@ -34,7 +34,7 @@ describe('ReactChildren', () => {
     const instance = <div>{simpleKid}</div>;
     React.Children.forEach(instance.props.children, callback, context);
     expect(callback).toHaveBeenCalledWith(simpleKid, 0);
-    callback.calls.reset();
+    callback.mockClear();
     const mappedChildren = React.Children.map(
       instance.props.children,
       callback,
@@ -46,7 +46,7 @@ describe('ReactChildren', () => {
 
   it('should support Portal components', () => {
     const context = {};
-    const callback = jasmine.createSpy().and.callFake(function(kid, index) {
+    const callback = jest.fn().mockImplementation(function(kid, index) {
       expect(this).toBe(context);
       return kid;
     });
@@ -59,7 +59,7 @@ describe('ReactChildren', () => {
     const parentInstance = <div>{reactPortal}</div>;
     React.Children.forEach(parentInstance.props.children, callback, context);
     expect(callback).toHaveBeenCalledWith(reactPortal, 0);
-    callback.calls.reset();
+    callback.mockClear();
     const mappedChildren = React.Children.map(
       parentInstance.props.children,
       callback,
@@ -71,7 +71,7 @@ describe('ReactChildren', () => {
 
   it('should treat single arrayless child as being in array', () => {
     const context = {};
-    const callback = jasmine.createSpy().and.callFake(function(kid, index) {
+    const callback = jest.fn().mockImplementation(function(kid, index) {
       expect(this).toBe(context);
       return kid;
     });
@@ -80,7 +80,7 @@ describe('ReactChildren', () => {
     const instance = <div>{simpleKid}</div>;
     React.Children.forEach(instance.props.children, callback, context);
     expect(callback).toHaveBeenCalledWith(simpleKid, 0);
-    callback.calls.reset();
+    callback.mockClear();
     const mappedChildren = React.Children.map(
       instance.props.children,
       callback,
@@ -92,7 +92,7 @@ describe('ReactChildren', () => {
 
   it('should treat single child in array as expected', () => {
     const context = {};
-    const callback = jasmine.createSpy().and.callFake(function(kid, index) {
+    const callback = jest.fn().mockImplementation(function(kid, index) {
       expect(this).toBe(context);
       return kid;
     });
@@ -101,7 +101,7 @@ describe('ReactChildren', () => {
     const instance = <div>{[simpleKid]}</div>;
     React.Children.forEach(instance.props.children, callback, context);
     expect(callback).toHaveBeenCalledWith(simpleKid, 0);
-    callback.calls.reset();
+    callback.mockClear();
     const mappedChildren = React.Children.map(
       instance.props.children,
       callback,
@@ -119,7 +119,7 @@ describe('ReactChildren', () => {
     const four = <div key="keyFour" />;
     const context = {};
 
-    const callback = jasmine.createSpy().and.callFake(function(kid) {
+    const callback = jest.fn().mockImplementation(function(kid) {
       expect(this).toBe(context);
       return kid;
     });
@@ -140,7 +140,7 @@ describe('ReactChildren', () => {
       expect(callback).toHaveBeenCalledWith(two, 2);
       expect(callback).toHaveBeenCalledWith(three, 3);
       expect(callback).toHaveBeenCalledWith(four, 4);
-      callback.calls.reset();
+      callback.mockClear();
     }
 
     React.Children.forEach(instance.props.children, callback, context);
@@ -165,7 +165,7 @@ describe('ReactChildren', () => {
     const a = <a key="aNode" />;
 
     const context = {};
-    const callback = jasmine.createSpy().and.callFake(function(kid) {
+    const callback = jest.fn().mockImplementation(function(kid) {
       expect(this).toBe(context);
       return kid;
     });
@@ -185,7 +185,7 @@ describe('ReactChildren', () => {
     );
 
     function assertCalls() {
-      expect(callback.calls.count()).toBe(9);
+      expect(callback).toHaveBeenCalledTimes(9);
       expect(callback).toHaveBeenCalledWith(div, 0);
       expect(callback).toHaveBeenCalledWith(span, 1);
       expect(callback).toHaveBeenCalledWith(a, 2);
@@ -195,7 +195,7 @@ describe('ReactChildren', () => {
       expect(callback).toHaveBeenCalledWith(null, 6);
       expect(callback).toHaveBeenCalledWith(null, 7);
       expect(callback).toHaveBeenCalledWith(null, 8);
-      callback.calls.reset();
+      callback.mockClear();
     }
 
     React.Children.forEach(instance.props.children, callback, context);
@@ -225,21 +225,21 @@ describe('ReactChildren', () => {
     const five = <div key="keyFive" />;
 
     const context = {};
-    const callback = jasmine.createSpy().and.callFake(function(kid) {
+    const callback = jest.fn().mockImplementation(function(kid) {
       return kid;
     });
 
     const instance = <div>{[[zero, one, two], [three, four], five]}</div>;
 
     function assertCalls() {
-      expect(callback.calls.count()).toBe(6);
+      expect(callback).toHaveBeenCalledTimes(6);
       expect(callback).toHaveBeenCalledWith(zero, 0);
       expect(callback).toHaveBeenCalledWith(one, 1);
       expect(callback).toHaveBeenCalledWith(two, 2);
       expect(callback).toHaveBeenCalledWith(three, 3);
       expect(callback).toHaveBeenCalledWith(four, 4);
       expect(callback).toHaveBeenCalledWith(five, 5);
-      callback.calls.reset();
+      callback.mockClear();
     }
 
     React.Children.forEach(instance.props.children, callback, context);
@@ -263,7 +263,7 @@ describe('ReactChildren', () => {
     const zeroForceKey = <div key="keyZero" />;
     const oneForceKey = <div key="keyOne" />;
     const context = {};
-    const callback = jasmine.createSpy().and.callFake(function(kid) {
+    const callback = jest.fn().mockImplementation(function(kid) {
       expect(this).toBe(context);
       return kid;
     });
@@ -278,7 +278,7 @@ describe('ReactChildren', () => {
     function assertCalls() {
       expect(callback).toHaveBeenCalledWith(zeroForceKey, 0);
       expect(callback).toHaveBeenCalledWith(oneForceKey, 1);
-      callback.calls.reset();
+      callback.mockClear();
     }
 
     React.Children.forEach(forcedKeys.props.children, callback, context);
@@ -313,7 +313,7 @@ describe('ReactChildren', () => {
     };
 
     const context = {};
-    const callback = jasmine.createSpy().and.callFake(function(kid) {
+    const callback = jest.fn().mockImplementation(function(kid) {
       expect(this).toBe(context);
       return kid;
     });
@@ -324,11 +324,11 @@ describe('ReactChildren', () => {
     );
 
     function assertCalls() {
-      expect(callback.calls.count()).toBe(3);
+      expect(callback).toHaveBeenCalledTimes(3);
       expect(callback).toHaveBeenCalledWith(<div />, 0);
       expect(callback).toHaveBeenCalledWith(<div />, 1);
       expect(callback).toHaveBeenCalledWith(<div />, 2);
-      callback.calls.reset();
+      callback.mockClear();
     }
 
     React.Children.forEach(instance.props.children, callback, context);
@@ -364,7 +364,7 @@ describe('ReactChildren', () => {
     };
 
     const context = {};
-    const callback = jasmine.createSpy().and.callFake(function(kid) {
+    const callback = jest.fn().mockImplementation(function(kid) {
       expect(this).toBe(context);
       return kid;
     });
@@ -372,11 +372,11 @@ describe('ReactChildren', () => {
     const instance = <div>{threeDivIterable}</div>;
 
     function assertCalls() {
-      expect(callback.calls.count()).toBe(3);
+      expect(callback).toHaveBeenCalledTimes(3);
       expect(callback).toHaveBeenCalledWith(<div key="#1" />, 0);
       expect(callback).toHaveBeenCalledWith(<div key="#2" />, 1);
       expect(callback).toHaveBeenCalledWith(<div key="#3" />, 2);
-      callback.calls.reset();
+      callback.mockClear();
     }
 
     React.Children.forEach(instance.props.children, callback, context);
@@ -412,17 +412,17 @@ describe('ReactChildren', () => {
       );
 
       const context = {};
-      const callback = jasmine.createSpy().and.callFake(function(kid) {
+      const callback = jest.fn().mockImplementation(function(kid) {
         expect(this).toBe(context);
         return kid;
       });
 
       const assertCalls = function() {
-        expect(callback.calls.count()).toBe(3);
+        expect(callback).toHaveBeenCalledTimes(3);
         expect(callback).toHaveBeenCalledWith(5, 0);
         expect(callback).toHaveBeenCalledWith(12, 1);
         expect(callback).toHaveBeenCalledWith(13, 2);
-        callback.calls.reset();
+        callback.mockClear();
       };
 
       React.Children.forEach(instance.props.children, callback, context);
@@ -454,16 +454,16 @@ describe('ReactChildren', () => {
     );
 
     const context = {};
-    const callback = jasmine.createSpy().and.callFake(function(kid) {
+    const callback = jest.fn().mockImplementation(function(kid) {
       expect(this).toBe(context);
       return kid;
     });
 
     function assertCalls() {
-      expect(callback.calls.count()).toBe(2, 0);
+      expect(callback).toHaveBeenCalledTimes(2, 0);
       expect(callback).toHaveBeenCalledWith('a', 0);
       expect(callback).toHaveBeenCalledWith(13, 1);
-      callback.calls.reset();
+      callback.mockClear();
     }
 
     React.Children.forEach(instance.props.children, callback, context);
@@ -536,7 +536,7 @@ describe('ReactChildren', () => {
       <span />, // Map from null to something.
       <div key="keyFour" />,
     ];
-    const callback = jasmine.createSpy().and.callFake(function(kid, index) {
+    const callback = jest.fn().mockImplementation(function(kid, index) {
       return mapped[index];
     });
 
@@ -556,13 +556,13 @@ describe('ReactChildren', () => {
     expect(callback).toHaveBeenCalledWith(two, 2);
     expect(callback).toHaveBeenCalledWith(three, 3);
     expect(callback).toHaveBeenCalledWith(four, 4);
-    callback.calls.reset();
+    callback.mockClear();
 
     const mappedChildren = React.Children.map(
       instance.props.children,
       callback,
     );
-    expect(callback.calls.count()).toBe(5);
+    expect(callback).toHaveBeenCalledTimes(5);
     expect(React.Children.count(mappedChildren)).toBe(4);
     // Keys default to indices.
     expect([
@@ -597,7 +597,7 @@ describe('ReactChildren', () => {
     const fourMapped = <div key="keyFour" />;
     const fiveMapped = <div />;
 
-    const callback = jasmine.createSpy().and.callFake(function(kid) {
+    const callback = jest.fn().mockImplementation(function(kid) {
       switch (kid) {
         case zero:
           return zeroMapped;
@@ -616,20 +616,20 @@ describe('ReactChildren', () => {
     const instance = <div>{[frag]}</div>;
 
     React.Children.forEach(instance.props.children, callback);
-    expect(callback.calls.count()).toBe(6);
+    expect(callback).toHaveBeenCalledTimes(6);
     expect(callback).toHaveBeenCalledWith(zero, 0);
     expect(callback).toHaveBeenCalledWith(one, 1);
     expect(callback).toHaveBeenCalledWith(two, 2);
     expect(callback).toHaveBeenCalledWith(three, 3);
     expect(callback).toHaveBeenCalledWith(four, 4);
     expect(callback).toHaveBeenCalledWith(five, 5);
-    callback.calls.reset();
+    callback.mockClear();
 
     const mappedChildren = React.Children.map(
       instance.props.children,
       callback,
     );
-    expect(callback.calls.count()).toBe(6);
+    expect(callback).toHaveBeenCalledTimes(6);
     expect(callback).toHaveBeenCalledWith(zero, 0);
     expect(callback).toHaveBeenCalledWith(one, 1);
     expect(callback).toHaveBeenCalledWith(two, 2);
diff --git a/scripts/jest/matchers/toWarnDev.js b/scripts/jest/matchers/toWarnDev.js
index f9961592f5..f8ae0be174 100644
--- a/scripts/jest/matchers/toWarnDev.js
+++ b/scripts/jest/matchers/toWarnDev.js
@@ -2,13 +2,6 @@
 
 const jestDiff = require('jest-diff');
 
-function diffString(a, b) {
-  // jest-diff does not currently handle single line strings correctly
-  // The easiest work around is to ensure that both strings are multiline
-  // https://github.com/facebook/jest/issues/5657
-  return jestDiff(a + '\n', b + '\n');
-}
-
 function normalizeCodeLocInfo(str) {
   return str && str.replace(/at .+?:\d+/g, 'at **');
 }
@@ -56,11 +49,11 @@ const createMatcherFor = consoleMethod =>
         } else if (expectedMessages.length === 1) {
           errorMessage =
             'Unexpected warning recorded: ' +
-            diffString(normalizedMessage, expectedMessages[0]);
+            jestDiff(normalizedMessage, expectedMessages[0]);
         } else {
           errorMessage =
             'Unexpected warning recorded: ' +
-            diffString([normalizedMessage], expectedMessages);
+            jestDiff([normalizedMessage], expectedMessages);
         }
 
         // Record the call stack for unexpected warnings.
diff --git a/yarn.lock b/yarn.lock
index 730cd08faf..9c76585db6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,20 +2,12 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@7.0.0-beta.44":
+"@babel/code-frame@7.0.0-beta.44", "@babel/code-frame@^7.0.0-beta.35":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
   dependencies:
     "@babel/highlight" "7.0.0-beta.44"
 
-"@babel/code-frame@^7.0.0-beta.35":
-  version "7.0.0-beta.38"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.38.tgz#c0af5930617e55e050336838e3a3670983b0b2b2"
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
-
 "@babel/generator@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
@@ -129,14 +121,10 @@ acorn@^4.0.3:
   version "4.0.11"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"
 
-acorn@^5.0.0, acorn@^5.1.2:
+acorn@^5.0.0, acorn@^5.1.2, acorn@^5.2.1:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
 
-acorn@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
-
 agent-base@^4.1.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.1.2.tgz#80fa6cde440f4dcf9af2617cf246099b5d99f0c8"
@@ -190,18 +178,12 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.1.0, ansi-styles@^3.2.1:
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
-  dependencies:
-    color-convert "^1.9.0"
-
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -357,14 +339,10 @@ aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
-aws4@^1.2.1:
+aws4@^1.2.1, aws4@^1.6.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
 
-aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-
 babel-cli@^6.6.5:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1"
@@ -578,12 +556,12 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-jest@^22.4.4:
-  version "22.4.4"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.4.4.tgz#977259240420e227444ebe49e226a61e49ea659d"
+babel-jest@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.0.1.tgz#bbad3bf523fb202da05ed0a6540b48c84eed13a6"
   dependencies:
-    babel-plugin-istanbul "^4.1.5"
-    babel-preset-jest "^22.4.4"
+    babel-plugin-istanbul "^4.1.6"
+    babel-preset-jest "^23.0.1"
 
 babel-messages@^6.23.0:
   version "6.23.0"
@@ -619,7 +597,7 @@ 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.1.5:
+babel-plugin-istanbul@^4.1.6:
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
   dependencies:
@@ -628,9 +606,9 @@ babel-plugin-istanbul@^4.1.5:
     istanbul-lib-instrument "^1.10.1"
     test-exclude "^4.2.1"
 
-babel-plugin-jest-hoist@^22.4.4:
-  version "22.4.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.4.tgz#b9851906eab34c7bf6f8c895a2b08bea1a844c0b"
+babel-plugin-jest-hoist@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.0.1.tgz#eaa11c964563aea9c21becef2bdf7853f7f3c148"
 
 babel-plugin-jscript@^1.0.4:
   version "1.0.4"
@@ -897,11 +875,11 @@ babel-preset-flow@^6.23.0:
   dependencies:
     babel-plugin-transform-flow-strip-types "^6.22.0"
 
-babel-preset-jest@^22.4.4:
-  version "22.4.4"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-22.4.4.tgz#ec9fbd8bcd7dfd24b8b5320e0e688013235b7c39"
+babel-preset-jest@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.0.1.tgz#631cc545c6cf021943013bcaf22f45d87fe62198"
   dependencies:
-    babel-plugin-jest-hoist "^22.4.4"
+    babel-plugin-jest-hoist "^23.0.1"
     babel-plugin-syntax-object-rest-spread "^6.13.0"
 
 babel-preset-react@^6.5.0:
@@ -1039,12 +1017,6 @@ bl@^1.0.0:
   dependencies:
     readable-stream "^2.0.5"
 
-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"
-
 bluebird@^2.9.33:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
@@ -1067,20 +1039,13 @@ boom@5.x.x:
   dependencies:
     hoek "4.x.x"
 
-brace-expansion@^1.0.0:
+brace-expansion@^1.0.0, brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
-  dependencies:
-    balanced-match "^1.0.0"
-    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"
@@ -1143,9 +1108,9 @@ bser@^2.0.0:
   dependencies:
     node-int64 "^0.4.0"
 
-buffer-shims@~1.0.0:
+buffer-from@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
 
 builtin-modules@^1.0.0, builtin-modules@^1.1.0:
   version "1.1.1"
@@ -1217,7 +1182,15 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@*, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@*, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.0.tgz#a060a297a6b57e15b61ca63ce84995daa0fe6e52"
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -1227,50 +1200,11 @@ chalk@*, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.0.tgz#a060a297a6b57e15b61ca63ce84995daa0fe6e52"
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.0.1.tgz#dbec49436d2ae15f536114e76d14656cdbc0f44d"
-  dependencies:
-    ansi-styles "^3.1.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
-
-chalk@^2.1.0, chalk@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
-  dependencies:
-    ansi-styles "^3.1.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
-
 chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
 
-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"
-
-chokidar@^1.6.1:
+chokidar@^1.0.0, chokidar@^1.6.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -1403,14 +1337,10 @@ color-name@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
-colors@1.0.3:
+colors@1.0.3, colors@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
 
-colors@^1.0.3:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-
 combine-source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.6.1.tgz#9b4a09c316033d768e0f11e029fa2730e079ad96"
@@ -1426,20 +1356,10 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.11.0:
+commander@^2.11.0, commander@^2.12.2, commander@^2.5.0, commander@^2.6.0, commander@^2.9.0:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
 
-commander@^2.12.2:
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
-
-commander@^2.5.0, commander@^2.6.0, commander@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
 commoner@~0.10.3:
   version "0.10.8"
   resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5"
@@ -1454,6 +1374,10 @@ commoner@~0.10.3:
     q "^1.1.2"
     recast "^0.11.17"
 
+compare-versions@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.2.1.tgz#a49eb7689d4caaf0b6db5220173fd279614000f7"
+
 component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
@@ -1462,15 +1386,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:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "~2.0.0"
-    typedarray "~0.0.5"
-
-concat-stream@^1.6.0:
+concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
@@ -1486,14 +1402,10 @@ content-type-parser@^1.0.1:
   version "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, convert-source-map@^1.5.0:
+convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
-convert-source-map@^1.4.0:
-  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"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
@@ -1506,11 +1418,7 @@ 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.2.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
-
-core-js@^2.4.0, core-js@^2.5.0:
+core-js@^2.2.1, core-js@^2.4.0, core-js@^2.5.0:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.5.tgz#b14dde936c640c0579a6b50cabcc132dd6127e3b"
 
@@ -1532,15 +1440,7 @@ coveralls@^2.11.6:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/crc32/-/crc32-0.2.2.tgz#7ad220d6ffdcd119f9fc127a7772cacea390a4ba"
 
-create-react-class@^15.6.2:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a"
-  dependencies:
-    fbjs "^0.8.9"
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
-
-create-react-class@^15.6.3:
+create-react-class@^15.6.2, create-react-class@^15.6.3:
   version "15.6.3"
   resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
   dependencies:
@@ -1653,12 +1553,6 @@ debug@^2.1.1, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
   dependencies:
     ms "2.0.0"
 
-debug@^2.6.3:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
-  dependencies:
-    ms "2.0.0"
-
 debug@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -1873,7 +1767,7 @@ error-ex@^1.2.0:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.5.1:
+es-abstract@^1.5.1, es-abstract@^1.7.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
   dependencies:
@@ -1883,15 +1777,6 @@ es-abstract@^1.5.1:
     is-callable "^1.1.3"
     is-regex "^1.0.4"
 
-es-abstract@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c"
-  dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.0"
-    is-callable "^1.1.3"
-    is-regex "^1.0.3"
-
 es-to-primitive@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
@@ -2090,7 +1975,7 @@ esprima@^2.6.0:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
-esprima@^3.1.1, esprima@^3.1.3, esprima@~3.1.0:
+esprima@^3.1.3, esprima@~3.1.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
 
@@ -2189,16 +2074,16 @@ expand-tilde@^1.2.2:
   dependencies:
     os-homedir "^1.0.1"
 
-expect@^22.4.0:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-22.4.3.tgz#d5a29d0a0e1fb2153557caef2674d4547e914674"
+expect@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-23.0.1.tgz#99131f2fd9115595f8cc3697401e7f0734d45fef"
   dependencies:
     ansi-styles "^3.2.0"
-    jest-diff "^22.4.3"
-    jest-get-type "^22.4.3"
-    jest-matcher-utils "^22.4.3"
-    jest-message-util "^22.4.3"
-    jest-regex-util "^22.4.3"
+    jest-diff "^23.0.1"
+    jest-get-type "^22.1.0"
+    jest-matcher-utils "^23.0.1"
+    jest-message-util "^23.0.0"
+    jest-regex-util "^23.0.0"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
@@ -2251,14 +2136,10 @@ extract-banner@0.1.2:
     strip-bom-string "^0.1.2"
     strip-use-strict "^0.1.0"
 
-extsprintf@1.3.0:
+extsprintf@1.3.0, extsprintf@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
 
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-
 falafel@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/falafel/-/falafel-1.2.0.tgz#c18d24ef5091174a497f318cd24b026a25cddab4"
@@ -2305,7 +2186,7 @@ fbjs-scripts@^0.6.0:
     semver "^5.1.0"
     through2 "^2.0.0"
 
-fbjs@^0.8.16:
+fbjs@^0.8.16, fbjs@^0.8.9:
   version "0.8.16"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
   dependencies:
@@ -2317,18 +2198,6 @@ fbjs@^0.8.16:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.9"
 
-fbjs@^0.8.9:
-  version "0.8.15"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.15.tgz#4f0695fdfcc16c37c0b07facec8cb4c4091685b9"
-  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"
-
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -2504,42 +2373,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.0:
+fsevents@^1.0.0, fsevents@^1.1.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.2.tgz#4f598f0f69b273188ef4a62ca4e9e08ace314bbf"
   dependencies:
     nan "^2.9.2"
     node-pre-gyp "^0.9.0"
 
-fsevents@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4"
-  dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.36"
-
-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"
-
-function-bind@^1.0.2, function-bind@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
-
-function-bind@^1.1.1:
+function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
 
@@ -2654,7 +2495,7 @@ glob-stream@^6.1.0:
     to-absolute-glob "^2.0.0"
     unique-stream "^2.0.2"
 
-glob@7.1.1, glob@^7.0.3, glob@^7.1.1:
+glob@7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
   dependencies:
@@ -2685,7 +2526,7 @@ glob@^6.0.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.5, glob@^7.1.2:
+glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -2712,11 +2553,7 @@ global-prefix@^0.1.4:
     is-windows "^0.2.0"
     which "^1.2.12"
 
-globals@^11.0.1:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4"
-
-globals@^11.1.0:
+globals@^11.0.1, globals@^11.1.0:
   version "11.4.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.4.0.tgz#b85c793349561c16076a3c13549238a27945f1bc"
 
@@ -2757,10 +2594,6 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
@@ -2985,26 +2818,12 @@ 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.17:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-
-iconv-lite@^0.4.4:
+iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
   version "0.4.21"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
   dependencies:
     safer-buffer "^2.1.0"
 
-iconv-lite@^0.4.5:
-  version "0.4.16"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.16.tgz#65de3beeb39e2960d67f049f1634ffcbcde9014b"
-
-iconv-lite@~0.4.13:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
@@ -3033,7 +2852,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.0.3:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3296,7 +3115,7 @@ is-property@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
 
-is-regex@^1.0.3, is-regex@^1.0.4:
+is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
   dependencies:
@@ -3340,11 +3159,7 @@ is-windows@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
 
-is-windows@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
-
-is-windows@^1.0.2:
+is-windows@^1.0.0, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
 
@@ -3381,29 +3196,30 @@ isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-istanbul-api@^1.1.14:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.2.1.tgz#0c60a0515eb11c7d65c6b50bba2c6e999acd8620"
+istanbul-api@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.1.tgz#4c3b05d18c0016d1022e079b98dc82c40f488954"
   dependencies:
     async "^2.1.4"
+    compare-versions "^3.1.0"
     fileset "^2.0.2"
-    istanbul-lib-coverage "^1.1.1"
-    istanbul-lib-hook "^1.1.0"
-    istanbul-lib-instrument "^1.9.1"
-    istanbul-lib-report "^1.1.2"
-    istanbul-lib-source-maps "^1.2.2"
-    istanbul-reports "^1.1.3"
+    istanbul-lib-coverage "^1.2.0"
+    istanbul-lib-hook "^1.2.0"
+    istanbul-lib-instrument "^1.10.1"
+    istanbul-lib-report "^1.1.4"
+    istanbul-lib-source-maps "^1.2.4"
+    istanbul-reports "^1.3.0"
     js-yaml "^3.7.0"
     mkdirp "^0.5.1"
     once "^1.4.0"
 
-istanbul-lib-coverage@^1.1.1, istanbul-lib-coverage@^1.2.0:
+istanbul-lib-coverage@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
 
-istanbul-lib-hook@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b"
+istanbul-lib-hook@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.0.tgz#ae556fd5a41a6e8efa0b1002b1e416dfeaf9816c"
   dependencies:
     append-transform "^0.4.0"
 
@@ -3419,50 +3235,28 @@ istanbul-lib-instrument@^1.10.1:
     istanbul-lib-coverage "^1.2.0"
     semver "^5.3.0"
 
-istanbul-lib-instrument@^1.8.0, istanbul-lib-instrument@^1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz#250b30b3531e5d3251299fdd64b0b2c9db6b558e"
+istanbul-lib-report@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz#e886cdf505c4ebbd8e099e4396a90d0a28e2acb5"
   dependencies:
-    babel-generator "^6.18.0"
-    babel-template "^6.16.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-    babylon "^6.18.0"
-    istanbul-lib-coverage "^1.1.1"
-    semver "^5.3.0"
-
-istanbul-lib-report@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz#922be27c13b9511b979bd1587359f69798c1d425"
-  dependencies:
-    istanbul-lib-coverage "^1.1.1"
+    istanbul-lib-coverage "^1.2.0"
     mkdirp "^0.5.1"
     path-parse "^1.0.5"
     supports-color "^3.1.2"
 
-istanbul-lib-source-maps@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.1.tgz#a6fe1acba8ce08eebc638e572e294d267008aa0c"
-  dependencies:
-    debug "^2.6.3"
-    istanbul-lib-coverage "^1.1.1"
-    mkdirp "^0.5.1"
-    rimraf "^2.6.1"
-    source-map "^0.5.3"
-
-istanbul-lib-source-maps@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz#750578602435f28a0c04ee6d7d9e0f2960e62c1c"
+istanbul-lib-source-maps@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.4.tgz#cc7ccad61629f4efff8e2f78adb8c522c9976ec7"
   dependencies:
     debug "^3.1.0"
-    istanbul-lib-coverage "^1.1.1"
+    istanbul-lib-coverage "^1.2.0"
     mkdirp "^0.5.1"
     rimraf "^2.6.1"
     source-map "^0.5.3"
 
-istanbul-reports@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.3.tgz#3b9e1e8defb6d18b1d425da8e8b32c5a163f2d10"
+istanbul-reports@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.3.0.tgz#2f322e81e1d9520767597dca3c20a0cce89a3554"
   dependencies:
     handlebars "^4.0.3"
 
@@ -3472,15 +3266,15 @@ jasmine-check@^1.0.0-rc.0:
   dependencies:
     testcheck "^1.0.0-rc"
 
-jest-changed-files@^22.2.0:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-22.4.3.tgz#8882181e022c38bd46a2e4d18d44d19d90a90fb2"
+jest-changed-files@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.0.1.tgz#f79572d0720844ea5df84c2a448e862c2254f60c"
   dependencies:
     throat "^4.0.0"
 
-jest-cli@^22.4.4:
-  version "22.4.4"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.4.4.tgz#68cd2a2aae983adb1e6638248ca21082fd6d9e90"
+jest-cli@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.0.1.tgz#351a5ba51cf28ecf20336d97a30b970d1f530a56"
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
@@ -3489,24 +3283,24 @@ jest-cli@^22.4.4:
     graceful-fs "^4.1.11"
     import-local "^1.0.0"
     is-ci "^1.0.10"
-    istanbul-api "^1.1.14"
-    istanbul-lib-coverage "^1.1.1"
-    istanbul-lib-instrument "^1.8.0"
-    istanbul-lib-source-maps "^1.2.1"
-    jest-changed-files "^22.2.0"
-    jest-config "^22.4.4"
-    jest-environment-jsdom "^22.4.1"
+    istanbul-api "^1.3.1"
+    istanbul-lib-coverage "^1.2.0"
+    istanbul-lib-instrument "^1.10.1"
+    istanbul-lib-source-maps "^1.2.4"
+    jest-changed-files "^23.0.1"
+    jest-config "^23.0.1"
+    jest-environment-jsdom "^23.0.1"
     jest-get-type "^22.1.0"
-    jest-haste-map "^22.4.2"
-    jest-message-util "^22.4.0"
-    jest-regex-util "^22.1.0"
-    jest-resolve-dependencies "^22.1.0"
-    jest-runner "^22.4.4"
-    jest-runtime "^22.4.4"
-    jest-snapshot "^22.4.0"
-    jest-util "^22.4.1"
-    jest-validate "^22.4.4"
-    jest-worker "^22.2.2"
+    jest-haste-map "^23.0.1"
+    jest-message-util "^23.0.0"
+    jest-regex-util "^23.0.0"
+    jest-resolve-dependencies "^23.0.1"
+    jest-runner "^23.0.1"
+    jest-runtime "^23.0.1"
+    jest-snapshot "^23.0.1"
+    jest-util "^23.0.1"
+    jest-validate "^23.0.1"
+    jest-worker "^23.0.1"
     micromatch "^2.3.11"
     node-notifier "^5.2.1"
     realpath-native "^1.0.0"
@@ -3515,107 +3309,112 @@ jest-cli@^22.4.4:
     string-length "^2.0.0"
     strip-ansi "^4.0.0"
     which "^1.2.12"
-    yargs "^10.0.3"
+    yargs "^11.0.0"
 
-jest-config@^22.4.4:
-  version "22.4.4"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.4.4.tgz#72a521188720597169cd8b4ff86934ef5752d86a"
+jest-config@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.0.1.tgz#6798bff1247c7a390b1327193305001582fc58fa"
   dependencies:
+    babel-core "^6.0.0"
+    babel-jest "^23.0.1"
     chalk "^2.0.1"
     glob "^7.1.1"
-    jest-environment-jsdom "^22.4.1"
-    jest-environment-node "^22.4.1"
+    jest-environment-jsdom "^23.0.1"
+    jest-environment-node "^23.0.1"
     jest-get-type "^22.1.0"
-    jest-jasmine2 "^22.4.4"
-    jest-regex-util "^22.1.0"
-    jest-resolve "^22.4.2"
-    jest-util "^22.4.1"
-    jest-validate "^22.4.4"
-    pretty-format "^22.4.0"
+    jest-jasmine2 "^23.0.1"
+    jest-regex-util "^23.0.0"
+    jest-resolve "^23.0.1"
+    jest-util "^23.0.1"
+    jest-validate "^23.0.1"
+    pretty-format "^23.0.1"
 
-jest-diff@^22.4.0, jest-diff@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.4.3.tgz#e18cc3feff0aeef159d02310f2686d4065378030"
+jest-diff@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.0.1.tgz#3d49137cee12c320a4b4d2b4a6fa6e82d491a16a"
   dependencies:
     chalk "^2.0.1"
     diff "^3.2.0"
-    jest-get-type "^22.4.3"
-    pretty-format "^22.4.3"
+    jest-get-type "^22.1.0"
+    pretty-format "^23.0.1"
 
-jest-docblock@^22.4.0, jest-docblock@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.4.3.tgz#50886f132b42b280c903c592373bb6e93bb68b19"
+jest-docblock@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.0.1.tgz#deddd18333be5dc2415260a04ef3fce9276b5725"
   dependencies:
     detect-newline "^2.1.0"
 
-jest-environment-jsdom@^22.4.1:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz#d67daa4155e33516aecdd35afd82d4abf0fa8a1e"
+jest-each@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.0.1.tgz#a6e5dbf530afc6bf9d74792dde69d8db70f84706"
   dependencies:
-    jest-mock "^22.4.3"
-    jest-util "^22.4.3"
+    chalk "^2.0.1"
+    pretty-format "^23.0.1"
+
+jest-environment-jsdom@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.0.1.tgz#da689eb9358dc16e5708abb208f4eb26a439575c"
+  dependencies:
+    jest-mock "^23.0.1"
+    jest-util "^23.0.1"
     jsdom "^11.5.1"
 
-jest-environment-node@^22.4.1:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.4.3.tgz#54c4eaa374c83dd52a9da8759be14ebe1d0b9129"
+jest-environment-node@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.0.1.tgz#676b740e205f1f2be77241969e7812be824ee795"
   dependencies:
-    jest-mock "^22.4.3"
-    jest-util "^22.4.3"
+    jest-mock "^23.0.1"
+    jest-util "^23.0.1"
 
 jest-get-type@^22.1.0:
   version "22.1.0"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.1.0.tgz#4e90af298ed6181edc85d2da500dbd2753e0d5a9"
 
-jest-get-type@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
-
-jest-haste-map@^22.4.2:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.4.3.tgz#25842fa2ba350200767ac27f658d58b9d5c2e20b"
+jest-haste-map@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.0.1.tgz#cd89052abfc8cba01f560bbec09d4f36aec25d4f"
   dependencies:
     fb-watchman "^2.0.0"
     graceful-fs "^4.1.11"
-    jest-docblock "^22.4.3"
-    jest-serializer "^22.4.3"
-    jest-worker "^22.4.3"
+    jest-docblock "^23.0.1"
+    jest-serializer "^23.0.1"
+    jest-worker "^23.0.1"
     micromatch "^2.3.11"
     sane "^2.0.0"
 
-jest-jasmine2@^22.4.4:
-  version "22.4.4"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.4.4.tgz#c55f92c961a141f693f869f5f081a79a10d24e23"
+jest-jasmine2@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.0.1.tgz#16d875356e6360872bba48426f7d31fdc1b0bcea"
   dependencies:
     chalk "^2.0.1"
     co "^4.6.0"
-    expect "^22.4.0"
-    graceful-fs "^4.1.11"
+    expect "^23.0.1"
     is-generator-fn "^1.0.0"
-    jest-diff "^22.4.0"
-    jest-matcher-utils "^22.4.0"
-    jest-message-util "^22.4.0"
-    jest-snapshot "^22.4.0"
-    jest-util "^22.4.1"
-    source-map-support "^0.5.0"
+    jest-diff "^23.0.1"
+    jest-each "^23.0.1"
+    jest-matcher-utils "^23.0.1"
+    jest-message-util "^23.0.0"
+    jest-snapshot "^23.0.1"
+    jest-util "^23.0.1"
+    pretty-format "^23.0.1"
 
-jest-leak-detector@^22.4.0:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-22.4.3.tgz#2b7b263103afae8c52b6b91241a2de40117e5b35"
+jest-leak-detector@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.0.1.tgz#9dba07505ac3495c39d3ec09ac1e564599e861a0"
   dependencies:
-    pretty-format "^22.4.3"
+    pretty-format "^23.0.1"
 
-jest-matcher-utils@^22.4.0, jest-matcher-utils@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz#4632fe428ebc73ebc194d3c7b65d37b161f710ff"
+jest-matcher-utils@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.0.1.tgz#0c6c0daedf9833c2a7f36236069efecb4c3f6e5f"
   dependencies:
     chalk "^2.0.1"
-    jest-get-type "^22.4.3"
-    pretty-format "^22.4.3"
+    jest-get-type "^22.1.0"
+    pretty-format "^23.0.1"
 
-jest-message-util@^22.4.0, jest-message-util@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.4.3.tgz#cf3d38aafe4befddbfc455e57d65d5239e399eb7"
+jest-message-util@^23.0.0:
+  version "23.0.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.0.0.tgz#073f3d76c701f7c718a4b9af1eb7f138792c4796"
   dependencies:
     "@babel/code-frame" "^7.0.0-beta.35"
     chalk "^2.0.1"
@@ -3623,117 +3422,121 @@ jest-message-util@^22.4.0, jest-message-util@^22.4.3:
     slash "^1.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.4.3.tgz#f63ba2f07a1511772cdc7979733397df770aabc7"
+jest-mock@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.0.1.tgz#1569f477968c668fc728273a17c3767773b46357"
 
-jest-regex-util@^22.1.0, jest-regex-util@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-22.4.3.tgz#a826eb191cdf22502198c5401a1fc04de9cef5af"
+jest-regex-util@^23.0.0:
+  version "23.0.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.0.0.tgz#dd5c1fde0c46f4371314cf10f7a751a23f4e8f76"
 
-jest-resolve-dependencies@^22.1.0:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-22.4.3.tgz#e2256a5a846732dc3969cb72f3c9ad7725a8195e"
+jest-resolve-dependencies@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.0.1.tgz#d01a10ddad9152c4cecdf5eac2b88571c4b6a64d"
   dependencies:
-    jest-regex-util "^22.4.3"
+    jest-regex-util "^23.0.0"
+    jest-snapshot "^23.0.1"
 
-jest-resolve@^22.4.2:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.4.3.tgz#0ce9d438c8438229aa9b916968ec6b05c1abb4ea"
+jest-resolve@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.0.1.tgz#3f8403462b10a34c2df1d47aab5574c4935bcd24"
   dependencies:
     browser-resolve "^1.11.2"
     chalk "^2.0.1"
+    realpath-native "^1.0.0"
 
-jest-runner@^22.4.4:
-  version "22.4.4"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.4.4.tgz#dfca7b7553e0fa617e7b1291aeb7ce83e540a907"
+jest-runner@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.0.1.tgz#b176ae3ecf9e194aa4b84a7fcf70d1b8db231aa7"
   dependencies:
     exit "^0.1.2"
-    jest-config "^22.4.4"
-    jest-docblock "^22.4.0"
-    jest-haste-map "^22.4.2"
-    jest-jasmine2 "^22.4.4"
-    jest-leak-detector "^22.4.0"
-    jest-message-util "^22.4.0"
-    jest-runtime "^22.4.4"
-    jest-util "^22.4.1"
-    jest-worker "^22.2.2"
+    graceful-fs "^4.1.11"
+    jest-config "^23.0.1"
+    jest-docblock "^23.0.1"
+    jest-haste-map "^23.0.1"
+    jest-jasmine2 "^23.0.1"
+    jest-leak-detector "^23.0.1"
+    jest-message-util "^23.0.0"
+    jest-runtime "^23.0.1"
+    jest-util "^23.0.1"
+    jest-worker "^23.0.1"
+    source-map-support "^0.5.6"
     throat "^4.0.0"
 
-jest-runtime@^22.4.4:
-  version "22.4.4"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.4.4.tgz#9ba7792fc75582a5be0f79af6f8fe8adea314048"
+jest-runtime@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.0.1.tgz#b1d765fb03fb6d4043805af270676a693f504d57"
   dependencies:
     babel-core "^6.0.0"
-    babel-jest "^22.4.4"
-    babel-plugin-istanbul "^4.1.5"
+    babel-plugin-istanbul "^4.1.6"
     chalk "^2.0.1"
     convert-source-map "^1.4.0"
     exit "^0.1.2"
+    fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.1.11"
-    jest-config "^22.4.4"
-    jest-haste-map "^22.4.2"
-    jest-regex-util "^22.1.0"
-    jest-resolve "^22.4.2"
-    jest-util "^22.4.1"
-    jest-validate "^22.4.4"
-    json-stable-stringify "^1.0.1"
+    jest-config "^23.0.1"
+    jest-haste-map "^23.0.1"
+    jest-message-util "^23.0.0"
+    jest-regex-util "^23.0.0"
+    jest-resolve "^23.0.1"
+    jest-snapshot "^23.0.1"
+    jest-util "^23.0.1"
+    jest-validate "^23.0.1"
     micromatch "^2.3.11"
     realpath-native "^1.0.0"
     slash "^1.0.0"
     strip-bom "3.0.0"
     write-file-atomic "^2.1.0"
-    yargs "^10.0.3"
+    yargs "^11.0.0"
 
-jest-serializer@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-22.4.3.tgz#a679b81a7f111e4766235f4f0c46d230ee0f7436"
+jest-serializer@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
 
-jest-snapshot@^22.4.0:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.4.3.tgz#b5c9b42846ffb9faccb76b841315ba67887362d2"
+jest-snapshot@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.0.1.tgz#6674fa19b9eb69a99cabecd415bddc42d6af3e7e"
   dependencies:
     chalk "^2.0.1"
-    jest-diff "^22.4.3"
-    jest-matcher-utils "^22.4.3"
+    jest-diff "^23.0.1"
+    jest-matcher-utils "^23.0.1"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    pretty-format "^22.4.3"
+    pretty-format "^23.0.1"
 
-jest-util@^22.4.1, jest-util@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.4.3.tgz#c70fec8eec487c37b10b0809dc064a7ecf6aafac"
+jest-util@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.0.1.tgz#68ea5bd7edb177d3059f9797259f8e0dacce2f99"
   dependencies:
     callsites "^2.0.0"
     chalk "^2.0.1"
     graceful-fs "^4.1.11"
     is-ci "^1.0.10"
-    jest-message-util "^22.4.3"
+    jest-message-util "^23.0.0"
     mkdirp "^0.5.1"
     source-map "^0.6.0"
 
-jest-validate@^22.4.4:
-  version "22.4.4"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.4.4.tgz#1dd0b616ef46c995de61810d85f57119dbbcec4d"
+jest-validate@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.0.1.tgz#cd9f01a89d26bb885f12a8667715e9c865a5754f"
   dependencies:
     chalk "^2.0.1"
-    jest-config "^22.4.4"
     jest-get-type "^22.1.0"
     leven "^2.1.0"
-    pretty-format "^22.4.0"
+    pretty-format "^23.0.1"
 
-jest-worker@^22.2.2, jest-worker@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.4.3.tgz#5c421417cba1c0abf64bf56bd5fb7968d79dd40b"
+jest-worker@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.0.1.tgz#9e649dd963ff4046026f91c4017f039a6aa4a7bc"
   dependencies:
     merge-stream "^1.0.1"
 
-jest@^22.4.4:
-  version "22.4.4"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-22.4.4.tgz#ffb36c9654b339a13e10b3d4b338eb3e9d49f6eb"
+jest@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-23.0.1.tgz#0d083290ee4112cecfb780df6ff81332ed373201"
   dependencies:
     import-local "^1.0.0"
-    jest-cli "^22.4.4"
+    jest-cli "^23.0.1"
 
 js-tokens@1.0.1:
   version "1.0.1"
@@ -3750,14 +3553,7 @@ js-yaml@3.6.1:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
-js-yaml@^3.7.0:
-  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@^3.9.1:
+js-yaml@^3.7.0, js-yaml@^3.9.1:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
   dependencies:
@@ -3829,7 +3625,7 @@ json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
 
-json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+json-stable-stringify@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
   dependencies:
@@ -4072,11 +3868,7 @@ 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.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.3.0:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
-lodash@^4.2.0:
+lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
@@ -4094,14 +3886,7 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
   dependencies:
     js-tokens "^3.0.0"
 
-lru-cache@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
-  dependencies:
-    pseudomap "^1.0.1"
-    yallist "^2.0.0"
-
-lru-cache@^4.0.1:
+lru-cache@^4.0.0, lru-cache@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
   dependencies:
@@ -4188,37 +3973,21 @@ micromatch@^3.1.8:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-
 mime-db@~1.33.0:
   version "1.33.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
 
-mime-types@^2.1.12, mime-types@~2.1.7:
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.7:
   version "2.1.18"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
   dependencies:
     mime-db "~1.33.0"
 
-mime-types@~2.1.17:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  dependencies:
-    mime-db "~1.30.0"
-
 mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
 
-"minimatch@2 || 3", 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.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -4258,7 +4027,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
+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:
@@ -4278,7 +4047,7 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@^2.3.0, nan@^2.9.2:
+nan@^2.9.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
@@ -4339,20 +4108,6 @@ node-notifier@^5.2.1:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@^0.6.36:
-  version "0.6.36"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786"
-  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"
-
 node-pre-gyp@^0.9.0:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz#f11c07516dd92f87199dbc7e1838eab7cd56c9e0"
@@ -4482,7 +4237,7 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -4547,7 +4302,7 @@ 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.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
@@ -4738,30 +4493,22 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@1.11.1:
+prettier@1.11.1, prettier@^1.0.0:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
 
-prettier@^1.0.0:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.8.1.tgz#91064d778c08c85ac1cbe6b23195c34310d039f9"
-
-pretty-format@^22.4.0, pretty-format@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.4.3.tgz#f873d780839a9c02e9664c8a082e9ee79eaac16f"
+pretty-format@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.0.1.tgz#d61d065268e4c759083bccbca27a01ad7c7601f4"
   dependencies:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
 
-private@^0.1.6, private@^0.1.7:
+private@^0.1.6, private@^0.1.7, private@~0.1.5:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
 
-private@~0.1.5:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
-
-process-nextick-args@^1.0.6, process-nextick-args@~1.0.6:
+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"
 
@@ -4779,15 +4526,7 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prop-types@^15.5.7:
-  version "15.6.0"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
-  dependencies:
-    fbjs "^0.8.16"
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
-
-prop-types@^15.6.0:
+prop-types@^15.5.7, prop-types@^15.6.0:
   version "15.6.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
   dependencies:
@@ -4806,7 +4545,7 @@ proxy-from-env@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
 
-pseudomap@^1.0.1, pseudomap@^1.0.2:
+pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
@@ -4928,19 +4667,7 @@ read-pkg@^2.0.0:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.1.5:
-  version "2.2.9"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
-  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 "~1.0.0"
-    util-deprecate "~1.0.1"
-
-readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4:
+readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
@@ -4952,29 +4679,6 @@ readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^2.0.5, readable-stream@^2.2.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
-readable-stream@~2.0.0:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
-  dependencies:
-    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"
@@ -5147,7 +4851,7 @@ request@2.79.0:
     tunnel-agent "~0.4.1"
     uuid "^3.0.0"
 
-request@^2.81.0:
+request@^2.83.0:
   version "2.85.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
   dependencies:
@@ -5174,33 +4878,6 @@ request@^2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
-request@^2.83.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -5249,13 +4926,7 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.6:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
-  dependencies:
-    path-parse "^1.0.5"
-
-resolve@^1.4.0:
+resolve@^1.1.6, resolve@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
   dependencies:
@@ -5282,18 +4953,12 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.5.1, rimraf@^2.5.4:
+rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
     glob "^7.0.5"
 
-rimraf@^2.2.8, 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.6:
   version "2.2.8"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
@@ -5403,7 +5068,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0:
+safer-buffer@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
@@ -5421,22 +5086,14 @@ sane@^2.0.0:
   optionalDependencies:
     fsevents "^1.1.1"
 
-sax@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
-
-sax@^1.2.4:
+sax@^1.2.1, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
-semver@^5.1.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-
 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"
@@ -5564,10 +5221,11 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.0.tgz#2018a7ad2bdf8faf2691e5fddab26bed5a2bacab"
+source-map-support@^0.5.6:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
   dependencies:
+    buffer-from "^1.0.0"
     source-map "^0.6.0"
 
 source-map-url@^0.4.0:
@@ -5586,14 +5244,10 @@ 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.6, source-map@^0.5.7, source-map@~0.5.6:
+source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
-source-map@^0.5.3, source-map@~0.5.0, 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.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -5693,14 +5347,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e"
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^3.0.0"
-
-string-width@^2.1.0, string-width@^2.1.1:
+string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
@@ -5711,12 +5358,6 @@ string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-string_decoder@~1.0.0, string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-  dependencies:
-    safe-buffer "~5.1.0"
-
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -5783,19 +5424,7 @@ supports-color@^3.1.2:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
-  dependencies:
-    has-flag "^2.0.0"
-
-supports-color@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
-  dependencies:
-    has-flag "^2.0.0"
-
-supports-color@^5.3.0:
+supports-color@^5.0.0, supports-color@^5.3.0:
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
   dependencies:
@@ -5836,19 +5465,6 @@ tar-fs@^1.8.1:
     pump "^1.0.0"
     tar-stream "^1.1.2"
 
-tar-pack@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
-  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-stream@^1.1.2:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.5.tgz#5cad84779f45c83b1f2508d96b09d88c7218af55"
@@ -5858,14 +5474,6 @@ tar-stream@^1.1.2:
     readable-stream "^2.0.0"
     xtend "^4.0.0"
 
-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"
-
 tar@^4:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.1.tgz#b25d5a8470c976fd7a9a8a350f42c59e9fa81749"
@@ -5949,18 +5557,12 @@ time-stamp@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.0.1.tgz#9f4bd23559c9365966f3302dbba2b07c6b99b151"
 
-tmp@^0.0.33:
+tmp@^0.0.33, tmp@~0.0.28:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   dependencies:
     os-tmpdir "~1.0.2"
 
-tmp@~0.0.28:
-  version "0.0.31"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
-  dependencies:
-    os-tmpdir "~1.0.1"
-
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
@@ -5973,11 +5575,7 @@ to-absolute-glob@^2.0.0:
     is-absolute "^0.2.5"
     is-negated-glob "^1.0.0"
 
-to-fast-properties@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"
-
-to-fast-properties@^1.0.3:
+to-fast-properties@^1.0.0, to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
@@ -6007,13 +5605,7 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
-  dependencies:
-    punycode "^1.4.1"
-
-tough-cookie@~2.3.0:
+tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
   dependencies:
@@ -6061,7 +5653,7 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-typedarray@^0.0.6, typedarray@~0.0.5:
+typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
@@ -6086,10 +5678,6 @@ 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"
-
 umd@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e"
@@ -6150,14 +5738,10 @@ util.promisify@^1.0.0:
     define-properties "^1.1.2"
     object.getownpropertydescriptors "^2.0.3"
 
-uuid@^3.0.0:
+uuid@^3.0.0, uuid@^3.1.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
 
-uuid@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
-
 v8flags@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
@@ -6256,13 +5840,7 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.2.12, which@^1.2.8:
-  version "1.2.14"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
-  dependencies:
-    isexe "^2.0.0"
-
-which@^1.2.9, which@^1.3.0:
+which@^1.2.12, which@^1.2.8, which@^1.2.9, which@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
@@ -6335,7 +5913,7 @@ y18n@^3.2.0, y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
-yallist@^2.0.0, yallist@^2.1.2:
+yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
@@ -6362,9 +5940,9 @@ yargs-parser@^7.0.0:
   dependencies:
     camelcase "^4.1.0"
 
-yargs-parser@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"
+yargs-parser@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
   dependencies:
     camelcase "^4.1.0"
 
@@ -6386,9 +5964,9 @@ yargs@8.0.1:
     y18n "^3.2.1"
     yargs-parser "^7.0.0"
 
-yargs@^10.0.3:
-  version "10.1.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5"
+yargs@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.0.0.tgz#c052931006c5eee74610e5fc0354bedfd08a201b"
   dependencies:
     cliui "^4.0.0"
     decamelize "^1.1.1"
@@ -6401,7 +5979,7 @@ yargs@^10.0.3:
     string-width "^2.0.0"
     which-module "^2.0.0"
     y18n "^3.2.1"
-    yargs-parser "^8.1.0"
+    yargs-parser "^9.0.2"
 
 yargs@^4.8.0:
   version "4.8.1"

From 8aeea5afa2d688968545b1cc5a30a48ddc0fa503 Mon Sep 17 00:00:00 2001
From: Nathan Hunzaker <nate.hunzaker@gmail.com>
Date: Tue, 29 May 2018 09:48:58 -0400
Subject: [PATCH 121/277] Do not assign node.value on input creation if no
 change will occur (#12925)

This commit fixes an issue where assigning an empty string to required
text inputs triggers the invalid state in Firefox (~60.0.1).

It does this by first comparing the initial state value to the current
value property on the text element. This:

1. Prevents the validation issue
2. Avoids an extra DOM Mutation in some cases
---
 .../components/fixtures/text-inputs/index.js  | 23 +++++++++++++++----
 .../src/client/ReactDOMFiberInput.js          | 14 ++++++++---
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/fixtures/dom/src/components/fixtures/text-inputs/index.js b/fixtures/dom/src/components/fixtures/text-inputs/index.js
index af71edcbb5..33639686a3 100644
--- a/fixtures/dom/src/components/fixtures/text-inputs/index.js
+++ b/fixtures/dom/src/components/fixtures/text-inputs/index.js
@@ -64,21 +64,36 @@ class TextInputFixtures extends React.Component {
           <Fixture>
             <form className="control-box">
               <fieldset>
-                <legend>Text</legend>
+                <legend>Empty value prop string</legend>
+                <input value="" required={true} />
+              </fieldset>
+              <fieldset>
+                <legend>No value prop</legend>
                 <input required={true} />
               </fieldset>
               <fieldset>
-                <legend>Date</legend>
+                <legend>Empty defaultValue prop string</legend>
+                <input required={true} defaultValue="" />
+              </fieldset>
+              <fieldset>
+                <legend>No value prop date input</legend>
                 <input type="date" required={true} />
               </fieldset>
+              <fieldset>
+                <legend>Empty value prop date input</legend>
+                <input type="date" value="" required={true} />
+              </fieldset>
             </form>
           </Fixture>
 
           <p className="footnote">
             Checking the date type is also important because of a prior fix for
             iOS Safari that involved assigning over value/defaultValue
-            properties of the input to prevent a display bug. This also
-            triggered input validation.
+            properties of the input to prevent a display bug. This also triggers
+            input validation.
+          </p>
+          <p className="footnote">
+            The date inputs should be blank in iOS. This is not a bug.
           </p>
         </TestCase>
 
diff --git a/packages/react-dom/src/client/ReactDOMFiberInput.js b/packages/react-dom/src/client/ReactDOMFiberInput.js
index fd5a574fec..475b444b55 100644
--- a/packages/react-dom/src/client/ReactDOMFiberInput.js
+++ b/packages/react-dom/src/client/ReactDOMFiberInput.js
@@ -209,16 +209,24 @@ export function postMountWrapper(element: Element, props: Object) {
   const node = ((element: any): InputWithWrapperState);
 
   if (props.hasOwnProperty('value') || props.hasOwnProperty('defaultValue')) {
+    const initialValue = '' + node._wrapperState.initialValue;
+    const currentValue = node.value;
+
     // Do not assign value if it is already set. This prevents user text input
     // from being lost during SSR hydration.
-    if (node.value === '') {
-      node.value = '' + node._wrapperState.initialValue;
+    if (currentValue === '') {
+      // Do not re-assign the value property if there is no change. This
+      // potentially avoids a DOM write and prevents Firefox (~60.0.1) from
+      // prematurely marking required inputs as invalid
+      if (initialValue !== currentValue) {
+        node.value = initialValue;
+      }
     }
 
     // value must be assigned before defaultValue. This fixes an issue where the
     // visually displayed value of date inputs disappears on mobile Safari and Chrome:
     // https://github.com/facebook/react/issues/7233
-    node.defaultValue = '' + node._wrapperState.initialValue;
+    node.defaultValue = initialValue;
   }
 
   // Normally, we'd just do `node.checked = node.checked` upon initial mount, less this bug

From 4f1f909b5b5ffe28675eed3fdb645dfaf975c1ef Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 29 May 2018 15:47:14 +0100
Subject: [PATCH 122/277] Disable Flow on AppVeyor again

It runs out of memory.
---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index f82fb5c7d9..1ee89f0333 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,7 +30,7 @@ install:
 test_script:
   - node --version
   - yarn lint
-  - yarn flow-ci
+#  - yarn flow-ci
   - yarn build
   - yarn test
   - yarn prettier

From 83f76e4db9a060911774f497b5715bd4d4f42a9c Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Tue, 29 May 2018 09:50:49 -0700
Subject: [PATCH 123/277] ForwardRefs supports propTypes (#12911)

* Moved some internal forwardRef tests to not be internal
* ForwardRef supports propTypes
---
 packages/react/src/ReactElementValidator.js   |  49 ++++--
 .../src/__tests__/forwardRef-test.internal.js |  90 ----------
 .../react/src/__tests__/forwardRef-test.js    | 158 ++++++++++++++++++
 3 files changed, 194 insertions(+), 103 deletions(-)
 create mode 100644 packages/react/src/__tests__/forwardRef-test.js

diff --git a/packages/react/src/ReactElementValidator.js b/packages/react/src/ReactElementValidator.js
index 2142c4783e..35dc391f43 100644
--- a/packages/react/src/ReactElementValidator.js
+++ b/packages/react/src/ReactElementValidator.js
@@ -16,7 +16,11 @@ import lowPriorityWarning from 'shared/lowPriorityWarning';
 import describeComponentFrame from 'shared/describeComponentFrame';
 import isValidElementType from 'shared/isValidElementType';
 import getComponentName from 'shared/getComponentName';
-import {getIteratorFn, REACT_FRAGMENT_TYPE} from 'shared/ReactSymbols';
+import {
+  getIteratorFn,
+  REACT_FORWARD_REF_TYPE,
+  REACT_FRAGMENT_TYPE,
+} from 'shared/ReactSymbols';
 import checkPropTypes from 'prop-types/checkPropTypes';
 import warning from 'fbjs/lib/warning';
 
@@ -42,10 +46,20 @@ if (__DEV__) {
       return '#text';
     } else if (typeof element.type === 'string') {
       return element.type;
-    } else if (element.type === REACT_FRAGMENT_TYPE) {
+    }
+
+    const type = element.type;
+    if (type === REACT_FRAGMENT_TYPE) {
       return 'React.Fragment';
+    } else if (
+      typeof type === 'object' &&
+      type !== null &&
+      type.$$typeof === REACT_FORWARD_REF_TYPE
+    ) {
+      const functionName = type.render.displayName || type.render.name || '';
+      return functionName !== '' ? `ForwardRef(${functionName})` : 'ForwardRef';
     } else {
-      return element.type.displayName || element.type.name || 'Unknown';
+      return type.displayName || type.name || 'Unknown';
     }
   };
 
@@ -213,20 +227,29 @@ function validateChildKeys(node, parentType) {
  * @param {ReactElement} element
  */
 function validatePropTypes(element) {
-  const componentClass = element.type;
-  if (typeof componentClass !== 'function') {
+  const type = element.type;
+  let name, propTypes;
+  if (typeof type === 'function') {
+    // Class or functional component
+    name = type.displayName || type.name;
+    propTypes = type.propTypes;
+  } else if (
+    typeof type === 'object' &&
+    type !== null &&
+    type.$$typeof === REACT_FORWARD_REF_TYPE
+  ) {
+    // ForwardRef
+    const functionName = type.render.displayName || type.render.name || '';
+    name = functionName !== '' ? `ForwardRef(${functionName})` : 'ForwardRef';
+    propTypes = type.propTypes;
+  } else {
     return;
   }
-  const name = componentClass.displayName || componentClass.name;
-  const propTypes = componentClass.propTypes;
   if (propTypes) {
     currentlyValidatingElement = element;
     checkPropTypes(propTypes, element.props, 'prop', name, getStackAddendum);
     currentlyValidatingElement = null;
-  } else if (
-    componentClass.PropTypes !== undefined &&
-    !propTypesMisspellWarningShown
-  ) {
+  } else if (type.PropTypes !== undefined && !propTypesMisspellWarningShown) {
     propTypesMisspellWarningShown = true;
     warning(
       false,
@@ -234,9 +257,9 @@ function validatePropTypes(element) {
       name || 'Unknown',
     );
   }
-  if (typeof componentClass.getDefaultProps === 'function') {
+  if (typeof type.getDefaultProps === 'function') {
     warning(
-      componentClass.getDefaultProps.isReactClassApproved,
+      type.getDefaultProps.isReactClassApproved,
       'getDefaultProps is only used on classic React.createClass ' +
         'definitions. Use a static property named `defaultProps` instead.',
     );
diff --git a/packages/react/src/__tests__/forwardRef-test.internal.js b/packages/react/src/__tests__/forwardRef-test.internal.js
index a578ae7368..358ed49e04 100644
--- a/packages/react/src/__tests__/forwardRef-test.internal.js
+++ b/packages/react/src/__tests__/forwardRef-test.internal.js
@@ -94,31 +94,6 @@ describe('forwardRef', () => {
     expect(ref.current instanceof Child).toBe(true);
   });
 
-  it('should update refs when switching between children', () => {
-    function FunctionalComponent({forwardedRef, setRefOnDiv}) {
-      return (
-        <section>
-          <div ref={setRefOnDiv ? forwardedRef : null}>First</div>
-          <span ref={setRefOnDiv ? null : forwardedRef}>Second</span>
-        </section>
-      );
-    }
-
-    const RefForwardingComponent = React.forwardRef((props, ref) => (
-      <FunctionalComponent {...props} forwardedRef={ref} />
-    ));
-
-    const ref = React.createRef();
-
-    ReactNoop.render(<RefForwardingComponent ref={ref} setRefOnDiv={true} />);
-    ReactNoop.flush();
-    expect(ref.current.type).toBe('div');
-
-    ReactNoop.render(<RefForwardingComponent ref={ref} setRefOnDiv={false} />);
-    ReactNoop.flush();
-    expect(ref.current.type).toBe('span');
-  });
-
   it('should maintain child instance and ref through updates', () => {
     class Child extends React.Component {
       constructor(props) {
@@ -206,32 +181,6 @@ describe('forwardRef', () => {
     expect(ref.current).toBe(null);
   });
 
-  it('should support rendering null', () => {
-    const RefForwardingComponent = React.forwardRef((props, ref) => null);
-
-    const ref = React.createRef();
-
-    ReactNoop.render(<RefForwardingComponent ref={ref} />);
-    ReactNoop.flush();
-    expect(ref.current).toBe(null);
-  });
-
-  it('should support rendering null for multiple children', () => {
-    const RefForwardingComponent = React.forwardRef((props, ref) => null);
-
-    const ref = React.createRef();
-
-    ReactNoop.render(
-      <div>
-        <div />
-        <RefForwardingComponent ref={ref} />
-        <div />
-      </div>,
-    );
-    ReactNoop.flush();
-    expect(ref.current).toBe(null);
-  });
-
   it('should not re-run the render callback on a deep setState', () => {
     let inst;
 
@@ -264,43 +213,4 @@ describe('forwardRef', () => {
     inst.setState({});
     expect(ReactNoop.flush()).toEqual(['Inner']);
   });
-
-  it('should warn if not provided a callback during creation', () => {
-    expect(() => React.forwardRef(undefined)).toWarnDev(
-      'forwardRef requires a render function but was given undefined.',
-    );
-    expect(() => React.forwardRef(null)).toWarnDev(
-      'forwardRef requires a render function but was given null.',
-    );
-    expect(() => React.forwardRef('foo')).toWarnDev(
-      'forwardRef requires a render function but was given string.',
-    );
-  });
-
-  it('should warn if no render function is provided', () => {
-    expect(React.forwardRef).toWarnDev(
-      'forwardRef requires a render function but was given undefined.',
-    );
-  });
-
-  it('should warn if the render function provided has propTypes or defaultProps attributes', () => {
-    function renderWithPropTypes() {
-      return null;
-    }
-    renderWithPropTypes.propTypes = {};
-
-    function renderWithDefaultProps() {
-      return null;
-    }
-    renderWithDefaultProps.defaultProps = {};
-
-    expect(() => React.forwardRef(renderWithPropTypes)).toWarnDev(
-      'forwardRef render functions do not support propTypes or defaultProps. ' +
-        'Did you accidentally pass a React component?',
-    );
-    expect(() => React.forwardRef(renderWithDefaultProps)).toWarnDev(
-      'forwardRef render functions do not support propTypes or defaultProps. ' +
-        'Did you accidentally pass a React component?',
-    );
-  });
 });
diff --git a/packages/react/src/__tests__/forwardRef-test.js b/packages/react/src/__tests__/forwardRef-test.js
new file mode 100644
index 0000000000..aa1cd160d5
--- /dev/null
+++ b/packages/react/src/__tests__/forwardRef-test.js
@@ -0,0 +1,158 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react-core
+ */
+
+'use strict';
+
+describe('forwardRef', () => {
+  let PropTypes;
+  let React;
+  let ReactNoop;
+
+  beforeEach(() => {
+    jest.resetModules();
+    PropTypes = require('prop-types');
+    React = require('react');
+    ReactNoop = require('react-noop-renderer');
+  });
+
+  it('should update refs when switching between children', () => {
+    function FunctionalComponent({forwardedRef, setRefOnDiv}) {
+      return (
+        <section>
+          <div ref={setRefOnDiv ? forwardedRef : null}>First</div>
+          <span ref={setRefOnDiv ? null : forwardedRef}>Second</span>
+        </section>
+      );
+    }
+
+    const RefForwardingComponent = React.forwardRef((props, ref) => (
+      <FunctionalComponent {...props} forwardedRef={ref} />
+    ));
+
+    const ref = React.createRef();
+
+    ReactNoop.render(<RefForwardingComponent ref={ref} setRefOnDiv={true} />);
+    ReactNoop.flush();
+    expect(ref.current.type).toBe('div');
+
+    ReactNoop.render(<RefForwardingComponent ref={ref} setRefOnDiv={false} />);
+    ReactNoop.flush();
+    expect(ref.current.type).toBe('span');
+  });
+
+  it('should support rendering null', () => {
+    const RefForwardingComponent = React.forwardRef((props, ref) => null);
+
+    const ref = React.createRef();
+
+    ReactNoop.render(<RefForwardingComponent ref={ref} />);
+    ReactNoop.flush();
+    expect(ref.current).toBe(null);
+  });
+
+  it('should support rendering null for multiple children', () => {
+    const RefForwardingComponent = React.forwardRef((props, ref) => null);
+
+    const ref = React.createRef();
+
+    ReactNoop.render(
+      <div>
+        <div />
+        <RefForwardingComponent ref={ref} />
+        <div />
+      </div>,
+    );
+    ReactNoop.flush();
+    expect(ref.current).toBe(null);
+  });
+
+  it('should support propTypes and defaultProps', () => {
+    function FunctionalComponent({forwardedRef, optional, required}) {
+      return (
+        <div ref={forwardedRef}>
+          {optional}
+          {required}
+        </div>
+      );
+    }
+
+    const RefForwardingComponent = React.forwardRef(function NamedFunction(
+      props,
+      ref,
+    ) {
+      return <FunctionalComponent {...props} forwardedRef={ref} />;
+    });
+    RefForwardingComponent.propTypes = {
+      optional: PropTypes.string,
+      required: PropTypes.string.isRequired,
+    };
+    RefForwardingComponent.defaultProps = {
+      optional: 'default',
+    };
+
+    const ref = React.createRef();
+
+    ReactNoop.render(
+      <RefForwardingComponent ref={ref} optional="foo" required="bar" />,
+    );
+    ReactNoop.flush();
+    expect(ref.current.children).toEqual([{text: 'foo'}, {text: 'bar'}]);
+
+    ReactNoop.render(<RefForwardingComponent ref={ref} required="foo" />);
+    ReactNoop.flush();
+    expect(ref.current.children).toEqual([{text: 'default'}, {text: 'foo'}]);
+
+    expect(() =>
+      ReactNoop.render(<RefForwardingComponent ref={ref} optional="foo" />),
+    ).toWarnDev(
+      'Warning: Failed prop type: The prop `required` is marked as required in ' +
+        '`ForwardRef(NamedFunction)`, but its value is `undefined`.\n' +
+        '    in ForwardRef(NamedFunction) (at **)',
+    );
+  });
+
+  it('should warn if not provided a callback during creation', () => {
+    expect(() => React.forwardRef(undefined)).toWarnDev(
+      'forwardRef requires a render function but was given undefined.',
+    );
+    expect(() => React.forwardRef(null)).toWarnDev(
+      'forwardRef requires a render function but was given null.',
+    );
+    expect(() => React.forwardRef('foo')).toWarnDev(
+      'forwardRef requires a render function but was given string.',
+    );
+  });
+
+  it('should warn if no render function is provided', () => {
+    expect(React.forwardRef).toWarnDev(
+      'forwardRef requires a render function but was given undefined.',
+    );
+  });
+
+  it('should warn if the render function provided has propTypes or defaultProps attributes', () => {
+    function renderWithPropTypes() {
+      return null;
+    }
+    renderWithPropTypes.propTypes = {};
+
+    function renderWithDefaultProps() {
+      return null;
+    }
+    renderWithDefaultProps.defaultProps = {};
+
+    expect(() => React.forwardRef(renderWithPropTypes)).toWarnDev(
+      'forwardRef render functions do not support propTypes or defaultProps. ' +
+        'Did you accidentally pass a React component?',
+    );
+    expect(() => React.forwardRef(renderWithDefaultProps)).toWarnDev(
+      'forwardRef render functions do not support propTypes or defaultProps. ' +
+        'Did you accidentally pass a React component?',
+    );
+  });
+});

From 001f9ef4717a0928b4875cbad3421a17f49f95a5 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Tue, 29 May 2018 12:50:04 -0700
Subject: [PATCH 124/277] Release script prompts for NPM 2FA code (#12908)

* Release script prompts for NPM 2fa code
---
 scripts/release/build.js                      |  1 -
 scripts/release/package.json                  |  1 +
 .../get-npm-two-factor-auth.js                | 15 +++++++++++++
 .../publish-commands/publish-to-npm.js        | 11 ++++++++--
 scripts/release/publish.js                    |  2 ++
 scripts/release/yarn.lock                     | 21 +++++++++++++++++++
 6 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 scripts/release/publish-commands/get-npm-two-factor-auth.js

diff --git a/scripts/release/build.js b/scripts/release/build.js
index f23e68d86a..dedce1c267 100755
--- a/scripts/release/build.js
+++ b/scripts/release/build.js
@@ -31,7 +31,6 @@ const run = async () => {
   try {
     const params = parseBuildParameters();
     params.packages = getPublicPackages();
-
     await checkEnvironmentVariables(params);
     await validateVersion(params);
     await checkUncommittedChanges(params);
diff --git a/scripts/release/package.json b/scripts/release/package.json
index 34f8c57999..c5f9f99af3 100644
--- a/scripts/release/package.json
+++ b/scripts/release/package.json
@@ -13,6 +13,7 @@
     "figlet": "^1.2.0",
     "fs-extra": "^4.0.2",
     "log-update": "^2.1.0",
+    "prompt-promise": "^1.0.3",
     "request-promise-json": "^1.0.4",
     "semver": "^5.4.1"
   }
diff --git a/scripts/release/publish-commands/get-npm-two-factor-auth.js b/scripts/release/publish-commands/get-npm-two-factor-auth.js
new file mode 100644
index 0000000000..d32bb8c429
--- /dev/null
+++ b/scripts/release/publish-commands/get-npm-two-factor-auth.js
@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+
+'use strict';
+
+const chalk = require('chalk');
+const logUpdate = require('log-update');
+const prompt = require('prompt-promise');
+
+module.exports = async params => {
+  logUpdate(chalk`{green ✓} Npm two-factor auth code {gray (or blank)}: `);
+  const otp = await prompt('');
+  prompt.done();
+  logUpdate.clear();
+  return otp.trim() || null;
+};
diff --git a/scripts/release/publish-commands/publish-to-npm.js b/scripts/release/publish-commands/publish-to-npm.js
index c573b2ccd1..f170ff4fe3 100644
--- a/scripts/release/publish-commands/publish-to-npm.js
+++ b/scripts/release/publish-commands/publish-to-npm.js
@@ -8,7 +8,7 @@ const {join} = require('path');
 const semver = require('semver');
 const {execRead, execUnlessDry, logPromise} = require('../utils');
 
-const push = async ({cwd, dry, packages, version, tag}) => {
+const push = async ({cwd, dry, otp, packages, version, tag}) => {
   const errors = [];
   const isPrerelease = semver.prerelease(version);
   if (tag === undefined) {
@@ -19,10 +19,17 @@ const push = async ({cwd, dry, packages, version, tag}) => {
     throw new Error('The tag `latest` can only be used for stable versions.');
   }
 
+  // Pass two factor auth code if provided:
+  // https://docs.npmjs.com/getting-started/using-two-factor-authentication
+  const twoFactorAuth = otp != null ? `--otp ${otp}` : '';
+
   const publishProject = async project => {
     try {
       const path = join(cwd, 'build', 'node_modules', project);
-      await execUnlessDry(`npm publish --tag ${tag}`, {cwd: path, dry});
+      await execUnlessDry(`npm publish --tag ${tag} ${twoFactorAuth}`, {
+        cwd: path,
+        dry,
+      });
 
       const packagePath = join(
         cwd,
diff --git a/scripts/release/publish.js b/scripts/release/publish.js
index b39c7227ca..c3d980b0f2 100755
--- a/scripts/release/publish.js
+++ b/scripts/release/publish.js
@@ -8,6 +8,7 @@ const {getPublicPackages} = require('./utils');
 
 const checkBuildStatus = require('./publish-commands/check-build-status');
 const commitChangelog = require('./publish-commands/commit-changelog');
+const getNpmTwoFactorAuth = require('./publish-commands/get-npm-two-factor-auth');
 const parsePublishParams = require('./publish-commands/parse-publish-params');
 const printPostPublishSummary = require('./publish-commands/print-post-publish-summary');
 const pushGitRemote = require('./publish-commands/push-git-remote');
@@ -22,6 +23,7 @@ const run = async () => {
     await checkBuildStatus(params);
     await commitChangelog(params);
     await pushGitRemote(params);
+    params.otp = await getNpmTwoFactorAuth(params);
     await publishToNpm(params);
     await printPostPublishSummary(params);
   } catch (error) {
diff --git a/scripts/release/yarn.lock b/scripts/release/yarn.lock
index f2f3835bc1..44ea4e5703 100644
--- a/scripts/release/yarn.lock
+++ b/scripts/release/yarn.lock
@@ -335,6 +335,10 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+keypress@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/keypress/-/keypress-0.2.1.tgz#1e80454250018dbad4c3fe94497d6e67b6269c77"
+
 lodash.padend@^4.6.1:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e"
@@ -368,6 +372,16 @@ mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
 
+native-or-another@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/native-or-another/-/native-or-another-2.0.0.tgz#17a567f92beea9cd71acff96a7681a735eca3bff"
+  dependencies:
+    native-or-bluebird "^1.1.2"
+
+native-or-bluebird@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/native-or-bluebird/-/native-or-bluebird-1.2.0.tgz#39c47bfd7825d1fb9ffad32210ae25daadf101c9"
+
 node-version@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.1.0.tgz#f437d7ba407e65e2c4eaef8887b1718ba523d4f0"
@@ -390,6 +404,13 @@ promise-polyfill@^6.0.1:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-6.0.2.tgz#d9c86d3dc4dc2df9016e88946defd69b49b41162"
 
+prompt-promise@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/prompt-promise/-/prompt-promise-1.0.3.tgz#78ce4fcb9a14a108c49174f2d808c440d1bde265"
+  dependencies:
+    keypress "~0.2.1"
+    native-or-another "~2.0.0"
+
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"

From ff724d3c286a1753723ea71e8c046498ed1aac98 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Tue, 29 May 2018 13:30:04 -0700
Subject: [PATCH 125/277] [scheduler] 4/n Allow splitting out `schedule` in
 fb-www, prepare to fix polyfill issue internally (#12900)

* Use local references to global things inside 'scheduler'

**what is the change?:**
See title

**why make this change?:**
We want to avoid initially calling one version of an API and then later
accessing a polyfilled version.

**test plan:**
Run existing tests.

* Shim ReactScheduler for www

**what is the change?:**
In 'www' we want to reference the separate build of ReactScheduler,
which allows treating it as a separate module internally.

**why make this change?:**
We need to require the ReactScheduler before our rAF polyfill activates,
in order to customize which custom behaviors we want.

This is also a step towards being able to experiment with using it
outside of React.

**test plan:**
Ran tests, ran the build, and ran `test-build`.

* Generate a bundle for fb-www

**what is the change?:**
See title

**why make this change?:**
Splitting out the 'schedule' module allows us to load it before
polyfills kick in for rAF and other APIs.

And long term we want to split this into a separate module anyway, this
is a step towards that.

**test plan:**
I'll run the sync next week and verify that this all works. :)

* ran prettier

* fix rebase issues

* Change names of variables used for holding globals
---
 packages/react-art/src/ReactARTHostConfig.js    |  2 +-
 .../react-dom/src/client/ReactDOMHostConfig.js  |  2 +-
 packages/react-scheduler/src/ReactScheduler.js  | 12 ++++++++++--
 packages/shared/ReactScheduler.js               | 17 +++++++++++++++++
 packages/shared/forks/ReactScheduler.www.js     | 11 +++++++++++
 .../shared/requestAnimationFrameForReact.js     |  5 +++++
 scripts/rollup/bundles.js                       |  9 ++++++++-
 scripts/rollup/forks.js                         | 11 +++++++++++
 8 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 packages/shared/ReactScheduler.js
 create mode 100644 packages/shared/forks/ReactScheduler.www.js

diff --git a/packages/react-art/src/ReactARTHostConfig.js b/packages/react-art/src/ReactARTHostConfig.js
index eae266eb49..689303c086 100644
--- a/packages/react-art/src/ReactARTHostConfig.js
+++ b/packages/react-art/src/ReactARTHostConfig.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import * as ReactScheduler from 'react-scheduler';
+import * as ReactScheduler from 'shared/ReactScheduler';
 import Transform from 'art/core/transform';
 import Mode from 'art/modes/current';
 import invariant from 'fbjs/lib/invariant';
diff --git a/packages/react-dom/src/client/ReactDOMHostConfig.js b/packages/react-dom/src/client/ReactDOMHostConfig.js
index 9d06c8f268..c19a2c7425 100644
--- a/packages/react-dom/src/client/ReactDOMHostConfig.js
+++ b/packages/react-dom/src/client/ReactDOMHostConfig.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import * as ReactScheduler from 'react-scheduler';
+import * as ReactScheduler from 'shared/ReactScheduler';
 
 import * as ReactDOMComponentTree from './ReactDOMComponentTree';
 import * as ReactDOMFiberComponent from './ReactDOMFiberComponent';
diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index a17fa51128..f3dd11886b 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -44,13 +44,21 @@ export type CallbackIdType = CallbackConfigType;
 import requestAnimationFrameForReact from 'shared/requestAnimationFrameForReact';
 import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
 
+// We capture a local reference to any global, in case it gets polyfilled after
+// this module is initially evaluated.
+// We want to be using a consistent implementation.
+const Date = global.Date;
+const setTimeout = global.setTimeout;
+const clearTimeout = global.clearTimeout;
+
 const hasNativePerformanceNow =
   typeof performance === 'object' && typeof performance.now === 'function';
 
 let now;
 if (hasNativePerformanceNow) {
+  const Performance = performance;
   now = function() {
-    return performance.now();
+    return Performance.now();
   };
 } else {
   now = function() {
@@ -224,7 +232,7 @@ if (!ExecutionEnvironment.canUseDOM) {
   };
   // Assumes that we have addEventListener in this environment. Might need
   // something better for old IE.
-  window.addEventListener('message', idleTick, false);
+  global.addEventListener('message', idleTick, false);
 
   const animationTick = function(rafTime) {
     isAnimationFrameScheduled = false;
diff --git a/packages/shared/ReactScheduler.js b/packages/shared/ReactScheduler.js
new file mode 100644
index 0000000000..c65d28ecfa
--- /dev/null
+++ b/packages/shared/ReactScheduler.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+'use strict';
+import {
+  now,
+  scheduleWork,
+  cancelScheduledWork,
+} from 'react-scheduler/src/ReactScheduler';
+
+export {now, scheduleWork, cancelScheduledWork};
diff --git a/packages/shared/forks/ReactScheduler.www.js b/packages/shared/forks/ReactScheduler.www.js
new file mode 100644
index 0000000000..4f76345a1c
--- /dev/null
+++ b/packages/shared/forks/ReactScheduler.www.js
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+const {now, scheduleWork, cancelScheduledWork} = require('customSchedule');
+
+export {now, scheduleWork, cancelScheduledWork};
diff --git a/packages/shared/requestAnimationFrameForReact.js b/packages/shared/requestAnimationFrameForReact.js
index aa59610322..7d568862da 100644
--- a/packages/shared/requestAnimationFrameForReact.js
+++ b/packages/shared/requestAnimationFrameForReact.js
@@ -12,6 +12,11 @@
 import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
 import warning from 'fbjs/lib/warning';
 
+// We capture a local reference to any global, in case it gets polyfilled after
+// this module is initially evaluated.
+// We want to be using a consistent implementation.
+const requestAnimationFrame = global.requestAnimationFrame;
+
 if (__DEV__) {
   if (
     ExecutionEnvironment.canUseDOM &&
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index 5040550885..da2c1fc1ce 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -371,7 +371,14 @@ const bundles = [
   /******* React Scheduler (experimental) *******/
   {
     label: 'react-scheduler',
-    bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
+    bundleTypes: [
+      UMD_DEV,
+      UMD_PROD,
+      NODE_DEV,
+      NODE_PROD,
+      FB_WWW_DEV,
+      FB_WWW_PROD,
+    ],
     moduleType: ISOMORPHIC,
     entry: 'react-scheduler',
     global: 'ReactScheduler',
diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js
index b2d526946e..d6fcdb4d18 100644
--- a/scripts/rollup/forks.js
+++ b/scripts/rollup/forks.js
@@ -79,6 +79,7 @@ const forks = Object.freeze({
   },
 
   // This logic is forked on www to use the 'acrossTransitions' version.
+  // This will be removed soon, see internal task T29442940
   'shared/requestAnimationFrameForReact': (bundleType, entry) => {
     switch (bundleType) {
       case FB_WWW_DEV:
@@ -89,6 +90,16 @@ const forks = Object.freeze({
     }
   },
 
+  'shared/ReactScheduler': (bundleType, entry) => {
+    switch (bundleType) {
+      case FB_WWW_DEV:
+      case FB_WWW_PROD:
+        return 'shared/forks/ReactScheduler.www.js';
+      default:
+        return null;
+    }
+  },
+
   // This logic is forked on www to blacklist warnings.
   'shared/lowPriorityWarning': (bundleType, entry) => {
     switch (bundleType) {

From 79a740c6e32ca300d4e7ff55ab06de172d4237fd Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Tue, 29 May 2018 17:54:38 -0700
Subject: [PATCH 126/277] Rename variables to remove references to 'global'
 global (#12931)

**what is the change?:**
In a recent PR we were referencing some global variables and storing
local references to them.

To make things more natural, we co-opted the original name of the global
for our local reference. To make this work with Flow, we get the
original reference from 'window.requestAnimationFrame' and assign it to
'const requestAnimationFrame'.

Sometimes React is used in an environment where 'window' is not defined
- in that case we need to use something else, or hide the 'window'
reference somewhere.

We opted to use 'global' thinking that Babel transforms would fill that
in with the proper thing.

But for some of our fixtures we are not doing that transform on the
bundle.

**why make this change?:**
I want to unbreak this on master and then investigate more about what we
should do to fix this.

**test plan:**
run `yarn build` and open the fixtures.

**issue:**
https://github.com/facebook/react/issues/12930
---
 packages/react-scheduler/src/ReactScheduler.js   | 14 +++++++-------
 packages/shared/requestAnimationFrameForReact.js |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index f3dd11886b..ddcfa17a56 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -47,9 +47,9 @@ import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
 // We capture a local reference to any global, in case it gets polyfilled after
 // this module is initially evaluated.
 // We want to be using a consistent implementation.
-const Date = global.Date;
-const setTimeout = global.setTimeout;
-const clearTimeout = global.clearTimeout;
+const localDate = Date;
+const localSetTimeout = setTimeout;
+const localClearTimeout = clearTimeout;
 
 const hasNativePerformanceNow =
   typeof performance === 'object' && typeof performance.now === 'function';
@@ -62,7 +62,7 @@ if (hasNativePerformanceNow) {
   };
 } else {
   now = function() {
-    return Date.now();
+    return localDate.now();
   };
 }
 
@@ -86,7 +86,7 @@ if (!ExecutionEnvironment.canUseDOM) {
       next: null,
       prev: null,
     };
-    const timeoutId = setTimeout(() => {
+    const timeoutId = localSetTimeout(() => {
       callback({
         timeRemaining() {
           return Infinity;
@@ -101,7 +101,7 @@ if (!ExecutionEnvironment.canUseDOM) {
     const callback = callbackId.scheduledCallback;
     const timeoutId = timeoutIds.get(callback);
     timeoutIds.delete(callbackId);
-    clearTimeout(timeoutId);
+    localClearTimeout(timeoutId);
   };
 } else {
   let headOfPendingCallbacksLinkedList: CallbackConfigType | null = null;
@@ -232,7 +232,7 @@ if (!ExecutionEnvironment.canUseDOM) {
   };
   // Assumes that we have addEventListener in this environment. Might need
   // something better for old IE.
-  global.addEventListener('message', idleTick, false);
+  window.addEventListener('message', idleTick, false);
 
   const animationTick = function(rafTime) {
     isAnimationFrameScheduled = false;
diff --git a/packages/shared/requestAnimationFrameForReact.js b/packages/shared/requestAnimationFrameForReact.js
index 7d568862da..fd2d19c6b7 100644
--- a/packages/shared/requestAnimationFrameForReact.js
+++ b/packages/shared/requestAnimationFrameForReact.js
@@ -15,12 +15,12 @@ import warning from 'fbjs/lib/warning';
 // We capture a local reference to any global, in case it gets polyfilled after
 // this module is initially evaluated.
 // We want to be using a consistent implementation.
-const requestAnimationFrame = global.requestAnimationFrame;
+const localRequestAnimationFrame = requestAnimationFrame;
 
 if (__DEV__) {
   if (
     ExecutionEnvironment.canUseDOM &&
-    typeof requestAnimationFrame !== 'function'
+    typeof localRequestAnimationFrame !== 'function'
   ) {
     warning(
       false,
@@ -30,4 +30,4 @@ if (__DEV__) {
   }
 }
 
-export default requestAnimationFrame;
+export default localRequestAnimationFrame;

From e0a03c1b4d84453122c4e9d1a5e0cec52bef9066 Mon Sep 17 00:00:00 2001
From: Spyros Ioakeimidis <spyrosikmd@gmail.com>
Date: Wed, 30 May 2018 13:08:21 +0200
Subject: [PATCH 127/277] Extend input type check in selection capabilities
 (#12062) (#12135)

* Do not set selection when prior selection is undefined (#12062)

`restoreSelection` did not account for input elements that have changed
type after the commit phase. The new `text` input supported selection
but the old `email` did not and `setSelection` was incorrectly trying to
restore `null` selection state.

We also extend input type check in selection capabilities to cover cases
where input type is `search`, `tel`, `url`, or `password`.

* Add link to HTML spec for element types and selection

* Add reset button to ReplaceEmailInput

This commit adds a button to restore the original state of the
ReplaceEmailInput fixture so that it can be run multiple times without
refreshing the page.
---
 .../fixtures/text-inputs/ReplaceEmailInput.js | 40 +++++++++++++++++++
 .../components/fixtures/text-inputs/index.js  | 16 ++++++++
 .../src/client/ReactInputSelection.js         | 17 +++++++-
 3 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 fixtures/dom/src/components/fixtures/text-inputs/ReplaceEmailInput.js

diff --git a/fixtures/dom/src/components/fixtures/text-inputs/ReplaceEmailInput.js b/fixtures/dom/src/components/fixtures/text-inputs/ReplaceEmailInput.js
new file mode 100644
index 0000000000..264be16085
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/text-inputs/ReplaceEmailInput.js
@@ -0,0 +1,40 @@
+import Fixture from '../../Fixture';
+
+const React = window.React;
+
+class ReplaceEmailInput extends React.Component {
+  state = {
+    formSubmitted: false,
+  };
+
+  onReset = () => {
+    this.setState({formSubmitted: false});
+  };
+
+  onSubmit = event => {
+    event.preventDefault();
+    this.setState({formSubmitted: true});
+  };
+
+  render() {
+    return (
+      <Fixture>
+        <form className="control-box" onSubmit={this.onSubmit}>
+          <fieldset>
+            <legend>Email</legend>
+            {!this.state.formSubmitted ? (
+              <input type="email" />
+            ) : (
+              <input type="text" disabled={true} />
+            )}
+          </fieldset>
+        </form>
+        <button type="button" onClick={this.onReset}>
+          Reset
+        </button>
+      </Fixture>
+    );
+  }
+}
+
+export default ReplaceEmailInput;
diff --git a/fixtures/dom/src/components/fixtures/text-inputs/index.js b/fixtures/dom/src/components/fixtures/text-inputs/index.js
index 33639686a3..54026257fd 100644
--- a/fixtures/dom/src/components/fixtures/text-inputs/index.js
+++ b/fixtures/dom/src/components/fixtures/text-inputs/index.js
@@ -2,6 +2,7 @@ import Fixture from '../../Fixture';
 import FixtureSet from '../../FixtureSet';
 import TestCase from '../../TestCase';
 import InputTestCase from './InputTestCase';
+import ReplaceEmailInput from './ReplaceEmailInput';
 
 const React = window.React;
 
@@ -125,6 +126,21 @@ class TextInputFixtures extends React.Component {
           <InputTestCase type="url" defaultValue="" />
         </TestCase>
 
+        <TestCase
+          title="Replacing email input with text disabled input"
+          relatedIssues="12062">
+          <TestCase.Steps>
+            <li>Type "test@test.com"</li>
+            <li>Press enter</li>
+          </TestCase.Steps>
+
+          <TestCase.ExpectedResult>
+            There should be no selection-related error in the console.
+          </TestCase.ExpectedResult>
+
+          <ReplaceEmailInput />
+        </TestCase>
+
         <TestCase title="All inputs" description="General test of all inputs">
           <InputTestCase type="text" defaultValue="Text" />
           <InputTestCase type="email" defaultValue="user@example.com" />
diff --git a/packages/react-dom/src/client/ReactInputSelection.js b/packages/react-dom/src/client/ReactInputSelection.js
index 506153a118..d4b47b992c 100644
--- a/packages/react-dom/src/client/ReactInputSelection.js
+++ b/packages/react-dom/src/client/ReactInputSelection.js
@@ -22,11 +22,21 @@ function isInDocument(node) {
  * Input selection module for React.
  */
 
+/**
+ * @hasSelectionCapabilities: we get the element types that support selection
+ * from https://html.spec.whatwg.org/#do-not-apply, looking at `selectionStart`
+ * and `selectionEnd` rows.
+ */
 export function hasSelectionCapabilities(elem) {
   const nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase();
   return (
     nodeName &&
-    ((nodeName === 'input' && elem.type === 'text') ||
+    ((nodeName === 'input' &&
+      (elem.type === 'text' ||
+        elem.type === 'search' ||
+        elem.type === 'tel' ||
+        elem.type === 'url' ||
+        elem.type === 'password')) ||
       nodeName === 'textarea' ||
       elem.contentEditable === 'true')
   );
@@ -52,7 +62,10 @@ export function restoreSelection(priorSelectionInformation) {
   const priorFocusedElem = priorSelectionInformation.focusedElem;
   const priorSelectionRange = priorSelectionInformation.selectionRange;
   if (curFocusedElem !== priorFocusedElem && isInDocument(priorFocusedElem)) {
-    if (hasSelectionCapabilities(priorFocusedElem)) {
+    if (
+      priorSelectionRange !== null &&
+      hasSelectionCapabilities(priorFocusedElem)
+    ) {
       setSelection(priorFocusedElem, priorSelectionRange);
     }
 

From ae57b125c798418fb6846094cfa911530206e074 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Wed, 30 May 2018 13:12:29 -0700
Subject: [PATCH 128/277] [simple-cache-provider] Use LRU cache eviction
 (#12851)

* [simple-cache-provider] Use LRU cache eviction

Max size is hard-coded to 500. In the future, we should make this
configurable per resource.

* Evict PAGE_SIZE records from cache when max limit is reached
---
 .../src/SimpleCacheProvider.js                | 149 ++++++++++++++----
 .../src/__tests__/SimpleCacheProvider-test.js |  37 +++++
 2 files changed, 154 insertions(+), 32 deletions(-)

diff --git a/packages/simple-cache-provider/src/SimpleCacheProvider.js b/packages/simple-cache-provider/src/SimpleCacheProvider.js
index 167c0813c4..accb55f87c 100644
--- a/packages/simple-cache-provider/src/SimpleCacheProvider.js
+++ b/packages/simple-cache-provider/src/SimpleCacheProvider.js
@@ -17,43 +17,60 @@ const Pending = 1;
 const Resolved = 2;
 const Rejected = 3;
 
-type EmptyRecord = {|
+type EmptyRecord<K, V> = {|
   status: 0,
   suspender: null,
+  key: K,
   value: null,
   error: null,
+  next: Record<K, V> | null,
+  previous: Record<K, V> | null,
 |};
 
-type PendingRecord<V> = {|
+type PendingRecord<K, V> = {|
   status: 1,
-  suspender: Promise<V>,
+  suspender: Promise<K, V>,
+  key: K,
   value: null,
   error: null,
+  next: Record<K, V> | null,
+  previous: Record<K, V> | null,
 |};
 
-type ResolvedRecord<V> = {|
+type ResolvedRecord<K, V> = {|
   status: 2,
   suspender: null,
+  key: K,
   value: V,
   error: null,
+  next: Record<K, V> | null,
+  previous: Record<K, V> | null,
 |};
 
-type RejectedRecord = {|
+type RejectedRecord<K, V> = {|
   status: 3,
   suspender: null,
+  key: K,
   value: null,
   error: Error,
+  next: Record<K, V> | null,
+  previous: Record<K, V> | null,
 |};
 
-type Record<V> =
-  | EmptyRecord
-  | PendingRecord<V>
-  | ResolvedRecord<V>
-  | RejectedRecord;
+type Record<K, V> =
+  | EmptyRecord<K, V>
+  | PendingRecord<K, V>
+  | ResolvedRecord<K, V>
+  | RejectedRecord<K, V>;
+
+type RecordCache<K, V> = {|
+  map: Map<K, Record<K, V>>,
+  head: Record<K, V> | null,
+  tail: Record<K, V> | null,
+|};
 
-type RecordCache<K, V> = Map<K, Record<V>>;
 // TODO: How do you express this type with Flow?
-type ResourceCache = Map<any, RecordCache<any, any>>;
+type ResourceMap = Map<any, RecordCache<any, any>>;
 type Cache = {
   invalidate(): void,
   read<K, V, A>(
@@ -86,10 +103,35 @@ if (__DEV__) {
     value.$$typeof === CACHE_TYPE;
 }
 
-export function createCache(invalidator: () => mixed): Cache {
-  const resourceCache: ResourceCache = new Map();
+// TODO: Make this configurable per resource
+const MAX_SIZE = 500;
+const PAGE_SIZE = 50;
 
-  function getRecord<K, V>(resourceType: any, key: K): Record<V> {
+function createRecord<K, V>(key: K): EmptyRecord<K, V> {
+  return {
+    status: Empty,
+    suspender: null,
+    key,
+    value: null,
+    error: null,
+    next: null,
+    previous: null,
+  };
+}
+
+function createRecordCache<K, V>(): RecordCache<K, V> {
+  return {
+    map: new Map(),
+    head: null,
+    tail: null,
+    size: 0,
+  };
+}
+
+export function createCache(invalidator: () => mixed): Cache {
+  const resourceMap: ResourceMap = new Map();
+
+  function accessRecord<K, V>(resourceType: any, key: K): Record<V> {
     if (__DEV__) {
       warning(
         typeof resourceType !== 'string' && typeof resourceType !== 'number',
@@ -100,25 +142,68 @@ export function createCache(invalidator: () => mixed): Cache {
       );
     }
 
-    let recordCache = resourceCache.get(resourceType);
-    if (recordCache !== undefined) {
-      const record = recordCache.get(key);
-      if (record !== undefined) {
-        return record;
+    let recordCache = resourceMap.get(resourceType);
+    if (recordCache === undefined) {
+      recordCache = createRecordCache();
+      resourceMap.set(resourceType, recordCache);
+    }
+    const map = recordCache.map;
+
+    let record = map.get(key);
+    if (record === undefined) {
+      // This record does not already exist. Create a new one.
+      record = createRecord(key);
+      map.set(key, record);
+      if (recordCache.size >= MAX_SIZE) {
+        // The cache is already at maximum capacity. Remove PAGE_SIZE least
+        // recently used records.
+        // TODO: We assume the max capcity is greater than zero. Otherwise warn.
+        const tail = recordCache.tail;
+        if (tail !== null) {
+          let newTail = tail;
+          for (let i = 0; i < PAGE_SIZE && newTail !== null; i++) {
+            recordCache.size -= 1;
+            map.delete(newTail.key);
+            newTail = newTail.previous;
+          }
+          recordCache.tail = newTail;
+          if (newTail !== null) {
+            newTail.next = null;
+          }
+        }
       }
     } else {
-      recordCache = new Map();
-      resourceCache.set(resourceType, recordCache);
+      // This record is already cached. Remove it from its current position in
+      // the list. We'll add it to the front below.
+      const previous = record.previous;
+      const next = record.next;
+      if (previous !== null) {
+        previous.next = next;
+      } else {
+        recordCache.head = next;
+      }
+      if (next !== null) {
+        next.previous = previous;
+      } else {
+        recordCache.tail = previous;
+      }
+      recordCache.size -= 1;
     }
 
-    const record = {
-      status: Empty,
-      suspender: null,
-      value: null,
-      error: null,
-    };
-    recordCache.set(key, record);
-    return record;
+    // Add the record to the front of the list.
+    const head = recordCache.head;
+    const newHead = record;
+    recordCache.head = newHead;
+    newHead.previous = null;
+    newHead.next = head;
+    if (head !== null) {
+      head.previous = newHead;
+    } else {
+      recordCache.tail = newHead;
+    }
+    recordCache.size += 1;
+
+    return newHead;
   }
 
   function load<V>(emptyRecord: EmptyRecord, suspender: Promise<V>) {
@@ -154,7 +239,7 @@ export function createCache(invalidator: () => mixed): Cache {
       miss: A => Promise<V>,
       missArg: A,
     ): void {
-      const record: Record<V> = getRecord(resourceType, key);
+      const record: Record<V> = accessRecord(resourceType, key);
       switch (record.status) {
         case Empty:
           // Warm the cache.
@@ -178,7 +263,7 @@ export function createCache(invalidator: () => mixed): Cache {
       miss: A => Promise<V>,
       missArg: A,
     ): V {
-      const record: Record<V> = getRecord(resourceType, key);
+      const record: Record<V> = accessRecord(resourceType, key);
       switch (record.status) {
         case Empty:
           // Load the requested resource.
diff --git a/packages/simple-cache-provider/src/__tests__/SimpleCacheProvider-test.js b/packages/simple-cache-provider/src/__tests__/SimpleCacheProvider-test.js
index b3a1f8ff78..4d775e255c 100644
--- a/packages/simple-cache-provider/src/__tests__/SimpleCacheProvider-test.js
+++ b/packages/simple-cache-provider/src/__tests__/SimpleCacheProvider-test.js
@@ -189,4 +189,41 @@ describe('SimpleCacheProvider', () => {
       fn();
     }
   });
+
+  it('stays within maximum capacity by evicting the least recently used record', async () => {
+    const {createCache, createResource} = SimpleCacheProvider;
+
+    function loadIntegerString(int) {
+      return Promise.resolve(int + '');
+    }
+    const IntegerStringResource = createResource(loadIntegerString);
+    const cache = createCache();
+
+    // TODO: This is hard-coded to a maximum size of 500. Make this configurable
+    // per resource.
+    for (let n = 1; n <= 500; n++) {
+      IntegerStringResource.preload(cache, n);
+    }
+
+    // Access 1, 2, and 3 again. The least recently used integer is now 4.
+    IntegerStringResource.preload(cache, 3);
+    IntegerStringResource.preload(cache, 2);
+    IntegerStringResource.preload(cache, 1);
+
+    // Evict older integers from the cache by adding new ones.
+    IntegerStringResource.preload(cache, 501);
+    IntegerStringResource.preload(cache, 502);
+    IntegerStringResource.preload(cache, 503);
+
+    await Promise.resolve();
+
+    // 1, 2, and 3 should be in the cache. 4, 5, and 6 should have been evicted.
+    expect(IntegerStringResource.read(cache, 1)).toEqual('1');
+    expect(IntegerStringResource.read(cache, 2)).toEqual('2');
+    expect(IntegerStringResource.read(cache, 3)).toEqual('3');
+
+    expect(() => IntegerStringResource.read(cache, 4)).toThrow(Promise);
+    expect(() => IntegerStringResource.read(cache, 5)).toThrow(Promise);
+    expect(() => IntegerStringResource.read(cache, 6)).toThrow(Promise);
+  });
 });

From 524a74331399fd7102037c878f327afbd5e14f53 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Wed, 30 May 2018 15:31:41 -0700
Subject: [PATCH 129/277] Fix for Flow issues in SimpleCacheProvider (#12942)

* Fix for Flow issues in SimpleCacheProvider

**what is the change?:**
- Fixed some flow errors which were somehow swallowed when CI
originally
- Loosen flow types to avoid issue with recursive loop in Flow; https://github.com/facebook/flow/issues/5870

**why make this change?:**
To unbreak master and unblock other changes we want to make.

**test plan:**
Flow passes!

**issue:**
https://github.com/facebook/react/issues/12941

* Fix lints
---
 .../src/SimpleCacheProvider.js                | 63 ++++++++++++-------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/packages/simple-cache-provider/src/SimpleCacheProvider.js b/packages/simple-cache-provider/src/SimpleCacheProvider.js
index accb55f87c..b10721bd9f 100644
--- a/packages/simple-cache-provider/src/SimpleCacheProvider.js
+++ b/packages/simple-cache-provider/src/SimpleCacheProvider.js
@@ -17,24 +17,34 @@ const Pending = 1;
 const Resolved = 2;
 const Rejected = 3;
 
-type EmptyRecord<K, V> = {|
+type EmptyRecord<K> = {|
   status: 0,
   suspender: null,
   key: K,
   value: null,
   error: null,
-  next: Record<K, V> | null,
-  previous: Record<K, V> | null,
+  next: any, // TODO: (issue #12941)
+  previous: any, // TODO: (issue #12941)
+  /**
+   * Proper types would be something like this:
+   * next: Record<K, V> | null,
+   * previous: Record<K, V> | null,
+   */
 |};
 
 type PendingRecord<K, V> = {|
   status: 1,
-  suspender: Promise<K, V>,
+  suspender: Promise<V>,
   key: K,
   value: null,
   error: null,
-  next: Record<K, V> | null,
-  previous: Record<K, V> | null,
+  next: any, // TODO: (issue #12941)
+  previous: any, // TODO: (issue #12941)
+  /**
+   * Proper types would be something like this:
+   * next: Record<K, V> | null,
+   * previous: Record<K, V> | null,
+   */
 |};
 
 type ResolvedRecord<K, V> = {|
@@ -43,30 +53,41 @@ type ResolvedRecord<K, V> = {|
   key: K,
   value: V,
   error: null,
-  next: Record<K, V> | null,
-  previous: Record<K, V> | null,
+  next: any, // TODO: (issue #12941)
+  previous: any, // TODO: (issue #12941)
+  /**
+   * Proper types would be something like this:
+   * next: Record<K, V> | null,
+   * previous: Record<K, V> | null,
+   */
 |};
 
-type RejectedRecord<K, V> = {|
+type RejectedRecord<K> = {|
   status: 3,
   suspender: null,
   key: K,
   value: null,
   error: Error,
-  next: Record<K, V> | null,
-  previous: Record<K, V> | null,
+  next: any, // TODO: (issue #12941)
+  previous: any, // TODO: (issue #12941)
+  /**
+   * Proper types would be something like this:
+   * next: Record<K, V> | null,
+   * previous: Record<K, V> | null,
+   */
 |};
 
 type Record<K, V> =
-  | EmptyRecord<K, V>
+  | EmptyRecord<K>
   | PendingRecord<K, V>
   | ResolvedRecord<K, V>
-  | RejectedRecord<K, V>;
+  | RejectedRecord<K>;
 
 type RecordCache<K, V> = {|
   map: Map<K, Record<K, V>>,
   head: Record<K, V> | null,
   tail: Record<K, V> | null,
+  size: number,
 |};
 
 // TODO: How do you express this type with Flow?
@@ -107,7 +128,7 @@ if (__DEV__) {
 const MAX_SIZE = 500;
 const PAGE_SIZE = 50;
 
-function createRecord<K, V>(key: K): EmptyRecord<K, V> {
+function createRecord<K>(key: K): EmptyRecord<K> {
   return {
     status: Empty,
     suspender: null,
@@ -131,7 +152,7 @@ function createRecordCache<K, V>(): RecordCache<K, V> {
 export function createCache(invalidator: () => mixed): Cache {
   const resourceMap: ResourceMap = new Map();
 
-  function accessRecord<K, V>(resourceType: any, key: K): Record<V> {
+  function accessRecord<K, V>(resourceType: any, key: K): Record<K, V> {
     if (__DEV__) {
       warning(
         typeof resourceType !== 'string' && typeof resourceType !== 'number',
@@ -206,14 +227,14 @@ export function createCache(invalidator: () => mixed): Cache {
     return newHead;
   }
 
-  function load<V>(emptyRecord: EmptyRecord, suspender: Promise<V>) {
-    const pendingRecord: PendingRecord<V> = (emptyRecord: any);
+  function load<K, V>(emptyRecord: EmptyRecord<K>, suspender: Promise<V>) {
+    const pendingRecord: PendingRecord<K, V> = (emptyRecord: any);
     pendingRecord.status = Pending;
     pendingRecord.suspender = suspender;
     suspender.then(
       value => {
         // Resource loaded successfully.
-        const resolvedRecord: ResolvedRecord<V> = (pendingRecord: any);
+        const resolvedRecord: ResolvedRecord<K, V> = (pendingRecord: any);
         resolvedRecord.status = Resolved;
         resolvedRecord.suspender = null;
         resolvedRecord.value = value;
@@ -221,7 +242,7 @@ export function createCache(invalidator: () => mixed): Cache {
       error => {
         // Resource failed to load. Stash the error for later so we can throw it
         // the next time it's requested.
-        const rejectedRecord: RejectedRecord = (pendingRecord: any);
+        const rejectedRecord: RejectedRecord<K> = (pendingRecord: any);
         rejectedRecord.status = Rejected;
         rejectedRecord.suspender = null;
         rejectedRecord.error = error;
@@ -239,7 +260,7 @@ export function createCache(invalidator: () => mixed): Cache {
       miss: A => Promise<V>,
       missArg: A,
     ): void {
-      const record: Record<V> = accessRecord(resourceType, key);
+      const record: Record<K, V> = accessRecord(resourceType, key);
       switch (record.status) {
         case Empty:
           // Warm the cache.
@@ -263,7 +284,7 @@ export function createCache(invalidator: () => mixed): Cache {
       miss: A => Promise<V>,
       missArg: A,
     ): V {
-      const record: Record<V> = accessRecord(resourceType, key);
+      const record: Record<K, V> = accessRecord(resourceType, key);
       switch (record.status) {
         case Empty:
           // Load the requested resource.

From 3118ed9d640ad28af306de308301f4fcd029ffca Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Wed, 30 May 2018 15:31:59 -0700
Subject: [PATCH 130/277] Expose unstable_interactiveUpdates on ReactDOM
 (#12943)

---
 packages/react-dom/src/client/ReactDOM.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js
index d65f09641e..ad0fd80d51 100644
--- a/packages/react-dom/src/client/ReactDOM.js
+++ b/packages/react-dom/src/client/ReactDOM.js
@@ -730,6 +730,8 @@ const ReactDOM: Object = {
 
   unstable_deferredUpdates: DOMRenderer.deferredUpdates,
 
+  unstable_interactiveUpdates: DOMRenderer.interactiveUpdates,
+
   flushSync: DOMRenderer.flushSync,
 
   unstable_flushControlled: DOMRenderer.flushControlled,

From 15767a8f8f798f0d80df4ddbc7cfaebdc29996a8 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Wed, 30 May 2018 15:38:48 -0700
Subject: [PATCH 131/277] [scheduler] 5/n Error handling in scheduler (#12920)

* Initial failing unit test for error handling in schedule

**what is the change?:**
see title

**why make this change?:**
Adding tests for the error handling behavior we are about to add. This
test is failing, which gives us the chance to make it pass.

Wrote skeletons of some other tests to add.

Unit testing this way is really hacky, and I'm also adding to the
fixture to test this in the real browser environment.

**test plan:**
Ran new test, saw it fail!

* Add fixture for testing error handling in scheduler

**what is the change?:**
Added a fixture which does the following -
logs in the console to show what happens when you use
`requestAnimationFrame` to schedule a series of callbacks and some of
them throw errors.

Then does the same actions with the `scheduler` and verifies that it
behaves in a similar way.

Hard to really verify the errors get thrown at the proper time without
looking at the console.

**why make this change?:**
We want the most authentic, accurate test of how errors are handled in
the scheduler. That's what this fixture should be.

**test plan:**
Manually verified that this test does what I expect - right now it's
failing but follow up commits will fix that.

* Handle errors in scheduler

**what is the change?:**
We set a flag before calling any callback, and then use a 'try/finally'
block to wrap it. Note that we *do not* catch the error, if one is
thrown. But, we only unset the flag after the callback successfully
finishes.

If we reach the 'finally' block and the flag was not unset, then it
means an error was thrown.

In that case we start a new postMessage callback, to finish calling any
other pending callbacks if there is time.

**why make this change?:**
We need to make sure that an error thrown from one callback doesn't stop
other callbacks from firing, but we also don't want to catch or swallow
the error because we want engineers to still be able to log and debug
errors.

**test plan:**
New tests added are passing, and we verified that they fail without this
change.

* Add more tests for error handling in scheduler

**what is the change?:**
Added tests for more situations where error handling may come up.

**why make this change?:**
To get additional protection against this being broken in the future.

**test plan:**
Ran new tests and verified that they fail when error handling fails.

* callSafely -> callUnsafely

* Fix bugs with error handling in schedule

**what is the change?:**
- ensure that we properly remove the callback from the linked list, even
if it throws an error and is timed out.
- ensure that you can call 'cancelScheduledWork' more than once and it
is idempotent.

**why make this change?:**
To fix bugs :)

**test plan:**
Existing tests pass, and we'll add more tests in a follow up commit.

* Unit tests for error handling with timed out callbacks

**what is the change?:**
More unit tests, to cover behavior which we missed; error handling of
timed out callbacks.

**why make this change?:**
To protect the future!~

**test plan:**
Run the new tests.

* Adds fixture to test timed out callbacks with scheduler

**what is the change?:**
See title

In the other error handling fixture we compare 'scheduleWork' error
handling to 'requestAnimationFrame' and try to get as close as possible.
There is no 'timing out' feature with 'requestAnimationFrame' but
effectively the 'timing out' feature changes the order in which things
are called. So we just changed the order in the 'requestAnimationFrame'
version and that works well for illustrating the behavior we expect in
the 'scheduleWork' test.

**why make this change?:**
We need more test coverage of timed out callbacks.

**test plan:**
Executed the fixture manually in Firefox and Chrome. Results looked
good.

* fix rebase problems

* make fixture compensate for chrome JS speed

* ran prettier

* Remove 'cancelled' flag on callbackConfig in scheduler, add test

**what is the change?:**
- Instead of using a 'cancelled' flag on the callbackConfig, it's easier
to just check the state of the callbackConfig inside
'cancelScheduledWork' to determine if it's already been cancelled. That
way we don't have to remember to set the 'cancelled' flag every time we
call a callback or cancel it. One less thing to remember.
- We added a test for calling 'cancelScheduledWork' more than once,
which would have failed before.

Thanks @acdlite for suggesting this in code review. :)

**why make this change?:**
To increase stability of the schedule module, increase test coverage.

**test plan:**
Existing tests pass and we added a new test to cover this behavior.

* fix typo
---
 fixtures/schedule/index.html                  | 178 +++++++-
 .../react-scheduler/src/ReactScheduler.js     |  87 ++--
 .../src/__tests__/ReactScheduler-test.js      | 387 +++++++++++++++++-
 3 files changed, 623 insertions(+), 29 deletions(-)

diff --git a/fixtures/schedule/index.html b/fixtures/schedule/index.html
index 24fd26aee9..d5b243a3c2 100644
--- a/fixtures/schedule/index.html
+++ b/fixtures/schedule/index.html
@@ -69,6 +69,16 @@
         <div><b>Actual:</b></div>
         <div id="test-4"></div>
       </li>
+      <li>
+        <p>When some callbacks throw errors, still calls them all within the same frame</p>
+        <p><b>IMPORTANT:</b> Open the console when you run this! Inspect the logs there!</p>
+        <button onClick="runTestFive()">Run Test 5</button>
+      </li>
+      <li>
+        <p>When some callbacks throw errors <b> and some also time out</b>, still calls them all within the same frame</p>
+        <p><b>IMPORTANT:</b> Open the console when you run this! Inspect the logs there!</p>
+        <button onClick="runTestSix()">Run Test 6</button>
+      </li>
     </ol>
     <script src="../../build/dist/react-scheduler.development.js"></script>
     <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
@@ -134,6 +144,9 @@ const latestResults = [
   // test 4
   [
   ],
+  // test 5
+  [
+  ],
 ];
 
 const expectedResults = [
@@ -182,6 +195,10 @@ const expectedResults = [
     'cbD called with argument of {"didTimeout":false}',
     'frame 3 started... we stop counting now.',
   ],
+  // test 5
+  [
+    // ... TODO
+  ],
 ];
 function runTestOne() {
   // Test 1
@@ -276,7 +293,7 @@ function runTestFour() {
   updateTestResult(4, 'scheduled cbA');
   scheduleWork(cbB, {timeout: 100}); // times out later
   updateTestResult(4, 'scheduled cbB');
-  scheduleWork(cbC, {timeout: 2}); // will time out fast
+  scheduleWork(cbC, {timeout: 1}); // will time out fast
   updateTestResult(4, 'scheduled cbC');
   scheduleWork(cbD); // won't time out
   updateTestResult(4, 'scheduled cbD');
@@ -287,6 +304,165 @@ function runTestFour() {
     displayTestResult(4);
     checkTestResult(4);
   });
+
+}
+
+// Error handling
+
+function runTestFive() {
+  // Test 5
+  // When some callbacks throw errors, still calls them all within the same frame
+  const cbA = (x) => {
+    console.log('cbA called with argument of ' + JSON.stringify(x));
+  }
+  const cbB = (x) => {
+    console.log('cbB called with argument of ' + JSON.stringify(x));
+    console.log('cbB is about to throw an error!');
+    throw new Error('error B');
+  }
+  const cbC = (x) => {
+    console.log('cbC called with argument of ' + JSON.stringify(x));
+  }
+  const cbD = (x) => {
+    console.log('cbD called with argument of ' + JSON.stringify(x));
+    console.log('cbD is about to throw an error!');
+    throw new Error('error D');
+  }
+  const cbE = (x) => {
+    console.log('cbE called with argument of ' + JSON.stringify(x));
+    console.log('This was the last callback! ------------------');
+  }
+
+  console.log('We are aiming to roughly emulate the way ' +
+  '`requestAnimationFrame` handles errors from callbacks.');
+
+  console.log('about to run the simulation of what it should look like...:');
+
+  requestAnimationFrame(() => {
+    console.log('frame 1 started');
+    requestAnimationFrame(() => {
+      console.log('frame 2 started');
+      requestAnimationFrame(() => {
+        console.log('frame 3 started... we stop counting now.');
+        console.log('about to wait a moment and start this again but ' +
+        'with the scheduler instead of requestAnimationFrame');
+        setTimeout(runSchedulerCode, 1000);
+      });
+    });
+  });
+  requestAnimationFrame(cbA);
+  console.log('scheduled cbA');
+  requestAnimationFrame(cbB); // will throw error
+  console.log('scheduled cbB');
+  requestAnimationFrame(cbC);
+  console.log('scheduled cbC');
+  requestAnimationFrame(cbD); // will throw error
+  console.log('scheduled cbD');
+  requestAnimationFrame(cbE);
+  console.log('scheduled cbE');
+
+
+  function runSchedulerCode() {
+    console.log('-------------------------------------------------------------');
+    console.log('now lets see what it looks like using the scheduler...:');
+    requestAnimationFrame(() => {
+      console.log('frame 1 started');
+      requestAnimationFrame(() => {
+        console.log('frame 2 started');
+        requestAnimationFrame(() => {
+          console.log('frame 3 started... we stop counting now.');
+        });
+      });
+    });
+    scheduleWork(cbA);
+    console.log('scheduled cbA');
+    scheduleWork(cbB); // will throw error
+    console.log('scheduled cbB');
+    scheduleWork(cbC);
+    console.log('scheduled cbC');
+    scheduleWork(cbD); // will throw error
+    console.log('scheduled cbD');
+    scheduleWork(cbE);
+    console.log('scheduled cbE');
+  };
+}
+
+function runTestSix() {
+  // Test 6
+  // When some callbacks throw errors, still calls them all within the same frame
+  const cbA = (x) => {
+    console.log('cbA called with argument of ' + JSON.stringify(x));
+    console.log('cbA is about to throw an error!');
+    throw new Error('error A');
+  }
+  const cbB = (x) => {
+    console.log('cbB called with argument of ' + JSON.stringify(x));
+  }
+  const cbC = (x) => {
+    console.log('cbC called with argument of ' + JSON.stringify(x));
+  }
+  const cbD = (x) => {
+    console.log('cbD called with argument of ' + JSON.stringify(x));
+    console.log('cbD is about to throw an error!');
+    throw new Error('error D');
+  }
+  const cbE = (x) => {
+    console.log('cbE called with argument of ' + JSON.stringify(x));
+    console.log('This was the last callback! ------------------');
+  }
+
+  console.log('We are aiming to roughly emulate the way ' +
+  '`requestAnimationFrame` handles errors from callbacks.');
+
+  console.log('about to run the simulation of what it should look like...:');
+
+  requestAnimationFrame(() => {
+    console.log('frame 1 started');
+    requestAnimationFrame(() => {
+      console.log('frame 2 started');
+      requestAnimationFrame(() => {
+        console.log('frame 3 started... we stop counting now.');
+        console.log('about to wait a moment and start this again but ' +
+        'with the scheduler instead of requestAnimationFrame');
+        setTimeout(runSchedulerCode, 1000);
+      });
+    });
+  });
+  requestAnimationFrame(cbC);
+  console.log('scheduled cbC first; simulating timing out');
+  requestAnimationFrame(cbD); // will throw error
+  console.log('scheduled cbD first; simulating timing out');
+  requestAnimationFrame(cbE);
+  console.log('scheduled cbE first; simulating timing out');
+  requestAnimationFrame(cbA);
+  console.log('scheduled cbA'); // will throw error
+  requestAnimationFrame(cbB);
+  console.log('scheduled cbB');
+
+
+  function runSchedulerCode() {
+    console.log('-------------------------------------------------------------');
+    console.log('now lets see what it looks like using the scheduler...:');
+    requestAnimationFrame(() => {
+      console.log('frame 1 started');
+      requestAnimationFrame(() => {
+        console.log('frame 2 started');
+        requestAnimationFrame(() => {
+          console.log('frame 3 started... we stop counting now.');
+        });
+      });
+    });
+    scheduleWork(cbA);
+    console.log('scheduled cbA');
+    scheduleWork(cbB); // will throw error
+    console.log('scheduled cbB');
+    scheduleWork(cbC, {timeout: 1});
+    console.log('scheduled cbC');
+    scheduleWork(cbD, {timeout: 1}); // will throw error
+    console.log('scheduled cbD');
+    scheduleWork(cbE, {timeout: 1});
+    console.log('scheduled cbE');
+  };
 }
     </script type="text/babel">
   </body>
diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index ddcfa17a56..cd21d1c3fc 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -129,6 +129,33 @@ if (!ExecutionEnvironment.canUseDOM) {
     },
   };
 
+  /**
+   * Handles the case where a callback errors:
+   * - don't catch the error, because this changes debugging behavior
+   * - do start a new postMessage callback, to call any remaining callbacks,
+   * - but only if there is an error, so there is not extra overhead.
+   */
+  const callUnsafely = function(
+    callbackConfig: CallbackConfigType,
+    arg: Deadline,
+  ) {
+    const callback = callbackConfig.scheduledCallback;
+    let finishedCalling = false;
+    try {
+      callback(arg);
+      finishedCalling = true;
+    } finally {
+      // always remove it from linked list
+      cancelScheduledWork(callbackConfig);
+
+      if (!finishedCalling) {
+        // an error must have been thrown
+        isIdleScheduled = true;
+        window.postMessage(messageKey, '*');
+      }
+    }
+  };
+
   /**
    * Checks for timed out callbacks, runs them, and then checks again to see if
    * any more have timed out.
@@ -152,32 +179,42 @@ if (!ExecutionEnvironment.canUseDOM) {
       // We know that none of them have timed out yet.
       return;
     }
-    nextSoonestTimeoutTime = -1; // we will reset it below
+    // NOTE: we intentionally wait to update the nextSoonestTimeoutTime until
+    // after successfully calling any timed out callbacks.
+    // If a timed out callback throws an error, we could get stuck in a state
+    // where the nextSoonestTimeoutTime was set wrong.
+    let updatedNextSoonestTimeoutTime = -1; // we will update nextSoonestTimeoutTime below
+    const timedOutCallbacks = [];
 
-    // keep checking until we don't find any more timed out callbacks
-    frameDeadlineObject.didTimeout = true;
+    // iterate once to find timed out callbacks and find nextSoonestTimeoutTime
     let currentCallbackConfig = headOfPendingCallbacksLinkedList;
     while (currentCallbackConfig !== null) {
       const timeoutTime = currentCallbackConfig.timeoutTime;
       if (timeoutTime !== -1 && timeoutTime <= currentTime) {
         // it has timed out!
-        // call it
-        const callback = currentCallbackConfig.scheduledCallback;
-        // TODO: error handling
-        callback(frameDeadlineObject);
-        // remove it from linked list
-        cancelScheduledWork(currentCallbackConfig);
+        timedOutCallbacks.push(currentCallbackConfig);
       } else {
         if (
           timeoutTime !== -1 &&
-          (nextSoonestTimeoutTime === -1 ||
-            timeoutTime < nextSoonestTimeoutTime)
+          (updatedNextSoonestTimeoutTime === -1 ||
+            timeoutTime < updatedNextSoonestTimeoutTime)
         ) {
-          nextSoonestTimeoutTime = timeoutTime;
+          updatedNextSoonestTimeoutTime = timeoutTime;
         }
       }
       currentCallbackConfig = currentCallbackConfig.next;
     }
+
+    if (timedOutCallbacks.length > 0) {
+      frameDeadlineObject.didTimeout = true;
+      for (let i = 0, len = timedOutCallbacks.length; i < len; i++) {
+        callUnsafely(timedOutCallbacks[i], frameDeadlineObject);
+      }
+    }
+
+    // NOTE: we intentionally wait to update the nextSoonestTimeoutTime until
+    // after successfully calling any timed out callbacks.
+    nextSoonestTimeoutTime = updatedNextSoonestTimeoutTime;
   };
 
   // We use the postMessage trick to defer idle work until after the repaint.
@@ -206,20 +243,9 @@ if (!ExecutionEnvironment.canUseDOM) {
       headOfPendingCallbacksLinkedList !== null
     ) {
       const latestCallbackConfig = headOfPendingCallbacksLinkedList;
-      // move head of list to next callback
-      headOfPendingCallbacksLinkedList = latestCallbackConfig.next;
-      if (headOfPendingCallbacksLinkedList !== null) {
-        headOfPendingCallbacksLinkedList.prev = null;
-      } else {
-        // if headOfPendingCallbacksLinkedList is null,
-        // then the list must be empty.
-        // make sure we set the tail to null as well.
-        tailOfPendingCallbacksLinkedList = null;
-      }
       frameDeadlineObject.didTimeout = false;
-      const latestCallback = latestCallbackConfig.scheduledCallback;
-      // TODO: before using this outside of React we need to add error handling
-      latestCallback(frameDeadlineObject);
+      // callUnsafely will remove it from the head of the linked list
+      callUnsafely(latestCallbackConfig, frameDeadlineObject);
       currentTime = now();
     }
     if (headOfPendingCallbacksLinkedList !== null) {
@@ -315,6 +341,15 @@ if (!ExecutionEnvironment.canUseDOM) {
   cancelScheduledWork = function(
     callbackConfig: CallbackIdType /* CallbackConfigType */,
   ) {
+    if (
+      callbackConfig.prev === null &&
+      headOfPendingCallbacksLinkedList !== callbackConfig
+    ) {
+      // this callbackConfig has already been cancelled.
+      // cancelScheduledWork should be idempotent, a no-op after first call.
+      return;
+    }
+
     /**
      * There are four possible cases:
      * - Head/nodeToRemove/Tail -> null
@@ -331,6 +366,8 @@ if (!ExecutionEnvironment.canUseDOM) {
      */
     const next = callbackConfig.next;
     const prev = callbackConfig.prev;
+    callbackConfig.next = null;
+    callbackConfig.prev = null;
     if (next !== null) {
       // we have a next
 
diff --git a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
index 88c49289fd..7cc6a9f279 100644
--- a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
+++ b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
@@ -20,6 +20,8 @@ describe('ReactScheduler', () => {
   let rAFCallbacks = [];
   let postMessageCallback;
   let postMessageEvents = [];
+  let postMessageErrors = [];
+  let catchPostMessageErrors = false;
 
   function runPostMessageCallbacks(config: FrameTimeoutConfigType) {
     let timeLeftInFrame = 0;
@@ -31,7 +33,17 @@ describe('ReactScheduler', () => {
     currentTime = startOfLatestFrame + frameSize - timeLeftInFrame;
     if (postMessageCallback) {
       while (postMessageEvents.length) {
-        postMessageCallback(postMessageEvents.shift());
+        if (catchPostMessageErrors) {
+          // catch errors for testing error handling
+          try {
+            postMessageCallback(postMessageEvents.shift());
+          } catch (e) {
+            postMessageErrors.push(e);
+          }
+        } else {
+          // we are not expecting errors
+          postMessageCallback(postMessageEvents.shift());
+        }
       }
     }
   }
@@ -64,6 +76,7 @@ describe('ReactScheduler', () => {
     const originalAddEventListener = global.addEventListener;
     postMessageCallback = null;
     postMessageEvents = [];
+    postMessageErrors = [];
     global.addEventListener = function(eventName, callback, useCapture) {
       if (eventName === 'message') {
         postMessageCallback = callback;
@@ -280,8 +293,6 @@ describe('ReactScheduler', () => {
 
       describe('when there is some time left in the frame', () => {
         it('calls timed out callbacks and then any more pending callbacks, defers others if time runs out', () => {
-          // TODO first call timed out callbacks
-          // then any non-timed out callbacks if there is time
           const {scheduleWork} = ReactScheduler;
           startOfLatestFrame = 1000000000000;
           currentTime = startOfLatestFrame - 10;
@@ -340,6 +351,27 @@ describe('ReactScheduler', () => {
     });
 
     describe('with multiple callbacks', () => {
+      it('when called more than once', () => {
+        const {scheduleWork, cancelScheduledWork} = ReactScheduler;
+        const callbackLog = [];
+        const callbackA = jest.fn(() => callbackLog.push('A'));
+        const callbackB = jest.fn(() => callbackLog.push('B'));
+        const callbackC = jest.fn(() => callbackLog.push('C'));
+        scheduleWork(callbackA);
+        const callbackId = scheduleWork(callbackB);
+        scheduleWork(callbackC);
+        cancelScheduledWork(callbackId);
+        cancelScheduledWork(callbackId);
+        cancelScheduledWork(callbackId);
+        // Initially doesn't call anything
+        expect(callbackLog).toEqual([]);
+        advanceOneFrame({timeLeftInFrame: 15});
+
+        // Should still call A and C
+        expect(callbackLog).toEqual(['A', 'C']);
+        expect(callbackB).toHaveBeenCalledTimes(0);
+      });
+
       it('when one callback cancels the next one', () => {
         const {scheduleWork, cancelScheduledWork} = ReactScheduler;
         const callbackLog = [];
@@ -361,5 +393,354 @@ describe('ReactScheduler', () => {
     });
   });
 
+  describe('when callbacks throw errors', () => {
+    describe('when some callbacks throw', () => {
+      /**
+       * +                                                             +
+       * |  rAF                        postMessage                     |
+       * |                                                             |
+       * |      +---------------------+                                |
+       * |      | paint/layout        |  cbA() cbB() cbC() cbD() cbE() |
+       * |      +---------------------+         ^           ^          |
+       * |                                      |           |          |
+       * +                                      |           |          +
+       *                                        +           +
+       *                                        throw errors
+       *
+       *
+       */
+      it('still calls all callbacks within same frame', () => {
+        const {scheduleWork} = ReactScheduler;
+        const callbackLog = [];
+        const callbackA = jest.fn(() => callbackLog.push('A'));
+        const callbackB = jest.fn(() => {
+          callbackLog.push('B');
+          throw new Error('B error');
+        });
+        const callbackC = jest.fn(() => callbackLog.push('C'));
+        const callbackD = jest.fn(() => {
+          callbackLog.push('D');
+          throw new Error('D error');
+        });
+        const callbackE = jest.fn(() => callbackLog.push('E'));
+        scheduleWork(callbackA);
+        scheduleWork(callbackB);
+        scheduleWork(callbackC);
+        scheduleWork(callbackD);
+        scheduleWork(callbackE);
+        // Initially doesn't call anything
+        expect(callbackLog).toEqual([]);
+        catchPostMessageErrors = true;
+        advanceOneFrame({timeLeftInFrame: 15});
+        // calls all callbacks
+        expect(callbackLog).toEqual(['A', 'B', 'C', 'D', 'E']);
+        // errors should still get thrown
+        const postMessageErrorMessages = postMessageErrors.map(e => e.message);
+        expect(postMessageErrorMessages).toEqual(['B error', 'D error']);
+        catchPostMessageErrors = false;
+      });
+
+      /**
+       *                                               timed out
+       *                                               +     +  +--+
+       *  +  rAF                        postMessage    |     |     |    +
+       *  |                                            |     |     |    |
+       *  |      +---------------------+               v     v     v    |
+       *  |      | paint/layout        |  cbA() cbB() cbC() cbD() cbE() |
+       *  |      +---------------------+   ^                 ^          |
+       *  |                                |                 |          |
+       *  +                                |                 |          +
+       *                                   +                 +
+       *                                   throw errors
+       *
+       *
+       */
+      it('and with some timed out callbacks, still calls all callbacks within same frame', () => {
+        const {scheduleWork} = ReactScheduler;
+        const callbackLog = [];
+        const callbackA = jest.fn(() => {
+          callbackLog.push('A');
+          throw new Error('A error');
+        });
+        const callbackB = jest.fn(() => callbackLog.push('B'));
+        const callbackC = jest.fn(() => callbackLog.push('C'));
+        const callbackD = jest.fn(() => {
+          callbackLog.push('D');
+          throw new Error('D error');
+        });
+        const callbackE = jest.fn(() => callbackLog.push('E'));
+        scheduleWork(callbackA);
+        scheduleWork(callbackB);
+        scheduleWork(callbackC, {timeout: 2}); // times out fast
+        scheduleWork(callbackD, {timeout: 2}); // times out fast
+        scheduleWork(callbackE, {timeout: 2}); // times out fast
+        // Initially doesn't call anything
+        expect(callbackLog).toEqual([]);
+        catchPostMessageErrors = true;
+        advanceOneFrame({timeLeftInFrame: 15});
+        // calls all callbacks; calls timed out ones first
+        expect(callbackLog).toEqual(['C', 'D', 'E', 'A', 'B']);
+        // errors should still get thrown
+        const postMessageErrorMessages = postMessageErrors.map(e => e.message);
+        expect(postMessageErrorMessages).toEqual(['D error', 'A error']);
+        catchPostMessageErrors = false;
+      });
+    });
+    describe('when all scheduled callbacks throw', () => {
+      /**
+       * +                                                             +
+       * |  rAF                        postMessage                     |
+       * |                                                             |
+       * |      +---------------------+                                |
+       * |      | paint/layout        |  cbA() cbB() cbC() cbD() cbE() |
+       * |      +---------------------+   ^     ^     ^     ^     ^    |
+       * |                                |     |     |     |     |    |
+       * +                                |     |     |     |     |    +
+       *                                  |     +     +     +     +
+       *                                  + all callbacks throw errors
+       *
+       *
+       */
+      it('still calls all callbacks within same frame', () => {
+        const {scheduleWork} = ReactScheduler;
+        const callbackLog = [];
+        const callbackA = jest.fn(() => {
+          callbackLog.push('A');
+          throw new Error('A error');
+        });
+        const callbackB = jest.fn(() => {
+          callbackLog.push('B');
+          throw new Error('B error');
+        });
+        const callbackC = jest.fn(() => {
+          callbackLog.push('C');
+          throw new Error('C error');
+        });
+        const callbackD = jest.fn(() => {
+          callbackLog.push('D');
+          throw new Error('D error');
+        });
+        const callbackE = jest.fn(() => {
+          callbackLog.push('E');
+          throw new Error('E error');
+        });
+        scheduleWork(callbackA);
+        scheduleWork(callbackB);
+        scheduleWork(callbackC);
+        scheduleWork(callbackD);
+        scheduleWork(callbackE);
+        // Initially doesn't call anything
+        expect(callbackLog).toEqual([]);
+        catchPostMessageErrors = true;
+        advanceOneFrame({timeLeftInFrame: 15});
+        // calls all callbacks
+        expect(callbackLog).toEqual(['A', 'B', 'C', 'D', 'E']);
+        // errors should still get thrown
+        const postMessageErrorMessages = postMessageErrors.map(e => e.message);
+        expect(postMessageErrorMessages).toEqual([
+          'A error',
+          'B error',
+          'C error',
+          'D error',
+          'E error',
+        ]);
+        catchPostMessageErrors = false;
+      });
+
+      /**
+       *                                  postMessage
+       *  +                                                             +
+       *  |  rAF                               all callbacks time out   |
+       *  |                                                             |
+       *  |      +---------------------+                                |
+       *  |      | paint/layout        |  cbA() cbB() cbC() cbD() cbE() |
+       *  |      +---------------------+   ^     ^     ^     ^     ^    |
+       *  |                                |     |     |     |     |    |
+       *  +                                |     |     |     |     |    +
+       *                                   |     +     +     +     +
+       *                                   + all callbacks throw errors
+       *
+       *
+       */
+      it('and with all timed out callbacks, still calls all callbacks within same frame', () => {
+        const {scheduleWork} = ReactScheduler;
+        const callbackLog = [];
+        const callbackA = jest.fn(() => {
+          callbackLog.push('A');
+          throw new Error('A error');
+        });
+        const callbackB = jest.fn(() => {
+          callbackLog.push('B');
+          throw new Error('B error');
+        });
+        const callbackC = jest.fn(() => {
+          callbackLog.push('C');
+          throw new Error('C error');
+        });
+        const callbackD = jest.fn(() => {
+          callbackLog.push('D');
+          throw new Error('D error');
+        });
+        const callbackE = jest.fn(() => {
+          callbackLog.push('E');
+          throw new Error('E error');
+        });
+        scheduleWork(callbackA, {timeout: 2}); // times out fast
+        scheduleWork(callbackB, {timeout: 2}); // times out fast
+        scheduleWork(callbackC, {timeout: 2}); // times out fast
+        scheduleWork(callbackD, {timeout: 2}); // times out fast
+        scheduleWork(callbackE, {timeout: 2}); // times out fast
+        // Initially doesn't call anything
+        expect(callbackLog).toEqual([]);
+        catchPostMessageErrors = true;
+        advanceOneFrame({timeLeftInFrame: 15});
+        // calls all callbacks
+        expect(callbackLog).toEqual(['A', 'B', 'C', 'D', 'E']);
+        // errors should still get thrown
+        const postMessageErrorMessages = postMessageErrors.map(e => e.message);
+        expect(postMessageErrorMessages).toEqual([
+          'A error',
+          'B error',
+          'C error',
+          'D error',
+          'E error',
+        ]);
+        catchPostMessageErrors = false;
+      });
+    });
+    describe('when callbacks throw over multiple frames', () => {
+      /**
+       *
+       * **Detail View of Frame 1**
+       *
+       * +                                            +
+       * |  rAF                        postMessage    |
+       * |                                            |
+       * |      +---------------------+               |
+       * |      | paint/layout        |  cbA() cbB()  |  ... Frame 2
+       * |      +---------------------+   ^     ^     |
+       * |                                |     |     |
+       * +                                +     |     +
+       *                              errors    |
+       *                                        +
+       *                                 takes long time
+       *                                 and pushes rest of
+       *                                 callbacks into
+       *                                 next frame ->
+       *
+       *
+       *
+       * **Overview of frames 1-4**
+       *
+       *
+       *  +            +            +            +            +
+       *  |            |            |            |            |
+       *  |  +--+      |  +--+      |  +--+      |  +--+      |
+       *  |  +--+  A,B+-> +--+  C,D+-> +--+  E,F+-> +--+  G   |
+       *  +        ^   +        ^   +        ^   +            +
+       *           |            |            |
+       *          error        error        error
+       *
+       *
+       */
+      it('still calls all callbacks within same frame', () => {
+        const {scheduleWork} = ReactScheduler;
+        startOfLatestFrame = 1000000000000;
+        currentTime = startOfLatestFrame - 10;
+        catchPostMessageErrors = true;
+        const callbackLog = [];
+        const callbackA = jest.fn(() => {
+          callbackLog.push('A');
+          throw new Error('A error');
+        });
+        const callbackB = jest.fn(() => {
+          callbackLog.push('B');
+          // time passes, causing us to run out of idle time
+          currentTime += 25;
+        });
+        const callbackC = jest.fn(() => {
+          callbackLog.push('C');
+          throw new Error('C error');
+        });
+        const callbackD = jest.fn(() => {
+          callbackLog.push('D');
+          // time passes, causing us to run out of idle time
+          currentTime += 25;
+        });
+        const callbackE = jest.fn(() => {
+          callbackLog.push('E');
+          throw new Error('E error');
+        });
+        const callbackF = jest.fn(() => {
+          callbackLog.push('F');
+          // time passes, causing us to run out of idle time
+          currentTime += 25;
+        });
+        const callbackG = jest.fn(() => callbackLog.push('G'));
+
+        scheduleWork(callbackA);
+        scheduleWork(callbackB);
+        scheduleWork(callbackC);
+        scheduleWork(callbackD);
+        scheduleWork(callbackE);
+        scheduleWork(callbackF);
+        scheduleWork(callbackG);
+
+        // does nothing initially
+        expect(callbackLog).toEqual([]);
+
+        // frame 1;
+        // callback A runs and throws, callback B takes up rest of frame
+        advanceOneFrame({timeLeftInFrame: 15}); // runs rAF and postMessage callbacks
+
+        // calls A and B
+        expect(callbackLog).toEqual(['A', 'B']);
+        // error was thrown from A
+        let postMessageErrorMessages = postMessageErrors.map(e => e.message);
+        expect(postMessageErrorMessages).toEqual(['A error']);
+
+        // frame 2;
+        // callback C runs and throws, callback D takes up rest of frame
+        advanceOneFrame({timeLeftInFrame: 15}); // runs rAF and postMessage callbacks
+
+        // calls C and D
+        expect(callbackLog).toEqual(['A', 'B', 'C', 'D']);
+        // error was thrown from A
+        postMessageErrorMessages = postMessageErrors.map(e => e.message);
+        expect(postMessageErrorMessages).toEqual(['A error', 'C error']);
+
+        // frame 3;
+        // callback E runs and throws, callback F takes up rest of frame
+        advanceOneFrame({timeLeftInFrame: 15}); // runs rAF and postMessage callbacks
+
+        // calls E and F
+        expect(callbackLog).toEqual(['A', 'B', 'C', 'D', 'E', 'F']);
+        // error was thrown from A
+        postMessageErrorMessages = postMessageErrors.map(e => e.message);
+        expect(postMessageErrorMessages).toEqual([
+          'A error',
+          'C error',
+          'E error',
+        ]);
+
+        // frame 4;
+        // callback G runs and it's the last one
+        advanceOneFrame({timeLeftInFrame: 15}); // runs rAF and postMessage callbacks
+
+        // calls G
+        expect(callbackLog).toEqual(['A', 'B', 'C', 'D', 'E', 'F', 'G']);
+        // error was thrown from A
+        postMessageErrorMessages = postMessageErrors.map(e => e.message);
+        expect(postMessageErrorMessages).toEqual([
+          'A error',
+          'C error',
+          'E error',
+        ]);
+
+        catchPostMessageErrors = true;
+      });
+    });
+  });
+
   // TODO: test 'now'
 });

From 65ab53694f6edf4437034d5644a602dea162e249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?=
 <165856+hramos@users.noreply.github.com>
Date: Thu, 31 May 2018 13:36:55 -0700
Subject: [PATCH 132/277] Update token (#12956)

---
 scripts/tasks/danger.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/tasks/danger.js b/scripts/tasks/danger.js
index ad61424e9e..5243f0c19a 100644
--- a/scripts/tasks/danger.js
+++ b/scripts/tasks/danger.js
@@ -12,8 +12,8 @@ const spawn = require('child_process').spawn;
 
 const extension = process.platform === 'win32' ? '.cmd' : '';
 
-// Facebook-Open-Source-Bot public_repo token
-const token = 'b186c9a82bab3b08ec80' + 'c0818117619eec6f281a';
+// React-Linter public_repo token (this is publicly visible on purpose)
+const token = '80aa64c50f38a267e9ba' + '575d41d528f9c234edb8';
 spawn(path.join('node_modules', '.bin', 'danger-ci' + extension), [], {
   // Allow colors to pass through
   stdio: 'inherit',

From 36546b5137e9012ebdc62fc9ec11e3518c9e0aab Mon Sep 17 00:00:00 2001
From: Maxime Nory <maximenory@yahoo.fr>
Date: Thu, 31 May 2018 23:23:26 +0200
Subject: [PATCH 133/277] Set the correct initial value on input range (#12939)

* Set the correct initial value on input range

* Add description and update value diff check for input range

* add isHydrating argument and tests

* update node value according to isHydrating
---
 .../ReactDOMServerIntegrationForms-test.js    | 30 +++++++++++++++++--
 .../src/client/ReactDOMFiberComponent.js      |  4 +--
 .../src/client/ReactDOMFiberInput.js          |  8 +++--
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js
index fc4594261e..2d873d20c6 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js
@@ -348,9 +348,13 @@ describe('ReactDOMServerIntegration', () => {
         ControlledSelect;
       beforeEach(() => {
         ControlledInput = class extends React.Component {
+          static defaultProps = {
+            type: 'text',
+            initialValue: 'Hello',
+          };
           constructor() {
-            super();
-            this.state = {value: 'Hello'};
+            super(...arguments);
+            this.state = {value: this.props.initialValue};
           }
           handleChange(event) {
             if (this.props.onChange) {
@@ -361,6 +365,7 @@ describe('ReactDOMServerIntegration', () => {
           render() {
             return (
               <input
+                type={this.props.type}
                 value={this.state.value}
                 onChange={this.handleChange.bind(this)}
               />
@@ -551,6 +556,27 @@ describe('ReactDOMServerIntegration', () => {
           expect(changeCount).toBe(0);
         });
 
+        it('should not blow away user-interaction on successful reconnect to an uncontrolled range input', () =>
+          testUserInteractionBeforeClientRender(
+            <input type="text" defaultValue="0.5" />,
+            '0.5',
+            '1',
+          ));
+
+        it('should not blow away user-interaction on successful reconnect to a controlled range input', async () => {
+          let changeCount = 0;
+          await testUserInteractionBeforeClientRender(
+            <ControlledInput
+              type="range"
+              initialValue="0.25"
+              onChange={() => changeCount++}
+            />,
+            '0.25',
+            '1',
+          );
+          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} />,
diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js
index 3c9e802b6e..e089b33098 100644
--- a/packages/react-dom/src/client/ReactDOMFiberComponent.js
+++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js
@@ -530,7 +530,7 @@ export function setInitialProperties(
       // TODO: Make sure we check if this is still unmounted or do any clean
       // up necessary since we never stop tracking anymore.
       inputValueTracking.track((domElement: any));
-      ReactDOMFiberInput.postMountWrapper(domElement, rawProps);
+      ReactDOMFiberInput.postMountWrapper(domElement, rawProps, false);
       break;
     case 'textarea':
       // TODO: Make sure we check if this is still unmounted or do any clean
@@ -1077,7 +1077,7 @@ export function diffHydratedProperties(
       // TODO: Make sure we check if this is still unmounted or do any clean
       // up necessary since we never stop tracking anymore.
       inputValueTracking.track((domElement: any));
-      ReactDOMFiberInput.postMountWrapper(domElement, rawProps);
+      ReactDOMFiberInput.postMountWrapper(domElement, rawProps, true);
       break;
     case 'textarea':
       // TODO: Make sure we check if this is still unmounted or do any clean
diff --git a/packages/react-dom/src/client/ReactDOMFiberInput.js b/packages/react-dom/src/client/ReactDOMFiberInput.js
index 475b444b55..9483279516 100644
--- a/packages/react-dom/src/client/ReactDOMFiberInput.js
+++ b/packages/react-dom/src/client/ReactDOMFiberInput.js
@@ -205,7 +205,11 @@ export function updateWrapper(element: Element, props: Object) {
   }
 }
 
-export function postMountWrapper(element: Element, props: Object) {
+export function postMountWrapper(
+  element: Element,
+  props: Object,
+  isHydrating: boolean,
+) {
   const node = ((element: any): InputWithWrapperState);
 
   if (props.hasOwnProperty('value') || props.hasOwnProperty('defaultValue')) {
@@ -214,7 +218,7 @@ export function postMountWrapper(element: Element, props: Object) {
 
     // Do not assign value if it is already set. This prevents user text input
     // from being lost during SSR hydration.
-    if (currentValue === '') {
+    if (!isHydrating) {
       // Do not re-assign the value property if there is no change. This
       // potentially avoids a DOM write and prevents Firefox (~60.0.1) from
       // prematurely marking required inputs as invalid

From c5a733e1e3ffa74bc6bbc769f1b13ecff9915763 Mon Sep 17 00:00:00 2001
From: Ende93 <ende93@hotmail.com>
Date: Tue, 5 Jun 2018 20:03:03 +0800
Subject: [PATCH 134/277] Fix links of docs on the comment (#12795)

---
 packages/react/src/ReactChildren.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/react/src/ReactChildren.js b/packages/react/src/ReactChildren.js
index 635db9c8a0..b99056b439 100644
--- a/packages/react/src/ReactChildren.js
+++ b/packages/react/src/ReactChildren.js
@@ -264,7 +264,7 @@ function forEachSingleChild(bookKeeping, child, name) {
 /**
  * Iterates through children that are typically specified as `props.children`.
  *
- * See https://reactjs.org/docs/react-api.html#react.children.foreach
+ * See https://reactjs.org/docs/react-api.html#reactchildrenforeach
  *
  * The provided forEachFunc(child, index) will be called for each
  * leaf child.
@@ -333,7 +333,7 @@ function mapIntoWithKeyPrefixInternal(children, array, prefix, func, context) {
 /**
  * Maps children that are typically specified as `props.children`.
  *
- * See https://reactjs.org/docs/react-api.html#react.children.map
+ * See https://reactjs.org/docs/react-api.html#reactchildrenmap
  *
  * The provided mapFunction(child, key, index) will be called for each
  * leaf child.
@@ -356,7 +356,7 @@ function mapChildren(children, func, context) {
  * Count the number of children that are typically specified as
  * `props.children`.
  *
- * See https://reactjs.org/docs/react-api.html#react.children.count
+ * See https://reactjs.org/docs/react-api.html#reactchildrencount
  *
  * @param {?*} children Children tree container.
  * @return {number} The number of children.
@@ -369,7 +369,7 @@ function countChildren(children) {
  * Flatten a children object (typically specified as `props.children`) and
  * return an array with appropriately re-keyed children.
  *
- * See https://reactjs.org/docs/react-api.html#react.children.toarray
+ * See https://reactjs.org/docs/react-api.html#reactchildrentoarray
  */
 function toArray(children) {
   const result = [];
@@ -386,7 +386,7 @@ function toArray(children) {
  * Returns the first child in a collection of children and verifies that there
  * is only one child in the collection.
  *
- * See https://reactjs.org/docs/react-api.html#react.children.only
+ * See https://reactjs.org/docs/react-api.html#reactchildrenonly
  *
  * The current implementation of this function assumes that a single child gets
  * passed without a wrapper, but the purpose of this helper function is to

From 52fbe7612e0527b8c86decac519c344626f6bd72 Mon Sep 17 00:00:00 2001
From: Demian Dekoninck <demian@live.be>
Date: Wed, 6 Jun 2018 15:19:33 +0200
Subject: [PATCH 135/277] use --frozen-lockfile in AppVeyor (#12950)

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 1ee89f0333..9b2a740845 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,7 +25,7 @@ deploy: off
 
 install:
   - ps: Install-Product node $env:nodejs_version $env:platform
-  - yarn install
+  - yarn install --frozen-lockfile
 
 test_script:
   - node --version

From 9cf3733a9a43aa53d1a3cc94b2cd015b235b84cc Mon Sep 17 00:00:00 2001
From: Nathan Quarles <nateq314@gmail.com>
Date: Thu, 7 Jun 2018 16:12:08 -0400
Subject: [PATCH 136/277] update comment in computeAsyncExpiration() to reflect
 code (#12994)

---
 packages/react-reconciler/src/ReactFiberScheduler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index dbd252a20e..0bd0f1c82e 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -1208,7 +1208,7 @@ function captureCommitPhaseError(fiber: Fiber, error: mixed) {
 function computeAsyncExpiration(currentTime: ExpirationTime) {
   // Given the current clock time, returns an expiration time. We use rounding
   // to batch like updates together.
-  // Should complete within ~1000ms. 1200ms max.
+  // Should complete within ~5000ms. 5250ms max.
   const expirationMs = 5000;
   const bucketSizeMs = 250;
   return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);

From d3e0a3aaf33dd0134a2c5296db8b6ca43cab968e Mon Sep 17 00:00:00 2001
From: Ivan Babak <babak.john@gmail.com>
Date: Fri, 8 Jun 2018 05:18:22 -0700
Subject: [PATCH 137/277] Fix jest/matchers/toWarnDev expected, actual order
 for jest-diff (#12285) (#12288)

`toWarnDev` calls `jestDiff(a, b)` which calls `diffStrings(a, b)` where by default `a` is annotated as `'Expected'` (green), `b` as `'Received'` (red).

So the first argument passed into `jestDiff` should be the expected message, the second should be the actual message.
It was vice versa previously.

- https://github.com/facebook/jest/blob/457776b2889a9be1ce8a2c636a23417264a98d99/packages/jest-diff/src/index.js#L54
- https://github.com/facebook/jest/blob/457776b2889a9be1ce8a2c636a23417264a98d99/packages/jest-diff/src/index.js#L93
- https://github.com/facebook/jest/blob/457776b2889a9be1ce8a2c636a23417264a98d99/packages/jest-diff/src/diff_strings.js#L249-L251
---
 scripts/jest/matchers/toWarnDev.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/jest/matchers/toWarnDev.js b/scripts/jest/matchers/toWarnDev.js
index f8ae0be174..c8e17d794c 100644
--- a/scripts/jest/matchers/toWarnDev.js
+++ b/scripts/jest/matchers/toWarnDev.js
@@ -49,11 +49,11 @@ const createMatcherFor = consoleMethod =>
         } else if (expectedMessages.length === 1) {
           errorMessage =
             'Unexpected warning recorded: ' +
-            jestDiff(normalizedMessage, expectedMessages[0]);
+            jestDiff(expectedMessages[0], normalizedMessage);
         } else {
           errorMessage =
             'Unexpected warning recorded: ' +
-            jestDiff([normalizedMessage], expectedMessages);
+            jestDiff(expectedMessages, [normalizedMessage]);
         }
 
         // Record the call stack for unexpected warnings.

From 188c4252a2a87d46199011c1f2ed9a3e8293cf64 Mon Sep 17 00:00:00 2001
From: Ivan Babak <babak.john@gmail.com>
Date: Fri, 8 Jun 2018 15:12:20 -0700
Subject: [PATCH 138/277] Fix react-dom ReferenceError requestAnimationFrame in
 non-browser env (#13000) (#13001)

* Fix react-dom ReferenceError requestAnimationFrame in non-browser env (#13000)

The https://github.com/facebook/react/pull/12931 ( https://github.com/facebook/react/commit/79a740c6e32ca300d4e7ff55ab06de172d4237fd ) broke the server-side rendering: in the `fixtures/ssr` the following error appeared from the server-side when `localhost:3000` is requested:
```
ReferenceError: requestAnimationFrame is not defined
    at /__CENSORED__/react/build/node_modules/react-dom/cjs/react-dom.development.js:5232:34
    at Object.<anonymous> (/__CENSORED__/react/build/node_modules/react-dom/cjs/react-dom.development.js:17632:5)
    at Module._compile (module.js:624:30)
    at Module._extensions..js (module.js:635:10)
    at Object.require.extensions.(anonymous function) [as .js] (/__CENSORED__/react/fixtures/ssr/node_modules/babel-register/lib/node.js:152:7)
    at Module.load (module.js:545:32)
    at tryModuleLoad (module.js:508:12)
    at Function.Module._load (module.js:500:3)
    at Module.require (module.js:568:17)
    at require (internal/module.js:11:18)
```

The exception pointed to this line:
```js
// We capture a local reference to any global, in case it gets polyfilled after
// this module is initially evaluated.
// We want to be using a consistent implementation.
const localRequestAnimationFrame = requestAnimationFrame;
```

**Test plan**

1. In `react` repo root, `yarn && yarn build`.
2. In `fixtures/ssr`, `yarn && yarn start`,
3. In browser, go to `http://localhost:3000`.
4. Observe the fixture page, not the exception message.

* Move the requestAnimationFrameForReact check and warning to callsites (#13000)

According to the comment by @gaearon: https://github.com/facebook/react/pull/13001#issuecomment-395803076

* Use `invariant` instead of `throw new Error`, use the same message (#13000)

According to the comment by @gaearon: https://github.com/facebook/react/pull/13001#discussion_r194133355
---
 .../react-scheduler/src/ReactScheduler.js     | 27 +++++++++++++++++--
 .../shared/requestAnimationFrameForReact.js   | 23 +++++-----------
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index cd21d1c3fc..afd0592cc9 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -43,6 +43,8 @@ export type CallbackIdType = CallbackConfigType;
 
 import requestAnimationFrameForReact from 'shared/requestAnimationFrameForReact';
 import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
+import invariant from 'fbjs/lib/invariant';
+import warning from 'fbjs/lib/warning';
 
 // We capture a local reference to any global, in case it gets polyfilled after
 // this module is initially evaluated.
@@ -104,6 +106,27 @@ if (!ExecutionEnvironment.canUseDOM) {
     localClearTimeout(timeoutId);
   };
 } else {
+  if (__DEV__) {
+    if (typeof requestAnimationFrameForReact !== 'function') {
+      warning(
+        false,
+        'React depends on requestAnimationFrame. Make sure that you load a ' +
+          'polyfill in older browsers. https://fb.me/react-polyfills',
+      );
+    }
+  }
+
+  let localRequestAnimationFrame =
+    typeof requestAnimationFrameForReact === 'function'
+      ? requestAnimationFrameForReact
+      : function(callback: Function) {
+          invariant(
+            false,
+            'React depends on requestAnimationFrame. Make sure that you load a ' +
+              'polyfill in older browsers. https://fb.me/react-polyfills',
+          );
+        };
+
   let headOfPendingCallbacksLinkedList: CallbackConfigType | null = null;
   let tailOfPendingCallbacksLinkedList: CallbackConfigType | null = null;
 
@@ -252,7 +275,7 @@ if (!ExecutionEnvironment.canUseDOM) {
       if (!isAnimationFrameScheduled) {
         // Schedule another animation callback so we retry later.
         isAnimationFrameScheduled = true;
-        requestAnimationFrameForReact(animationTick);
+        localRequestAnimationFrame(animationTick);
       }
     }
   };
@@ -333,7 +356,7 @@ if (!ExecutionEnvironment.canUseDOM) {
       // might want to still have setTimeout trigger scheduleWork as a backup to ensure
       // that we keep performing work.
       isAnimationFrameScheduled = true;
-      requestAnimationFrameForReact(animationTick);
+      localRequestAnimationFrame(animationTick);
     }
     return scheduledCallbackConfig;
   };
diff --git a/packages/shared/requestAnimationFrameForReact.js b/packages/shared/requestAnimationFrameForReact.js
index fd2d19c6b7..91a584e94b 100644
--- a/packages/shared/requestAnimationFrameForReact.js
+++ b/packages/shared/requestAnimationFrameForReact.js
@@ -9,25 +9,16 @@
 
 'use strict';
 
-import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
-import warning from 'fbjs/lib/warning';
-
 // We capture a local reference to any global, in case it gets polyfilled after
 // this module is initially evaluated.
 // We want to be using a consistent implementation.
-const localRequestAnimationFrame = requestAnimationFrame;
+const localRequestAnimationFrame =
+  typeof requestAnimationFrame === 'function'
+    ? requestAnimationFrame
+    : undefined;
 
-if (__DEV__) {
-  if (
-    ExecutionEnvironment.canUseDOM &&
-    typeof localRequestAnimationFrame !== 'function'
-  ) {
-    warning(
-      false,
-      'React depends on requestAnimationFrame. Make sure that you load a ' +
-        'polyfill in older browsers. https://fb.me/react-polyfills',
-    );
-  }
-}
+// The callsites should check if the requestAnimationFrame imported from this module is a function,
+// fire a developer warning if it doesn't exist, and substitute it by a shim in that case
+// (e.g. that throws on call).
 
 export default localRequestAnimationFrame;

From 394b17eede14c97ceff3827b716ca016e805a094 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Sat, 9 Jun 2018 22:19:12 +0100
Subject: [PATCH 139/277] Update custom renderer docs

---
 packages/react-reconciler/README.md | 34 +++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/packages/react-reconciler/README.md b/packages/react-reconciler/README.md
index 256f466a7f..744c4ab498 100644
--- a/packages/react-reconciler/README.md
+++ b/packages/react-reconciler/README.md
@@ -11,12 +11,12 @@ This is an experimental package for creating custom React renderers.
 ```js
 var Reconciler = require('react-reconciler');
 
-var ReconcilerConfig = {
+var HostConfig = {
   // You'll need to implement some methods here.
   // See below for more information and examples.
 };
 
-var MyRenderer = Reconciler(ReconcilerConfig);
+var MyRenderer = Reconciler(HostConfig);
 
 var RendererPublicAPI = {
   render(element, container, callback) {
@@ -30,10 +30,30 @@ module.exports = RendererPublicAPI;
 
 ## Practical Examples
 
-* [React ART](https://github.com/facebook/react/blob/master/packages/react-art/src/ReactART.js)
-* [React DOM](https://github.com/facebook/react/blob/master/packages/react-dom/src/client/ReactDOM.js)
-* [React Native](https://github.com/facebook/react/blob/master/packages/react-native-renderer/src/ReactNativeRenderer.js)
+A "host config" is an object that you need to provide, and that describes how to make something happen in the "host" environment (e.g. DOM, canvas, console, or whatever your rendering target is). It looks like this:
 
-If these links break please file an issue and we’ll fix them. They intentionally link to the latest versions since the API is still evolving.
+```js
+var HostConfig = {
+  createInstance(type, props) {
+    // e.g. DOM renderer returns a DOM node
+  },
+  // ...
+  supportsMutation: true, // it works by mutating nodes
+  appendChild(parent, child) {
+    // e.g. DOM renderer would call .appendChild() here
+  },
+  // ...
+};
+```
 
-This [third-party tutorial](https://github.com/nitin42/Making-a-custom-React-renderer) is relatively up-to-date and may be helpful.
+The full list of supported methods [can be found here](https://github.com/facebook/react/blob/master/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js). For their signatures, we recommend looking at specific examples below.
+
+The React repository includes several renderers. Each of them has its own host config.
+
+The examples in the React repository are declared a bit differently than a third-party renderer would be. In particular, the `HostConfig` object mentioned above is never explicitly declared, and instead is a *module* in our code. However, its exports correspond directly to properties on a `HostConfig` object you'd need to declare in your code:
+
+* [React ART](https://github.com/facebook/react/blob/master/packages/react-art/src/ReactART.js) and its [host config](https://github.com/facebook/react/blob/master/packages/react-art/src/ReactARTHostConfig.js)
+* [React DOM](https://github.com/facebook/react/blob/master/packages/react-dom/src/client/ReactDOM.js) and its [host config](https://github.com/facebook/react/blob/master/packages/react-dom/src/client/ReactDOMHostConfig.js)
+* [React Native](https://github.com/facebook/react/blob/master/packages/react-native-renderer/src/ReactNativeRenderer.js) and its [host config](https://github.com/facebook/react/blob/master/packages/react-native-renderer/src/ReactNativeHostConfig.js)
+
+If these links break please file an issue and we’ll fix them. They intentionally link to the latest versions since the API is still evolving. If you have more questions please file an issue and we’ll try to help!

From bfb12ebb521853f6604521d4d548f5f5840a16de Mon Sep 17 00:00:00 2001
From: Nathan Quarles <nateq314@gmail.com>
Date: Sat, 9 Jun 2018 17:56:21 -0400
Subject: [PATCH 140/277] delete a couple of redundant lines in
 performWorkOnRoot() in ReactFiberScheduler.js (#13003)

---
 packages/react-reconciler/src/ReactFiberScheduler.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 0bd0f1c82e..8f78c0bc4a 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -1768,7 +1768,6 @@ function performWorkOnRoot(
       // This root is already complete. We can commit it.
       completeRoot(root, finishedWork, expirationTime);
     } else {
-      root.finishedWork = null;
       finishedWork = renderRoot(root, expirationTime, false);
       if (finishedWork !== null) {
         // We've completed the root. Commit it.
@@ -1782,7 +1781,6 @@ function performWorkOnRoot(
       // This root is already complete. We can commit it.
       completeRoot(root, finishedWork, expirationTime);
     } else {
-      root.finishedWork = null;
       finishedWork = renderRoot(root, expirationTime, true);
       if (finishedWork !== null) {
         // We've completed the root. Check the deadline one more time

From c78957eac852e673e35bab39ee2dd35d6461d757 Mon Sep 17 00:00:00 2001
From: Jifa Jiang <thaddeusjiang@gmail.com>
Date: Mon, 11 Jun 2018 11:39:29 +0900
Subject: [PATCH 141/277] Fix an SVG focusing crash in IE11 (#12996)

* revert #11800

because #12763

* use try/catch for SVG in IE11

* use focusNode(element) when element.focus isn't a function.

* revert #11800
---
 packages/react-dom/src/client/ReactInputSelection.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/react-dom/src/client/ReactInputSelection.js b/packages/react-dom/src/client/ReactInputSelection.js
index d4b47b992c..3eda615710 100644
--- a/packages/react-dom/src/client/ReactInputSelection.js
+++ b/packages/react-dom/src/client/ReactInputSelection.js
@@ -82,7 +82,9 @@ export function restoreSelection(priorSelectionInformation) {
       }
     }
 
-    priorFocusedElem.focus();
+    if (typeof priorFocusedElem.focus === 'function') {
+      priorFocusedElem.focus();
+    }
 
     for (let i = 0; i < ancestors.length; i++) {
       const info = ancestors[i];

From d0d4280640967eca2faad0d96be6fca08ac846a6 Mon Sep 17 00:00:00 2001
From: Nathan Hunzaker <nate.hunzaker@gmail.com>
Date: Mon, 11 Jun 2018 09:16:50 -0400
Subject: [PATCH 142/277] Remove old reference to inst._wrapperState (#12987)

This commit removes a reference to inst._wrapperState, which was the
old way of tracking input state in the stack renderer.

This means we no longer need to pass the instance into the associated
function, allowing us to eliminate an exception for IE (and a TODO).
---
 packages/react-dom/src/events/ChangeEventPlugin.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/react-dom/src/events/ChangeEventPlugin.js b/packages/react-dom/src/events/ChangeEventPlugin.js
index ce0d328d87..2d04e5dd43 100644
--- a/packages/react-dom/src/events/ChangeEventPlugin.js
+++ b/packages/react-dom/src/events/ChangeEventPlugin.js
@@ -231,14 +231,8 @@ 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;
+function handleControlledInputBlur(node) {
+  let state = node._wrapperState;
 
   if (!state || !state.controlled || node.type !== 'number') {
     return;
@@ -303,7 +297,7 @@ const ChangeEventPlugin = {
 
     // When blurring, set the value attribute for number inputs
     if (topLevelType === TOP_BLUR) {
-      handleControlledInputBlur(targetInst, targetNode);
+      handleControlledInputBlur(targetNode);
     }
   },
 };

From 23be4102df273d6ee6d9be42c6d65885d0a914b1 Mon Sep 17 00:00:00 2001
From: Eric Soderberg <eric.soderberg@hpe.com>
Date: Mon, 11 Jun 2018 06:25:18 -0700
Subject: [PATCH 143/277] Fixed an issue with nested contexts unwinding when
 server rendering. Issue #12984 (#12985)

* Fixed an issue with nested contexts unwinding when server rendering. GitHub issue #12984

* Fixed an issue with search direction and stricter false checking

* Use decrement infix operator

* Streamlined existence checks

* Streamlined assignment. Removed redundant comment. Use null for array values

* Made prettier

* Relaxed type checking and improved comment

* Improve test coverage
---
 ...eactDOMServerIntegrationNewContext-test.js | 58 +++++++++++++++++++
 .../src/server/ReactPartialRenderer.js        | 23 +++++---
 2 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js
index c3c08eb6bf..2bcece083a 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js
@@ -191,5 +191,63 @@ describe('ReactDOMServerIntegration', () => {
       expect(e.querySelector('#theme').textContent).toBe('light');
       expect(e.querySelector('#language').textContent).toBe('english');
     });
+
+    itRenders('nested context unwinding', async render => {
+      const Theme = React.createContext('dark');
+      const Language = React.createContext('french');
+
+      const App = () => (
+        <div>
+          <Theme.Provider value="light">
+            <Language.Provider value="english">
+              <Theme.Provider value="dark">
+                <Theme.Consumer>
+                  {theme => <div id="theme1">{theme}</div>}
+                </Theme.Consumer>
+              </Theme.Provider>
+              <Theme.Consumer>
+                {theme => <div id="theme2">{theme}</div>}
+              </Theme.Consumer>
+              <Language.Provider value="sanskrit">
+                <Theme.Provider value="blue">
+                  <Theme.Provider value="red">
+                    <Language.Consumer>
+                      {() => (
+                        <Language.Provider value="chinese">
+                          <Language.Provider value="hungarian" />
+                          <Language.Consumer>
+                            {language => <div id="language1">{language}</div>}
+                          </Language.Consumer>
+                        </Language.Provider>
+                      )}
+                    </Language.Consumer>
+                  </Theme.Provider>
+                  <Language.Consumer>
+                    {language => (
+                      <React.Fragment>
+                        <Theme.Consumer>
+                          {theme => <div id="theme3">{theme}</div>}
+                        </Theme.Consumer>
+                        <div id="language2">{language}</div>
+                      </React.Fragment>
+                    )}
+                  </Language.Consumer>
+                </Theme.Provider>
+              </Language.Provider>
+            </Language.Provider>
+          </Theme.Provider>
+          <Language.Consumer>
+            {language => <div id="language3">{language}</div>}
+          </Language.Consumer>
+        </div>
+      );
+      let e = await render(<App />);
+      expect(e.querySelector('#theme1').textContent).toBe('dark');
+      expect(e.querySelector('#theme2').textContent).toBe('light');
+      expect(e.querySelector('#theme3').textContent).toBe('blue');
+      expect(e.querySelector('#language1').textContent).toBe('chinese');
+      expect(e.querySelector('#language2').textContent).toBe('sanskrit');
+      expect(e.querySelector('#language3').textContent).toBe('french');
+    });
   });
 });
diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index 59ea170b93..f33ffd239e 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -689,14 +689,23 @@ class ReactDOMServerRenderer {
     this.providerStack[this.providerIndex] = null;
     this.providerIndex -= 1;
     const context: ReactContext<any> = provider.type._context;
-    if (this.providerIndex < 0) {
-      context._currentValue = context._defaultValue;
+
+    // Find the closest parent provider of the same type and use its value.
+    // TODO: it would be nice to avoid this being O(N).
+    let contextPriorProvider = null;
+    for (let i = this.providerIndex; i >= 0; i--) {
+      // We assume this Flow type is correct because of the index check above
+      // and because pushProvider() enforces the correct type.
+      const priorProvider: ReactProvider<any> = (this.providerStack[i]: any);
+      if (priorProvider.type === provider.type) {
+        contextPriorProvider = priorProvider;
+        break;
+      }
+    }
+    if (contextPriorProvider !== null) {
+      context._currentValue = contextPriorProvider.props.value;
     } else {
-      // We assume this type is correct because of the index check above.
-      const previousProvider: ReactProvider<any> = (this.providerStack[
-        this.providerIndex
-      ]: any);
-      context._currentValue = previousProvider.props.value;
+      context._currentValue = context._defaultValue;
     }
   }
 

From 4ac6f133aff78e7616c7427167f0d43a18441b94 Mon Sep 17 00:00:00 2001
From: Nathan Hunzaker <nate.hunzaker@gmail.com>
Date: Mon, 11 Jun 2018 09:35:42 -0400
Subject: [PATCH 144/277] Fallback to event.srcElement for IE9 (#12976)

It looks like we accidentally removed a fallback condition for the
event target in IE9 when we dropped some support for IE8. This commit
adds the event target specific support code back to getEventTarget.js

Fixes #12506
---
 packages/react-dom/src/events/getEventTarget.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/react-dom/src/events/getEventTarget.js b/packages/react-dom/src/events/getEventTarget.js
index 76c0052c85..960ba2040a 100644
--- a/packages/react-dom/src/events/getEventTarget.js
+++ b/packages/react-dom/src/events/getEventTarget.js
@@ -15,7 +15,9 @@ import {TEXT_NODE} from '../shared/HTMLNodeType';
  * @return {DOMEventTarget} Target node.
  */
 function getEventTarget(nativeEvent) {
-  let target = nativeEvent.target || window;
+  // Fallback to nativeEvent.srcElement for IE9
+  // https://github.com/facebook/react/issues/12506
+  let target = nativeEvent.target || nativeEvent.srcElement || window;
 
   // Normalize SVG <use> element events #4963
   if (target.correspondingUseElement) {

From d480782c4162431d06c077ebf8fdf6b8ba7896ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Spie=C3=9F?= <hello@philippspiess.com>
Date: Mon, 11 Jun 2018 15:43:30 +0200
Subject: [PATCH 145/277] =?UTF-8?q?Don=E2=80=99t=20error=20when=20returnin?=
 =?UTF-8?q?g=20an=20empty=20Fragment=20(#12966)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Don’t error when returning an empty Fragment

When a fragment is reconciled, we directly move onto it’s children.
Since an empty `<React.Fragment/>` will have children of `undefined`,
this would always throw.

To fix this, we bail out in those cases.

* Test the update path as well

* Reuse existing code path

* An even more explicit solution that also fixes Flow
---
 .../src/__tests__/ReactDOMFiber-test.js       | 25 +++++++++++++++++++
 .../react-reconciler/src/ReactChildFiber.js   |  8 +++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMFiber-test.js b/packages/react-dom/src/__tests__/ReactDOMFiber-test.js
index a93dda6ce1..911f161b0e 100644
--- a/packages/react-dom/src/__tests__/ReactDOMFiber-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMFiber-test.js
@@ -171,6 +171,31 @@ describe('ReactDOMFiber', () => {
     expect(firstNode.tagName).toBe('DIV');
   });
 
+  it('renders an empty fragment', () => {
+    const Div = () => <div />;
+    const EmptyFragment = () => <React.Fragment />;
+    const NonEmptyFragment = () => (
+      <React.Fragment>
+        <Div />
+      </React.Fragment>
+    );
+
+    ReactDOM.render(<EmptyFragment />, container);
+    expect(container.firstChild).toBe(null);
+
+    ReactDOM.render(<NonEmptyFragment />, container);
+    expect(container.firstChild.tagName).toBe('DIV');
+
+    ReactDOM.render(<EmptyFragment />, container);
+    expect(container.firstChild).toBe(null);
+
+    ReactDOM.render(<Div />, container);
+    expect(container.firstChild.tagName).toBe('DIV');
+
+    ReactDOM.render(<EmptyFragment />, container);
+    expect(container.firstChild).toBe(null);
+  });
+
   let svgEls, htmlEls, mathEls;
   const expectSVG = {ref: el => svgEls.push(el)};
   const expectHTML = {ref: el => htmlEls.push(el)};
diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js
index ae19577aa2..e3d1dd72ed 100644
--- a/packages/react-reconciler/src/ReactChildFiber.js
+++ b/packages/react-reconciler/src/ReactChildFiber.js
@@ -1208,12 +1208,12 @@ function ChildReconciler(shouldTrackSideEffects) {
     // Handle top level unkeyed fragments as if they were arrays.
     // This leads to an ambiguity between <>{[...]}</> and <>...</>.
     // We treat the ambiguous cases above the same.
-    if (
+    const isUnkeyedTopLevelFragment =
       typeof newChild === 'object' &&
       newChild !== null &&
       newChild.type === REACT_FRAGMENT_TYPE &&
-      newChild.key === null
-    ) {
+      newChild.key === null;
+    if (isUnkeyedTopLevelFragment) {
       newChild = newChild.props.children;
     }
 
@@ -1281,7 +1281,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         warnOnFunctionType();
       }
     }
-    if (typeof newChild === 'undefined') {
+    if (typeof newChild === 'undefined' && !isUnkeyedTopLevelFragment) {
       // If the new child is undefined, and the return fiber is a composite
       // component, throw an error. If Fiber return types are disabled,
       // we already threw above.

From 30bc8ef79295c71f5a4fc459c5bbd4b271f6f390 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 11 Jun 2018 20:03:51 +0100
Subject: [PATCH 146/277] Allow multiple root children in test renderer
 traversal API (#13017)

---
 .../src/ReactTestRenderer.js                  | 91 ++++++++++++-------
 .../ReactTestRendererTraversal-test.js        | 44 +++++++++
 2 files changed, 101 insertions(+), 34 deletions(-)

diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js
index 3fff46d818..711f8f6a5e 100644
--- a/packages/react-test-renderer/src/ReactTestRenderer.js
+++ b/packages/react-test-renderer/src/ReactTestRenderer.js
@@ -200,8 +200,45 @@ const validWrapperTypes = new Set([
   ClassComponent,
   HostComponent,
   ForwardRef,
+  // Normally skipped, but used when there's more than one root child.
+  HostRoot,
 ]);
 
+function getChildren(parent: Fiber) {
+  const children = [];
+  const startingNode = parent;
+  let node: Fiber = startingNode;
+  if (node.child === null) {
+    return children;
+  }
+  node.child.return = node;
+  node = node.child;
+  outer: while (true) {
+    let descend = false;
+    if (validWrapperTypes.has(node.tag)) {
+      children.push(wrapFiber(node));
+    } else if (node.tag === HostText) {
+      children.push('' + node.memoizedProps);
+    } else {
+      descend = true;
+    }
+    if (descend && node.child !== null) {
+      node.child.return = node;
+      node = node.child;
+      continue;
+    }
+    while (node.sibling === null) {
+      if (node.return === startingNode) {
+        break outer;
+      }
+      node = (node.return: any);
+    }
+    (node.sibling: any).return = node.return;
+    node = (node.sibling: any);
+  }
+  return children;
+}
+
 class ReactTestInstance {
   _fiber: Fiber;
 
@@ -246,6 +283,13 @@ class ReactTestInstance {
     let parent = this._fiber.return;
     while (parent !== null) {
       if (validWrapperTypes.has(parent.tag)) {
+        if (parent.tag === HostRoot) {
+          // Special case: we only "materialize" instances for roots
+          // if they have more than a single child. So we'll check that now.
+          if (getChildren(parent).length < 2) {
+            return null;
+          }
+        }
         return wrapFiber(parent);
       }
       parent = parent.return;
@@ -254,38 +298,7 @@ class ReactTestInstance {
   }
 
   get children(): Array<ReactTestInstance | string> {
-    const children = [];
-    const startingNode = this._currentFiber();
-    let node: Fiber = startingNode;
-    if (node.child === null) {
-      return children;
-    }
-    node.child.return = node;
-    node = node.child;
-    outer: while (true) {
-      let descend = false;
-      if (validWrapperTypes.has(node.tag)) {
-        children.push(wrapFiber(node));
-      } else if (node.tag === HostText) {
-        children.push('' + node.memoizedProps);
-      } else {
-        descend = true;
-      }
-      if (descend && node.child !== null) {
-        node.child.return = node;
-        node = node.child;
-        continue;
-      }
-      while (node.sibling === null) {
-        if (node.return === startingNode) {
-          break outer;
-        }
-        node = (node.return: any);
-      }
-      (node.sibling: any).return = node.return;
-      node = (node.sibling: any);
-    }
-    return children;
+    return getChildren(this._currentFiber());
   }
 
   // Custom search functions
@@ -469,10 +482,20 @@ const ReactTestRendererFiber = {
         configurable: true,
         enumerable: true,
         get: function() {
-          if (root === null || root.current.child === null) {
+          if (root === null) {
             throw new Error("Can't access .root on unmounted test renderer");
           }
-          return wrapFiber(root.current.child);
+          const children = getChildren(root.current);
+          if (children.length === 0) {
+            throw new Error("Can't access .root on unmounted test renderer");
+          } else if (children.length === 1) {
+            // Normally, we skip the root and just give you the child.
+            return children[0];
+          } else {
+            // However, we give you the root if there's more than one root child.
+            // We could make this the behavior for all cases but it would be a breaking change.
+            return wrapFiber(root.current);
+          }
         },
       }: Object),
     );
diff --git a/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js b/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js
index 9fb91e1f35..3ea71880ea 100644
--- a/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js
@@ -199,4 +199,48 @@ describe('ReactTestRendererTraversal', () => {
     expect(nestedViews[1].parent).toBe(expectedParent);
     expect(nestedViews[2].parent).toBe(expectedParent);
   });
+
+  it('can have special nodes as roots', () => {
+    const FR = React.forwardRef(props => <section {...props} />);
+    expect(
+      ReactTestRenderer.create(
+        <FR>
+          <div />
+          <div />
+        </FR>,
+      ).root.findAllByType('div').length,
+    ).toBe(2);
+    expect(
+      ReactTestRenderer.create(
+        <React.Fragment>
+          <div />
+          <div />
+        </React.Fragment>,
+      ).root.findAllByType('div').length,
+    ).toBe(2);
+    expect(
+      ReactTestRenderer.create(
+        <React.Fragment key="foo">
+          <div />
+          <div />
+        </React.Fragment>,
+      ).root.findAllByType('div').length,
+    ).toBe(2);
+    expect(
+      ReactTestRenderer.create(
+        <React.StrictMode>
+          <div />
+          <div />
+        </React.StrictMode>,
+      ).root.findAllByType('div').length,
+    ).toBe(2);
+    expect(
+      ReactTestRenderer.create(
+        <Context.Provider>
+          <div />
+          <div />
+        </Context.Provider>,
+      ).root.findAllByType('div').length,
+    ).toBe(2);
+  });
 });

From ec60457bcd22d06c404a44839c14beda88081ac7 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 11 Jun 2018 20:52:39 +0100
Subject: [PATCH 147/277] Popping context is O(1) in SSR (#13019)

---
 .../src/server/ReactPartialRenderer.js        | 75 ++++++++++++-------
 1 file changed, 48 insertions(+), 27 deletions(-)

diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index f33ffd239e..d3ca7a8c1c 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -641,8 +641,10 @@ class ReactDOMServerRenderer {
   previousWasTextNode: boolean;
   makeStaticMarkup: boolean;
 
-  providerStack: Array<?ReactProvider<any>>;
-  providerIndex: number;
+  contextIndex: number;
+  contextStack: Array<ReactContext<any>>;
+  contextValueStack: Array<any>;
+  contextProviderStack: ?Array<ReactProvider<any>>; // DEV-only
 
   constructor(children: mixed, makeStaticMarkup: boolean) {
     const flatChildren = flattenTopLevelChildren(children);
@@ -667,46 +669,65 @@ class ReactDOMServerRenderer {
     this.makeStaticMarkup = makeStaticMarkup;
 
     // Context (new API)
-    this.providerStack = []; // Stack of provider objects
-    this.providerIndex = -1;
+    this.contextIndex = -1;
+    this.contextStack = [];
+    this.contextValueStack = [];
+    if (__DEV__) {
+      this.contextProviderStack = [];
+    }
   }
 
+  /**
+   * Note: We use just two stacks regardless of how many context providers you have.
+   * Providers are always popped in the reverse order to how they were pushed
+   * so we always know on the way down which provider you'll encounter next on the way up.
+   * On the way down, we push the current provider, and its context value *before*
+   * we mutated it, onto the stacks. Therefore, on the way up, we always know which
+   * provider needs to be "restored" to which value.
+   * https://github.com/facebook/react/pull/12985#issuecomment-396301248
+   */
+
   pushProvider<T>(provider: ReactProvider<T>): void {
-    this.providerIndex += 1;
-    this.providerStack[this.providerIndex] = provider;
+    const index = ++this.contextIndex;
     const context: ReactContext<any> = provider.type._context;
+    const previousValue = context._currentValue;
+
+    // Remember which value to restore this context to on our way up.
+    this.contextStack[index] = context;
+    this.contextValueStack[index] = previousValue;
+    if (__DEV__) {
+      // Only used for push/pop mismatch warnings.
+      (this.contextProviderStack: any)[index] = provider;
+    }
+
+    // Mutate the current value.
     context._currentValue = provider.props.value;
   }
 
   popProvider<T>(provider: ReactProvider<T>): void {
+    const index = this.contextIndex;
     if (__DEV__) {
       warning(
-        this.providerIndex > -1 &&
-          provider === this.providerStack[this.providerIndex],
+        index > -1 && provider === (this.contextProviderStack: any)[index],
         'Unexpected pop.',
       );
     }
-    this.providerStack[this.providerIndex] = null;
-    this.providerIndex -= 1;
-    const context: ReactContext<any> = provider.type._context;
 
-    // Find the closest parent provider of the same type and use its value.
-    // TODO: it would be nice to avoid this being O(N).
-    let contextPriorProvider = null;
-    for (let i = this.providerIndex; i >= 0; i--) {
-      // We assume this Flow type is correct because of the index check above
-      // and because pushProvider() enforces the correct type.
-      const priorProvider: ReactProvider<any> = (this.providerStack[i]: any);
-      if (priorProvider.type === provider.type) {
-        contextPriorProvider = priorProvider;
-        break;
-      }
-    }
-    if (contextPriorProvider !== null) {
-      context._currentValue = contextPriorProvider.props.value;
-    } else {
-      context._currentValue = context._defaultValue;
+    const context: ReactContext<any> = this.contextStack[index];
+    const previousValue = this.contextValueStack[index];
+
+    // "Hide" these null assignments from Flow by using `any`
+    // because conceptually they are deletions--as long as we
+    // promise to never access values beyond `this.contextIndex`.
+    this.contextStack[index] = (null: any);
+    this.contextValueStack[index] = (null: any);
+    if (__DEV__) {
+      (this.contextProviderStack: any)[index] = (null: any);
     }
+    this.contextIndex--;
+
+    // Restore to the previous value we stored as we were walking down.
+    context._currentValue = previousValue;
   }
 
   read(bytes: number): string | null {

From d5c11193e2e6d5ea2d55ce3b428616c401310731 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Mon, 11 Jun 2018 13:16:27 -0700
Subject: [PATCH 148/277] Added production profiling bundle type (#12886)

* Added profiling bundle
* Turned profiling on for React Fabric OSS profiling and dev bundles
* Added new global var "__PROFILE__" for profiling DCE
---
 .eslintrc.js                                  |  1 +
 packages/shared/ReactFeatureFlags.js          |  2 +-
 .../ReactFeatureFlags.native-fabric-oss.js    |  2 +-
 .../forks/ReactFeatureFlags.native-oss.js     |  2 +-
 scripts/flow/environment.js                   |  2 +
 scripts/jest/setupEnvironment.js              |  1 +
 scripts/rollup/build.js                       | 38 +++++++++++++++++++
 scripts/rollup/bundles.js                     |  9 ++++-
 scripts/rollup/forks.js                       |  4 ++
 scripts/rollup/packaging.js                   |  4 ++
 scripts/rollup/wrappers.js                    | 35 +++++++++++++++++
 11 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index e4b8d27b29..27147d2d0e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -81,5 +81,6 @@ module.exports = {
     spyOnDev: true,
     spyOnDevAndProd: true,
     spyOnProd: true,
+    __PROFILE__: true,
   },
 };
diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
index 91ebce8c09..31aad39f14 100644
--- a/packages/shared/ReactFeatureFlags.js
+++ b/packages/shared/ReactFeatureFlags.js
@@ -37,7 +37,7 @@ export const warnAboutDeprecatedLifecycles = false;
 export const warnAboutLegacyContextAPI = false;
 
 // Gather advanced timing metrics for Profiler subtrees.
-export const enableProfilerTimer = __DEV__;
+export const enableProfilerTimer = __PROFILE__;
 
 // Fires getDerivedStateFromProps for state *or* props changes
 export const fireGetDerivedStateFromPropsOnStateUpdates = true;
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
index f80827ef02..b4cb4e54b1 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
@@ -20,7 +20,7 @@ export const enableSuspense = false;
 export const warnAboutDeprecatedLifecycles = false;
 export const warnAboutLegacyContextAPI = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
-export const enableProfilerTimer = false;
+export const enableProfilerTimer = __PROFILE__;
 export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
 // Only used in www builds.
diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js
index 0eb9c58b4e..254aab1dfc 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js
@@ -20,7 +20,7 @@ export const enableUserTimingAPI = __DEV__;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const warnAboutDeprecatedLifecycles = false;
 export const warnAboutLegacyContextAPI = false;
-export const enableProfilerTimer = __DEV__;
+export const enableProfilerTimer = __PROFILE__;
 export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
 // Only used in www builds.
diff --git a/scripts/flow/environment.js b/scripts/flow/environment.js
index e7f477360e..8cb7e7192d 100644
--- a/scripts/flow/environment.js
+++ b/scripts/flow/environment.js
@@ -9,6 +9,8 @@
 
 /* eslint-disable */
 
+declare var __PROFILE__: boolean;
+
 declare var __REACT_DEVTOOLS_GLOBAL_HOOK__: any; /*?{
   inject: ?((stuff: Object) => void)
 };*/
diff --git a/scripts/jest/setupEnvironment.js b/scripts/jest/setupEnvironment.js
index 36013adf19..2b6fd8bd84 100644
--- a/scripts/jest/setupEnvironment.js
+++ b/scripts/jest/setupEnvironment.js
@@ -5,6 +5,7 @@ if (NODE_ENV !== 'development' && NODE_ENV !== 'production') {
   throw new Error('NODE_ENV must either be set to development or production.');
 }
 global.__DEV__ = NODE_ENV === 'development';
+global.__PROFILE__ = NODE_ENV === 'development';
 
 global.requestAnimationFrame = function(callback) {
   setTimeout(callback);
diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index ba1ee434f6..cafea350e8 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -39,10 +39,12 @@ const {
   UMD_PROD,
   NODE_DEV,
   NODE_PROD,
+  NODE_PROFILING,
   FB_WWW_DEV,
   FB_WWW_PROD,
   RN_OSS_DEV,
   RN_OSS_PROD,
+  RN_OSS_PROFILING,
   RN_FB_DEV,
   RN_FB_PROD,
 } = Bundles.bundleTypes;
@@ -95,6 +97,7 @@ function getBabelConfig(updateBabelOptions, bundleType, filename) {
       });
     case RN_OSS_DEV:
     case RN_OSS_PROD:
+    case RN_OSS_PROFILING:
     case RN_FB_DEV:
     case RN_FB_PROD:
       return Object.assign({}, options, {
@@ -107,6 +110,7 @@ function getBabelConfig(updateBabelOptions, bundleType, filename) {
     case UMD_PROD:
     case NODE_DEV:
     case NODE_PROD:
+    case NODE_PROFILING:
       return Object.assign({}, options, {
         plugins: options.plugins.concat([
           // Use object-assign polyfill in open source
@@ -152,10 +156,12 @@ function getFormat(bundleType) {
       return `umd`;
     case NODE_DEV:
     case NODE_PROD:
+    case NODE_PROFILING:
     case FB_WWW_DEV:
     case FB_WWW_PROD:
     case RN_OSS_DEV:
     case RN_OSS_PROD:
+    case RN_OSS_PROFILING:
     case RN_FB_DEV:
     case RN_FB_PROD:
       return `cjs`;
@@ -174,6 +180,8 @@ function getFilename(name, globalName, bundleType) {
       return `${name}.development.js`;
     case NODE_PROD:
       return `${name}.production.min.js`;
+    case NODE_PROFILING:
+      return `${name}.profiling.min.js`;
     case FB_WWW_DEV:
     case RN_OSS_DEV:
     case RN_FB_DEV:
@@ -182,6 +190,8 @@ function getFilename(name, globalName, bundleType) {
     case RN_OSS_PROD:
     case RN_FB_PROD:
       return `${globalName}-prod.js`;
+    case RN_OSS_PROFILING:
+      return `${globalName}-profiling.js`;
   }
 }
 
@@ -195,8 +205,10 @@ function isProductionBundleType(bundleType) {
       return false;
     case UMD_PROD:
     case NODE_PROD:
+    case NODE_PROFILING:
     case FB_WWW_PROD:
     case RN_OSS_PROD:
+    case RN_OSS_PROFILING:
     case RN_FB_PROD:
       return true;
     default:
@@ -204,6 +216,27 @@ function isProductionBundleType(bundleType) {
   }
 }
 
+function isProfilingBundleType(bundleType) {
+  switch (bundleType) {
+    case FB_WWW_DEV:
+    case FB_WWW_PROD:
+    case NODE_DEV:
+    case NODE_PROD:
+    case RN_FB_DEV:
+    case RN_FB_PROD:
+    case RN_OSS_DEV:
+    case RN_OSS_PROD:
+    case UMD_DEV:
+    case UMD_PROD:
+      return false;
+    case NODE_PROFILING:
+    case RN_OSS_PROFILING:
+      return true;
+    default:
+      throw new Error(`Unknown type: ${bundleType}`);
+  }
+}
+
 function getPlugins(
   entry,
   externals,
@@ -218,11 +251,13 @@ function getPlugins(
   const findAndRecordErrorCodes = extractErrorCodes(errorCodeOpts);
   const forks = Modules.getForks(bundleType, entry, moduleType);
   const isProduction = isProductionBundleType(bundleType);
+  const isProfiling = isProfilingBundleType(bundleType);
   const isInGlobalScope = bundleType === UMD_DEV || bundleType === UMD_PROD;
   const isFBBundle = bundleType === FB_WWW_DEV || bundleType === FB_WWW_PROD;
   const isRNBundle =
     bundleType === RN_OSS_DEV ||
     bundleType === RN_OSS_PROD ||
+    bundleType === RN_OSS_PROFILING ||
     bundleType === RN_FB_DEV ||
     bundleType === RN_FB_PROD;
   const shouldStayReadable = isFBBundle || isRNBundle || forcePrettyOutput;
@@ -255,6 +290,7 @@ function getPlugins(
     // Turn __DEV__ and process.env checks into constants.
     replace({
       __DEV__: isProduction ? 'false' : 'true',
+      __PROFILE__: isProfiling || !isProduction ? 'true' : 'false',
       'process.env.NODE_ENV': isProduction ? "'production'" : "'development'",
     }),
     // We still need CommonJS for external deps like object-assign.
@@ -508,10 +544,12 @@ async function buildEverything() {
     await createBundle(bundle, UMD_PROD);
     await createBundle(bundle, NODE_DEV);
     await createBundle(bundle, NODE_PROD);
+    await createBundle(bundle, NODE_PROFILING);
     await createBundle(bundle, FB_WWW_DEV);
     await createBundle(bundle, FB_WWW_PROD);
     await createBundle(bundle, RN_OSS_DEV);
     await createBundle(bundle, RN_OSS_PROD);
+    await createBundle(bundle, RN_OSS_PROFILING);
     await createBundle(bundle, RN_FB_DEV);
     await createBundle(bundle, RN_FB_PROD);
   }
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index da2c1fc1ce..a9fc687f75 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -5,10 +5,12 @@ const bundleTypes = {
   UMD_PROD: 'UMD_PROD',
   NODE_DEV: 'NODE_DEV',
   NODE_PROD: 'NODE_PROD',
+  NODE_PROFILING: 'NODE_PROFILING',
   FB_WWW_DEV: 'FB_WWW_DEV',
   FB_WWW_PROD: 'FB_WWW_PROD',
   RN_OSS_DEV: 'RN_OSS_DEV',
   RN_OSS_PROD: 'RN_OSS_PROD',
+  RN_OSS_PROFILING: 'RN_OSS_PROFILING',
   RN_FB_DEV: 'RN_FB_DEV',
   RN_FB_PROD: 'RN_FB_PROD',
 };
@@ -17,10 +19,12 @@ 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 NODE_PROFILING = bundleTypes.NODE_PROFILING;
 const FB_WWW_DEV = bundleTypes.FB_WWW_DEV;
 const FB_WWW_PROD = bundleTypes.FB_WWW_PROD;
 const RN_OSS_DEV = bundleTypes.RN_OSS_DEV;
 const RN_OSS_PROD = bundleTypes.RN_OSS_PROD;
+const RN_OSS_PROFILING = bundleTypes.RN_OSS_PROFILING;
 const RN_FB_DEV = bundleTypes.RN_FB_DEV;
 const RN_FB_PROD = bundleTypes.RN_FB_PROD;
 
@@ -69,6 +73,7 @@ const bundles = [
       UMD_PROD,
       NODE_DEV,
       NODE_PROD,
+      NODE_PROFILING,
       FB_WWW_DEV,
       FB_WWW_PROD,
     ],
@@ -175,7 +180,7 @@ const bundles = [
 
   {
     label: 'native',
-    bundleTypes: [RN_OSS_DEV, RN_OSS_PROD],
+    bundleTypes: [RN_OSS_DEV, RN_OSS_PROD, RN_OSS_PROFILING],
     moduleType: RENDERER,
     entry: 'react-native-renderer',
     global: 'ReactNativeRenderer',
@@ -217,7 +222,7 @@ const bundles = [
 
   {
     label: 'native-fabric',
-    bundleTypes: [RN_OSS_DEV, RN_OSS_PROD],
+    bundleTypes: [RN_OSS_DEV, RN_OSS_PROD, RN_OSS_PROFILING],
     moduleType: RENDERER,
     entry: 'react-native-renderer/fabric',
     global: 'ReactFabric',
diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js
index d6fcdb4d18..ed047100a0 100644
--- a/scripts/rollup/forks.js
+++ b/scripts/rollup/forks.js
@@ -10,6 +10,7 @@ const FB_WWW_DEV = bundleTypes.FB_WWW_DEV;
 const FB_WWW_PROD = bundleTypes.FB_WWW_PROD;
 const RN_OSS_DEV = bundleTypes.RN_OSS_DEV;
 const RN_OSS_PROD = bundleTypes.RN_OSS_PROD;
+const RN_OSS_PROFILING = bundleTypes.RN_OSS_PROFILING;
 const RN_FB_DEV = bundleTypes.RN_FB_DEV;
 const RN_FB_PROD = bundleTypes.RN_FB_PROD;
 const RENDERER = moduleTypes.RENDERER;
@@ -45,6 +46,7 @@ const forks = Object.freeze({
             return 'shared/forks/ReactFeatureFlags.native-fb.js';
           case RN_OSS_DEV:
           case RN_OSS_PROD:
+          case RN_OSS_PROFILING:
             return 'shared/forks/ReactFeatureFlags.native-oss.js';
           default:
             throw Error(
@@ -58,6 +60,7 @@ const forks = Object.freeze({
             return 'shared/forks/ReactFeatureFlags.native-fabric-fb.js';
           case RN_OSS_DEV:
           case RN_OSS_PROD:
+          case RN_OSS_PROFILING:
             return 'shared/forks/ReactFeatureFlags.native-fabric-oss.js';
           default:
             throw Error(
@@ -143,6 +146,7 @@ const forks = Object.freeze({
         return 'react-reconciler/src/forks/ReactFiberErrorDialog.www.js';
       case RN_OSS_DEV:
       case RN_OSS_PROD:
+      case RN_OSS_PROFILING:
       case RN_FB_DEV:
       case RN_FB_PROD:
         switch (entry) {
diff --git a/scripts/rollup/packaging.js b/scripts/rollup/packaging.js
index 3e59041f3f..507b0d48cf 100644
--- a/scripts/rollup/packaging.js
+++ b/scripts/rollup/packaging.js
@@ -14,10 +14,12 @@ const {
   UMD_PROD,
   NODE_DEV,
   NODE_PROD,
+  NODE_PROFILING,
   FB_WWW_DEV,
   FB_WWW_PROD,
   RN_OSS_DEV,
   RN_OSS_PROD,
+  RN_OSS_PROFILING,
   RN_FB_DEV,
   RN_FB_PROD,
 } = Bundles.bundleTypes;
@@ -33,6 +35,7 @@ function getBundleOutputPaths(bundleType, filename, packageName) {
   switch (bundleType) {
     case NODE_DEV:
     case NODE_PROD:
+    case NODE_PROFILING:
       return [`build/node_modules/${packageName}/cjs/${filename}`];
     case UMD_DEV:
     case UMD_PROD:
@@ -45,6 +48,7 @@ function getBundleOutputPaths(bundleType, filename, packageName) {
       return [`build/facebook-www/${filename}`];
     case RN_OSS_DEV:
     case RN_OSS_PROD:
+    case RN_OSS_PROFILING:
       switch (packageName) {
         case 'react-native-renderer':
           return [`build/react-native/oss/${filename}`];
diff --git a/scripts/rollup/wrappers.js b/scripts/rollup/wrappers.js
index b195b8b25c..36bae238d0 100644
--- a/scripts/rollup/wrappers.js
+++ b/scripts/rollup/wrappers.js
@@ -7,10 +7,12 @@ 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 NODE_PROFILING = Bundles.bundleTypes.NODE_PROFILING;
 const FB_WWW_DEV = Bundles.bundleTypes.FB_WWW_DEV;
 const FB_WWW_PROD = Bundles.bundleTypes.FB_WWW_PROD;
 const RN_OSS_DEV = Bundles.bundleTypes.RN_OSS_DEV;
 const RN_OSS_PROD = Bundles.bundleTypes.RN_OSS_PROD;
+const RN_OSS_PROFILING = Bundles.bundleTypes.RN_OSS_PROFILING;
 const RN_FB_DEV = Bundles.bundleTypes.RN_FB_DEV;
 const RN_FB_PROD = Bundles.bundleTypes.RN_FB_PROD;
 
@@ -91,6 +93,25 @@ ${
 ${source}`;
   },
 
+  /***************** NODE_PROFILING *****************/
+  [NODE_PROFILING](source, globalName, filename, moduleType) {
+    return `/** @license React v${reactVersion}
+ * ${filename}
+ *
+${license}
+ */
+${
+      globalName === 'ReactNoopRenderer' ||
+      globalName === 'ReactNoopRendererPersistent'
+        ? // React Noop needs regenerator runtime because it uses
+          // generators but GCC doesn't handle them in the output.
+          // So we use Babel for them.
+          `const regeneratorRuntime = require("regenerator-runtime");`
+        : ``
+    }
+${source}`;
+  },
+
   /****************** FB_WWW_DEV ******************/
   [FB_WWW_DEV](source, globalName, filename, moduleType) {
     return `/**
@@ -154,6 +175,20 @@ ${license}
  * ${'@gen' + 'erated'}
  */
 
+${source}`;
+  },
+
+  /****************** RN_OSS_PROFILING ******************/
+  [RN_OSS_PROFILING](source, globalName, filename, moduleType) {
+    return `/**
+${license}
+ *
+ * @noflow
+ * @providesModule ${globalName}-profiling
+ * @preventMunge
+ * ${'@gen' + 'erated'}
+ */
+
 ${source}`;
   },
 

From 1594409fab564214eff1737848773e6194852173 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 11 Jun 2018 22:13:05 +0100
Subject: [PATCH 149/277] Scheduler depends on common packages (#13020)

---
 packages/react-scheduler/package.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/react-scheduler/package.json b/packages/react-scheduler/package.json
index b16a07e99b..b5bc00dde1 100644
--- a/packages/react-scheduler/package.json
+++ b/packages/react-scheduler/package.json
@@ -13,6 +13,10 @@
     "url": "https://github.com/facebook/react/issues"
   },
   "homepage": "https://reactjs.org/",
+  "dependencies": {
+    "fbjs": "^0.8.16",
+    "object-assign": "^4.1.1"
+  },
   "files": [
     "LICENSE",
     "README.md",

From 392530104c00c25074ce38e1f7e1dd363018c7ce Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Mon, 11 Jun 2018 16:31:07 -0700
Subject: [PATCH 150/277] Remove feature flag around 'getDerivedStateFromProps'
 bug fix (#13022)

**what is the change?:**
Basically undoes https://github.com/facebook/react/commit/4b2e65d32e3adec7d4ef5ddd5fcb35e617e0cde6#diff-904ceabd8a1e9a07ab1d876d843d62e1

**why make this change?:**
We rolled out this fix internally and in open source weeks ago, and now
we're cleaning up.

**test plan:**
Ran tests and lint, and really we have been testing this because the
flag is open internally as of last week or so.

**issue:**
Internal task T29948812 has some info.
---
 .../src/ReactFiberClassComponent.js           | 15 +++----
 .../ReactIncremental-test.internal.js         | 45 -------------------
 packages/shared/ReactFeatureFlags.js          |  3 --
 .../ReactFeatureFlags.native-fabric-fb.js     |  1 -
 .../ReactFeatureFlags.native-fabric-oss.js    |  1 -
 .../forks/ReactFeatureFlags.native-fb.js      |  1 -
 .../forks/ReactFeatureFlags.native-oss.js     |  1 -
 .../forks/ReactFeatureFlags.persistent.js     |  1 -
 .../forks/ReactFeatureFlags.test-renderer.js  |  1 -
 .../shared/forks/ReactFeatureFlags.www.js     |  1 -
 10 files changed, 6 insertions(+), 64 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js
index 56219535e4..c427af4240 100644
--- a/packages/react-reconciler/src/ReactFiberClassComponent.js
+++ b/packages/react-reconciler/src/ReactFiberClassComponent.js
@@ -15,7 +15,6 @@ import {
   debugRenderPhaseSideEffects,
   debugRenderPhaseSideEffectsForStrictMode,
   warnAboutDeprecatedLifecycles,
-  fireGetDerivedStateFromPropsOnStateUpdates,
 } from 'shared/ReactFeatureFlags';
 import ReactStrictModeWarnings from './ReactStrictModeWarnings';
 import {isMounted} from 'react-reconciler/reflection';
@@ -949,14 +948,12 @@ function updateClassInstance(
   }
 
   if (typeof getDerivedStateFromProps === 'function') {
-    if (fireGetDerivedStateFromPropsOnStateUpdates || oldProps !== newProps) {
-      applyDerivedStateFromProps(
-        workInProgress,
-        getDerivedStateFromProps,
-        newProps,
-      );
-      newState = workInProgress.memoizedState;
-    }
+    applyDerivedStateFromProps(
+      workInProgress,
+      getDerivedStateFromProps,
+      newProps,
+    );
+    newState = workInProgress.memoizedState;
   }
 
   const shouldUpdate =
diff --git a/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
index f58228d952..b4674fd75f 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
@@ -1520,51 +1520,6 @@ describe('ReactIncremental', () => {
     expect(ReactNoop.flush()).toEqual(['Child']);
   });
 
-  it('does not call getDerivedStateFromProps for state-only updates if feature flag is disabled', () => {
-    jest.resetModules();
-    ReactFeatureFlags = require('shared/ReactFeatureFlags');
-    ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
-    ReactFeatureFlags.fireGetDerivedStateFromPropsOnStateUpdates = false;
-    React = require('react');
-    ReactNoop = require('react-noop-renderer');
-
-    let ops = [];
-    let instance;
-
-    class LifeCycle extends React.Component {
-      state = {};
-      static getDerivedStateFromProps(props, prevState) {
-        ops.push('getDerivedStateFromProps');
-        return {foo: 'foo'};
-      }
-      changeState() {
-        this.setState({foo: 'bar'});
-      }
-      componentDidUpdate() {
-        ops.push('componentDidUpdate');
-      }
-      render() {
-        ops.push('render');
-        instance = this;
-        return null;
-      }
-    }
-
-    ReactNoop.render(<LifeCycle />);
-    ReactNoop.flush();
-
-    expect(ops).toEqual(['getDerivedStateFromProps', 'render']);
-    expect(instance.state).toEqual({foo: 'foo'});
-
-    ops = [];
-
-    instance.changeState();
-    ReactNoop.flush();
-
-    expect(ops).toEqual(['render', 'componentDidUpdate']);
-    expect(instance.state).toEqual({foo: 'bar'});
-  });
-
   xit('does not call componentWillReceiveProps for state-only updates', () => {
     let ops = [];
 
diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
index 31aad39f14..003d96fe95 100644
--- a/packages/shared/ReactFeatureFlags.js
+++ b/packages/shared/ReactFeatureFlags.js
@@ -39,9 +39,6 @@ export const warnAboutLegacyContextAPI = false;
 // Gather advanced timing metrics for Profiler subtrees.
 export const enableProfilerTimer = __PROFILE__;
 
-// Fires getDerivedStateFromProps for state *or* props changes
-export const fireGetDerivedStateFromPropsOnStateUpdates = true;
-
 // Only used in www builds.
 export function addUserTimingListener() {
   invariant(false, 'Not implemented.');
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
index 5fc79cc55d..1d45d79c79 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
@@ -21,7 +21,6 @@ export const warnAboutDeprecatedLifecycles = false;
 export const warnAboutLegacyContextAPI = __DEV__;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableProfilerTimer = __DEV__;
-export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
index b4cb4e54b1..80aa2d7e46 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
@@ -21,7 +21,6 @@ export const warnAboutDeprecatedLifecycles = false;
 export const warnAboutLegacyContextAPI = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableProfilerTimer = __PROFILE__;
-export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js
index 086518d9f3..d36c0143c1 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js
@@ -21,7 +21,6 @@ export const {
   warnAboutDeprecatedLifecycles,
   replayFailedUnitOfWorkWithInvokeGuardedCallback,
   enableProfilerTimer,
-  fireGetDerivedStateFromPropsOnStateUpdates,
 } = require('ReactFeatureFlags');
 
 // The rest of the flags are static for better dead code elimination.
diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js
index 254aab1dfc..5f4511c8dd 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js
@@ -21,7 +21,6 @@ export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const warnAboutDeprecatedLifecycles = false;
 export const warnAboutLegacyContextAPI = false;
 export const enableProfilerTimer = __PROFILE__;
-export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.persistent.js b/packages/shared/forks/ReactFeatureFlags.persistent.js
index 06c1014dd7..8203c2c931 100644
--- a/packages/shared/forks/ReactFeatureFlags.persistent.js
+++ b/packages/shared/forks/ReactFeatureFlags.persistent.js
@@ -21,7 +21,6 @@ export const warnAboutDeprecatedLifecycles = false;
 export const warnAboutLegacyContextAPI = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
 export const enableProfilerTimer = false;
-export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
index b8e0cbcea1..70f055d5a2 100644
--- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js
+++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
@@ -21,7 +21,6 @@ export const warnAboutDeprecatedLifecycles = false;
 export const warnAboutLegacyContextAPI = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = false;
 export const enableProfilerTimer = false;
-export const fireGetDerivedStateFromPropsOnStateUpdates = true;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js
index 0923924957..a50191a176 100644
--- a/packages/shared/forks/ReactFeatureFlags.www.js
+++ b/packages/shared/forks/ReactFeatureFlags.www.js
@@ -19,7 +19,6 @@ export const {
   replayFailedUnitOfWorkWithInvokeGuardedCallback,
   warnAboutDeprecatedLifecycles,
   enableProfilerTimer,
-  fireGetDerivedStateFromPropsOnStateUpdates,
 } = require('ReactFeatureFlags');
 
 // The rest of the flags are static for better dead code elimination.

From 945fc1bfce5f2a93ac6ff0c53da3fd57e81b5a63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ruci=C5=84ski?= <fatfisz@gmail.com>
Date: Wed, 13 Jun 2018 00:36:50 +0200
Subject: [PATCH 151/277] Call gDSFP with the right state in react-test-render
 (#13030)

* Call gDSFP with the right state in react-test-render

* Change the test
---
 .../src/ReactShallowRenderer.js               |  4 +--
 .../__tests__/ReactShallowRenderer-test.js    | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js
index 3134f991ee..0c1f717883 100644
--- a/packages/react-test-renderer/src/ReactShallowRenderer.js
+++ b/packages/react-test-renderer/src/ReactShallowRenderer.js
@@ -238,14 +238,14 @@ class ReactShallowRenderer {
     const {type} = this._element;
 
     if (typeof type.getDerivedStateFromProps === 'function') {
+      const oldState = this._newState || this._instance.state;
       const partialState = type.getDerivedStateFromProps.call(
         null,
         props,
-        this._instance.state,
+        oldState,
       );
 
       if (partialState != null) {
-        const oldState = this._newState || this._instance.state;
         const newState = Object.assign({}, oldState, partialState);
         this._instance.state = this._newState = newState;
       }
diff --git a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
index eb8942a520..b47495bca9 100644
--- a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
@@ -915,6 +915,33 @@ describe('ReactShallowRenderer', () => {
     expect(result.props.children).toEqual(3);
   });
 
+  it('should not override state with stale values if prevState is spread within getDerivedStateFromProps', () => {
+    class SimpleComponent extends React.Component {
+      state = {value: 0};
+
+      static getDerivedStateFromProps(nextProps, prevState) {
+        return {...prevState};
+      }
+
+      updateState = () => {
+        this.setState(state => ({value: state.value + 1}));
+      };
+
+      render() {
+        return <div>{`value:${this.state.value}`}</div>;
+      }
+    }
+
+    const shallowRenderer = createRenderer();
+    let result = shallowRenderer.render(<SimpleComponent />);
+    expect(result).toEqual(<div>value:0</div>);
+
+    let instance = shallowRenderer.getMountedInstance();
+    instance.updateState();
+    result = shallowRenderer.getRenderOutput();
+    expect(result).toEqual(<div>value:1</div>);
+  });
+
   it('can setState with an updater function', () => {
     let instance;
 

From 036ae3c6e2f056adffc31dfb78d1b6f0c63272f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Spie=C3=9F?= <hello@philippspiess.com>
Date: Wed, 13 Jun 2018 13:41:23 +0200
Subject: [PATCH 152/277] Use native event dispatching instead of Simulate or
 SimulateNative (#13023)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Use native event dispatching instead of Simulate or SimulateNative

In #12629 @gaearon suggested that it would be better to drop usage of
`ReactTestUtils.Simulate` and `ReactTestUtils.SimulateNative`. In this
PR I’m attempting at removing it from a lot of places with only a few
leftovers.

Those leftovers can be categorized into three groups:

1. Anything that tests that `SimulateNative` throws. This is a property
   that native event dispatching doesn’t have so I can’t convert that
   easily. Affected test suites: `EventPluginHub-test`,
   `ReactBrowserEventEmitter-test`.
2. Anything that tests `ReactTestUtils` directly. Affected test suites:
   `ReactBrowserEventEmitter-test` (this file has one test that reads
    "should have mouse enter simulated by test utils"),
    `ReactTestUtils-test`.
3. Anything that dispatches a `change` event. The reason here goes a bit
   deeper and is rooted in the way we shim onChange. Usually when using
   native event dispatching, you would set the node’s `.value` and then
   dispatch the event. However inside [`inputValueTracking.js`][] we
   install a setter on the node’s `.value` that will ignore the next
   `change` event (I found [this][near-perfect-oninput-shim] article
   from Sophie that explains that this is to avoid onChange when
   updating the value via JavaScript).

All remaining usages of `Simulate` or `SimulateNative` can be avoided
by mounting the containers inside the `document` and dispatching native
events.

Here some remarks:

1. I’m using `Element#click()` instead of `dispatchEvent`. In the jsdom
   changelog I read that `click()` now properly sets the correct values
   (you can also verify it does the same thing by looking at the
   [source][jsdom-source]).
2. I had to update jsdom in order to get `TouchEvent` constructors
   working (and while doing so also updated jest). There was one
   unexpected surprise: `ReactScheduler-test` was relying on not having
   `window.performance` available. I’ve recreated the previous
   environment by deleting this property from the global object.
3. I was a bit confused that `ReactTestUtils.renderIntoDocument()` does
   not render into the document 🤷‍

[`inputValueTracking.js`]: https://github.com/facebook/react/blob/392530104c00c25074ce38e1f7e1dd363018c7ce/packages/react-dom/src/client/inputValueTracking.js#L79
[near-perfect-oninput-shim]: https://sophiebits.com/2013/06/18/a-near-perfect-oninput-shim-for-ie-8-and-9.html
[jsdom-source]: https://github.com/jsdom/jsdom/blob/45b77f5d21cef74cad278d089937d8462c29acce/lib/jsdom/living/nodes/HTMLElement-impl.js#L43-L76

* Make sure contains are unlinked from the document even if the test fails

* Remove unnecessary findDOMNode calls
---
 package.json                                  |   2 +-
 .../ReactBrowserEventEmitter-test.internal.js |  36 +-
 .../src/__tests__/ReactComponent-test.js      |   2 +-
 .../__tests__/ReactComponentLifeCycle-test.js |  22 +-
 .../__tests__/ReactCompositeComponent-test.js |  25 +-
 ...ReactCompositeComponentNestedState-test.js |   4 +-
 .../react-dom/src/__tests__/ReactDOM-test.js  |  95 ++-
 .../src/__tests__/ReactDOMFiber-test.js       | 281 ++++----
 .../src/__tests__/ReactDOMIframe-test.js      |   4 +-
 .../src/__tests__/ReactDOMInput-test.js       |  81 +--
 .../src/__tests__/ReactDOMOption-test.js      |  12 +-
 .../src/__tests__/ReactDOMSelect-test.js      |  55 +-
 .../__tests__/ReactDOMTextComponent-test.js   |  47 +-
 .../__tests__/ReactEventIndependence-test.js  |  74 ++-
 .../src/__tests__/ReactIdentity-test.js       |   2 +-
 .../ReactServerRenderingHydration.js          | 199 +++---
 .../src/__tests__/ReactTestUtils-test.js      |   5 +-
 packages/react-dom/src/__tests__/refs-test.js |  57 +-
 .../SimpleEventPlugin-test.internal.js        |  70 +-
 .../events/__tests__/SyntheticEvent-test.js   |  12 +-
 .../__tests__/TapEventPlugin-test.internal.js |  69 +-
 .../src/__tests__/ReactScheduler-test.js      |   2 +
 yarn.lock                                     | 609 ++++++++++--------
 23 files changed, 946 insertions(+), 819 deletions(-)

diff --git a/package.json b/package.json
index 73c007dfa3..23692fd8d4 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "gzip-js": "~0.3.2",
     "gzip-size": "^3.0.0",
     "jasmine-check": "^1.0.0-rc.0",
-    "jest": "^23.0.1",
+    "jest": "^23.1.0",
     "jest-diff": "^23.0.1",
     "merge-stream": "^1.0.0",
     "minimatch": "^3.0.4",
diff --git a/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.internal.js b/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.internal.js
index 85d6e22dfb..86a668a4bb 100644
--- a/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.internal.js
+++ b/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.internal.js
@@ -42,6 +42,8 @@ let getListener;
 let putListener;
 let deleteAllListeners;
 
+let container;
+
 function registerSimpleTestHandler() {
   putListener(CHILD, ON_CLICK_KEY, LISTENER);
   const listener = getListener(CHILD, ON_CLICK_KEY);
@@ -63,7 +65,8 @@ describe('ReactBrowserEventEmitter', () => {
     ReactBrowserEventEmitter = require('../events/ReactBrowserEventEmitter');
     ReactTestUtils = require('react-dom/test-utils');
 
-    const container = document.createElement('div');
+    container = document.createElement('div');
+    document.body.appendChild(container);
 
     let GRANDPARENT_PROPS = {};
     let PARENT_PROPS = {};
@@ -129,6 +132,11 @@ describe('ReactBrowserEventEmitter', () => {
     idCallOrder = [];
   });
 
+  afterEach(() => {
+    document.body.removeChild(container);
+    container = null;
+  });
+
   it('should store a listener correctly', () => {
     registerSimpleTestHandler();
     const listener = getListener(CHILD, ON_CLICK_KEY);
@@ -150,17 +158,17 @@ describe('ReactBrowserEventEmitter', () => {
 
   it('should invoke a simple handler registered on a node', () => {
     registerSimpleTestHandler();
-    ReactTestUtils.Simulate.click(CHILD);
+    CHILD.click();
     expect(LISTENER).toHaveBeenCalledTimes(1);
   });
 
   it('should not invoke handlers if ReactBrowserEventEmitter is disabled', () => {
     registerSimpleTestHandler();
     ReactBrowserEventEmitter.setEnabled(false);
-    ReactTestUtils.SimulateNative.click(CHILD);
+    CHILD.click();
     expect(LISTENER).toHaveBeenCalledTimes(0);
     ReactBrowserEventEmitter.setEnabled(true);
-    ReactTestUtils.SimulateNative.click(CHILD);
+    CHILD.click();
     expect(LISTENER).toHaveBeenCalledTimes(1);
   });
 
@@ -168,7 +176,7 @@ describe('ReactBrowserEventEmitter', () => {
     putListener(CHILD, ON_CLICK_KEY, recordID.bind(null, CHILD));
     putListener(PARENT, ON_CLICK_KEY, recordID.bind(null, PARENT));
     putListener(GRANDPARENT, ON_CLICK_KEY, recordID.bind(null, GRANDPARENT));
-    ReactTestUtils.Simulate.click(CHILD);
+    CHILD.click();
     expect(idCallOrder.length).toBe(3);
     expect(idCallOrder[0]).toBe(CHILD);
     expect(idCallOrder[1]).toBe(PARENT);
@@ -179,7 +187,7 @@ describe('ReactBrowserEventEmitter', () => {
     putListener(GRANDPARENT, ON_CLICK_KEY, recordID.bind(null, 'GRANDPARENT'));
     putListener(PARENT, ON_CLICK_KEY, recordID.bind(null, 'PARENT'));
     putListener(CHILD, ON_CLICK_KEY, recordID.bind(null, 'CHILD'));
-    ReactTestUtils.Simulate.click(CHILD);
+    CHILD.click();
     expect(idCallOrder).toEqual(['CHILD', 'PARENT', 'GRANDPARENT']);
 
     idCallOrder = [];
@@ -191,7 +199,7 @@ describe('ReactBrowserEventEmitter', () => {
       recordID.bind(null, 'UPDATED_GRANDPARENT'),
     );
 
-    ReactTestUtils.Simulate.click(CHILD);
+    CHILD.click();
     expect(idCallOrder).toEqual(['CHILD', 'PARENT', 'UPDATED_GRANDPARENT']);
   });
 
@@ -224,7 +232,7 @@ describe('ReactBrowserEventEmitter', () => {
       recordID(GRANDPARENT);
       expect(event.currentTarget).toBe(GRANDPARENT);
     });
-    ReactTestUtils.Simulate.click(CHILD);
+    CHILD.click();
     expect(idCallOrder.length).toBe(3);
     expect(idCallOrder[0]).toBe(CHILD);
     expect(idCallOrder[1]).toBe(PARENT);
@@ -239,7 +247,7 @@ describe('ReactBrowserEventEmitter', () => {
       recordIDAndStopPropagation.bind(null, PARENT),
     );
     putListener(GRANDPARENT, ON_CLICK_KEY, recordID.bind(null, GRANDPARENT));
-    ReactTestUtils.Simulate.click(CHILD);
+    CHILD.click();
     expect(idCallOrder.length).toBe(2);
     expect(idCallOrder[0]).toBe(CHILD);
     expect(idCallOrder[1]).toBe(PARENT);
@@ -254,7 +262,7 @@ describe('ReactBrowserEventEmitter', () => {
       e.isPropagationStopped = () => true;
     });
     putListener(GRANDPARENT, ON_CLICK_KEY, recordID.bind(null, GRANDPARENT));
-    ReactTestUtils.Simulate.click(CHILD);
+    CHILD.click();
     expect(idCallOrder.length).toBe(2);
     expect(idCallOrder[0]).toBe(CHILD);
     expect(idCallOrder[1]).toBe(PARENT);
@@ -268,7 +276,7 @@ describe('ReactBrowserEventEmitter', () => {
     );
     putListener(PARENT, ON_CLICK_KEY, recordID.bind(null, PARENT));
     putListener(GRANDPARENT, ON_CLICK_KEY, recordID.bind(null, GRANDPARENT));
-    ReactTestUtils.Simulate.click(CHILD);
+    CHILD.click();
     expect(idCallOrder.length).toBe(1);
     expect(idCallOrder[0]).toBe(CHILD);
   });
@@ -277,7 +285,7 @@ describe('ReactBrowserEventEmitter', () => {
     putListener(CHILD, ON_CLICK_KEY, recordIDAndReturnFalse.bind(null, CHILD));
     putListener(PARENT, ON_CLICK_KEY, recordID.bind(null, PARENT));
     putListener(GRANDPARENT, ON_CLICK_KEY, recordID.bind(null, GRANDPARENT));
-    ReactTestUtils.Simulate.click(CHILD);
+    CHILD.click();
     expect(idCallOrder.length).toBe(3);
     expect(idCallOrder[0]).toBe(CHILD);
     expect(idCallOrder[1]).toBe(PARENT);
@@ -300,7 +308,7 @@ describe('ReactBrowserEventEmitter', () => {
     };
     putListener(CHILD, ON_CLICK_KEY, handleChildClick);
     putListener(PARENT, ON_CLICK_KEY, handleParentClick);
-    ReactTestUtils.Simulate.click(CHILD);
+    CHILD.click();
     expect(handleParentClick).toHaveBeenCalledTimes(1);
   });
 
@@ -310,7 +318,7 @@ describe('ReactBrowserEventEmitter', () => {
       putListener(PARENT, ON_CLICK_KEY, handleParentClick);
     };
     putListener(CHILD, ON_CLICK_KEY, handleChildClick);
-    ReactTestUtils.Simulate.click(CHILD);
+    CHILD.click();
     expect(handleParentClick).toHaveBeenCalledTimes(0);
   });
 
diff --git a/packages/react-dom/src/__tests__/ReactComponent-test.js b/packages/react-dom/src/__tests__/ReactComponent-test.js
index 37f3fc226a..06bfa68baa 100644
--- a/packages/react-dom/src/__tests__/ReactComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactComponent-test.js
@@ -278,7 +278,7 @@ describe('ReactComponent', () => {
       componentDidMount() {
         // Check .props.title to make sure we got the right elements back
         expect(this.wrapperRef.getTitle()).toBe('wrapper');
-        expect(ReactDOM.findDOMNode(this.innerRef).className).toBe('inner');
+        expect(this.innerRef.className).toBe('inner');
         mounted = true;
       }
     }
diff --git a/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js b/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js
index 965b04f30a..25577ee5af 100644
--- a/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js
+++ b/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js
@@ -1065,16 +1065,22 @@ describe('ReactComponentLifeCycle', () => {
       }
     }
 
-    ReactTestUtils.renderIntoDocument(<Parent />);
-    expect(divRef.current.textContent).toBe('remote:0, local:0');
+    const container = document.createElement('div');
+    document.body.appendChild(container);
+    try {
+      ReactDOM.render(<Parent />, container);
+      expect(divRef.current.textContent).toBe('remote:0, local:0');
 
-    // Trigger setState() calls
-    childInstance.updateState();
-    expect(divRef.current.textContent).toBe('remote:1, local:1');
+      // Trigger setState() calls
+      childInstance.updateState();
+      expect(divRef.current.textContent).toBe('remote:1, local:1');
 
-    // Trigger batched setState() calls
-    ReactTestUtils.Simulate.click(divRef.current);
-    expect(divRef.current.textContent).toBe('remote:2, local:2');
+      // Trigger batched setState() calls
+      divRef.current.click();
+      expect(divRef.current.textContent).toBe('remote:2, local:2');
+    } finally {
+      document.body.removeChild(container);
+    }
   });
 
   it('should pass the return value from getSnapshotBeforeUpdate to componentDidUpdate', () => {
diff --git a/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js b/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js
index 216afa8550..d614d27dd3 100644
--- a/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js
@@ -140,23 +140,28 @@ describe('ReactCompositeComponent', () => {
   });
 
   it('should react to state changes from callbacks', () => {
-    const instance = ReactTestUtils.renderIntoDocument(<MorphingComponent />);
-    let el = ReactDOM.findDOMNode(instance);
-    expect(el.tagName).toBe('A');
-
-    ReactTestUtils.Simulate.click(el);
-    el = ReactDOM.findDOMNode(instance);
-    expect(el.tagName).toBe('B');
+    const container = document.createElement('div');
+    document.body.appendChild(container);
+    try {
+      const instance = ReactDOM.render(<MorphingComponent />, container);
+      let el = ReactDOM.findDOMNode(instance);
+      expect(el.tagName).toBe('A');
+      el.click();
+      el = ReactDOM.findDOMNode(instance);
+      expect(el.tagName).toBe('B');
+    } finally {
+      document.body.removeChild(container);
+    }
   });
 
   it('should rewire refs when rendering to different child types', () => {
     const instance = ReactTestUtils.renderIntoDocument(<MorphingComponent />);
 
-    expect(ReactDOM.findDOMNode(instance.refs.x).tagName).toBe('A');
+    expect(instance.refs.x.tagName).toBe('A');
     instance._toggleActivatedState();
-    expect(ReactDOM.findDOMNode(instance.refs.x).tagName).toBe('B');
+    expect(instance.refs.x.tagName).toBe('B');
     instance._toggleActivatedState();
-    expect(ReactDOM.findDOMNode(instance.refs.x).tagName).toBe('A');
+    expect(instance.refs.x.tagName).toBe('A');
   });
 
   it('should not cache old DOM nodes when switching constructors', () => {
diff --git a/packages/react-dom/src/__tests__/ReactCompositeComponentNestedState-test.js b/packages/react-dom/src/__tests__/ReactCompositeComponentNestedState-test.js
index 94a33a457a..e233e78b72 100644
--- a/packages/react-dom/src/__tests__/ReactCompositeComponentNestedState-test.js
+++ b/packages/react-dom/src/__tests__/ReactCompositeComponentNestedState-test.js
@@ -11,13 +11,11 @@
 
 let React;
 let ReactDOM;
-let ReactTestUtils;
 
 describe('ReactCompositeComponentNestedState-state', () => {
   beforeEach(() => {
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('react-dom/test-utils');
   });
 
   it('should provide up to date values for props', () => {
@@ -102,7 +100,7 @@ describe('ReactCompositeComponentNestedState-state', () => {
     void ReactDOM.render(<ParentComponent logger={logger} />, container);
 
     // click "light green"
-    ReactTestUtils.Simulate.click(container.childNodes[0].childNodes[3]);
+    container.childNodes[0].childNodes[3].click();
 
     expect(logger.mock.calls).toEqual([
       ['parent-render', 'blue'],
diff --git a/packages/react-dom/src/__tests__/ReactDOM-test.js b/packages/react-dom/src/__tests__/ReactDOM-test.js
index cca40165fd..48609a2c25 100644
--- a/packages/react-dom/src/__tests__/ReactDOM-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOM-test.js
@@ -45,23 +45,21 @@ describe('ReactDOM', () => {
 
   it('allows a DOM element to be used with a string', () => {
     const element = React.createElement('div', {className: 'foo'});
-    const instance = ReactTestUtils.renderIntoDocument(element);
-    expect(ReactDOM.findDOMNode(instance).tagName).toBe('DIV');
+    const node = ReactTestUtils.renderIntoDocument(element);
+    expect(node.tagName).toBe('DIV');
   });
 
   it('should allow children to be passed as an argument', () => {
-    const argDiv = ReactTestUtils.renderIntoDocument(
+    const argNode = ReactTestUtils.renderIntoDocument(
       React.createElement('div', null, 'child'),
     );
-    const argNode = ReactDOM.findDOMNode(argDiv);
     expect(argNode.innerHTML).toBe('child');
   });
 
   it('should overwrite props.children with children argument', () => {
-    const conflictDiv = ReactTestUtils.renderIntoDocument(
+    const conflictNode = ReactTestUtils.renderIntoDocument(
       React.createElement('div', {children: 'fakechild'}, 'child'),
     );
-    const conflictNode = ReactDOM.findDOMNode(conflictDiv);
     expect(conflictNode.innerHTML).toBe('child');
   });
 
@@ -103,8 +101,7 @@ describe('ReactDOM', () => {
         <div key="theBird" className="bird" />,
       </div>,
     );
-    const root = ReactDOM.findDOMNode(myDiv);
-    const dog = root.childNodes[0];
+    const dog = myDiv.childNodes[0];
     expect(dog.className).toBe('bigdog');
   });
 
@@ -242,34 +239,37 @@ describe('ReactDOM', () => {
     const log = [];
     const container = document.createElement('div');
     document.body.appendChild(container);
-    ReactDOM.render(<A showTwo={false} />, container);
-    input.focus();
+    try {
+      ReactDOM.render(<A showTwo={false} />, container);
+      input.focus();
 
-    // When the second input is added, let's simulate losing focus, which is
-    // something that could happen when manipulating DOM nodes (but is hard to
-    // deterministically force without relying intensely on React DOM
-    // implementation details)
-    const div = container.firstChild;
-    ['appendChild', 'insertBefore'].forEach(name => {
-      const mutator = div[name];
-      div[name] = function() {
-        if (input) {
-          input.blur();
-          expect(document.activeElement.tagName).toBe('BODY');
-          log.push('input2 inserted');
-        }
-        return mutator.apply(this, arguments);
-      };
-    });
+      // When the second input is added, let's simulate losing focus, which is
+      // something that could happen when manipulating DOM nodes (but is hard to
+      // deterministically force without relying intensely on React DOM
+      // implementation details)
+      const div = container.firstChild;
+      ['appendChild', 'insertBefore'].forEach(name => {
+        const mutator = div[name];
+        div[name] = function() {
+          if (input) {
+            input.blur();
+            expect(document.activeElement.tagName).toBe('BODY');
+            log.push('input2 inserted');
+          }
+          return mutator.apply(this, arguments);
+        };
+      });
 
-    expect(document.activeElement.id).toBe('one');
-    ReactDOM.render(<A showTwo={true} />, container);
-    // input2 gets added, which causes input to get blurred. Then
-    // componentDidUpdate focuses input2 and that should make it down to here,
-    // not get overwritten by focus restoration.
-    expect(document.activeElement.id).toBe('two');
-    expect(log).toEqual(['input2 inserted', 'input2 focused']);
-    document.body.removeChild(container);
+      expect(document.activeElement.id).toBe('one');
+      ReactDOM.render(<A showTwo={true} />, container);
+      // input2 gets added, which causes input to get blurred. Then
+      // componentDidUpdate focuses input2 and that should make it down to here,
+      // not get overwritten by focus restoration.
+      expect(document.activeElement.id).toBe('two');
+      expect(log).toEqual(['input2 inserted', 'input2 focused']);
+    } finally {
+      document.body.removeChild(container);
+    }
   });
 
   it('calls focus() on autoFocus elements after they have been mounted to the DOM', () => {
@@ -308,15 +308,9 @@ describe('ReactDOM', () => {
   it("shouldn't fire duplicate event handler while handling other nested dispatch", () => {
     const actual = [];
 
-    function click(node) {
-      ReactTestUtils.Simulate.click(node, {
-        path: [node, container],
-      });
-    }
-
     class Wrapper extends React.Component {
       componentDidMount() {
-        click(this.ref1);
+        this.ref1.click();
       }
 
       render() {
@@ -325,7 +319,7 @@ describe('ReactDOM', () => {
             <div
               onClick={() => {
                 actual.push('1st node clicked');
-                click(this.ref2);
+                this.ref2.click();
               }}
               ref={ref => (this.ref1 = ref)}
             />
@@ -341,13 +335,18 @@ describe('ReactDOM', () => {
     }
 
     const container = document.createElement('div');
-    ReactDOM.render(<Wrapper />, container);
+    document.body.appendChild(container);
+    try {
+      ReactDOM.render(<Wrapper />, container);
 
-    const expected = [
-      '1st node clicked',
-      "2nd node clicked imperatively from 1st's handler",
-    ];
-    expect(actual).toEqual(expected);
+      const expected = [
+        '1st node clicked',
+        "2nd node clicked imperatively from 1st's handler",
+      ];
+      expect(actual).toEqual(expected);
+    } finally {
+      document.body.removeChild(container);
+    }
   });
 
   it('should not crash with devtools installed', () => {
diff --git a/packages/react-dom/src/__tests__/ReactDOMFiber-test.js b/packages/react-dom/src/__tests__/ReactDOMFiber-test.js
index 911f161b0e..530232becb 100644
--- a/packages/react-dom/src/__tests__/ReactDOMFiber-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMFiber-test.js
@@ -11,7 +11,6 @@
 
 const React = require('react');
 const ReactDOM = require('react-dom');
-const ReactTestUtils = require('react-dom/test-utils');
 const PropTypes = require('prop-types');
 
 describe('ReactDOMFiber', () => {
@@ -843,33 +842,39 @@ describe('ReactDOMFiber', () => {
 
   it('should bubble events from the portal to the parent', () => {
     const portalContainer = document.createElement('div');
+    document.body.appendChild(portalContainer);
+    try {
+      const ops = [];
+      let portal = null;
 
-    const ops = [];
-    let portal = null;
+      ReactDOM.render(
+        <div onClick={() => ops.push('parent clicked')}>
+          {ReactDOM.createPortal(
+            <div
+              onClick={() => ops.push('portal clicked')}
+              ref={n => (portal = n)}>
+              portal
+            </div>,
+            portalContainer,
+          )}
+        </div>,
+        container,
+      );
 
-    ReactDOM.render(
-      <div onClick={() => ops.push('parent clicked')}>
-        {ReactDOM.createPortal(
-          <div
-            onClick={() => ops.push('portal clicked')}
-            ref={n => (portal = n)}>
-            portal
-          </div>,
-          portalContainer,
-        )}
-      </div>,
-      container,
-    );
+      expect(portal.tagName).toBe('DIV');
 
-    expect(portal.tagName).toBe('DIV');
+      portal.click();
 
-    ReactTestUtils.Simulate.click(portal);
-
-    expect(ops).toEqual(['portal clicked', 'parent clicked']);
+      expect(ops).toEqual(['portal clicked', 'parent clicked']);
+    } finally {
+      document.body.removeChild(portalContainer);
+    }
   });
 
   it('should not onMouseLeave when staying in the portal', () => {
     const portalContainer = document.createElement('div');
+    document.body.appendChild(container);
+    document.body.appendChild(portalContainer);
 
     let ops = [];
     let firstTarget = null;
@@ -878,56 +883,69 @@ describe('ReactDOMFiber', () => {
 
     function simulateMouseMove(from, to) {
       if (from) {
-        ReactTestUtils.SimulateNative.mouseOut(from, {
-          relatedTarget: to,
-        });
+        from.dispatchEvent(
+          new MouseEvent('mouseout', {
+            bubbles: true,
+            cancelable: true,
+            relatedTarget: to,
+          }),
+        );
       }
       if (to) {
-        ReactTestUtils.SimulateNative.mouseOver(to, {
-          relatedTarget: from,
-        });
+        to.dispatchEvent(
+          new MouseEvent('mouseover', {
+            bubbles: true,
+            cancelable: true,
+            relatedTarget: from,
+          }),
+        );
       }
     }
 
-    ReactDOM.render(
-      <div>
-        <div
-          onMouseEnter={() => ops.push('enter parent')}
-          onMouseLeave={() => ops.push('leave parent')}>
-          <div ref={n => (firstTarget = n)} />
-          {ReactDOM.createPortal(
-            <div
-              onMouseEnter={() => ops.push('enter portal')}
-              onMouseLeave={() => ops.push('leave portal')}
-              ref={n => (secondTarget = n)}>
-              portal
-            </div>,
-            portalContainer,
-          )}
-        </div>
-        <div ref={n => (thirdTarget = n)} />
-      </div>,
-      container,
-    );
+    try {
+      ReactDOM.render(
+        <div>
+          <div
+            onMouseEnter={() => ops.push('enter parent')}
+            onMouseLeave={() => ops.push('leave parent')}>
+            <div ref={n => (firstTarget = n)} />
+            {ReactDOM.createPortal(
+              <div
+                onMouseEnter={() => ops.push('enter portal')}
+                onMouseLeave={() => ops.push('leave portal')}
+                ref={n => (secondTarget = n)}>
+                portal
+              </div>,
+              portalContainer,
+            )}
+          </div>
+          <div ref={n => (thirdTarget = n)} />
+        </div>,
+        container,
+      );
 
-    simulateMouseMove(null, firstTarget);
-    expect(ops).toEqual(['enter parent']);
+      simulateMouseMove(null, firstTarget);
+      expect(ops).toEqual(['enter parent']);
 
-    ops = [];
+      ops = [];
 
-    simulateMouseMove(firstTarget, secondTarget);
-    expect(ops).toEqual([
-      // Parent did not invoke leave because we're still inside the portal.
-      'enter portal',
-    ]);
+      simulateMouseMove(firstTarget, secondTarget);
+      expect(ops).toEqual([
+        // Parent did not invoke leave because we're still inside the portal.
+        'enter portal',
+      ]);
 
-    ops = [];
+      ops = [];
 
-    simulateMouseMove(secondTarget, thirdTarget);
-    expect(ops).toEqual([
-      'leave portal',
-      'leave parent', // Only when we leave the portal does onMouseLeave fire.
-    ]);
+      simulateMouseMove(secondTarget, thirdTarget);
+      expect(ops).toEqual([
+        'leave portal',
+        'leave parent', // Only when we leave the portal does onMouseLeave fire.
+      ]);
+    } finally {
+      document.body.removeChild(container);
+      document.body.removeChild(portalContainer);
+    }
   });
 
   it('should throw on bad createPortal argument', () => {
@@ -967,81 +985,82 @@ describe('ReactDOMFiber', () => {
   });
 
   it('should not update event handlers until commit', () => {
-    let ops = [];
-    const handlerA = () => ops.push('A');
-    const handlerB = () => ops.push('B');
+    document.body.appendChild(container);
+    try {
+      let ops = [];
+      const handlerA = () => ops.push('A');
+      const handlerB = () => ops.push('B');
 
-    class Example extends React.Component {
-      state = {flip: false, count: 0};
-      flip() {
-        this.setState({flip: true, count: this.state.count + 1});
+      class Example extends React.Component {
+        state = {flip: false, count: 0};
+        flip() {
+          this.setState({flip: true, count: this.state.count + 1});
+        }
+        tick() {
+          this.setState({count: this.state.count + 1});
+        }
+        render() {
+          const useB = !this.props.forceA && this.state.flip;
+          return <div onClick={useB ? handlerB : handlerA} />;
+        }
       }
-      tick() {
-        this.setState({count: this.state.count + 1});
-      }
-      render() {
-        const useB = !this.props.forceA && this.state.flip;
-        return <div onClick={useB ? handlerB : handlerA} />;
+
+      class Click extends React.Component {
+        constructor() {
+          super();
+          node.click();
+        }
+        render() {
+          return null;
+        }
       }
+
+      let inst;
+      ReactDOM.render([<Example key="a" ref={n => (inst = n)} />], container);
+      const node = container.firstChild;
+      expect(node.tagName).toEqual('DIV');
+
+      node.click();
+
+      expect(ops).toEqual(['A']);
+      ops = [];
+
+      // Render with the other event handler.
+      inst.flip();
+
+      node.click();
+
+      expect(ops).toEqual(['B']);
+      ops = [];
+
+      // Rerender without changing any props.
+      inst.tick();
+
+      node.click();
+
+      expect(ops).toEqual(['B']);
+      ops = [];
+
+      // Render a flip back to the A handler. The second component invokes the
+      // 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 key="a" forceA={true} />, <Click key="b" />],
+        container,
+      );
+
+      // Because the new click handler has not yet committed, we should still
+      // invoke B.
+      expect(ops).toEqual(['B']);
+      ops = [];
+
+      // Any click that happens after commit, should invoke A.
+      node.click();
+      expect(ops).toEqual(['A']);
+    } finally {
+      document.body.removeChild(container);
     }
-
-    class Click extends React.Component {
-      constructor() {
-        super();
-        click(node);
-      }
-      render() {
-        return null;
-      }
-    }
-
-    let inst;
-    ReactDOM.render([<Example key="a" ref={n => (inst = n)} />], container);
-    const node = container.firstChild;
-    expect(node.tagName).toEqual('DIV');
-
-    function click(target) {
-      ReactTestUtils.Simulate.click(target);
-    }
-
-    click(node);
-
-    expect(ops).toEqual(['A']);
-    ops = [];
-
-    // Render with the other event handler.
-    inst.flip();
-
-    click(node);
-
-    expect(ops).toEqual(['B']);
-    ops = [];
-
-    // Rerender without changing any props.
-    inst.tick();
-
-    click(node);
-
-    expect(ops).toEqual(['B']);
-    ops = [];
-
-    // Render a flip back to the A handler. The second component invokes the
-    // 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 key="a" forceA={true} />, <Click key="b" />],
-      container,
-    );
-
-    // Because the new click handler has not yet committed, we should still
-    // invoke B.
-    expect(ops).toEqual(['B']);
-    ops = [];
-
-    // Any click that happens after commit, should invoke A.
-    click(node);
-    expect(ops).toEqual(['A']);
   });
 
   it('should not crash encountering low-priority tree', () => {
diff --git a/packages/react-dom/src/__tests__/ReactDOMIframe-test.js b/packages/react-dom/src/__tests__/ReactDOMIframe-test.js
index 97b07bb0b7..8c3a01b78f 100644
--- a/packages/react-dom/src/__tests__/ReactDOMIframe-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMIframe-test.js
@@ -11,12 +11,10 @@
 
 describe('ReactDOMIframe', () => {
   let React;
-  let ReactDOM;
   let ReactTestUtils;
 
   beforeEach(() => {
     React = require('react');
-    ReactDOM = require('react-dom');
     ReactTestUtils = require('react-dom/test-utils');
   });
 
@@ -28,7 +26,7 @@ describe('ReactDOMIframe', () => {
     const loadEvent = document.createEvent('Event');
     loadEvent.initEvent('load', false, false);
 
-    ReactDOM.findDOMNode(iframe).dispatchEvent(loadEvent);
+    iframe.dispatchEvent(loadEvent);
 
     expect(onLoadSpy).toHaveBeenCalled();
   });
diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index 4a3066a073..ca4b999f5f 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -38,27 +38,27 @@ describe('ReactDOMInput', () => {
 
   it('should properly control a value even if no event listener exists', () => {
     const container = document.createElement('div');
-    let stub;
+    let node;
 
     expect(() => {
-      stub = ReactDOM.render(<input type="text" value="lion" />, container);
+      node = ReactDOM.render(<input type="text" value="lion" />, container);
     }).toWarnDev(
       'Failed prop type: You provided a `value` prop to a form field without an `onChange` handler.',
     );
 
     document.body.appendChild(container);
 
-    const node = ReactDOM.findDOMNode(stub);
+    try {
+      setUntrackedValue.call(node, 'giraffe');
 
-    setUntrackedValue.call(node, 'giraffe');
+      // This must use the native event dispatching. If we simulate, we will
+      // bypass the lazy event attachment system so we won't actually test this.
+      dispatchEventOnNode(node, 'change');
 
-    // This must use the native event dispatching. If we simulate, we will
-    // bypass the lazy event attachment system so we won't actually test this.
-    dispatchEventOnNode(node, 'change');
-
-    expect(node.value).toBe('lion');
-
-    document.body.removeChild(container);
+      expect(node.value).toBe('lion');
+    } finally {
+      document.body.removeChild(container);
+    }
   });
 
   it('should control a value in reentrant events', () => {
@@ -169,26 +169,24 @@ describe('ReactDOMInput', () => {
 
   describe('switching text inputs between numeric and string numbers', () => {
     it('does change the number 2 to "2.0" with no change handler', () => {
-      let stub = <input type="text" value={2} onChange={jest.fn()} />;
-      stub = ReactTestUtils.renderIntoDocument(stub);
-      const node = ReactDOM.findDOMNode(stub);
+      const stub = <input type="text" value={2} onChange={jest.fn()} />;
+      const node = ReactTestUtils.renderIntoDocument(stub);
 
       node.value = '2.0';
 
-      ReactTestUtils.Simulate.change(stub);
+      ReactTestUtils.Simulate.change(node);
 
       expect(node.getAttribute('value')).toBe('2');
       expect(node.value).toBe('2');
     });
 
     it('does change the string "2" to "2.0" with no change handler', () => {
-      let stub = <input type="text" value={'2'} onChange={jest.fn()} />;
-      stub = ReactTestUtils.renderIntoDocument(stub);
-      const node = ReactDOM.findDOMNode(stub);
+      const stub = <input type="text" value={'2'} onChange={jest.fn()} />;
+      const node = ReactTestUtils.renderIntoDocument(stub);
 
       node.value = '2.0';
 
-      ReactTestUtils.Simulate.change(stub);
+      ReactTestUtils.Simulate.change(node);
 
       expect(node.getAttribute('value')).toBe('2');
       expect(node.value).toBe('2');
@@ -315,8 +313,7 @@ describe('ReactDOMInput', () => {
 
   it('should display `defaultValue` of number 0', () => {
     let stub = <input type="text" defaultValue={0} />;
-    stub = ReactTestUtils.renderIntoDocument(stub);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactTestUtils.renderIntoDocument(stub);
 
     expect(node.getAttribute('value')).toBe('0');
     expect(node.value).toBe('0');
@@ -348,16 +345,14 @@ describe('ReactDOMInput', () => {
 
   it('should display "true" for `defaultValue` of `true`', () => {
     let stub = <input type="text" defaultValue={true} />;
-    stub = ReactTestUtils.renderIntoDocument(stub);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactTestUtils.renderIntoDocument(stub);
 
     expect(node.value).toBe('true');
   });
 
   it('should display "false" for `defaultValue` of `false`', () => {
     let stub = <input type="text" defaultValue={false} />;
-    stub = ReactTestUtils.renderIntoDocument(stub);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactTestUtils.renderIntoDocument(stub);
 
     expect(node.value).toBe('false');
   });
@@ -467,17 +462,15 @@ describe('ReactDOMInput', () => {
       },
     };
 
-    let stub = <input type="text" defaultValue={objToString} />;
-    stub = ReactTestUtils.renderIntoDocument(stub);
-    const node = ReactDOM.findDOMNode(stub);
+    const stub = <input type="text" defaultValue={objToString} />;
+    const node = ReactTestUtils.renderIntoDocument(stub);
 
     expect(node.value).toBe('foobar');
   });
 
   it('should display `value` of number 0', () => {
-    let stub = <input type="text" value={0} />;
-    stub = ReactTestUtils.renderIntoDocument(stub);
-    const node = ReactDOM.findDOMNode(stub);
+    const stub = <input type="text" value={0} />;
+    const node = ReactTestUtils.renderIntoDocument(stub);
 
     expect(node.value).toBe('0');
   });
@@ -593,9 +586,8 @@ describe('ReactDOMInput', () => {
   });
 
   it('should properly control a value of number `0`', () => {
-    let stub = <input type="text" value={0} onChange={emptyFunction} />;
-    stub = ReactTestUtils.renderIntoDocument(stub);
-    const node = ReactDOM.findDOMNode(stub);
+    const stub = <input type="text" value={0} onChange={emptyFunction} />;
+    const node = ReactTestUtils.renderIntoDocument(stub);
 
     node.value = 'giraffe';
     ReactTestUtils.Simulate.change(node);
@@ -603,9 +595,8 @@ describe('ReactDOMInput', () => {
   });
 
   it('should properly control 0.0 for a text input', () => {
-    let stub = <input type="text" value={0} onChange={emptyFunction} />;
-    stub = ReactTestUtils.renderIntoDocument(stub);
-    const node = ReactDOM.findDOMNode(stub);
+    const stub = <input type="text" value={0} onChange={emptyFunction} />;
+    const node = ReactTestUtils.renderIntoDocument(stub);
 
     node.value = '0.0';
     ReactTestUtils.Simulate.change(node, {target: {value: '0.0'}});
@@ -613,9 +604,8 @@ describe('ReactDOMInput', () => {
   });
 
   it('should properly control 0.0 for a number input', () => {
-    let stub = <input type="number" value={0} onChange={emptyFunction} />;
-    stub = ReactTestUtils.renderIntoDocument(stub);
-    const node = ReactDOM.findDOMNode(stub);
+    const stub = <input type="number" value={0} onChange={emptyFunction} />;
+    const node = ReactTestUtils.renderIntoDocument(stub);
 
     node.value = '0.0';
     ReactTestUtils.Simulate.change(node, {target: {value: '0.0'}});
@@ -702,9 +692,8 @@ describe('ReactDOMInput', () => {
   });
 
   it('should not set a value for submit buttons unnecessarily', () => {
-    let stub = <input type="submit" />;
-    stub = ReactTestUtils.renderIntoDocument(stub);
-    const node = ReactDOM.findDOMNode(stub);
+    const stub = <input type="submit" />;
+    const node = ReactTestUtils.renderIntoDocument(stub);
 
     // The value shouldn't be '', or else the button will have no text; it
     // should have the default "Submit" or "Submit Query" label. Most browsers
@@ -1460,10 +1449,9 @@ describe('ReactDOMInput', () => {
     });
 
     it('an uncontrolled number input will not update the value attribute on blur', () => {
-      const stub = ReactTestUtils.renderIntoDocument(
+      const node = ReactTestUtils.renderIntoDocument(
         <input type="number" defaultValue="1" />,
       );
-      const node = ReactDOM.findDOMNode(stub);
 
       node.value = 4;
 
@@ -1473,10 +1461,9 @@ describe('ReactDOMInput', () => {
     });
 
     it('an uncontrolled text input will not update the value attribute on blur', () => {
-      const stub = ReactTestUtils.renderIntoDocument(
+      const node = ReactTestUtils.renderIntoDocument(
         <input type="text" defaultValue="1" />,
       );
-      const node = ReactDOM.findDOMNode(stub);
 
       node.value = 4;
 
diff --git a/packages/react-dom/src/__tests__/ReactDOMOption-test.js b/packages/react-dom/src/__tests__/ReactDOMOption-test.js
index 02e1f662c0..8cbd0118d2 100644
--- a/packages/react-dom/src/__tests__/ReactDOMOption-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMOption-test.js
@@ -26,8 +26,7 @@ describe('ReactDOMOption', () => {
         {1} {'foo'}
       </option>
     );
-    stub = ReactTestUtils.renderIntoDocument(stub);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactTestUtils.renderIntoDocument(stub);
 
     expect(node.innerHTML).toBe('1 foo');
   });
@@ -59,17 +58,15 @@ describe('ReactDOMOption', () => {
         {undefined} {2}
       </option>
     );
-    stub = ReactTestUtils.renderIntoDocument(stub);
+    const node = ReactTestUtils.renderIntoDocument(stub);
 
-    const node = ReactDOM.findDOMNode(stub);
     expect(node.innerHTML).toBe('1  2');
   });
 
   it('should be able to use dangerouslySetInnerHTML on option', () => {
     let stub = <option dangerouslySetInnerHTML={{__html: 'foobar'}} />;
-    stub = ReactTestUtils.renderIntoDocument(stub);
+    const node = ReactTestUtils.renderIntoDocument(stub);
 
-    const node = ReactDOM.findDOMNode(stub);
     expect(node.innerHTML).toBe('foobar');
   });
 
@@ -95,8 +92,7 @@ describe('ReactDOMOption', () => {
     );
     const options = stub.props.children;
     const container = document.createElement('div');
-    stub = ReactDOM.render(stub, container);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(node.selectedIndex).toBe(1);
 
diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index 19b1e00be9..5c2277c5ee 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -35,8 +35,7 @@ describe('ReactDOMSelect', () => {
     );
     const options = stub.props.children;
     const container = document.createElement('div');
-    stub = ReactDOM.render(stub, container);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(node.value).toBe('giraffe');
 
@@ -65,8 +64,7 @@ describe('ReactDOMSelect', () => {
       </select>
     );
     const container = document.createElement('div');
-    const stub = ReactDOM.render(el, container);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactDOM.render(el, container);
 
     expect(node.value).toBe('giraffe');
 
@@ -86,8 +84,7 @@ describe('ReactDOMSelect', () => {
     );
     const options = stub.props.children;
     const container = document.createElement('div');
-    stub = ReactDOM.render(stub, container);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(node.options[0].selected).toBe(false); // monkey
     expect(node.options[1].selected).toBe(true); // giraffe
@@ -116,8 +113,7 @@ describe('ReactDOMSelect', () => {
     );
     const options = stub.props.children;
     const container = document.createElement('div');
-    stub = ReactDOM.render(stub, container);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(node.value).toBe('giraffe');
 
@@ -141,8 +137,7 @@ describe('ReactDOMSelect', () => {
       </select>
     );
     const container = document.createElement('div');
-    stub = ReactDOM.render(stub, container);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactDOM.render(stub, container);
     expect(node.options[0].selected).toBe(false);
     expect(node.options[2].selected).toBe(true);
   });
@@ -157,8 +152,7 @@ describe('ReactDOMSelect', () => {
     );
     const options = stub.props.children;
     const container = document.createElement('div');
-    stub = ReactDOM.render(stub, container);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(node.value).toBe('__proto__');
 
@@ -190,8 +184,7 @@ describe('ReactDOMSelect', () => {
     );
     const options = stub.props.children;
     const container = document.createElement('div');
-    stub = ReactDOM.render(stub, container);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(node.options[0].selected).toBe(false); // monkey
     expect(node.options[1].selected).toBe(true); // giraffe
@@ -220,8 +213,7 @@ describe('ReactDOMSelect', () => {
     );
     const options = stub.props.children;
     const container = document.createElement('div');
-    stub = ReactDOM.render(stub, container);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(node.options[0].selected).toBe(false); // monkey
     expect(node.options[1].selected).toBe(true); // __proto__
@@ -248,8 +240,7 @@ describe('ReactDOMSelect', () => {
         <option value="12">twelve</option>
       </select>
     );
-    stub = ReactTestUtils.renderIntoDocument(stub);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactTestUtils.renderIntoDocument(stub);
 
     expect(node.options[0].selected).toBe(false); // one
     expect(node.options[1].selected).toBe(false); // two
@@ -259,7 +250,7 @@ describe('ReactDOMSelect', () => {
   it('should reset child options selected when they are changed and `value` is set', () => {
     let stub = <select multiple={true} value={['a', 'b']} onChange={noop} />;
     const container = document.createElement('div');
-    stub = ReactDOM.render(stub, container);
+    const node = ReactDOM.render(stub, container);
 
     ReactDOM.render(
       <select multiple={true} value={['a', 'b']} onChange={noop}>
@@ -270,8 +261,6 @@ describe('ReactDOMSelect', () => {
       container,
     );
 
-    const node = ReactDOM.findDOMNode(stub);
-
     expect(node.options[0].selected).toBe(true); // a
     expect(node.options[1].selected).toBe(true); // b
     expect(node.options[2].selected).toBe(false); // c
@@ -293,8 +282,7 @@ describe('ReactDOMSelect', () => {
       </select>
     );
     const container = document.createElement('div');
-    const stub = ReactDOM.render(el, container);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactDOM.render(el, container);
 
     expect(node.options[0].selected).toBe(false); // monkey
     expect(node.options[1].selected).toBe(true); // giraffe
@@ -327,8 +315,7 @@ describe('ReactDOMSelect', () => {
     );
     const options = stub.props.children;
     const container = document.createElement('div');
-    stub = ReactDOM.render(stub, container);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(node.options[0].selected).toBe(false); // monkey
     expect(node.options[1].selected).toBe(true); // giraffe
@@ -357,8 +344,7 @@ describe('ReactDOMSelect', () => {
     );
     const options = stub.props.children;
     const container = document.createElement('div');
-    stub = ReactDOM.render(stub, container);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(node.options[0].selected).toBe(false); // monkey
     expect(node.options[1].selected).toBe(true); // giraffe
@@ -386,8 +372,7 @@ describe('ReactDOMSelect', () => {
     );
     const options = stub.props.children;
     const container = document.createElement('div');
-    stub = ReactDOM.render(stub, container);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(node.options[0].selected).toBe(false); // monkey
     expect(node.options[1].selected).toBe(true); // giraffe
@@ -410,8 +395,7 @@ describe('ReactDOMSelect', () => {
     );
     const options = stub.props.children;
     const container = document.createElement('div');
-    stub = ReactDOM.render(stub, container);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactDOM.render(stub, container);
 
     ReactDOM.render(
       <select value="gorilla" onChange={noop}>
@@ -476,7 +460,7 @@ describe('ReactDOMSelect', () => {
   it('should not control defaultValue if readding options', () => {
     const container = document.createElement('div');
 
-    const select = ReactDOM.render(
+    const node = ReactDOM.render(
       <select multiple={true} defaultValue={['giraffe']}>
         <option key="monkey" value="monkey">
           A monkey!
@@ -490,7 +474,6 @@ describe('ReactDOMSelect', () => {
       </select>,
       container,
     );
-    const node = ReactDOM.findDOMNode(select);
 
     expect(node.options[0].selected).toBe(false); // monkey
     expect(node.options[1].selected).toBe(true); // giraffe
@@ -601,8 +584,7 @@ describe('ReactDOMSelect', () => {
         <option value="gorilla">A gorilla!</option>
       </select>
     );
-    stub = ReactTestUtils.renderIntoDocument(stub);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactTestUtils.renderIntoDocument(stub);
 
     ReactTestUtils.Simulate.change(node);
 
@@ -648,8 +630,7 @@ describe('ReactDOMSelect', () => {
         <option value="gorilla">A gorilla!</option>
       </select>
     );
-    stub = ReactDOM.render(stub, container);
-    const node = ReactDOM.findDOMNode(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(() => ReactTestUtils.Simulate.change(node)).not.toThrow();
   });
diff --git a/packages/react-dom/src/__tests__/ReactDOMTextComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMTextComponent-test.js
index f3f9dc5485..2adb55d69b 100644
--- a/packages/react-dom/src/__tests__/ReactDOMTextComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMTextComponent-test.js
@@ -39,7 +39,7 @@ describe('ReactDOMTextComponent', () => {
       </div>,
       el,
     );
-    let nodes = filterOutComments(ReactDOM.findDOMNode(inst).childNodes);
+    let nodes = filterOutComments(inst.childNodes);
 
     let foo = nodes[1];
     let bar = nodes[2];
@@ -56,7 +56,7 @@ describe('ReactDOMTextComponent', () => {
     );
     // After the update, the text nodes should have stayed in place (as opposed
     // to getting unmounted and remounted)
-    nodes = filterOutComments(ReactDOM.findDOMNode(inst).childNodes);
+    nodes = filterOutComments(inst.childNodes);
     expect(nodes[1]).toBe(foo);
     expect(nodes[2]).toBe(bar);
     expect(foo.data).toBe('baz');
@@ -74,8 +74,7 @@ describe('ReactDOMTextComponent', () => {
       el,
     );
 
-    let container = ReactDOM.findDOMNode(inst);
-    let childNodes = filterOutComments(container.childNodes);
+    let childNodes = filterOutComments(inst.childNodes);
     let childDiv = childNodes[1];
 
     inst = ReactDOM.render(
@@ -86,8 +85,7 @@ describe('ReactDOMTextComponent', () => {
       </div>,
       el,
     );
-    container = ReactDOM.findDOMNode(inst);
-    childNodes = filterOutComments(container.childNodes);
+    childNodes = filterOutComments(inst.childNodes);
     expect(childNodes.length).toBe(1);
     expect(childNodes[0]).toBe(childDiv);
 
@@ -99,8 +97,7 @@ describe('ReactDOMTextComponent', () => {
       </div>,
       el,
     );
-    container = ReactDOM.findDOMNode(inst);
-    childNodes = filterOutComments(container.childNodes);
+    childNodes = filterOutComments(inst.childNodes);
     expect(childNodes.length).toBe(3);
     expect(childNodes[0].data).toBe('foo');
     expect(childNodes[1]).toBe(childDiv);
@@ -125,8 +122,7 @@ describe('ReactDOMTextComponent', () => {
       el,
     );
 
-    let container = ReactDOM.findDOMNode(inst);
-    container.normalize();
+    inst.normalize();
 
     inst = ReactDOM.render(
       <div>
@@ -138,8 +134,7 @@ describe('ReactDOMTextComponent', () => {
       </div>,
       el,
     );
-    container = ReactDOM.findDOMNode(inst);
-    expect(container.textContent).toBe('barbazquxfoo');
+    expect(inst.textContent).toBe('barbazquxfoo');
   });
 
   xit('can reconcile text merged by Node.normalize()', () => {
@@ -153,8 +148,7 @@ describe('ReactDOMTextComponent', () => {
       el,
     );
 
-    let container = ReactDOM.findDOMNode(inst);
-    container.normalize();
+    inst.normalize();
 
     inst = ReactDOM.render(
       <div>
@@ -164,8 +158,7 @@ describe('ReactDOMTextComponent', () => {
       </div>,
       el,
     );
-    container = ReactDOM.findDOMNode(inst);
-    expect(container.textContent).toBe('barbazqux');
+    expect(inst.textContent).toBe('barbazqux');
   });
 
   it('can reconcile text from pre-rendered markup', () => {
@@ -207,15 +200,14 @@ describe('ReactDOMTextComponent', () => {
       el,
     );
 
-    let container = ReactDOM.findDOMNode(inst);
-    let childNodes = filterOutComments(ReactDOM.findDOMNode(inst).childNodes);
+    let childNodes = filterOutComments(inst.childNodes);
     let textNode = childNodes[1];
     textNode.textContent = 'foo';
-    container.insertBefore(
+    inst.insertBefore(
       document.createTextNode('bar'),
       childNodes[1].nextSibling,
     );
-    container.insertBefore(
+    inst.insertBefore(
       document.createTextNode('baz'),
       childNodes[1].nextSibling,
     );
@@ -227,8 +219,7 @@ describe('ReactDOMTextComponent', () => {
       </div>,
       el,
     );
-    container = ReactDOM.findDOMNode(inst);
-    expect(container.textContent).toBe('barbazqux');
+    expect(inst.textContent).toBe('barbazqux');
   });
 
   xit('can reconcile text arbitrarily split into multiple nodes on some substitutions only', () => {
@@ -246,21 +237,20 @@ describe('ReactDOMTextComponent', () => {
       el,
     );
 
-    let container = ReactDOM.findDOMNode(inst);
-    let childNodes = filterOutComments(ReactDOM.findDOMNode(inst).childNodes);
+    let childNodes = filterOutComments(inst.childNodes);
     let textNode = childNodes[3];
     textNode.textContent = 'foo';
-    container.insertBefore(
+    inst.insertBefore(
       document.createTextNode('bar'),
       childNodes[3].nextSibling,
     );
-    container.insertBefore(
+    inst.insertBefore(
       document.createTextNode('baz'),
       childNodes[3].nextSibling,
     );
     let secondTextNode = childNodes[5];
     secondTextNode.textContent = 'bar';
-    container.insertBefore(
+    inst.insertBefore(
       document.createTextNode('foo'),
       childNodes[5].nextSibling,
     );
@@ -277,8 +267,7 @@ describe('ReactDOMTextComponent', () => {
       </div>,
       el,
     );
-    container = ReactDOM.findDOMNode(inst);
-    expect(container.textContent).toBe('bazbarbazquxbarbazbar');
+    expect(inst.textContent).toBe('bazbarbazquxbarbazbar');
   });
 
   xit('can unmount normalized text nodes', () => {
diff --git a/packages/react-dom/src/__tests__/ReactEventIndependence-test.js b/packages/react-dom/src/__tests__/ReactEventIndependence-test.js
index 5133c3d818..e7b90e360e 100644
--- a/packages/react-dom/src/__tests__/ReactEventIndependence-test.js
+++ b/packages/react-dom/src/__tests__/ReactEventIndependence-test.js
@@ -11,7 +11,6 @@
 
 let React;
 let ReactDOM;
-let ReactTestUtils;
 
 describe('ReactEventIndependence', () => {
   beforeEach(() => {
@@ -19,49 +18,66 @@ describe('ReactEventIndependence', () => {
 
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('react-dom/test-utils');
   });
 
   it('does not crash with other react inside', () => {
     let clicks = 0;
-    const div = ReactTestUtils.renderIntoDocument(
-      <div
-        onClick={() => clicks++}
-        dangerouslySetInnerHTML={{
-          __html: '<button data-reactid=".z">click me</div>',
-        }}
-      />,
-    );
-    ReactTestUtils.SimulateNative.click(div.firstChild);
-    expect(clicks).toBe(1);
+    const container = document.createElement('div');
+    document.body.appendChild(container);
+    try {
+      const div = ReactDOM.render(
+        <div
+          onClick={() => clicks++}
+          dangerouslySetInnerHTML={{
+            __html: '<button data-reactid=".z">click me</div>',
+          }}
+        />,
+        container,
+      );
+
+      div.firstChild.click();
+      expect(clicks).toBe(1);
+    } finally {
+      document.body.removeChild(container);
+    }
   });
 
   it('does not crash with other react outside', () => {
     let clicks = 0;
     const outer = document.createElement('div');
-    outer.setAttribute('data-reactid', '.z');
-    const inner = ReactDOM.render(
-      <button onClick={() => clicks++}>click me</button>,
-      outer,
-    );
-    ReactTestUtils.SimulateNative.click(inner);
-    expect(clicks).toBe(1);
+    document.body.appendChild(outer);
+    try {
+      outer.setAttribute('data-reactid', '.z');
+      const inner = ReactDOM.render(
+        <button onClick={() => clicks++}>click me</button>,
+        outer,
+      );
+      inner.click();
+      expect(clicks).toBe(1);
+    } finally {
+      document.body.removeChild(outer);
+    }
   });
 
   it('does not when event fired on unmounted tree', () => {
     let clicks = 0;
     const container = document.createElement('div');
-    const button = ReactDOM.render(
-      <button onClick={() => clicks++}>click me</button>,
-      container,
-    );
+    document.body.appendChild(container);
+    try {
+      const button = ReactDOM.render(
+        <button onClick={() => clicks++}>click me</button>,
+        container,
+      );
 
-    // Now we unmount the component, as if caused by a non-React event handler
-    // for the same click we're about to simulate, like closing a layer:
-    ReactDOM.unmountComponentAtNode(container);
-    ReactTestUtils.SimulateNative.click(button);
+      // Now we unmount the component, as if caused by a non-React event handler
+      // for the same click we're about to simulate, like closing a layer:
+      ReactDOM.unmountComponentAtNode(container);
+      button.click();
 
-    // Since the tree is unmounted, we don't dispatch the click event.
-    expect(clicks).toBe(0);
+      // Since the tree is unmounted, we don't dispatch the click event.
+      expect(clicks).toBe(0);
+    } finally {
+      document.body.removeChild(container);
+    }
   });
 });
diff --git a/packages/react-dom/src/__tests__/ReactIdentity-test.js b/packages/react-dom/src/__tests__/ReactIdentity-test.js
index 7849d7d3b7..880266c87d 100644
--- a/packages/react-dom/src/__tests__/ReactIdentity-test.js
+++ b/packages/react-dom/src/__tests__/ReactIdentity-test.js
@@ -78,7 +78,7 @@ describe('ReactIdentity', () => {
 
     const instance = ReactDOM.render(<Wrapper />, container);
     const span = instance.refs.span;
-    expect(ReactDOM.findDOMNode(span)).not.toBe(null);
+    expect(span).not.toBe(null);
   }
 
   it('should allow any character as a key, in a detached parent', () => {
diff --git a/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js b/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
index 3fa9a18eaa..1faf45872b 100644
--- a/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
+++ b/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
@@ -12,7 +12,6 @@
 let React;
 let ReactDOM;
 let ReactDOMServer;
-let ReactTestUtils;
 
 // These tests rely both on ReactDOMServer and ReactDOM.
 // If a test only needs ReactDOMServer, put it in ReactServerRendering-test instead.
@@ -21,7 +20,6 @@ describe('ReactDOMServerHydration', () => {
     jest.resetModules();
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('react-dom/test-utils');
     ReactDOMServer = require('react-dom/server');
   });
 
@@ -48,67 +46,73 @@ describe('ReactDOMServerHydration', () => {
     }
 
     const element = document.createElement('div');
-    ReactDOM.render(<TestComponent />, element);
+    document.body.appendChild(element);
+    try {
+      ReactDOM.render(<TestComponent />, element);
 
-    let lastMarkup = element.innerHTML;
+      let lastMarkup = element.innerHTML;
 
-    // Exercise the update path. Markup should not change,
-    // but some lifecycle methods should be run again.
-    ReactDOM.render(<TestComponent name="x" />, element);
-    expect(mountCount).toEqual(1);
+      // Exercise the update path. Markup should not change,
+      // but some lifecycle methods should be run again.
+      ReactDOM.render(<TestComponent name="x" />, element);
+      expect(mountCount).toEqual(1);
 
-    // Unmount and remount. We should get another mount event and
-    // we should get different markup, as the IDs are unique each time.
-    ReactDOM.unmountComponentAtNode(element);
-    expect(element.innerHTML).toEqual('');
-    ReactDOM.render(<TestComponent name="x" />, element);
-    expect(mountCount).toEqual(2);
-    expect(element.innerHTML).not.toEqual(lastMarkup);
+      // Unmount and remount. We should get another mount event and
+      // we should get different markup, as the IDs are unique each time.
+      ReactDOM.unmountComponentAtNode(element);
+      expect(element.innerHTML).toEqual('');
+      ReactDOM.render(<TestComponent name="x" />, element);
+      expect(mountCount).toEqual(2);
+      expect(element.innerHTML).not.toEqual(lastMarkup);
 
-    // Now kill the node and render it on top of server-rendered markup, as if
-    // we used server rendering. We should mount again, but the markup should
-    // be unchanged. We will append a sentinel at the end of innerHTML to be
-    // sure that innerHTML was not changed.
-    ReactDOM.unmountComponentAtNode(element);
-    expect(element.innerHTML).toEqual('');
+      // Now kill the node and render it on top of server-rendered markup, as if
+      // we used server rendering. We should mount again, but the markup should
+      // be unchanged. We will append a sentinel at the end of innerHTML to be
+      // sure that innerHTML was not changed.
+      ReactDOM.unmountComponentAtNode(element);
+      expect(element.innerHTML).toEqual('');
 
-    lastMarkup = ReactDOMServer.renderToString(<TestComponent name="x" />);
-    element.innerHTML = lastMarkup;
+      lastMarkup = ReactDOMServer.renderToString(<TestComponent name="x" />);
+      element.innerHTML = lastMarkup;
 
-    let instance;
+      let instance;
 
-    expect(() => {
-      instance = ReactDOM.render(<TestComponent name="x" />, element);
-    }).toLowPriorityWarnDev(
-      'render(): Calling ReactDOM.render() to hydrate server-rendered markup ' +
-        'will stop working in React v17. Replace the ReactDOM.render() call ' +
-        'with ReactDOM.hydrate() if you want React to attach to the server HTML.',
-    );
-    expect(mountCount).toEqual(3);
-    expect(element.innerHTML).toBe(lastMarkup);
+      expect(() => {
+        instance = ReactDOM.render(<TestComponent name="x" />, element);
+      }).toLowPriorityWarnDev(
+        'render(): Calling ReactDOM.render() to hydrate server-rendered markup ' +
+          'will stop working in React v17. Replace the ReactDOM.render() call ' +
+          'with ReactDOM.hydrate() if you want React to attach to the server HTML.',
+      );
+      expect(mountCount).toEqual(3);
+      expect(element.innerHTML).toBe(lastMarkup);
 
-    // Ensure the events system works after mount into server markup
-    expect(numClicks).toEqual(0);
-    ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(instance.refs.span));
-    expect(numClicks).toEqual(1);
+      // Ensure the events system works after mount into server markup
+      expect(numClicks).toEqual(0);
 
-    ReactDOM.unmountComponentAtNode(element);
-    expect(element.innerHTML).toEqual('');
+      instance.refs.span.click();
+      expect(numClicks).toEqual(1);
 
-    // Now simulate a situation where the app is not idempotent. React should
-    // warn but do the right thing.
-    element.innerHTML = lastMarkup;
-    expect(() => {
-      instance = ReactDOM.render(<TestComponent name="y" />, element);
-    }).toWarnDev('Text content did not match. Server: "x" Client: "y"');
-    expect(mountCount).toEqual(4);
-    expect(element.innerHTML.length > 0).toBe(true);
-    expect(element.innerHTML).not.toEqual(lastMarkup);
+      ReactDOM.unmountComponentAtNode(element);
+      expect(element.innerHTML).toEqual('');
 
-    // Ensure the events system works after markup mismatch.
-    expect(numClicks).toEqual(1);
-    ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(instance.refs.span));
-    expect(numClicks).toEqual(2);
+      // Now simulate a situation where the app is not idempotent. React should
+      // warn but do the right thing.
+      element.innerHTML = lastMarkup;
+      expect(() => {
+        instance = ReactDOM.render(<TestComponent name="y" />, element);
+      }).toWarnDev('Text content did not match. Server: "x" Client: "y"');
+      expect(mountCount).toEqual(4);
+      expect(element.innerHTML.length > 0).toBe(true);
+      expect(element.innerHTML).not.toEqual(lastMarkup);
+
+      // Ensure the events system works after markup mismatch.
+      expect(numClicks).toEqual(1);
+      instance.refs.span.click();
+      expect(numClicks).toEqual(2);
+    } finally {
+      document.body.removeChild(element);
+    }
   });
 
   it('should have the correct mounting behavior (new hydrate API)', () => {
@@ -134,59 +138,64 @@ describe('ReactDOMServerHydration', () => {
     }
 
     const element = document.createElement('div');
-    ReactDOM.render(<TestComponent />, element);
+    document.body.appendChild(element);
+    try {
+      ReactDOM.render(<TestComponent />, element);
 
-    let lastMarkup = element.innerHTML;
+      let lastMarkup = element.innerHTML;
 
-    // Exercise the update path. Markup should not change,
-    // but some lifecycle methods should be run again.
-    ReactDOM.render(<TestComponent name="x" />, element);
-    expect(mountCount).toEqual(1);
+      // Exercise the update path. Markup should not change,
+      // but some lifecycle methods should be run again.
+      ReactDOM.render(<TestComponent name="x" />, element);
+      expect(mountCount).toEqual(1);
 
-    // Unmount and remount. We should get another mount event and
-    // we should get different markup, as the IDs are unique each time.
-    ReactDOM.unmountComponentAtNode(element);
-    expect(element.innerHTML).toEqual('');
-    ReactDOM.render(<TestComponent name="x" />, element);
-    expect(mountCount).toEqual(2);
-    expect(element.innerHTML).not.toEqual(lastMarkup);
+      // Unmount and remount. We should get another mount event and
+      // we should get different markup, as the IDs are unique each time.
+      ReactDOM.unmountComponentAtNode(element);
+      expect(element.innerHTML).toEqual('');
+      ReactDOM.render(<TestComponent name="x" />, element);
+      expect(mountCount).toEqual(2);
+      expect(element.innerHTML).not.toEqual(lastMarkup);
 
-    // Now kill the node and render it on top of server-rendered markup, as if
-    // we used server rendering. We should mount again, but the markup should
-    // be unchanged. We will append a sentinel at the end of innerHTML to be
-    // sure that innerHTML was not changed.
-    ReactDOM.unmountComponentAtNode(element);
-    expect(element.innerHTML).toEqual('');
+      // Now kill the node and render it on top of server-rendered markup, as if
+      // we used server rendering. We should mount again, but the markup should
+      // be unchanged. We will append a sentinel at the end of innerHTML to be
+      // sure that innerHTML was not changed.
+      ReactDOM.unmountComponentAtNode(element);
+      expect(element.innerHTML).toEqual('');
 
-    lastMarkup = ReactDOMServer.renderToString(<TestComponent name="x" />);
-    element.innerHTML = lastMarkup;
+      lastMarkup = ReactDOMServer.renderToString(<TestComponent name="x" />);
+      element.innerHTML = lastMarkup;
 
-    let instance = ReactDOM.hydrate(<TestComponent name="x" />, element);
-    expect(mountCount).toEqual(3);
-    expect(element.innerHTML).toBe(lastMarkup);
+      let instance = ReactDOM.hydrate(<TestComponent name="x" />, element);
+      expect(mountCount).toEqual(3);
+      expect(element.innerHTML).toBe(lastMarkup);
 
-    // Ensure the events system works after mount into server markup
-    expect(numClicks).toEqual(0);
-    ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(instance.refs.span));
-    expect(numClicks).toEqual(1);
+      // Ensure the events system works after mount into server markup
+      expect(numClicks).toEqual(0);
+      instance.refs.span.click();
+      expect(numClicks).toEqual(1);
 
-    ReactDOM.unmountComponentAtNode(element);
-    expect(element.innerHTML).toEqual('');
+      ReactDOM.unmountComponentAtNode(element);
+      expect(element.innerHTML).toEqual('');
 
-    // Now simulate a situation where the app is not idempotent. React should
-    // warn but do the right thing.
-    element.innerHTML = lastMarkup;
-    expect(() => {
-      instance = ReactDOM.hydrate(<TestComponent name="y" />, element);
-    }).toWarnDev('Text content did not match. Server: "x" Client: "y"');
-    expect(mountCount).toEqual(4);
-    expect(element.innerHTML.length > 0).toBe(true);
-    expect(element.innerHTML).not.toEqual(lastMarkup);
+      // Now simulate a situation where the app is not idempotent. React should
+      // warn but do the right thing.
+      element.innerHTML = lastMarkup;
+      expect(() => {
+        instance = ReactDOM.hydrate(<TestComponent name="y" />, element);
+      }).toWarnDev('Text content did not match. Server: "x" Client: "y"');
+      expect(mountCount).toEqual(4);
+      expect(element.innerHTML.length > 0).toBe(true);
+      expect(element.innerHTML).not.toEqual(lastMarkup);
 
-    // Ensure the events system works after markup mismatch.
-    expect(numClicks).toEqual(1);
-    ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(instance.refs.span));
-    expect(numClicks).toEqual(2);
+      // Ensure the events system works after markup mismatch.
+      expect(numClicks).toEqual(1);
+      instance.refs.span.click();
+      expect(numClicks).toEqual(2);
+    } finally {
+      document.body.removeChild(element);
+    }
   });
 
   // We have a polyfill for autoFocus on the client, but we intentionally don't
diff --git a/packages/react-dom/src/__tests__/ReactTestUtils-test.js b/packages/react-dom/src/__tests__/ReactTestUtils-test.js
index 328eefe0b2..83437133b6 100644
--- a/packages/react-dom/src/__tests__/ReactTestUtils-test.js
+++ b/packages/react-dom/src/__tests__/ReactTestUtils-test.js
@@ -280,12 +280,11 @@ describe('ReactTestUtils', () => {
       };
       spyOnDevAndProd(obj, 'handler').and.callThrough();
       const container = document.createElement('div');
-      const instance = ReactDOM.render(
+      const node = ReactDOM.render(
         <input type="text" onChange={obj.handler} />,
         container,
       );
 
-      const node = ReactDOM.findDOMNode(instance);
       node.value = 'giraffe';
       ReactTestUtils.Simulate.change(node);
 
@@ -321,7 +320,7 @@ describe('ReactTestUtils', () => {
         container,
       );
 
-      const node = ReactDOM.findDOMNode(instance.refs.input);
+      const node = instance.refs.input;
       node.value = 'zebra';
       ReactTestUtils.Simulate.change(node);
 
diff --git a/packages/react-dom/src/__tests__/refs-test.js b/packages/react-dom/src/__tests__/refs-test.js
index f439118cd7..6ca2c981f6 100644
--- a/packages/react-dom/src/__tests__/refs-test.js
+++ b/packages/react-dom/src/__tests__/refs-test.js
@@ -10,6 +10,7 @@
 'use strict';
 
 let React = require('react');
+let ReactDOM = require('react-dom');
 let ReactTestUtils = require('react-dom/test-utils');
 
 /**
@@ -81,24 +82,6 @@ class TestRefsComponent extends React.Component {
   }
 }
 
-/**
- * Render a TestRefsComponent and ensure that the main refs are wired up.
- */
-const renderTestRefsComponent = function() {
-  const testRefsComponent = ReactTestUtils.renderIntoDocument(
-    <TestRefsComponent />,
-  );
-  expect(testRefsComponent instanceof TestRefsComponent).toBe(true);
-
-  const generalContainer = testRefsComponent.refs.myContainer;
-  expect(generalContainer instanceof GeneralContainerComponent).toBe(true);
-
-  const counter = testRefsComponent.refs.myCounter;
-  expect(counter instanceof ClickCounter).toBe(true);
-
-  return testRefsComponent;
-};
-
 const expectClickLogsLengthToBe = function(instance, length) {
   const clickLogs = ReactTestUtils.scryRenderedDOMComponentsWithClass(
     instance,
@@ -109,12 +92,40 @@ const expectClickLogsLengthToBe = function(instance, length) {
 };
 
 describe('reactiverefs', () => {
+  let container;
+
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
+    ReactDOM = require('react-dom');
     ReactTestUtils = require('react-dom/test-utils');
   });
 
+  afterEach(() => {
+    if (container) {
+      document.body.removeChild(container);
+      container = null;
+    }
+  });
+
+  /**
+   * Render a TestRefsComponent and ensure that the main refs are wired up.
+   */
+  const renderTestRefsComponent = function() {
+    container = document.createElement('div');
+    document.body.appendChild(container);
+    const testRefsComponent = ReactDOM.render(<TestRefsComponent />, container);
+    expect(testRefsComponent instanceof TestRefsComponent).toBe(true);
+
+    const generalContainer = testRefsComponent.refs.myContainer;
+    expect(generalContainer instanceof GeneralContainerComponent).toBe(true);
+
+    const counter = testRefsComponent.refs.myCounter;
+    expect(counter instanceof ClickCounter).toBe(true);
+
+    return testRefsComponent;
+  };
+
   /**
    * Ensure that for every click log there is a corresponding ref (from the
    * perspective of the injected ClickCounter component.
@@ -129,18 +140,18 @@ describe('reactiverefs', () => {
     expectClickLogsLengthToBe(testRefsComponent, 1);
 
     // After clicking the reset, there should still only be one click log ref.
-    ReactTestUtils.Simulate.click(testRefsComponent.refs.resetDiv);
+    testRefsComponent.refs.resetDiv.click();
     expectClickLogsLengthToBe(testRefsComponent, 1);
 
     // Begin incrementing clicks (and therefore refs).
-    ReactTestUtils.Simulate.click(clickIncrementer);
+    clickIncrementer.click();
     expectClickLogsLengthToBe(testRefsComponent, 2);
 
-    ReactTestUtils.Simulate.click(clickIncrementer);
+    clickIncrementer.click();
     expectClickLogsLengthToBe(testRefsComponent, 3);
 
     // Now reset again
-    ReactTestUtils.Simulate.click(testRefsComponent.refs.resetDiv);
+    testRefsComponent.refs.resetDiv.click();
     expectClickLogsLengthToBe(testRefsComponent, 1);
   });
 });
@@ -168,6 +179,7 @@ describe('ref swapping', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
+    ReactDOM = require('react-dom');
     ReactTestUtils = require('react-dom/test-utils');
 
     RefHopsAround = class extends React.Component {
@@ -293,7 +305,6 @@ describe('ref swapping', () => {
 
 describe('root level refs', () => {
   it('attaches and detaches root refs', () => {
-    const ReactDOM = require('react-dom');
     let inst = null;
 
     // host node
diff --git a/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js b/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js
index 4020e69fd0..2d264fc4ea 100644
--- a/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js
+++ b/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js
@@ -12,23 +12,25 @@
 describe('SimpleEventPlugin', function() {
   let React;
   let ReactDOM;
-  let ReactTestUtils;
   let ReactFeatureFlags;
 
   let onClick;
+  let container;
 
   function expectClickThru(element) {
-    ReactTestUtils.SimulateNative.click(ReactDOM.findDOMNode(element));
+    element.click();
     expect(onClick).toHaveBeenCalledTimes(1);
   }
 
   function expectNoClickThru(element) {
-    ReactTestUtils.SimulateNative.click(ReactDOM.findDOMNode(element));
+    element.click();
     expect(onClick).toHaveBeenCalledTimes(0);
   }
 
   function mounted(element) {
-    element = ReactTestUtils.renderIntoDocument(element);
+    container = document.createElement('div');
+    document.body.appendChild(container);
+    element = ReactDOM.render(element, container);
     return element;
   }
 
@@ -60,75 +62,80 @@ describe('SimpleEventPlugin', function() {
     jest.resetModules();
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('react-dom/test-utils');
 
     onClick = jest.fn();
   });
 
+  afterEach(() => {
+    if (container && document.body.contains(container)) {
+      document.body.removeChild(container);
+      container = null;
+    }
+  });
+
   it('A non-interactive tags click when disabled', function() {
     const element = <div onClick={onClick} />;
     expectClickThru(mounted(element));
   });
 
   it('A non-interactive tags clicks bubble when disabled', function() {
-    const element = ReactTestUtils.renderIntoDocument(
+    const element = mounted(
       <div onClick={onClick}>
         <div />
       </div>,
     );
-    const child = ReactDOM.findDOMNode(element).firstChild;
-
-    ReactTestUtils.SimulateNative.click(child);
+    const child = element.firstChild;
+    child.click();
     expect(onClick).toHaveBeenCalledTimes(1);
   });
 
   it('does not register a click when clicking a child of a disabled element', function() {
-    const element = ReactTestUtils.renderIntoDocument(
+    const element = mounted(
       <button onClick={onClick} disabled={true}>
         <span />
       </button>,
     );
-    const child = ReactDOM.findDOMNode(element).querySelector('span');
+    const child = element.querySelector('span');
 
-    ReactTestUtils.SimulateNative.click(child);
+    child.click();
     expect(onClick).toHaveBeenCalledTimes(0);
   });
 
   it('triggers click events for children of disabled elements', function() {
-    const element = ReactTestUtils.renderIntoDocument(
+    const element = mounted(
       <button disabled={true}>
         <span onClick={onClick} />
       </button>,
     );
-    const child = ReactDOM.findDOMNode(element).querySelector('span');
+    const child = element.querySelector('span');
 
-    ReactTestUtils.SimulateNative.click(child);
+    child.click();
     expect(onClick).toHaveBeenCalledTimes(1);
   });
 
   it('triggers parent captured click events when target is a child of a disabled elements', function() {
-    const element = ReactTestUtils.renderIntoDocument(
+    const element = mounted(
       <div onClickCapture={onClick}>
         <button disabled={true}>
           <span />
         </button>
       </div>,
     );
-    const child = ReactDOM.findDOMNode(element).querySelector('span');
+    const child = element.querySelector('span');
 
-    ReactTestUtils.SimulateNative.click(child);
+    child.click();
     expect(onClick).toHaveBeenCalledTimes(1);
   });
 
   it('triggers captured click events for children of disabled elements', function() {
-    const element = ReactTestUtils.renderIntoDocument(
+    const element = mounted(
       <button disabled={true}>
         <span onClickCapture={onClick} />
       </button>,
     );
-    const child = ReactDOM.findDOMNode(element).querySelector('span');
+    const child = element.querySelector('span');
 
-    ReactTestUtils.SimulateNative.click(child);
+    child.click();
     expect(onClick).toHaveBeenCalledTimes(1);
   });
 
@@ -152,7 +159,8 @@ describe('SimpleEventPlugin', function() {
       });
 
       it('should forward clicks when it becomes not disabled', () => {
-        const container = document.createElement('div');
+        container = document.createElement('div');
+        document.body.appendChild(container);
         let element = ReactDOM.render(
           React.createElement(tagName, {onClick: onClick, disabled: true}),
           container,
@@ -165,7 +173,8 @@ describe('SimpleEventPlugin', function() {
       });
 
       it('should not forward clicks when it becomes disabled', () => {
-        const container = document.createElement('div');
+        container = document.createElement('div');
+        document.body.appendChild(container);
         let element = ReactDOM.render(
           React.createElement(tagName, {onClick: onClick}),
           container,
@@ -178,7 +187,8 @@ describe('SimpleEventPlugin', function() {
       });
 
       it('should work correctly if the listener is changed', () => {
-        const container = document.createElement('div');
+        container = document.createElement('div');
+        document.body.appendChild(container);
         let element = ReactDOM.render(
           React.createElement(tagName, {onClick: onClick, disabled: true}),
           container,
@@ -193,7 +203,7 @@ describe('SimpleEventPlugin', function() {
   });
 
   it('batches updates that occur as a result of a nested event dispatch', () => {
-    const container = document.createElement('div');
+    container = document.createElement('div');
     document.body.appendChild(container);
 
     let ops = [];
@@ -251,7 +261,7 @@ describe('SimpleEventPlugin', function() {
     });
 
     it('flushes pending interactive work before extracting event handler', () => {
-      const container = document.createElement('div');
+      container = document.createElement('div');
       const root = ReactDOM.unstable_createRoot(container);
       document.body.appendChild(container);
 
@@ -331,7 +341,7 @@ describe('SimpleEventPlugin', function() {
     });
 
     it('end result of many interactive updates is deterministic', () => {
-      const container = document.createElement('div');
+      container = document.createElement('div');
       const root = ReactDOM.unstable_createRoot(container);
       document.body.appendChild(container);
 
@@ -386,7 +396,7 @@ describe('SimpleEventPlugin', function() {
     });
 
     it('flushes lowest pending interactive priority', () => {
-      const container = document.createElement('div');
+      container = document.createElement('div');
       document.body.appendChild(container);
 
       let button;
@@ -459,7 +469,7 @@ describe('SimpleEventPlugin', function() {
     // See http://www.quirksmode.org/blog/archives/2010/09/click_event_del.html
 
     it('does not add a local click to interactive elements', function() {
-      const container = document.createElement('div');
+      container = document.createElement('div');
 
       ReactDOM.render(<button onClick={onClick} />, container);
 
@@ -471,7 +481,7 @@ describe('SimpleEventPlugin', function() {
     });
 
     it('adds a local click listener to non-interactive elements', function() {
-      const container = document.createElement('div');
+      container = document.createElement('div');
 
       ReactDOM.render(<div onClick={onClick} />, container);
 
diff --git a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js
index e46ef77a49..6ba906593c 100644
--- a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js
+++ b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js
@@ -11,7 +11,6 @@
 
 let React;
 let ReactDOM;
-let ReactTestUtils;
 
 describe('SyntheticEvent', () => {
   let container;
@@ -19,7 +18,6 @@ describe('SyntheticEvent', () => {
   beforeEach(() => {
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('react-dom/test-utils');
 
     container = document.createElement('div');
     document.body.appendChild(container);
@@ -245,17 +243,13 @@ describe('SyntheticEvent', () => {
     expect(expectedCount).toBe(1);
   });
 
-  // TODO: reenable this test. We are currently silencing these warnings when
-  // using TestUtils.Simulate to avoid spurious warnings that result from the
-  // way we simulate events.
-  xit('should properly log warnings when events simulated with rendered components', () => {
+  it('should properly log warnings when events simulated with rendered components', () => {
     let event;
-    const element = document.createElement('div');
     function assignEvent(e) {
       event = e;
     }
-    const node = ReactDOM.render(<div onClick={assignEvent} />, element);
-    ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(node));
+    const node = ReactDOM.render(<div onClick={assignEvent} />, container);
+    node.click();
 
     // access a property to cause the warning
     expect(() => {
diff --git a/packages/react-dom/src/events/__tests__/TapEventPlugin-test.internal.js b/packages/react-dom/src/events/__tests__/TapEventPlugin-test.internal.js
index b822da91b0..5aa89cd37e 100644
--- a/packages/react-dom/src/events/__tests__/TapEventPlugin-test.internal.js
+++ b/packages/react-dom/src/events/__tests__/TapEventPlugin-test.internal.js
@@ -28,6 +28,27 @@ let PARENT;
 let CHILD;
 
 let putListener;
+let container;
+
+function touchStart(element, touchEventInit) {
+  element.dispatchEvent(
+    new TouchEvent('touchstart', {
+      bubbles: true,
+      cancelable: true,
+      ...touchEventInit,
+    }),
+  );
+}
+
+function touchEnd(element, touchEventInit) {
+  element.dispatchEvent(
+    new TouchEvent('touchend', {
+      bubbles: true,
+      cancelable: true,
+      ...touchEventInit,
+    }),
+  );
+}
 
 describe('TapEventPlugin', () => {
   beforeEach(() => {
@@ -40,7 +61,8 @@ describe('TapEventPlugin', () => {
     ReactTestUtils = require('react-dom/test-utils');
     TapEventPlugin = require('react-dom/src/events/TapEventPlugin').default;
 
-    const container = document.createElement('div');
+    container = document.createElement('div');
+    document.body.appendChild(container);
 
     const GRANDPARENT_PROPS = {};
     const PARENT_PROPS = {};
@@ -91,6 +113,11 @@ describe('TapEventPlugin', () => {
     });
   });
 
+  afterEach(() => {
+    document.body.removeChild(container);
+    container = null;
+  });
+
   /**
    * The onTouchTap inject is ignore future,
    * we should always test the deprecated message correct.
@@ -99,42 +126,24 @@ describe('TapEventPlugin', () => {
 
   it('should infer onTouchTap from a touchStart/End', () => {
     putListener(CHILD, ON_TOUCH_TAP_KEY, recordID.bind(null, CHILD));
-    ReactTestUtils.SimulateNative.touchStart(
-      CHILD,
-      ReactTestUtils.nativeTouchData(0, 0),
-    );
-    ReactTestUtils.SimulateNative.touchEnd(
-      CHILD,
-      ReactTestUtils.nativeTouchData(0, 0),
-    );
+    touchStart(CHILD, ReactTestUtils.nativeTouchData(0, 0));
+    touchEnd(CHILD, ReactTestUtils.nativeTouchData(0, 0));
     expect(idCallOrder.length).toBe(1);
     expect(idCallOrder[0]).toBe(CHILD);
   });
 
   it('should infer onTouchTap from when dragging below threshold', () => {
     putListener(CHILD, ON_TOUCH_TAP_KEY, recordID.bind(null, CHILD));
-    ReactTestUtils.SimulateNative.touchStart(
-      CHILD,
-      ReactTestUtils.nativeTouchData(0, 0),
-    );
-    ReactTestUtils.SimulateNative.touchEnd(
-      CHILD,
-      ReactTestUtils.nativeTouchData(0, tapMoveThreshold - 1),
-    );
+    touchStart(CHILD, ReactTestUtils.nativeTouchData(0, 0));
+    touchEnd(CHILD, ReactTestUtils.nativeTouchData(0, tapMoveThreshold - 1));
     expect(idCallOrder.length).toBe(1);
     expect(idCallOrder[0]).toBe(CHILD);
   });
 
   it('should not onTouchTap from when dragging beyond threshold', () => {
     putListener(CHILD, ON_TOUCH_TAP_KEY, recordID.bind(null, CHILD));
-    ReactTestUtils.SimulateNative.touchStart(
-      CHILD,
-      ReactTestUtils.nativeTouchData(0, 0),
-    );
-    ReactTestUtils.SimulateNative.touchEnd(
-      CHILD,
-      ReactTestUtils.nativeTouchData(0, tapMoveThreshold + 1),
-    );
+    touchStart(CHILD, ReactTestUtils.nativeTouchData(0, 0));
+    touchEnd(CHILD, ReactTestUtils.nativeTouchData(0, tapMoveThreshold + 1));
     expect(idCallOrder.length).toBe(0);
   });
 
@@ -146,14 +155,8 @@ describe('TapEventPlugin', () => {
       ON_TOUCH_TAP_KEY,
       recordID.bind(null, GRANDPARENT),
     );
-    ReactTestUtils.SimulateNative.touchStart(
-      CHILD,
-      ReactTestUtils.nativeTouchData(0, 0),
-    );
-    ReactTestUtils.SimulateNative.touchEnd(
-      CHILD,
-      ReactTestUtils.nativeTouchData(0, 0),
-    );
+    touchStart(CHILD, ReactTestUtils.nativeTouchData(0, 0));
+    touchEnd(CHILD, ReactTestUtils.nativeTouchData(0, 0));
     expect(idCallOrder.length).toBe(3);
     expect(idCallOrder[0] === CHILD).toBe(true);
     expect(idCallOrder[1] === PARENT).toBe(true);
diff --git a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
index 7cc6a9f279..a1070dbff6 100644
--- a/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
+++ b/packages/react-scheduler/src/__tests__/ReactScheduler-test.js
@@ -68,6 +68,8 @@ describe('ReactScheduler', () => {
     // - requestAnimationFrame should pass the DOMHighResTimeStamp argument
     // - calling 'window.postMessage' should actually fire postmessage handlers
     // - Date.now should return the correct thing
+    // - test with native performance.now()
+    delete global.performance;
     global.requestAnimationFrame = function(cb) {
       return rAFCallbacks.push(() => {
         cb(startOfLatestFrame);
diff --git a/yarn.lock b/yarn.lock
index 9c76585db6..87580ed0fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,12 +2,18 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@7.0.0-beta.44", "@babel/code-frame@^7.0.0-beta.35":
+"@babel/code-frame@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
   dependencies:
     "@babel/highlight" "7.0.0-beta.44"
 
+"@babel/code-frame@^7.0.0-beta.35":
+  version "7.0.0-beta.49"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.49.tgz#becd805482734440c9d137e46d77340e64d7f51b"
+  dependencies:
+    "@babel/highlight" "7.0.0-beta.49"
+
 "@babel/generator@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
@@ -46,6 +52,14 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
+"@babel/highlight@7.0.0-beta.49":
+  version "7.0.0-beta.49"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.49.tgz#96bdc6b43e13482012ba6691b1018492d39622cc"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
 "@babel/template@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
@@ -78,10 +92,6 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@types/node@*":
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.1.tgz#4ec3020bcdfe2abffeef9ba3fbf26fca097514b5"
-
 JSONStream@^1.0.3:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
@@ -89,15 +99,15 @@ JSONStream@^1.0.3:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abab@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
+abab@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
 
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
-acorn-globals@^4.0.0:
+acorn-globals@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.1.0.tgz#ab716025dbe17c54d3ef81d32ece2b2d99fe2538"
   dependencies:
@@ -121,7 +131,11 @@ acorn@^4.0.3:
   version "4.0.11"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"
 
-acorn@^5.0.0, acorn@^5.1.2, acorn@^5.2.1:
+acorn@^5.0.0, acorn@^5.3.0:
+  version "5.6.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.6.2.tgz#b1da1d7be2ac1b4a327fb9eab851702c5045b4e7"
+
+acorn@^5.2.1:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
 
@@ -191,11 +205,18 @@ anymatch@^1.3.0:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
 
-append-transform@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
   dependencies:
-    default-require-extensions "^1.0.0"
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
+append-transform@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
+  dependencies:
+    default-require-extensions "^2.0.0"
 
 aproba@^1.0.3:
   version "1.2.0"
@@ -313,15 +334,19 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
+async-limiter@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+
 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.3.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9"
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
   dependencies:
-    lodash "^4.14.0"
+    lodash "^4.17.10"
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -1027,18 +1052,6 @@ boom@2.x.x:
   dependencies:
     hoek "2.x.x"
 
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  dependencies:
-    hoek "4.x.x"
-
 brace-expansion@^1.0.0, brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1109,8 +1122,8 @@ bser@^2.0.0:
     node-int64 "^0.4.0"
 
 buffer-from@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04"
 
 builtin-modules@^1.0.0, builtin-modules@^1.1.0:
   version "1.1.1"
@@ -1167,6 +1180,12 @@ camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
+capture-exit@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
+  dependencies:
+    rsvp "^3.3.3"
+
 caseless@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
@@ -1224,8 +1243,8 @@ chownr@^1.0.1:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
 
 ci-info@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
 
 circular-json@^0.3.1:
   version "0.3.1"
@@ -1273,8 +1292,8 @@ cliui@^3.2.0:
     wrap-ansi "^2.0.0"
 
 cliui@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc"
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
   dependencies:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
@@ -1350,7 +1369,7 @@ combine-source-map@~0.6.1:
     lodash.memoize "~3.0.3"
     source-map "~0.4.2"
 
-combined-stream@^1.0.5, combined-stream@~1.0.5:
+combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
   dependencies:
@@ -1375,8 +1394,8 @@ commoner@~0.10.3:
     recast "^0.11.17"
 
 compare-versions@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.2.1.tgz#a49eb7689d4caaf0b6db5220173fd279614000f7"
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.3.0.tgz#af93ea705a96943f622ab309578b9b90586f39c3"
 
 component-emitter@^1.2.1:
   version "1.2.1"
@@ -1398,10 +1417,6 @@ 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"
 
-content-type-parser@^1.0.1:
-  version "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, convert-source-map@^1.4.0, convert-source-map@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
@@ -1483,19 +1498,13 @@ cryptiles@2.x.x:
   dependencies:
     boom "2.x.x"
 
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  dependencies:
-    boom "5.x.x"
-
 cssom@0.3.x, "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"
+"cssstyle@>= 0.3.1 < 0.4.0":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.3.1.tgz#6da9b4cff1bc5d716e6e5fe8e04fcb1b50a49adf"
   dependencies:
     cssom "0.3.x"
 
@@ -1543,6 +1552,14 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-urls@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.0.0.tgz#24802de4e81c298ea8a9388bb0d8e461c774684f"
+  dependencies:
+    abab "^1.0.4"
+    whatwg-mimetype "^2.0.0"
+    whatwg-url "^6.4.0"
+
 dateformat@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17"
@@ -1575,11 +1592,11 @@ 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"
+default-require-extensions@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
   dependencies:
-    strip-bom "^2.0.0"
+    strip-bom "^3.0.0"
 
 define-properties@^1.1.2:
   version "1.1.2"
@@ -1707,8 +1724,10 @@ doctrine@^2.0.2:
     esutils "^2.0.2"
 
 domexception@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.0.tgz#81fe5df81b3f057052cde3a9fa9bf536a85b9ab0"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  dependencies:
+    webidl-conversions "^4.0.2"
 
 dotenv@^4.0.0:
   version "4.0.0"
@@ -1767,7 +1786,17 @@ error-ex@^1.2.0:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.5.1, es-abstract@^1.7.0:
+es-abstract@^1.5.1:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
+  dependencies:
+    es-to-primitive "^1.1.1"
+    function-bind "^1.1.1"
+    has "^1.0.1"
+    is-callable "^1.1.3"
+    is-regex "^1.0.4"
+
+es-abstract@^1.7.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
   dependencies:
@@ -1852,15 +1881,15 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
 escodegen@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.10.0.tgz#f647395de22519fbd0d928ffcf1d17e0dec2603e"
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
   optionalDependencies:
-    source-map "~0.5.6"
+    source-map "~0.6.1"
 
 escope@^3.6.0:
   version "3.6.0"
@@ -2023,8 +2052,8 @@ event-emitter@~0.3.5:
     es5-ext "~0.10.14"
 
 exec-sh@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.0.tgz#14f75de3f20d286ef933099b2ce50a90359cef10"
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.1.tgz#163b98a6e89e6b65b47c2a28d215bc1f63989c38"
   dependencies:
     merge "^1.1.3"
 
@@ -2074,15 +2103,15 @@ expand-tilde@^1.2.2:
   dependencies:
     os-homedir "^1.0.1"
 
-expect@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-23.0.1.tgz#99131f2fd9115595f8cc3697401e7f0734d45fef"
+expect@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-23.1.0.tgz#bfdfd57a2a20170d875999ee9787cc71f01c205f"
   dependencies:
     ansi-styles "^3.2.0"
     jest-diff "^23.0.1"
     jest-get-type "^22.1.0"
     jest-matcher-utils "^23.0.1"
-    jest-message-util "^23.0.0"
+    jest-message-util "^23.1.0"
     jest-regex-util "^23.0.0"
 
 extend-shallow@^2.0.1:
@@ -2338,11 +2367,11 @@ form-data@~2.1.1:
     mime-types "^2.1.12"
 
 form-data@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "^1.0.5"
+    combined-stream "1.0.6"
     mime-types "^2.1.12"
 
 fragment-cache@^0.2.1:
@@ -2373,13 +2402,20 @@ 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, fsevents@^1.1.1:
+fsevents@^1.0.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.2.tgz#4f598f0f69b273188ef4a62ca4e9e08ace314bbf"
   dependencies:
     nan "^2.9.2"
     node-pre-gyp "^0.9.0"
 
+fsevents@^1.2.3:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
+  dependencies:
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
+
 function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -2641,8 +2677,8 @@ gzip-size@^3.0.0:
     duplexer "^0.1.1"
 
 handlebars@^4.0.3:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.5.tgz#92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
   dependencies:
     async "^1.4.0"
     optimist "^0.6.1"
@@ -2740,23 +2776,10 @@ hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
 hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
-hoek@4.x.x:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
-
 home-or-tmp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-1.0.0.tgz#4b9f1e40800c3e50c6c27f781676afcce71f3985"
@@ -2781,9 +2804,9 @@ hosted-git-info@^2.1.4:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
 
-html-encoding-sniffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz#79bf7a785ea495fe66165e734153f363ff5437da"
+html-encoding-sniffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
   dependencies:
     whatwg-encoding "^1.0.1"
 
@@ -2814,9 +2837,9 @@ hyperlinker@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hyperlinker/-/hyperlinker-1.0.0.tgz#23dc9e38a206b208ee49bc2d6c8ef47027df0c0e"
 
-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.19:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
 iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
   version "0.4.21"
@@ -2939,8 +2962,8 @@ is-callable@^1.1.1, is-callable@^1.1.3:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
 
 is-ci@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
   dependencies:
     ci-info "^1.0.0"
 
@@ -3218,10 +3241,10 @@ istanbul-lib-coverage@^1.2.0:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
 
 istanbul-lib-hook@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.0.tgz#ae556fd5a41a6e8efa0b1002b1e416dfeaf9816c"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.1.tgz#f614ec45287b2a8fc4f07f5660af787575601805"
   dependencies:
-    append-transform "^0.4.0"
+    append-transform "^1.0.0"
 
 istanbul-lib-instrument@^1.10.1:
   version "1.10.1"
@@ -3245,8 +3268,8 @@ istanbul-lib-report@^1.1.4:
     supports-color "^3.1.2"
 
 istanbul-lib-source-maps@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.4.tgz#cc7ccad61629f4efff8e2f78adb8c522c9976ec7"
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.5.tgz#ffe6be4e7ab86d3603e4290d54990b14506fc9b1"
   dependencies:
     debug "^3.1.0"
     istanbul-lib-coverage "^1.2.0"
@@ -3272,9 +3295,9 @@ jest-changed-files@^23.0.1:
   dependencies:
     throat "^4.0.0"
 
-jest-cli@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.0.1.tgz#351a5ba51cf28ecf20336d97a30b970d1f530a56"
+jest-cli@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.1.0.tgz#eb8bdd4ce0d15250892e31ad9b69bc99d2a8f6bf"
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
@@ -3288,18 +3311,19 @@ jest-cli@^23.0.1:
     istanbul-lib-instrument "^1.10.1"
     istanbul-lib-source-maps "^1.2.4"
     jest-changed-files "^23.0.1"
-    jest-config "^23.0.1"
-    jest-environment-jsdom "^23.0.1"
+    jest-config "^23.1.0"
+    jest-environment-jsdom "^23.1.0"
     jest-get-type "^22.1.0"
-    jest-haste-map "^23.0.1"
-    jest-message-util "^23.0.0"
+    jest-haste-map "^23.1.0"
+    jest-message-util "^23.1.0"
     jest-regex-util "^23.0.0"
     jest-resolve-dependencies "^23.0.1"
-    jest-runner "^23.0.1"
-    jest-runtime "^23.0.1"
+    jest-runner "^23.1.0"
+    jest-runtime "^23.1.0"
     jest-snapshot "^23.0.1"
-    jest-util "^23.0.1"
+    jest-util "^23.1.0"
     jest-validate "^23.0.1"
+    jest-watcher "^23.1.0"
     jest-worker "^23.0.1"
     micromatch "^2.3.11"
     node-notifier "^5.2.1"
@@ -3311,21 +3335,21 @@ jest-cli@^23.0.1:
     which "^1.2.12"
     yargs "^11.0.0"
 
-jest-config@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.0.1.tgz#6798bff1247c7a390b1327193305001582fc58fa"
+jest-config@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.1.0.tgz#708ca0f431d356ee424fb4895d3308006bdd8241"
   dependencies:
     babel-core "^6.0.0"
     babel-jest "^23.0.1"
     chalk "^2.0.1"
     glob "^7.1.1"
-    jest-environment-jsdom "^23.0.1"
-    jest-environment-node "^23.0.1"
+    jest-environment-jsdom "^23.1.0"
+    jest-environment-node "^23.1.0"
     jest-get-type "^22.1.0"
-    jest-jasmine2 "^23.0.1"
+    jest-jasmine2 "^23.1.0"
     jest-regex-util "^23.0.0"
-    jest-resolve "^23.0.1"
-    jest-util "^23.0.1"
+    jest-resolve "^23.1.0"
+    jest-util "^23.1.0"
     jest-validate "^23.0.1"
     pretty-format "^23.0.1"
 
@@ -3344,35 +3368,35 @@ jest-docblock@^23.0.1:
   dependencies:
     detect-newline "^2.1.0"
 
-jest-each@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.0.1.tgz#a6e5dbf530afc6bf9d74792dde69d8db70f84706"
+jest-each@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.1.0.tgz#16146b592c354867a5ae5e13cdf15c6c65b696c6"
   dependencies:
     chalk "^2.0.1"
     pretty-format "^23.0.1"
 
-jest-environment-jsdom@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.0.1.tgz#da689eb9358dc16e5708abb208f4eb26a439575c"
+jest-environment-jsdom@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.1.0.tgz#85929914e23bed3577dac9755f4106d0697c479c"
   dependencies:
-    jest-mock "^23.0.1"
-    jest-util "^23.0.1"
+    jest-mock "^23.1.0"
+    jest-util "^23.1.0"
     jsdom "^11.5.1"
 
-jest-environment-node@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.0.1.tgz#676b740e205f1f2be77241969e7812be824ee795"
+jest-environment-node@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.1.0.tgz#452c0bf949cfcbbacda1e1762eeed70bc784c7d5"
   dependencies:
-    jest-mock "^23.0.1"
-    jest-util "^23.0.1"
+    jest-mock "^23.1.0"
+    jest-util "^23.1.0"
 
 jest-get-type@^22.1.0:
   version "22.1.0"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.1.0.tgz#4e90af298ed6181edc85d2da500dbd2753e0d5a9"
 
-jest-haste-map@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.0.1.tgz#cd89052abfc8cba01f560bbec09d4f36aec25d4f"
+jest-haste-map@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.1.0.tgz#18e6c7d5a8d27136f91b7d9852f85de0c7074c49"
   dependencies:
     fb-watchman "^2.0.0"
     graceful-fs "^4.1.11"
@@ -3382,20 +3406,20 @@ jest-haste-map@^23.0.1:
     micromatch "^2.3.11"
     sane "^2.0.0"
 
-jest-jasmine2@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.0.1.tgz#16d875356e6360872bba48426f7d31fdc1b0bcea"
+jest-jasmine2@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.1.0.tgz#4afab31729b654ddcd2b074add849396f13b30b8"
   dependencies:
     chalk "^2.0.1"
     co "^4.6.0"
-    expect "^23.0.1"
+    expect "^23.1.0"
     is-generator-fn "^1.0.0"
     jest-diff "^23.0.1"
-    jest-each "^23.0.1"
+    jest-each "^23.1.0"
     jest-matcher-utils "^23.0.1"
-    jest-message-util "^23.0.0"
+    jest-message-util "^23.1.0"
     jest-snapshot "^23.0.1"
-    jest-util "^23.0.1"
+    jest-util "^23.1.0"
     pretty-format "^23.0.1"
 
 jest-leak-detector@^23.0.1:
@@ -3412,9 +3436,9 @@ jest-matcher-utils@^23.0.1:
     jest-get-type "^22.1.0"
     pretty-format "^23.0.1"
 
-jest-message-util@^23.0.0:
-  version "23.0.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.0.0.tgz#073f3d76c701f7c718a4b9af1eb7f138792c4796"
+jest-message-util@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.1.0.tgz#9a809ba487ecac5ce511d4e698ee3b5ee2461ea9"
   dependencies:
     "@babel/code-frame" "^7.0.0-beta.35"
     chalk "^2.0.1"
@@ -3422,9 +3446,9 @@ jest-message-util@^23.0.0:
     slash "^1.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.0.1.tgz#1569f477968c668fc728273a17c3767773b46357"
+jest-mock@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.1.0.tgz#a381c31b121ab1f60c462a2dadb7b86dcccac487"
 
 jest-regex-util@^23.0.0:
   version "23.0.0"
@@ -3437,35 +3461,35 @@ jest-resolve-dependencies@^23.0.1:
     jest-regex-util "^23.0.0"
     jest-snapshot "^23.0.1"
 
-jest-resolve@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.0.1.tgz#3f8403462b10a34c2df1d47aab5574c4935bcd24"
+jest-resolve@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.1.0.tgz#b9e316eecebd6f00bc50a3960d1527bae65792d2"
   dependencies:
     browser-resolve "^1.11.2"
     chalk "^2.0.1"
     realpath-native "^1.0.0"
 
-jest-runner@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.0.1.tgz#b176ae3ecf9e194aa4b84a7fcf70d1b8db231aa7"
+jest-runner@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.1.0.tgz#fa20a933fff731a5432b3561e7f6426594fa29b5"
   dependencies:
     exit "^0.1.2"
     graceful-fs "^4.1.11"
-    jest-config "^23.0.1"
+    jest-config "^23.1.0"
     jest-docblock "^23.0.1"
-    jest-haste-map "^23.0.1"
-    jest-jasmine2 "^23.0.1"
+    jest-haste-map "^23.1.0"
+    jest-jasmine2 "^23.1.0"
     jest-leak-detector "^23.0.1"
-    jest-message-util "^23.0.0"
-    jest-runtime "^23.0.1"
-    jest-util "^23.0.1"
+    jest-message-util "^23.1.0"
+    jest-runtime "^23.1.0"
+    jest-util "^23.1.0"
     jest-worker "^23.0.1"
     source-map-support "^0.5.6"
     throat "^4.0.0"
 
-jest-runtime@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.0.1.tgz#b1d765fb03fb6d4043805af270676a693f504d57"
+jest-runtime@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.1.0.tgz#b4ae0e87259ecacfd4a884b639db07cf4dd620af"
   dependencies:
     babel-core "^6.0.0"
     babel-plugin-istanbul "^4.1.6"
@@ -3474,13 +3498,13 @@ jest-runtime@^23.0.1:
     exit "^0.1.2"
     fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.1.11"
-    jest-config "^23.0.1"
-    jest-haste-map "^23.0.1"
-    jest-message-util "^23.0.0"
+    jest-config "^23.1.0"
+    jest-haste-map "^23.1.0"
+    jest-message-util "^23.1.0"
     jest-regex-util "^23.0.0"
-    jest-resolve "^23.0.1"
+    jest-resolve "^23.1.0"
     jest-snapshot "^23.0.1"
-    jest-util "^23.0.1"
+    jest-util "^23.1.0"
     jest-validate "^23.0.1"
     micromatch "^2.3.11"
     realpath-native "^1.0.0"
@@ -3504,16 +3528,17 @@ jest-snapshot@^23.0.1:
     natural-compare "^1.4.0"
     pretty-format "^23.0.1"
 
-jest-util@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.0.1.tgz#68ea5bd7edb177d3059f9797259f8e0dacce2f99"
+jest-util@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.1.0.tgz#c0251baf34644c6dd2fea78a962f4263ac55772d"
   dependencies:
     callsites "^2.0.0"
     chalk "^2.0.1"
     graceful-fs "^4.1.11"
     is-ci "^1.0.10"
-    jest-message-util "^23.0.0"
+    jest-message-util "^23.1.0"
     mkdirp "^0.5.1"
+    slash "^1.0.0"
     source-map "^0.6.0"
 
 jest-validate@^23.0.1:
@@ -3525,18 +3550,26 @@ jest-validate@^23.0.1:
     leven "^2.1.0"
     pretty-format "^23.0.1"
 
+jest-watcher@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.1.0.tgz#a8d5842e38d9fb4afff823df6abb42a58ae6cdbd"
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    string-length "^2.0.0"
+
 jest-worker@^23.0.1:
   version "23.0.1"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.0.1.tgz#9e649dd963ff4046026f91c4017f039a6aa4a7bc"
   dependencies:
     merge-stream "^1.0.1"
 
-jest@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-23.0.1.tgz#0d083290ee4112cecfb780df6ff81332ed373201"
+jest@^23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-23.1.0.tgz#bbb7f893100a11a742dd8bd0d047a54b0968ad1a"
   dependencies:
     import-local "^1.0.0"
-    jest-cli "^23.0.1"
+    jest-cli "^23.1.0"
 
 js-tokens@1.0.1:
   version "1.0.1"
@@ -3553,7 +3586,14 @@ js-yaml@3.6.1:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
-js-yaml@^3.7.0, js-yaml@^3.9.1:
+js-yaml@^3.7.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+js-yaml@^3.9.1:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
   dependencies:
@@ -3565,33 +3605,35 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
 jsdom@^11.5.1:
-  version "11.5.1"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.5.1.tgz#5df753b8d0bca20142ce21f4f6c039f99a992929"
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.11.0.tgz#df486efad41aee96c59ad7a190e2449c7eb1110e"
   dependencies:
-    abab "^1.0.3"
-    acorn "^5.1.2"
-    acorn-globals "^4.0.0"
+    abab "^1.0.4"
+    acorn "^5.3.0"
+    acorn-globals "^4.1.0"
     array-equal "^1.0.0"
-    browser-process-hrtime "^0.1.2"
-    content-type-parser "^1.0.1"
     cssom ">= 0.3.2 < 0.4.0"
-    cssstyle ">= 0.2.37 < 0.3.0"
+    cssstyle ">= 0.3.1 < 0.4.0"
+    data-urls "^1.0.0"
     domexception "^1.0.0"
     escodegen "^1.9.0"
-    html-encoding-sniffer "^1.0.1"
+    html-encoding-sniffer "^1.0.2"
     left-pad "^1.2.0"
-    nwmatcher "^1.4.3"
-    parse5 "^3.0.2"
-    pn "^1.0.0"
+    nwsapi "^2.0.0"
+    parse5 "4.0.0"
+    pn "^1.1.0"
     request "^2.83.0"
-    request-promise-native "^1.0.3"
-    sax "^1.2.1"
-    symbol-tree "^3.2.1"
+    request-promise-native "^1.0.5"
+    sax "^1.2.4"
+    symbol-tree "^3.2.2"
     tough-cookie "^2.3.3"
+    w3c-hr-time "^1.0.1"
     webidl-conversions "^4.0.2"
-    whatwg-encoding "^1.0.1"
-    whatwg-url "^6.3.0"
-    xml-name-validator "^2.0.1"
+    whatwg-encoding "^1.0.3"
+    whatwg-mimetype "^2.1.0"
+    whatwg-url "^6.4.1"
+    ws "^4.0.0"
+    xml-name-validator "^3.0.0"
 
 jsesc@^1.3.0:
   version "1.3.0"
@@ -3703,8 +3745,8 @@ lcov-parse@0.0.10:
   resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
 
 left-pad@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
 
 leven@^1.0.2:
   version "1.0.2"
@@ -3868,7 +3910,7 @@ 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.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
+lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
@@ -3955,7 +3997,7 @@ micromatch@^2.1.5, micromatch@^2.3.11:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-micromatch@^3.1.8:
+micromatch@^3.1.4, micromatch@^3.1.8:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   dependencies:
@@ -3999,7 +4041,7 @@ minimatch@^2.0.3:
   dependencies:
     brace-expansion "^1.0.0"
 
-minimist@0.0.8, minimist@~0.0.1:
+minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
@@ -4007,6 +4049,10 @@ 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"
 
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
 minipass@^2.2.1, minipass@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.4.tgz#03c824d84551ec38a8d1bb5bc350a5a30a354a40"
@@ -4108,6 +4154,21 @@ node-notifier@^5.2.1:
     shellwords "^0.1.1"
     which "^1.3.0"
 
+node-pre-gyp@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz#6e4ef5bb5c5203c6552448828c852c40111aac46"
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.0"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.1.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
 node-pre-gyp@^0.9.0:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz#f11c07516dd92f87199dbc7e1838eab7cd56c9e0"
@@ -4139,7 +4200,7 @@ normalize-package-data@^2.3.2:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.0, normalize-path@^2.0.1:
+normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
@@ -4175,9 +4236,9 @@ 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"
 
-nwmatcher@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
+nwsapi@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.3.tgz#3f4010d6c943f34018d3dfb5f2fbc0de90476959"
 
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
@@ -4383,11 +4444,9 @@ parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
 
-parse5@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
-  dependencies:
-    "@types/node" "*"
+parse5@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
 
 pascalcase@^0.1.1:
   version "0.1.1"
@@ -4477,7 +4536,7 @@ pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
 
-pn@^1.0.0:
+pn@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
 
@@ -4549,6 +4608,10 @@ pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
+psl@^1.1.24:
+  version "1.1.27"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.27.tgz#2b2c77019db86855170d903532400bf71ee085b6"
+
 pump@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.2.tgz#3b3ee6512f94f0e575538c17995f9f16990a5d51"
@@ -4569,8 +4632,8 @@ punycode@^1.4.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
 punycode@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
 
 q@^1.1.2:
   version "1.5.0"
@@ -4581,8 +4644,8 @@ qs@~6.3.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
 
 qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
 random-seed@^0.3.0:
   version "0.3.0"
@@ -4818,7 +4881,7 @@ request-promise-core@1.1.1:
   dependencies:
     lodash "^4.13.1"
 
-request-promise-native@^1.0.3:
+request-promise-native@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5"
   dependencies:
@@ -4852,8 +4915,8 @@ request@2.79.0:
     uuid "^3.0.0"
 
 request@^2.83.0:
-  version "2.85.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+  version "2.87.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -4863,7 +4926,6 @@ request@^2.83.0:
     forever-agent "~0.6.1"
     form-data "~2.3.1"
     har-validator "~5.0.3"
-    hawk "~6.0.2"
     http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
@@ -4873,7 +4935,6 @@ request@^2.83.0:
     performance-now "^2.1.0"
     qs "~6.5.1"
     safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
     tough-cookie "~2.3.3"
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
@@ -5029,6 +5090,10 @@ rollup@^0.52.1:
   version "0.52.1"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.52.1.tgz#610e8e1be432f18fcfbfa865408a1cd7618cd707"
 
+rsvp@^3.3.3:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -5058,7 +5123,11 @@ rxjs@^5.5.6:
   dependencies:
     symbol-observable "1.0.1"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@^5.0.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+
+safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
@@ -5073,20 +5142,21 @@ safer-buffer@^2.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
 sane@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-2.0.0.tgz#99cb79f21f4a53a69d4d0cd957c2db04024b8eb2"
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
   dependencies:
-    anymatch "^1.3.0"
+    anymatch "^2.0.0"
+    capture-exit "^1.2.0"
     exec-sh "^0.2.0"
     fb-watchman "^2.0.0"
-    minimatch "^3.0.2"
+    micromatch "^3.1.4"
     minimist "^1.1.1"
     walker "~1.0.5"
-    watch "~0.10.0"
+    watch "~0.18.0"
   optionalDependencies:
-    fsevents "^1.1.1"
+    fsevents "^1.2.3"
 
-sax@^1.2.1, sax@^1.2.4:
+sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
@@ -5193,12 +5263,6 @@ sntp@1.x.x:
   dependencies:
     hoek "2.x.x"
 
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  dependencies:
-    hoek "4.x.x"
-
 source-map-resolve@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
@@ -5244,11 +5308,11 @@ 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.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.6:
+source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
-source-map@^0.6.0:
+source-map@^0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
@@ -5372,7 +5436,7 @@ stringset@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/stringset/-/stringset-0.2.1.tgz#ef259c4e349344377fcd1c913dd2e848c9c042b5"
 
-stringstream@~0.0.4, stringstream@~0.0.5:
+stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
 
@@ -5441,7 +5505,7 @@ symbol-observable@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
 
-symbol-tree@^3.2.1:
+symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
@@ -5605,13 +5669,20 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+tough-cookie@>=2.3.3, tough-cookie@^2.3.3:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.2.tgz#aa9133154518b494efab98a58247bfc38818c00c"
+  dependencies:
+    psl "^1.1.24"
+    punycode "^1.4.1"
+
+tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
   dependencies:
     punycode "^1.4.1"
 
-tr46@^1.0.0:
+tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
   dependencies:
@@ -5666,8 +5737,8 @@ ua-parser-js@^0.7.9:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
 
 uglify-js@^2.6:
-  version "2.8.22"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.22.tgz#d54934778a8da14903fa29a326fb24c0ab51a1a0"
+  version "2.8.29"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:
     source-map "~0.5.1"
     yargs "~3.10.0"
@@ -5800,37 +5871,50 @@ voca@^1.3.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/voca/-/voca-1.4.0.tgz#e15ac58b38290b72acc0c330366b6cc7984924d7"
 
+w3c-hr-time@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
+  dependencies:
+    browser-process-hrtime "^0.1.2"
+
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
   dependencies:
     makeerror "1.0.x"
 
-watch@~0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/watch/-/watch-0.10.0.tgz#77798b2da0f9910d595f1ace5b0c2258521f21dc"
+watch@~0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
+  dependencies:
+    exec-sh "^0.2.0"
+    minimist "^1.2.0"
 
-webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:
+webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
 
-whatwg-encoding@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4"
+whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"
   dependencies:
-    iconv-lite "0.4.13"
+    iconv-lite "0.4.19"
 
 whatwg-fetch@>=0.10.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
 
-whatwg-url@^6.3.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.0.tgz#08fdf2b9e872783a7a1f6216260a1d66cc722e08"
+whatwg-mimetype@^2.0.0, whatwg-mimetype@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.1.0.tgz#f0f21d76cbba72362eb609dbed2a30cd17fcc7d4"
+
+whatwg-url@^6.4.0, whatwg-url@^6.4.1:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
   dependencies:
     lodash.sortby "^4.7.0"
-    tr46 "^1.0.0"
-    webidl-conversions "^4.0.1"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
 
 which-module@^1.0.0:
   version "1.0.0"
@@ -5840,12 +5924,18 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.2.12, which@^1.2.8, which@^1.2.9, which@^1.3.0:
+which@^1.2.12, which@^1.2.8, which@^1.2.9:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
     isexe "^2.0.0"
 
+which@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  dependencies:
+    isexe "^2.0.0"
+
 wide-align@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
@@ -5901,9 +5991,16 @@ write@^0.2.1:
   dependencies:
     mkdirp "^0.5.1"
 
-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"
+ws@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"
+  dependencies:
+    async-limiter "~1.0.0"
+    safe-buffer "~5.1.0"
+
+xml-name-validator@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
 
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"

From c469e3b422fcb833ad28fcc32cd88f48b660a06a Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 13 Jun 2018 16:57:46 +0100
Subject: [PATCH 153/277] Add unreleased changelog

---
 CHANGELOG.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69f5807c34..cb66be8074 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,34 @@
+## [Unreleased]
+<details>
+  <summary>
+    Changes that have landed in master but are not yet released.
+    Click to see more.
+  </summary>
+
+### React
+
+* You can now assign `propTypes` to components returned by `React.ForwardRef`. ([@bvaughn](https://github.com/bvaughn) in [#12911](https://github.com/facebook/react/pull/12911))
+
+### React DOM
+
+* Fix a crash when the input `type` changes from some other types to `text`. ([@spirosikmd](https://github.com/spirosikmd) in [#12135](https://github.com/facebook/react/pull/12135))
+* Fix a crash in IE11 when restoring focus to an SVG element. ([@ThaddeusJiang](https://github.com/ThaddeusJiang) in [#12996](https://github.com/facebook/react/pull/12996))
+* Fix a range input not updating in some cases. ([@Illu](https://github.com/Illu) in [#12939](https://github.com/facebook/react/pull/12939))
+* Fix input validation triggering unnecessarily in Firefox. ([@nhunzaker](https://github.com/nhunzaker) in [#12925](https://github.com/facebook/react/pull/12925))
+* Fix an incorrect `event.target` value for the `onChange` event in IE9. ([@nhunzaker](https://github.com/nhunzaker) in [#12976](https://github.com/facebook/react/pull/12976))
+* Fix a false positive error when returning an empty `<React.Fragment />` from a component. ([@philipp-spiess](https://github.com/philipp-spiess) in [#12966](https://github.com/facebook/react/pull/12966))
+
+### React DOM Server
+
+* Fix an incorrect value being provided by new context API. ([@ericsoderberghp](https://github.com/ericsoderberghp) in [#12985](https://github.com/facebook/react/pull/12985), [@gaearon](https://github.com/gaearon) in [#13019](https://github.com/facebook/react/pull/13019))
+
+### React Test Renderer
+
+* Allow multiple root children in test renderer traversal API. ([@gaearon](https://github.com/gaearon) in [#13017](https://github.com/facebook/react/pull/13017))
+* Fix `getDerivedStateFromProps()` in the shallow renderer to not discard the pending state. ([@fatfisz](https://github.com/fatfisz) in [#13030](https://github.com/facebook/react/pull/13030))
+
+</details>
+
 ## 16.4.0 (May 23, 2018)
 
 ### React

From 65eb6b94ac3d0def59b2fc3a09aa03f63c25f909 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 13 Jun 2018 17:13:29 +0100
Subject: [PATCH 154/277] Updating yarn.lock file for 16.4.1 release

---
 yarn.lock | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 87580ed0fb..9e7bd01cea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2215,7 +2215,19 @@ fbjs-scripts@^0.6.0:
     semver "^5.1.0"
     through2 "^2.0.0"
 
-fbjs@^0.8.16, fbjs@^0.8.9:
+fbjs@^0.8.16:
+  version "0.8.17"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
+  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.18"
+
+fbjs@^0.8.9:
   version "0.8.16"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
   dependencies:
@@ -2841,12 +2853,18 @@ iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
-iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
+iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@^0.4.5:
   version "0.4.21"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
   dependencies:
     safer-buffer "^2.1.0"
 
+iconv-lite@~0.4.13:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
@@ -5137,7 +5155,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-safer-buffer@^2.1.0:
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
@@ -5732,7 +5750,7 @@ typescript@~1.8.10:
   version "1.8.10"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-1.8.10.tgz#b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e"
 
-ua-parser-js@^0.7.9:
+ua-parser-js@^0.7.18, ua-parser-js@^0.7.9:
   version "0.7.18"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
 

From 0b87b279069d21ec6308afcdc557a39dfc459536 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 13 Jun 2018 17:16:10 +0100
Subject: [PATCH 155/277] Updating package versions for release 16.4.1

---
 package.json                                | 2 +-
 packages/create-subscription/package.json   | 2 +-
 packages/react-art/package.json             | 2 +-
 packages/react-dom/package.json             | 2 +-
 packages/react-is/package.json              | 2 +-
 packages/react-reconciler/package.json      | 2 +-
 packages/react-test-renderer/package.json   | 4 ++--
 packages/react/package.json                 | 2 +-
 packages/shared/ReactVersion.js             | 2 +-
 packages/simple-cache-provider/package.json | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 23692fd8d4..939375b0a0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "16.4.0",
+  "version": "16.4.1",
   "workspaces": [
     "packages/*"
   ],
diff --git a/packages/create-subscription/package.json b/packages/create-subscription/package.json
index c7126a2d79..a9e306e4b9 100644
--- a/packages/create-subscription/package.json
+++ b/packages/create-subscription/package.json
@@ -1,7 +1,7 @@
 {
   "name": "create-subscription",
   "description": "utility for subscribing to external data sources inside React components",
-  "version": "16.4.0",
+  "version": "16.4.1",
   "repository": "facebook/react",
   "files": [
     "LICENSE",
diff --git a/packages/react-art/package.json b/packages/react-art/package.json
index 9198860c5f..c3863c4838 100644
--- a/packages/react-art/package.json
+++ b/packages/react-art/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-art",
   "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).",
-  "version": "16.4.0",
+  "version": "16.4.1",
   "main": "index.js",
   "repository": "facebook/react",
   "keywords": [
diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
index eb8cd5c390..f6ba19cc43 100644
--- a/packages/react-dom/package.json
+++ b/packages/react-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dom",
-  "version": "16.4.0",
+  "version": "16.4.1",
   "description": "React package for working with the DOM.",
   "main": "index.js",
   "repository": "facebook/react",
diff --git a/packages/react-is/package.json b/packages/react-is/package.json
index 96bfa33ad7..9b41e5e81b 100644
--- a/packages/react-is/package.json
+++ b/packages/react-is/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-is",
-  "version": "16.4.0",
+  "version": "16.4.1",
   "description": "Brand checking of React Elements.",
   "main": "index.js",
   "repository": "facebook/react",
diff --git a/packages/react-reconciler/package.json b/packages/react-reconciler/package.json
index 3cd3fc3318..586796e2fb 100644
--- a/packages/react-reconciler/package.json
+++ b/packages/react-reconciler/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-reconciler",
   "description": "React package for creating custom renderers.",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "keywords": [
     "react"
   ],
diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json
index 56c29b8833..6aafaf967b 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.4.0",
+  "version": "16.4.1",
   "description": "React package for snapshot testing.",
   "main": "index.js",
   "repository": "facebook/react",
@@ -18,7 +18,7 @@
     "fbjs": "^0.8.16",
     "object-assign": "^4.1.1",
     "prop-types": "^15.6.0",
-    "react-is": "^16.4.0"
+    "react-is": "^16.4.1"
   },
   "peerDependencies": {
     "react": "^16.0.0"
diff --git a/packages/react/package.json b/packages/react/package.json
index c08a6b108e..a69208d563 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -4,7 +4,7 @@
   "keywords": [
     "react"
   ],
-  "version": "16.4.0",
+  "version": "16.4.1",
   "homepage": "https://reactjs.org/",
   "bugs": "https://github.com/facebook/react/issues",
   "license": "MIT",
diff --git a/packages/shared/ReactVersion.js b/packages/shared/ReactVersion.js
index d0bd008b97..47ea28d349 100644
--- a/packages/shared/ReactVersion.js
+++ b/packages/shared/ReactVersion.js
@@ -8,4 +8,4 @@
 'use strict';
 
 // TODO: this is special because it gets imported during build.
-module.exports = '16.4.0';
+module.exports = '16.4.1';
diff --git a/packages/simple-cache-provider/package.json b/packages/simple-cache-provider/package.json
index 9141280cd4..f785df0f2e 100644
--- a/packages/simple-cache-provider/package.json
+++ b/packages/simple-cache-provider/package.json
@@ -1,7 +1,7 @@
 {
   "name": "simple-cache-provider",
   "description": "A basic cache for React applications",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "repository": "facebook/react",
   "files": [
     "LICENSE",

From a5957bf296d894fd2d5a67dd8d6712d5bf8eb845 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 13 Jun 2018 17:20:35 +0100
Subject: [PATCH 156/277] Update error codes for 16.4.1 release

---
 scripts/error-codes/codes.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/error-codes/codes.json b/scripts/error-codes/codes.json
index eb64793ede..c98bbb05e1 100644
--- a/scripts/error-codes/codes.json
+++ b/scripts/error-codes/codes.json
@@ -274,5 +274,6 @@
   "272": "The current renderer does not support hyration. This error is likely caused by a bug in React. Please file an issue.",
   "273": "Nesting of <View> within <Text> is not currently supported.",
   "274": "Text strings must be rendered within a <Text> component.",
-  "275": "The current renderer does not support mutation. This error is likely caused by a bug in React. Please file an issue."
+  "275": "The current renderer does not support mutation. This error is likely caused by a bug in React. Please file an issue.",
+  "276": "React depends on requestAnimationFrame. Make sure that you load a polyfill in older browsers. https://fb.me/react-polyfills"
 }

From 9725065eb4054be5a223b16d28de0aeda91f4464 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 13 Jun 2018 17:20:35 +0100
Subject: [PATCH 157/277] Update bundle sizes for 16.4.1 release

---
 scripts/rollup/results.json | 255 ++++++++++++++++++++----------------
 1 file changed, 145 insertions(+), 110 deletions(-)

diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index b04285dbe9..ea7d1c4e07 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -4,8 +4,8 @@
       "filename": "react.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react",
-      "size": 58569,
-      "gzip": 16268
+      "size": 59086,
+      "gzip": 16296
     },
     {
       "filename": "react.production.min.js",
@@ -18,8 +18,8 @@
       "filename": "react.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react",
-      "size": 48984,
-      "gzip": 13873
+      "size": 49501,
+      "gzip": 13887
     },
     {
       "filename": "react.production.min.js",
@@ -46,29 +46,29 @@
       "filename": "react-dom.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-dom",
-      "size": 636515,
-      "gzip": 148265
+      "size": 641505,
+      "gzip": 149286
     },
     {
       "filename": "react-dom.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-dom",
-      "size": 95960,
-      "gzip": 31067
+      "size": 96507,
+      "gzip": 31258
     },
     {
       "filename": "react-dom.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 620506,
-      "gzip": 144162
+      "size": 625496,
+      "gzip": 145193
     },
     {
       "filename": "react-dom.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
-      "size": 94422,
-      "gzip": 30018
+      "size": 94969,
+      "gzip": 30225
     },
     {
       "filename": "ReactDOM-dev.js",
@@ -110,7 +110,7 @@
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
       "size": 9913,
-      "gzip": 3697
+      "gzip": 3696
     },
     {
       "filename": "ReactTestUtils-dev.js",
@@ -145,7 +145,7 @@
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
       "size": 10939,
-      "gzip": 3743
+      "gzip": 3744
     },
     {
       "filename": "ReactDOMUnstableNativeDependencies-dev.js",
@@ -165,29 +165,29 @@
       "filename": "react-dom-server.browser.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-dom",
-      "size": 103978,
-      "gzip": 27118
+      "size": 105006,
+      "gzip": 27524
     },
     {
       "filename": "react-dom-server.browser.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-dom",
-      "size": 15420,
-      "gzip": 5900
+      "size": 15463,
+      "gzip": 5917
     },
     {
       "filename": "react-dom-server.browser.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 93024,
-      "gzip": 24811
+      "size": 94052,
+      "gzip": 25217
     },
     {
       "filename": "react-dom-server.browser.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
-      "size": 14768,
-      "gzip": 5647
+      "size": 14810,
+      "gzip": 5665
     },
     {
       "filename": "ReactDOMServer-dev.js",
@@ -207,43 +207,43 @@
       "filename": "react-dom-server.node.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-dom",
-      "size": 94992,
-      "gzip": 25368
+      "size": 96020,
+      "gzip": 25767
     },
     {
       "filename": "react-dom-server.node.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-dom",
-      "size": 15592,
-      "gzip": 5946
+      "size": 15634,
+      "gzip": 5964
     },
     {
       "filename": "react-art.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-art",
-      "size": 413567,
-      "gzip": 92395
+      "size": 417844,
+      "gzip": 93214
     },
     {
       "filename": "react-art.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-art",
-      "size": 82648,
-      "gzip": 25481
+      "size": 83064,
+      "gzip": 25615
     },
     {
       "filename": "react-art.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-art",
-      "size": 337640,
-      "gzip": 73051
+      "size": 341917,
+      "gzip": 73846
     },
     {
       "filename": "react-art.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-art",
-      "size": 46153,
-      "gzip": 14348
+      "size": 46568,
+      "gzip": 14504
     },
     {
       "filename": "ReactART-dev.js",
@@ -291,29 +291,29 @@
       "filename": "react-test-renderer.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-test-renderer",
-      "size": 347431,
-      "gzip": 75093
+      "size": 349236,
+      "gzip": 75574
     },
     {
       "filename": "react-test-renderer.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-test-renderer",
-      "size": 46664,
-      "gzip": 14400
+      "size": 47024,
+      "gzip": 14562
     },
     {
       "filename": "react-test-renderer.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-test-renderer",
-      "size": 338042,
-      "gzip": 72285
+      "size": 339847,
+      "gzip": 72777
     },
     {
       "filename": "react-test-renderer.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-test-renderer",
-      "size": 45745,
-      "gzip": 13915
+      "size": 46110,
+      "gzip": 14094
     },
     {
       "filename": "ReactTestRenderer-dev.js",
@@ -326,29 +326,29 @@
       "filename": "react-test-renderer-shallow.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-test-renderer",
-      "size": 24959,
-      "gzip": 6661
+      "size": 24945,
+      "gzip": 6660
     },
     {
       "filename": "react-test-renderer-shallow.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-test-renderer",
-      "size": 7329,
-      "gzip": 2400
+      "size": 7320,
+      "gzip": 2398
     },
     {
       "filename": "react-test-renderer-shallow.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-test-renderer",
-      "size": 14765,
-      "gzip": 3695
+      "size": 14751,
+      "gzip": 3694
     },
     {
       "filename": "react-test-renderer-shallow.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-test-renderer",
-      "size": 7372,
-      "gzip": 2413
+      "size": 7363,
+      "gzip": 2403
     },
     {
       "filename": "ReactShallowRenderer-dev.js",
@@ -375,29 +375,29 @@
       "filename": "react-reconciler.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-reconciler",
-      "size": 331575,
-      "gzip": 70231
+      "size": 331893,
+      "gzip": 70268
     },
     {
       "filename": "react-reconciler.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-reconciler",
-      "size": 46245,
-      "gzip": 13814
+      "size": 46230,
+      "gzip": 13812
     },
     {
       "filename": "react-reconciler-persistent.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-reconciler",
-      "size": 330095,
-      "gzip": 69615
+      "size": 330477,
+      "gzip": 69672
     },
     {
       "filename": "react-reconciler-persistent.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-reconciler",
-      "size": 46256,
-      "gzip": 13819
+      "size": 46241,
+      "gzip": 13818
     },
     {
       "filename": "react-reconciler-reflection.development.js",
@@ -473,22 +473,22 @@
       "filename": "simple-cache-provider.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "simple-cache-provider",
-      "size": 5827,
-      "gzip": 1881
+      "size": 7654,
+      "gzip": 2412
     },
     {
       "filename": "simple-cache-provider.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "simple-cache-provider",
-      "size": 1287,
-      "gzip": 651
+      "size": 1667,
+      "gzip": 827
     },
     {
       "filename": "create-subscription.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "create-subscription",
       "size": 5636,
-      "gzip": 1970
+      "gzip": 1973
     },
     {
       "filename": "create-subscription.production.min.js",
@@ -501,29 +501,29 @@
       "filename": "React-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react",
-      "size": 49202,
-      "gzip": 13524
+      "size": 49728,
+      "gzip": 13583
     },
     {
       "filename": "React-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react",
       "size": 13708,
-      "gzip": 3837
+      "gzip": 3835
     },
     {
       "filename": "ReactDOM-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-dom",
-      "size": 643334,
-      "gzip": 146983
+      "size": 634902,
+      "gzip": 144512
     },
     {
       "filename": "ReactDOM-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-dom",
-      "size": 280306,
-      "gzip": 52771
+      "size": 275897,
+      "gzip": 51771
     },
     {
       "filename": "ReactTestUtils-dev.js",
@@ -550,99 +550,99 @@
       "filename": "ReactDOMServer-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-dom",
-      "size": 96894,
-      "gzip": 24677
+      "size": 97859,
+      "gzip": 25094
     },
     {
       "filename": "ReactDOMServer-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-dom",
-      "size": 32142,
-      "gzip": 7900
+      "size": 32295,
+      "gzip": 7922
     },
     {
       "filename": "ReactART-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-art",
-      "size": 343294,
-      "gzip": 72413
+      "size": 334032,
+      "gzip": 69646
     },
     {
       "filename": "ReactART-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "react-art",
-      "size": 150369,
-      "gzip": 25956
+      "size": 145574,
+      "gzip": 24830
     },
     {
       "filename": "ReactNativeRenderer-dev.js",
       "bundleType": "RN_FB_DEV",
       "packageName": "react-native-renderer",
-      "size": 468415,
-      "gzip": 102416
+      "size": 468596,
+      "gzip": 102411
     },
     {
       "filename": "ReactNativeRenderer-prod.js",
       "bundleType": "RN_FB_PROD",
       "packageName": "react-native-renderer",
-      "size": 210769,
-      "gzip": 36828
+      "size": 210858,
+      "gzip": 36787
     },
     {
       "filename": "ReactNativeRenderer-dev.js",
       "bundleType": "RN_OSS_DEV",
       "packageName": "react-native-renderer",
-      "size": 468069,
-      "gzip": 102344
+      "size": 468299,
+      "gzip": 102347
     },
     {
       "filename": "ReactNativeRenderer-prod.js",
       "bundleType": "RN_OSS_PROD",
       "packageName": "react-native-renderer",
-      "size": 198322,
-      "gzip": 34717
+      "size": 198778,
+      "gzip": 34759
     },
     {
       "filename": "ReactFabric-dev.js",
       "bundleType": "RN_FB_DEV",
       "packageName": "react-native-renderer",
-      "size": 459114,
-      "gzip": 100116
+      "size": 459344,
+      "gzip": 100124
     },
     {
       "filename": "ReactFabric-prod.js",
       "bundleType": "RN_FB_PROD",
       "packageName": "react-native-renderer",
-      "size": 190386,
-      "gzip": 33327
+      "size": 190842,
+      "gzip": 33372
     },
     {
       "filename": "ReactFabric-dev.js",
       "bundleType": "RN_OSS_DEV",
       "packageName": "react-native-renderer",
-      "size": 459151,
-      "gzip": 100132
+      "size": 459380,
+      "gzip": 100141
     },
     {
       "filename": "ReactFabric-prod.js",
       "bundleType": "RN_OSS_PROD",
       "packageName": "react-native-renderer",
-      "size": 190422,
-      "gzip": 33346
+      "size": 190878,
+      "gzip": 33392
     },
     {
       "filename": "ReactTestRenderer-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-test-renderer",
-      "size": 344028,
-      "gzip": 71858
+      "size": 345831,
+      "gzip": 72349
     },
     {
       "filename": "ReactShallowRenderer-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "react-test-renderer",
-      "size": 15521,
-      "gzip": 3820
+      "size": 15507,
+      "gzip": 3819
     },
     {
       "filename": "ReactIs-dev.js",
@@ -662,43 +662,43 @@
       "filename": "react-scheduler.development.js",
       "bundleType": "UMD_DEV",
       "packageName": "react-scheduler",
-      "size": 14094,
-      "gzip": 4681
+      "size": 19628,
+      "gzip": 5881
     },
     {
       "filename": "react-scheduler.production.min.js",
       "bundleType": "UMD_PROD",
       "packageName": "react-scheduler",
-      "size": 2142,
-      "gzip": 1068
+      "size": 3233,
+      "gzip": 1562
     },
     {
       "filename": "react-scheduler.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "react-scheduler",
-      "size": 13898,
-      "gzip": 4632
+      "size": 14449,
+      "gzip": 4354
     },
     {
       "filename": "react-scheduler.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "react-scheduler",
-      "size": 2230,
-      "gzip": 1097
+      "size": 2825,
+      "gzip": 1387
     },
     {
       "filename": "SimpleCacheProvider-dev.js",
       "bundleType": "FB_WWW_DEV",
       "packageName": "simple-cache-provider",
-      "size": 6227,
-      "gzip": 1926
+      "size": 8054,
+      "gzip": 2450
     },
     {
       "filename": "SimpleCacheProvider-prod.js",
       "bundleType": "FB_WWW_PROD",
       "packageName": "simple-cache-provider",
-      "size": 2752,
-      "gzip": 854
+      "size": 3714,
+      "gzip": 1127
     },
     {
       "filename": "react-noop-renderer-persistent.development.js",
@@ -713,6 +713,41 @@
       "packageName": "react-noop-renderer",
       "size": 6851,
       "gzip": 2637
+    },
+    {
+      "filename": "react-dom.profiling.min.js",
+      "bundleType": "NODE_PROFILING",
+      "packageName": "react-dom",
+      "size": 95896,
+      "gzip": 30574
+    },
+    {
+      "filename": "ReactNativeRenderer-profiling.js",
+      "bundleType": "RN_OSS_PROFILING",
+      "packageName": "react-native-renderer",
+      "size": 201375,
+      "gzip": 35312
+    },
+    {
+      "filename": "ReactFabric-profiling.js",
+      "bundleType": "RN_OSS_PROFILING",
+      "packageName": "react-native-renderer",
+      "size": 193150,
+      "gzip": 33867
+    },
+    {
+      "filename": "ReactScheduler-dev.js",
+      "bundleType": "FB_WWW_DEV",
+      "packageName": "react-scheduler",
+      "size": 14452,
+      "gzip": 4364
+    },
+    {
+      "filename": "ReactScheduler-prod.js",
+      "bundleType": "FB_WWW_PROD",
+      "packageName": "react-scheduler",
+      "size": 7800,
+      "gzip": 2108
     }
   ]
 }
\ No newline at end of file

From 74b1723df15785a06f4be647560d2641b9bd76a9 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 13 Jun 2018 17:23:59 +0100
Subject: [PATCH 158/277] Update changelog for 16.4.1

---
 CHANGELOG.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb66be8074..9c4808e813 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@
     Click to see more.
   </summary>
 
+</details>
+
+## 16.4.1 (June 13, 2018)
+
 ### React
 
 * You can now assign `propTypes` to components returned by `React.ForwardRef`. ([@bvaughn](https://github.com/bvaughn) in [#12911](https://github.com/facebook/react/pull/12911))
@@ -27,8 +31,6 @@
 * Allow multiple root children in test renderer traversal API. ([@gaearon](https://github.com/gaearon) in [#13017](https://github.com/facebook/react/pull/13017))
 * Fix `getDerivedStateFromProps()` in the shallow renderer to not discard the pending state. ([@fatfisz](https://github.com/fatfisz) in [#13030](https://github.com/facebook/react/pull/13030))
 
-</details>
-
 ## 16.4.0 (May 23, 2018)
 
 ### React

From e0c78344e2f49fb91a75607ccdb170b5649bb1e9 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Wed, 13 Jun 2018 10:47:14 -0700
Subject: [PATCH 159/277] Retry on error if there's lower priority pending work
 (#12957)

* Remove enableSuspense flag from PendingPriority module

We're going to use this for suspending on error, too.

* Retry on error if there's lower priority pending work

If an error is thrown, and there's lower priority work, it's possible
the lower priority work will fix the error. Retry at the lower priority.

If an error is thrown and there's no more work to try, handle the error
like we normally do (trigger the nearest error boundary).
---
 .../src/ReactFiberPendingPriority.js          | 264 +++++++++---------
 .../src/ReactFiberScheduler.js                |  50 ++--
 .../src/ReactFiberUnwindWork.js               |  18 +-
 ...tIncrementalErrorHandling-test.internal.js |  31 ++
 4 files changed, 198 insertions(+), 165 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberPendingPriority.js b/packages/react-reconciler/src/ReactFiberPendingPriority.js
index b34b266713..2f30f53f72 100644
--- a/packages/react-reconciler/src/ReactFiberPendingPriority.js
+++ b/packages/react-reconciler/src/ReactFiberPendingPriority.js
@@ -12,30 +12,26 @@ import type {ExpirationTime} from './ReactFiberExpirationTime';
 
 import {NoWork} from './ReactFiberExpirationTime';
 
-import {enableSuspense} from 'shared/ReactFeatureFlags';
-
 // TODO: Offscreen updates
 
 export function markPendingPriorityLevel(
   root: FiberRoot,
   expirationTime: ExpirationTime,
 ): void {
-  if (enableSuspense) {
-    // Update the latest and earliest pending times
-    const earliestPendingTime = root.earliestPendingTime;
-    if (earliestPendingTime === NoWork) {
-      // No other pending updates.
-      root.earliestPendingTime = root.latestPendingTime = expirationTime;
+  // Update the latest and earliest pending times
+  const earliestPendingTime = root.earliestPendingTime;
+  if (earliestPendingTime === NoWork) {
+    // No other pending updates.
+    root.earliestPendingTime = root.latestPendingTime = expirationTime;
+  } else {
+    if (earliestPendingTime > expirationTime) {
+      // This is the earliest pending update.
+      root.earliestPendingTime = expirationTime;
     } else {
-      if (earliestPendingTime > expirationTime) {
-        // This is the earliest pending update.
-        root.earliestPendingTime = expirationTime;
-      } else {
-        const latestPendingTime = root.latestPendingTime;
-        if (latestPendingTime < expirationTime) {
-          // This is the latest pending update
-          root.latestPendingTime = expirationTime;
-        }
+      const latestPendingTime = root.latestPendingTime;
+      if (latestPendingTime < expirationTime) {
+        // This is the latest pending update
+        root.latestPendingTime = expirationTime;
       }
     }
   }
@@ -46,114 +42,110 @@ export function markCommittedPriorityLevels(
   currentTime: ExpirationTime,
   earliestRemainingTime: ExpirationTime,
 ): void {
-  if (enableSuspense) {
-    if (earliestRemainingTime === NoWork) {
-      // Fast path. There's no remaining work. Clear everything.
-      root.earliestPendingTime = NoWork;
-      root.latestPendingTime = NoWork;
-      root.earliestSuspendedTime = NoWork;
-      root.latestSuspendedTime = NoWork;
-      root.latestPingedTime = NoWork;
-      return;
-    }
+  if (earliestRemainingTime === NoWork) {
+    // Fast path. There's no remaining work. Clear everything.
+    root.earliestPendingTime = NoWork;
+    root.latestPendingTime = NoWork;
+    root.earliestSuspendedTime = NoWork;
+    root.latestSuspendedTime = NoWork;
+    root.latestPingedTime = NoWork;
+    return;
+  }
 
-    // Let's see if the previous latest known pending level was just flushed.
-    const latestPendingTime = root.latestPendingTime;
-    if (latestPendingTime !== NoWork) {
-      if (latestPendingTime < earliestRemainingTime) {
-        // We've flushed all the known pending levels.
-        root.earliestPendingTime = root.latestPendingTime = NoWork;
-      } else {
-        const earliestPendingTime = root.earliestPendingTime;
-        if (earliestPendingTime < earliestRemainingTime) {
-          // We've flushed the earliest known pending level. Set this to the
-          // latest pending time.
-          root.earliestPendingTime = root.latestPendingTime;
-        }
+  // Let's see if the previous latest known pending level was just flushed.
+  const latestPendingTime = root.latestPendingTime;
+  if (latestPendingTime !== NoWork) {
+    if (latestPendingTime < earliestRemainingTime) {
+      // We've flushed all the known pending levels.
+      root.earliestPendingTime = root.latestPendingTime = NoWork;
+    } else {
+      const earliestPendingTime = root.earliestPendingTime;
+      if (earliestPendingTime < earliestRemainingTime) {
+        // We've flushed the earliest known pending level. Set this to the
+        // latest pending time.
+        root.earliestPendingTime = root.latestPendingTime;
       }
     }
-
-    // Now let's handle the earliest remaining level in the whole tree. We need to
-    // decide whether to treat it as a pending level or as suspended. Check
-    // it falls within the range of known suspended levels.
-
-    const earliestSuspendedTime = root.earliestSuspendedTime;
-    if (earliestSuspendedTime === NoWork) {
-      // There's no suspended work. Treat the earliest remaining level as a
-      // pending level.
-      markPendingPriorityLevel(root, earliestRemainingTime);
-      return;
-    }
-
-    const latestSuspendedTime = root.latestSuspendedTime;
-    if (earliestRemainingTime > latestSuspendedTime) {
-      // The earliest remaining level is later than all the suspended work. That
-      // means we've flushed all the suspended work.
-      root.earliestSuspendedTime = NoWork;
-      root.latestSuspendedTime = NoWork;
-      root.latestPingedTime = NoWork;
-
-      // There's no suspended work. Treat the earliest remaining level as a
-      // pending level.
-      markPendingPriorityLevel(root, earliestRemainingTime);
-      return;
-    }
-
-    if (earliestRemainingTime < earliestSuspendedTime) {
-      // The earliest remaining time is earlier than all the suspended work.
-      // Treat it as a pending update.
-      markPendingPriorityLevel(root, earliestRemainingTime);
-      return;
-    }
-
-    // The earliest remaining time falls within the range of known suspended
-    // levels. We should treat this as suspended work.
   }
+
+  // Now let's handle the earliest remaining level in the whole tree. We need to
+  // decide whether to treat it as a pending level or as suspended. Check
+  // it falls within the range of known suspended levels.
+
+  const earliestSuspendedTime = root.earliestSuspendedTime;
+  if (earliestSuspendedTime === NoWork) {
+    // There's no suspended work. Treat the earliest remaining level as a
+    // pending level.
+    markPendingPriorityLevel(root, earliestRemainingTime);
+    return;
+  }
+
+  const latestSuspendedTime = root.latestSuspendedTime;
+  if (earliestRemainingTime > latestSuspendedTime) {
+    // The earliest remaining level is later than all the suspended work. That
+    // means we've flushed all the suspended work.
+    root.earliestSuspendedTime = NoWork;
+    root.latestSuspendedTime = NoWork;
+    root.latestPingedTime = NoWork;
+
+    // There's no suspended work. Treat the earliest remaining level as a
+    // pending level.
+    markPendingPriorityLevel(root, earliestRemainingTime);
+    return;
+  }
+
+  if (earliestRemainingTime < earliestSuspendedTime) {
+    // The earliest remaining time is earlier than all the suspended work.
+    // Treat it as a pending update.
+    markPendingPriorityLevel(root, earliestRemainingTime);
+    return;
+  }
+
+  // The earliest remaining time falls within the range of known suspended
+  // levels. We should treat this as suspended work.
 }
 
 export function markSuspendedPriorityLevel(
   root: FiberRoot,
   suspendedTime: ExpirationTime,
 ): void {
-  if (enableSuspense) {
-    // First, check the known pending levels and update them if needed.
-    const earliestPendingTime = root.earliestPendingTime;
-    const latestPendingTime = root.latestPendingTime;
-    if (earliestPendingTime === suspendedTime) {
-      if (latestPendingTime === suspendedTime) {
-        // Both known pending levels were suspended. Clear them.
-        root.earliestPendingTime = root.latestPendingTime = NoWork;
-      } else {
-        // The earliest pending level was suspended. Clear by setting it to the
-        // latest pending level.
-        root.earliestPendingTime = latestPendingTime;
-      }
-    } else if (latestPendingTime === suspendedTime) {
-      // The latest pending level was suspended. Clear by setting it to the
-      // latest pending level.
-      root.latestPendingTime = earliestPendingTime;
-    }
-
-    // Next, if we're working on the lowest known suspended level, clear the ping.
-    // TODO: What if a promise suspends and pings before the root completes?
-    const latestSuspendedTime = root.latestSuspendedTime;
-    if (latestSuspendedTime === suspendedTime) {
-      root.latestPingedTime = NoWork;
-    }
-
-    // Finally, update the known suspended levels.
-    const earliestSuspendedTime = root.earliestSuspendedTime;
-    if (earliestSuspendedTime === NoWork) {
-      // No other suspended levels.
-      root.earliestSuspendedTime = root.latestSuspendedTime = suspendedTime;
+  // First, check the known pending levels and update them if needed.
+  const earliestPendingTime = root.earliestPendingTime;
+  const latestPendingTime = root.latestPendingTime;
+  if (earliestPendingTime === suspendedTime) {
+    if (latestPendingTime === suspendedTime) {
+      // Both known pending levels were suspended. Clear them.
+      root.earliestPendingTime = root.latestPendingTime = NoWork;
     } else {
-      if (earliestSuspendedTime > suspendedTime) {
-        // This is the earliest suspended level.
-        root.earliestSuspendedTime = suspendedTime;
-      } else if (latestSuspendedTime < suspendedTime) {
-        // This is the latest suspended level
-        root.latestSuspendedTime = suspendedTime;
-      }
+      // The earliest pending level was suspended. Clear by setting it to the
+      // latest pending level.
+      root.earliestPendingTime = latestPendingTime;
+    }
+  } else if (latestPendingTime === suspendedTime) {
+    // The latest pending level was suspended. Clear by setting it to the
+    // latest pending level.
+    root.latestPendingTime = earliestPendingTime;
+  }
+
+  // Next, if we're working on the lowest known suspended level, clear the ping.
+  // TODO: What if a promise suspends and pings before the root completes?
+  const latestSuspendedTime = root.latestSuspendedTime;
+  if (latestSuspendedTime === suspendedTime) {
+    root.latestPingedTime = NoWork;
+  }
+
+  // Finally, update the known suspended levels.
+  const earliestSuspendedTime = root.earliestSuspendedTime;
+  if (earliestSuspendedTime === NoWork) {
+    // No other suspended levels.
+    root.earliestSuspendedTime = root.latestSuspendedTime = suspendedTime;
+  } else {
+    if (earliestSuspendedTime > suspendedTime) {
+      // This is the earliest suspended level.
+      root.earliestSuspendedTime = suspendedTime;
+    } else if (latestSuspendedTime < suspendedTime) {
+      // This is the latest suspended level
+      root.latestSuspendedTime = suspendedTime;
     }
   }
 }
@@ -162,35 +154,29 @@ export function markPingedPriorityLevel(
   root: FiberRoot,
   pingedTime: ExpirationTime,
 ): void {
-  if (enableSuspense) {
-    const latestSuspendedTime = root.latestSuspendedTime;
-    if (latestSuspendedTime !== NoWork && latestSuspendedTime <= pingedTime) {
-      const latestPingedTime = root.latestPingedTime;
-      if (latestPingedTime === NoWork || latestPingedTime < pingedTime) {
-        root.latestPingedTime = pingedTime;
-      }
+  const latestSuspendedTime = root.latestSuspendedTime;
+  if (latestSuspendedTime !== NoWork && latestSuspendedTime <= pingedTime) {
+    const latestPingedTime = root.latestPingedTime;
+    if (latestPingedTime === NoWork || latestPingedTime < pingedTime) {
+      root.latestPingedTime = pingedTime;
     }
   }
 }
 
 export function findNextPendingPriorityLevel(root: FiberRoot): ExpirationTime {
-  if (enableSuspense) {
-    const earliestSuspendedTime = root.earliestSuspendedTime;
-    const earliestPendingTime = root.earliestPendingTime;
-    if (earliestSuspendedTime === NoWork) {
-      // Fast path. There's no suspended work.
-      return earliestPendingTime;
-    }
-
-    // First, check if there's known pending work.
-    if (earliestPendingTime !== NoWork) {
-      return earliestPendingTime;
-    }
-
-    // Finally, if a suspended level was pinged, work on that. Otherwise there's
-    // nothing to work on.
-    return root.latestPingedTime;
-  } else {
-    return root.current.expirationTime;
+  const earliestSuspendedTime = root.earliestSuspendedTime;
+  const earliestPendingTime = root.earliestPendingTime;
+  if (earliestSuspendedTime === NoWork) {
+    // Fast path. There's no suspended work.
+    return earliestPendingTime;
   }
+
+  // First, check if there's known pending work.
+  if (earliestPendingTime !== NoWork) {
+    return earliestPendingTime;
+  }
+
+  // Finally, if a suspended level was pinged, work on that. Otherwise there's
+  // nothing to work on.
+  return root.latestPingedTime;
 }
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 8f78c0bc4a..453db245a7 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -237,8 +237,6 @@ let nextEffect: Fiber | null = null;
 
 let isCommitting: boolean = false;
 
-let isRootReadyForCommit: boolean = false;
-
 let legacyErrorBoundariesThatAlreadyFailed: Set<mixed> | null = null;
 
 // Used for performance tracking.
@@ -349,8 +347,6 @@ function resetStack() {
   nextLatestTimeoutMs = -1;
   nextRenderIsExpired = false;
   nextUnitOfWork = null;
-
-  isRootReadyForCommit = false;
 }
 
 function commitAllHostEffects() {
@@ -518,7 +514,12 @@ function commitRoot(finishedWork: Fiber): ExpirationTime {
   );
   root.pendingCommitExpirationTime = NoWork;
 
+  // Update the pending priority levels to account for the work that we are
+  // about to commit. This needs to happen before calling the lifecycles, since
+  // they may schedule additional updates.
+  const earliestRemainingTime = finishedWork.expirationTime;
   const currentTime = recalculateCurrentTime();
+  markCommittedPriorityLevels(root, currentTime, earliestRemainingTime);
 
   // Reset this to null before calling lifecycles
   ReactCurrentOwner.current = null;
@@ -689,14 +690,13 @@ function commitRoot(finishedWork: Fiber): ExpirationTime {
     ReactFiberInstrumentation.debugTool.onCommitWork(finishedWork);
   }
 
-  markCommittedPriorityLevels(root, currentTime, root.current.expirationTime);
-  const remainingTime = findNextPendingPriorityLevel(root);
-  if (remainingTime === NoWork) {
+  const nextPendingPriorityLevel = findNextPendingPriorityLevel(root);
+  if (nextPendingPriorityLevel === NoWork) {
     // If there's no remaining work, we can clear the set of already failed
     // error boundaries.
     legacyErrorBoundariesThatAlreadyFailed = null;
   }
-  return remainingTime;
+  return nextPendingPriorityLevel;
 }
 
 function resetExpirationTime(
@@ -847,7 +847,6 @@ function completeUnitOfWork(workInProgress: Fiber): Fiber | null {
         continue;
       } else {
         // We've reached the root.
-        isRootReadyForCommit = true;
         return null;
       }
     } else {
@@ -1097,11 +1096,11 @@ function renderRoot(
   } while (true);
 
   // We're done performing work. Time to clean up.
-  let didCompleteRoot = false;
   isWorking = false;
 
   // Yield back to main thread.
   if (didFatal) {
+    const didCompleteRoot = false;
     stopWorkLoopTimer(interruptedBy, didCompleteRoot);
     interruptedBy = null;
     // There was a fatal error.
@@ -1111,34 +1110,38 @@ function renderRoot(
     return null;
   } else if (nextUnitOfWork === null) {
     // We reached the root.
-    if (isRootReadyForCommit) {
-      didCompleteRoot = true;
+    const rootWorkInProgress = root.current.alternate;
+    invariant(
+      rootWorkInProgress !== null,
+      'Finished root should have a work-in-progress. This error is likely ' +
+        'caused by a bug in React. Please file an issue.',
+    );
+    if ((rootWorkInProgress.effectTag & Incomplete) === NoEffect) {
+      const didCompleteRoot = true;
       stopWorkLoopTimer(interruptedBy, didCompleteRoot);
       interruptedBy = null;
-      // The root successfully completed. It's ready for commit.
+      // The root successfully completed.
       root.pendingCommitExpirationTime = expirationTime;
-      const finishedWork = root.current.alternate;
-      return finishedWork;
+      // Return the completed work-in-progress.
+      return rootWorkInProgress;
     } else {
       // The root did not complete.
+      const didCompleteRoot = false;
       stopWorkLoopTimer(interruptedBy, didCompleteRoot);
       interruptedBy = null;
-      invariant(
-        !nextRenderIsExpired,
-        'Expired work should have completed. This error is likely caused ' +
-          'by a bug in React. Please file an issue.',
-      );
-      markSuspendedPriorityLevel(root, expirationTime);
       if (nextLatestTimeoutMs >= 0) {
         setTimeout(() => {
           retrySuspendedRoot(root, expirationTime);
         }, nextLatestTimeoutMs);
       }
+      markSuspendedPriorityLevel(root, expirationTime);
       const firstUnblockedExpirationTime = findNextPendingPriorityLevel(root);
       onBlock(firstUnblockedExpirationTime);
+      // Return null to indicate that the root did not complete.
       return null;
     }
   } else {
+    const didCompleteRoot = false;
     stopWorkLoopTimer(interruptedBy, didCompleteRoot);
     interruptedBy = null;
     // There's more work to do, but we ran out of time. Yield back to
@@ -1294,8 +1297,7 @@ function computeExpirationForFiber(currentTime: ExpirationTime, fiber: Fiber) {
   return expirationTime;
 }
 
-// TODO: Rename this to scheduleTimeout or something
-function suspendRoot(
+function markTimeout(
   root: FiberRoot,
   thenable: Thenable,
   timeoutMs: number,
@@ -1978,7 +1980,7 @@ export {
   computeExpirationForFiber,
   captureCommitPhaseError,
   onUncaughtError,
-  suspendRoot,
+  markTimeout,
   retrySuspendedRoot,
   markLegacyErrorBoundaryAsFailed,
   isAlreadyFailedLegacyErrorBoundary,
diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index 19bb46bfa5..ba441e7dd7 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -55,7 +55,7 @@ import {
   recordElapsedActualRenderTime,
 } from './ReactProfilerTimer';
 import {
-  suspendRoot,
+  markTimeout,
   onUncaughtError,
   markLegacyErrorBoundaryAsFailed,
   isAlreadyFailedLegacyErrorBoundary,
@@ -151,6 +151,20 @@ function throwException(
   // Its effect list is no longer valid.
   sourceFiber.firstEffect = sourceFiber.lastEffect = null;
 
+  // Check if there is lower priority work, regardless of whether it's pending.
+  // If so, it may have the effect of fixing the exception that was just thrown.
+  const latestPendingTime = root.latestPendingTime;
+  const latestSuspendedTime = root.latestSuspendedTime;
+  if (
+    renderExpirationTime !== latestPendingTime &&
+    renderExpirationTime !== latestSuspendedTime &&
+    renderExpirationTime !== Never
+  ) {
+    // There's lower priority work. Exit to suspend this render and retry at
+    // the lower priority.
+    return;
+  }
+
   if (
     enableSuspense &&
     value !== null &&
@@ -206,7 +220,7 @@ function throwException(
 
     if (renderExpirationTime === Never || msUntilTimeout > 0) {
       // There's still time remaining.
-      suspendRoot(root, thenable, msUntilTimeout, renderExpirationTime);
+      markTimeout(root, thenable, msUntilTimeout, renderExpirationTime);
       const onResolveOrReject = () => {
         retrySuspendedRoot(root, renderExpirationTime);
       };
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
index 1acaa64216..432a757c9f 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
@@ -198,6 +198,37 @@ describe('ReactIncrementalErrorHandling', () => {
     expect(ReactNoop.getChildren()).toEqual([span('Caught an error: oops!')]);
   });
 
+  it("retries at a lower priority if there's additional pending work", () => {
+    function App(props) {
+      if (props.isBroken) {
+        ReactNoop.yield('error');
+        throw new Error('Oops!');
+      }
+      ReactNoop.yield('success');
+      return <span prop="Everything is fine." />;
+    }
+
+    function onCommit() {
+      ReactNoop.yield('commit');
+    }
+
+    ReactNoop.render(<App isBroken={true} />, onCommit);
+    ReactNoop.expire(2000);
+    ReactNoop.render(<App isBroken={false} />, onCommit);
+
+    expect(ReactNoop.flush()).toEqual([
+      // The first render fails. But because there's a lower priority pending
+      // update, it doesn't throw.
+      'error',
+      // Now we retry at the lower priority. This time it succeeds.
+      'success',
+      // Nothing commits until the second update completes.
+      'commit',
+      'commit',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([span('Everything is fine.')]);
+  });
+
   it('calls componentDidCatch multiple times for multiple errors', () => {
     let id = 0;
     class BadMount extends React.Component {

From 2a8085980f5a96fa33bf12d8fd78594a3baecccb Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Wed, 13 Jun 2018 10:57:35 -0700
Subject: [PATCH 160/277] Remove rAF fork (#12980)

* Remove rAF fork

**what is the change?:**
Undid https://github.com/facebook/react/pull/12837

**why make this change?:**
We originally forked rAF because we needed to pull in a particular
version of rAF internally at Facebook, to avoid grabbing the default
polyfilled version.

The longer term solution, until we can get rid of the global polyfill
behavior, is to initialize 'schedule' before the polyfilling happens.

Now that we have landed and synced
https://github.com/facebook/react/pull/12900 successfully, we can
initialize 'schedule' before the polyfill runs.
So we can remove the rAF fork. Here is how it will work:

1. Land this PR on Github.
2. Flarnie will quickly run a sync getting this change into www.
3. We delete the internal forked version of
   'requestAnimationFrameForReact'.
4. We require 'schedule' in the polyfill file itself, before the
   polyfilling happens.

**test plan:**
Flarnie will manually try the above steps locally and verify that things
work.

**issue:**
Internal task T29442940

* fix nits

* fix tests, fix changes from rebasing

* fix lint
---
 .../react-dom/src/__tests__/ReactDOM-test.js  |  2 +-
 .../react-scheduler/src/ReactScheduler.js     | 38 ++++++++-----------
 .../__tests__/ReactDOMFrameScheduling-test.js |  2 +-
 .../requestAnimationFrameForReact.www.js      | 10 -----
 .../shared/requestAnimationFrameForReact.js   | 24 ------------
 scripts/rollup/forks.js                       | 12 ------
 6 files changed, 18 insertions(+), 70 deletions(-)
 delete mode 100644 packages/shared/forks/requestAnimationFrameForReact.www.js
 delete mode 100644 packages/shared/requestAnimationFrameForReact.js

diff --git a/packages/react-dom/src/__tests__/ReactDOM-test.js b/packages/react-dom/src/__tests__/ReactDOM-test.js
index 48609a2c25..8c21143d52 100644
--- a/packages/react-dom/src/__tests__/ReactDOM-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOM-test.js
@@ -440,7 +440,7 @@ describe('ReactDOM', () => {
       global.requestAnimationFrame = undefined;
       jest.resetModules();
       expect(() => require('react-dom')).toWarnDev(
-        'React depends on requestAnimationFrame.',
+        "This browser doesn't support requestAnimationFrame.",
       );
     } finally {
       global.requestAnimationFrame = previousRAF;
diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index afd0592cc9..b8f9155995 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -41,11 +41,24 @@ type CallbackConfigType = {|
 
 export type CallbackIdType = CallbackConfigType;
 
-import requestAnimationFrameForReact from 'shared/requestAnimationFrameForReact';
 import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
-import invariant from 'fbjs/lib/invariant';
 import warning from 'fbjs/lib/warning';
 
+if (__DEV__) {
+  if (
+    ExecutionEnvironment.canUseDOM &&
+    typeof requestAnimationFrame !== 'function'
+  ) {
+    warning(
+      false,
+      // TODO: reword this when schedule is a stand-alone module
+      "This browser doesn't support requestAnimationFrame. " +
+        'Make sure that you load a ' +
+        'polyfill in older browsers. https://fb.me/react-polyfills',
+    );
+  }
+}
+
 // We capture a local reference to any global, in case it gets polyfilled after
 // this module is initially evaluated.
 // We want to be using a consistent implementation.
@@ -106,26 +119,7 @@ if (!ExecutionEnvironment.canUseDOM) {
     localClearTimeout(timeoutId);
   };
 } else {
-  if (__DEV__) {
-    if (typeof requestAnimationFrameForReact !== 'function') {
-      warning(
-        false,
-        'React depends on requestAnimationFrame. Make sure that you load a ' +
-          'polyfill in older browsers. https://fb.me/react-polyfills',
-      );
-    }
-  }
-
-  let localRequestAnimationFrame =
-    typeof requestAnimationFrameForReact === 'function'
-      ? requestAnimationFrameForReact
-      : function(callback: Function) {
-          invariant(
-            false,
-            'React depends on requestAnimationFrame. Make sure that you load a ' +
-              'polyfill in older browsers. https://fb.me/react-polyfills',
-          );
-        };
+  const localRequestAnimationFrame = requestAnimationFrame;
 
   let headOfPendingCallbacksLinkedList: CallbackConfigType | null = null;
   let tailOfPendingCallbacksLinkedList: CallbackConfigType | null = null;
diff --git a/packages/shared/__tests__/ReactDOMFrameScheduling-test.js b/packages/shared/__tests__/ReactDOMFrameScheduling-test.js
index ff7a3d5a91..68dfdbfa14 100644
--- a/packages/shared/__tests__/ReactDOMFrameScheduling-test.js
+++ b/packages/shared/__tests__/ReactDOMFrameScheduling-test.js
@@ -16,7 +16,7 @@ describe('ReactDOMFrameScheduling', () => {
       global.requestAnimationFrame = undefined;
       jest.resetModules();
       expect(() => require('react-dom')).toWarnDev(
-        'React depends on requestAnimationFrame.',
+        "This browser doesn't support requestAnimationFrame.",
       );
     } finally {
       global.requestAnimationFrame = previousRAF;
diff --git a/packages/shared/forks/requestAnimationFrameForReact.www.js b/packages/shared/forks/requestAnimationFrameForReact.www.js
deleted file mode 100644
index f082644eca..0000000000
--- a/packages/shared/forks/requestAnimationFrameForReact.www.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-'use strict';
-
-export default require('requestAnimationFrameForReact');
diff --git a/packages/shared/requestAnimationFrameForReact.js b/packages/shared/requestAnimationFrameForReact.js
deleted file mode 100644
index 91a584e94b..0000000000
--- a/packages/shared/requestAnimationFrameForReact.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow
- */
-
-'use strict';
-
-// We capture a local reference to any global, in case it gets polyfilled after
-// this module is initially evaluated.
-// We want to be using a consistent implementation.
-const localRequestAnimationFrame =
-  typeof requestAnimationFrame === 'function'
-    ? requestAnimationFrame
-    : undefined;
-
-// The callsites should check if the requestAnimationFrame imported from this module is a function,
-// fire a developer warning if it doesn't exist, and substitute it by a shim in that case
-// (e.g. that throws on call).
-
-export default localRequestAnimationFrame;
diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js
index ed047100a0..4c9802b369 100644
--- a/scripts/rollup/forks.js
+++ b/scripts/rollup/forks.js
@@ -81,18 +81,6 @@ const forks = Object.freeze({
     return null;
   },
 
-  // This logic is forked on www to use the 'acrossTransitions' version.
-  // This will be removed soon, see internal task T29442940
-  'shared/requestAnimationFrameForReact': (bundleType, entry) => {
-    switch (bundleType) {
-      case FB_WWW_DEV:
-      case FB_WWW_PROD:
-        return 'shared/forks/requestAnimationFrameForReact.www.js';
-      default:
-        return null;
-    }
-  },
-
   'shared/ReactScheduler': (bundleType, entry) => {
     switch (bundleType) {
       case FB_WWW_DEV:

From 051637da615a4e8d0cbf8f147a75e129c1866138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= <sebastian@calyptus.eu>
Date: Wed, 13 Jun 2018 16:20:48 -0700
Subject: [PATCH 161/277] Extract Fabric event handlers from canonical props
 (#13024)

We need a different "component tree" thingy for Fabric.

A lot of this doesn't really make much sense in a persistent world but
currently we can't dispatch events to memoizedProps on a Fiber since
they're pooled. Also, it's unclear what the semantics should be when we
dispatch an event that happened when the old props were in effect but now
we have new props already.

This implementation tries to use the last committed props but also fails
at that because we don't have a commit hook in the persistent mode.

However, at least it doesn't crash when dispatching. :)
---
 .../react-native-renderer/src/ReactFabric.js  |  4 +-
 .../src/ReactFabricComponentTree.js           | 28 ++++++++++++
 .../src/ReactFabricHostConfig.js              |  2 +
 .../src/ReactFabricInjection.js               | 14 ++----
 .../src/ReactNativeComponentTree.js           |  7 +--
 .../src/ReactNativeInjection.js               |  4 ++
 .../src/ReactNativeInjectionShared.js         |  3 --
 .../__tests__/ReactFabric-test.internal.js    | 45 +++++++++++++++++++
 8 files changed, 85 insertions(+), 22 deletions(-)
 create mode 100644 packages/react-native-renderer/src/ReactFabricComponentTree.js

diff --git a/packages/react-native-renderer/src/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js
index e4e663de72..0634921b68 100644
--- a/packages/react-native-renderer/src/ReactFabric.js
+++ b/packages/react-native-renderer/src/ReactFabric.js
@@ -20,7 +20,7 @@ import ReactVersion from 'shared/ReactVersion';
 
 import NativeMethodsMixin from './NativeMethodsMixin';
 import ReactNativeComponent from './ReactNativeComponent';
-import * as ReactNativeComponentTree from './ReactNativeComponentTree';
+import * as ReactFabricComponentTree from './ReactFabricComponentTree';
 import {getInspectorDataForViewTag} from './ReactNativeFiberInspector';
 
 import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
@@ -120,7 +120,7 @@ const ReactFabric: ReactFabricType = {
 };
 
 ReactFabricRenderer.injectIntoDevTools({
-  findFiberByHostInstance: ReactNativeComponentTree.getClosestInstanceFromNode,
+  findFiberByHostInstance: ReactFabricComponentTree.getClosestInstanceFromNode,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: __DEV__ ? 1 : 0,
   version: ReactVersion,
diff --git a/packages/react-native-renderer/src/ReactFabricComponentTree.js b/packages/react-native-renderer/src/ReactFabricComponentTree.js
new file mode 100644
index 0000000000..23f5ce9b95
--- /dev/null
+++ b/packages/react-native-renderer/src/ReactFabricComponentTree.js
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import invariant from 'fbjs/lib/invariant';
+
+function getInstanceFromInstance(instanceHandle) {
+  return instanceHandle;
+}
+
+function getTagFromInstance(inst) {
+  let tag = inst.stateNode.canonical._nativeTag;
+  invariant(tag, 'All native instances should have a tag.');
+  return tag;
+}
+
+export {
+  getInstanceFromInstance as getClosestInstanceFromNode,
+  getInstanceFromInstance as getInstanceFromNode,
+  getTagFromInstance as getNodeFromInstance,
+};
+
+export function getFiberCurrentPropsFromNode(inst) {
+  return inst.canonical.currentProps;
+}
diff --git a/packages/react-native-renderer/src/ReactFabricHostConfig.js b/packages/react-native-renderer/src/ReactFabricHostConfig.js
index 321b86753e..ef4525d8e5 100644
--- a/packages/react-native-renderer/src/ReactFabricHostConfig.js
+++ b/packages/react-native-renderer/src/ReactFabricHostConfig.js
@@ -293,6 +293,8 @@ export function prepareUpdate(
   );
   // TODO: If the event handlers have changed, we need to update the current props
   // in the commit phase but there is no host config hook to do it yet.
+  // So instead we hack it by updating it in the render phase.
+  instance.canonical.currentProps = newProps;
   return updatePayload;
 }
 
diff --git a/packages/react-native-renderer/src/ReactFabricInjection.js b/packages/react-native-renderer/src/ReactFabricInjection.js
index eb4c2bca3f..a3e766b47e 100644
--- a/packages/react-native-renderer/src/ReactFabricInjection.js
+++ b/packages/react-native-renderer/src/ReactFabricInjection.js
@@ -9,15 +9,7 @@
 
 import './ReactNativeInjectionShared';
 
-// TODO: The event emitter registration is interfering with the existing
-// ReactNative renderer. So disable it for Fabric for now.
+import * as ReactFabricComponentTree from './ReactFabricComponentTree';
+import * as EventPluginUtils from 'events/EventPluginUtils';
 
-// import * as ReactNativeEventEmitter from './ReactNativeEventEmitter';
-
-// Module provided by RN:
-// import RCTEventEmitter from 'RCTEventEmitter';
-
-/**
- * Register the event emitter with the native bridge
- */
-// RCTEventEmitter.register(ReactNativeEventEmitter);
+EventPluginUtils.injection.injectComponentTree(ReactFabricComponentTree);
diff --git a/packages/react-native-renderer/src/ReactNativeComponentTree.js b/packages/react-native-renderer/src/ReactNativeComponentTree.js
index 6123dc1928..32554cd0bc 100644
--- a/packages/react-native-renderer/src/ReactNativeComponentTree.js
+++ b/packages/react-native-renderer/src/ReactNativeComponentTree.js
@@ -20,12 +20,7 @@ export function uncacheFiberNode(tag) {
 }
 
 function getInstanceFromTag(tag) {
-  if (typeof tag === 'number') {
-    return instanceCache[tag] || null;
-  } else {
-    // Fabric will invoke event emitters on a direct fiber reference
-    return tag;
-  }
+  return instanceCache[tag] || null;
 }
 
 function getTagFromInstance(inst) {
diff --git a/packages/react-native-renderer/src/ReactNativeInjection.js b/packages/react-native-renderer/src/ReactNativeInjection.js
index df5a468cd1..801304cf0d 100644
--- a/packages/react-native-renderer/src/ReactNativeInjection.js
+++ b/packages/react-native-renderer/src/ReactNativeInjection.js
@@ -9,6 +9,8 @@
 
 import './ReactNativeInjectionShared';
 
+import * as ReactNativeComponentTree from './ReactNativeComponentTree';
+import * as EventPluginUtils from 'events/EventPluginUtils';
 import * as ReactNativeEventEmitter from './ReactNativeEventEmitter';
 
 // Module provided by RN:
@@ -18,3 +20,5 @@ import RCTEventEmitter from 'RCTEventEmitter';
  * Register the event emitter with the native bridge
  */
 RCTEventEmitter.register(ReactNativeEventEmitter);
+
+EventPluginUtils.injection.injectComponentTree(ReactNativeComponentTree);
diff --git a/packages/react-native-renderer/src/ReactNativeInjectionShared.js b/packages/react-native-renderer/src/ReactNativeInjectionShared.js
index cc35fdebe9..be0f25a4d3 100644
--- a/packages/react-native-renderer/src/ReactNativeInjectionShared.js
+++ b/packages/react-native-renderer/src/ReactNativeInjectionShared.js
@@ -17,11 +17,9 @@
 import 'InitializeCore';
 
 import * as EventPluginHub from 'events/EventPluginHub';
-import * as EventPluginUtils from 'events/EventPluginUtils';
 import ResponderEventPlugin from 'events/ResponderEventPlugin';
 
 import ReactNativeBridgeEventPlugin from './ReactNativeBridgeEventPlugin';
-import * as ReactNativeComponentTree from './ReactNativeComponentTree';
 import ReactNativeEventPluginOrder from './ReactNativeEventPluginOrder';
 import ReactNativeGlobalResponderHandler from './ReactNativeGlobalResponderHandler';
 
@@ -29,7 +27,6 @@ import ReactNativeGlobalResponderHandler from './ReactNativeGlobalResponderHandl
  * Inject module for resolving DOM hierarchy and plugin ordering.
  */
 EventPluginHub.injection.injectEventPluginOrder(ReactNativeEventPluginOrder);
-EventPluginUtils.injection.injectComponentTree(ReactNativeComponentTree);
 
 ResponderEventPlugin.injection.injectGlobalResponderHandler(
   ReactNativeGlobalResponderHandler,
diff --git a/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js b/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js
index d01a5a26f3..fda50ecb78 100644
--- a/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js
+++ b/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js
@@ -352,4 +352,49 @@ describe('ReactFabric', () => {
       11,
     );
   });
+
+  it('dispatches events to the last committed props', () => {
+    const View = createReactNativeComponentClass('RCTView', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTView',
+      directEventTypes: {
+        topTouchStart: {
+          registrationName: 'onTouchStart',
+        },
+      },
+    }));
+
+    const touchStart = jest.fn();
+    const touchStart2 = jest.fn();
+
+    ReactFabric.render(<View onTouchStart={touchStart} />, 11);
+
+    expect(FabricUIManager.createNode.mock.calls.length).toBe(1);
+    expect(FabricUIManager.registerEventHandler.mock.calls.length).toBe(1);
+
+    let [, , , , instanceHandle] = FabricUIManager.createNode.mock.calls[0];
+    let [dispatchEvent] = FabricUIManager.registerEventHandler.mock.calls[0];
+
+    let touchEvent = {
+      touches: [],
+      changedTouches: [],
+    };
+
+    expect(touchStart).not.toBeCalled();
+
+    dispatchEvent(instanceHandle, 'topTouchStart', touchEvent);
+
+    expect(touchStart).toBeCalled();
+    expect(touchStart2).not.toBeCalled();
+
+    ReactFabric.render(<View onTouchStart={touchStart2} />, 11);
+
+    // Intentionally dispatch to the same instanceHandle again.
+    dispatchEvent(instanceHandle, 'topTouchStart', touchEvent);
+
+    // The current semantics dictate that we always dispatch to the last committed
+    // props even though the actual scheduling of the event could have happened earlier.
+    // This could change in the future.
+    expect(touchStart2).toBeCalled();
+  });
 });

From bc963f353dc23a6c84c4d2b4daa51a4fdb12a6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= <sebastian@calyptus.eu>
Date: Wed, 13 Jun 2018 17:03:26 -0700
Subject: [PATCH 162/277] setJSResponder in Fabric renderer (#13031)

---
 .../src/ReactFabricGlobalResponderHandler.js  | 24 +++++++++++++++++++
 .../src/ReactFabricInjection.js               |  6 +++++
 .../src/ReactNativeInjection.js               |  6 +++++
 .../src/ReactNativeInjectionShared.js         |  5 ----
 4 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 packages/react-native-renderer/src/ReactFabricGlobalResponderHandler.js

diff --git a/packages/react-native-renderer/src/ReactFabricGlobalResponderHandler.js b/packages/react-native-renderer/src/ReactFabricGlobalResponderHandler.js
new file mode 100644
index 0000000000..8231bb727f
--- /dev/null
+++ b/packages/react-native-renderer/src/ReactFabricGlobalResponderHandler.js
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+// Module provided by RN:
+import UIManager from 'UIManager';
+
+const ReactFabricGlobalResponderHandler = {
+  onChange: function(from: any, to: any, blockNativeResponder: boolean) {
+    if (to !== null) {
+      const tag = to.stateNode.canonical._nativeTag;
+      UIManager.setJSResponder(tag, blockNativeResponder);
+    } else {
+      UIManager.clearJSResponder();
+    }
+  },
+};
+
+export default ReactFabricGlobalResponderHandler;
diff --git a/packages/react-native-renderer/src/ReactFabricInjection.js b/packages/react-native-renderer/src/ReactFabricInjection.js
index a3e766b47e..492a8cd29d 100644
--- a/packages/react-native-renderer/src/ReactFabricInjection.js
+++ b/packages/react-native-renderer/src/ReactFabricInjection.js
@@ -11,5 +11,11 @@ import './ReactNativeInjectionShared';
 
 import * as ReactFabricComponentTree from './ReactFabricComponentTree';
 import * as EventPluginUtils from 'events/EventPluginUtils';
+import ReactFabricGlobalResponderHandler from './ReactFabricGlobalResponderHandler';
+import ResponderEventPlugin from 'events/ResponderEventPlugin';
 
 EventPluginUtils.injection.injectComponentTree(ReactFabricComponentTree);
+
+ResponderEventPlugin.injection.injectGlobalResponderHandler(
+  ReactFabricGlobalResponderHandler,
+);
diff --git a/packages/react-native-renderer/src/ReactNativeInjection.js b/packages/react-native-renderer/src/ReactNativeInjection.js
index 801304cf0d..5fea3d78cb 100644
--- a/packages/react-native-renderer/src/ReactNativeInjection.js
+++ b/packages/react-native-renderer/src/ReactNativeInjection.js
@@ -12,6 +12,8 @@ import './ReactNativeInjectionShared';
 import * as ReactNativeComponentTree from './ReactNativeComponentTree';
 import * as EventPluginUtils from 'events/EventPluginUtils';
 import * as ReactNativeEventEmitter from './ReactNativeEventEmitter';
+import ReactNativeGlobalResponderHandler from './ReactNativeGlobalResponderHandler';
+import ResponderEventPlugin from 'events/ResponderEventPlugin';
 
 // Module provided by RN:
 import RCTEventEmitter from 'RCTEventEmitter';
@@ -22,3 +24,7 @@ import RCTEventEmitter from 'RCTEventEmitter';
 RCTEventEmitter.register(ReactNativeEventEmitter);
 
 EventPluginUtils.injection.injectComponentTree(ReactNativeComponentTree);
+
+ResponderEventPlugin.injection.injectGlobalResponderHandler(
+  ReactNativeGlobalResponderHandler,
+);
diff --git a/packages/react-native-renderer/src/ReactNativeInjectionShared.js b/packages/react-native-renderer/src/ReactNativeInjectionShared.js
index be0f25a4d3..6802cb6f99 100644
--- a/packages/react-native-renderer/src/ReactNativeInjectionShared.js
+++ b/packages/react-native-renderer/src/ReactNativeInjectionShared.js
@@ -21,17 +21,12 @@ import ResponderEventPlugin from 'events/ResponderEventPlugin';
 
 import ReactNativeBridgeEventPlugin from './ReactNativeBridgeEventPlugin';
 import ReactNativeEventPluginOrder from './ReactNativeEventPluginOrder';
-import ReactNativeGlobalResponderHandler from './ReactNativeGlobalResponderHandler';
 
 /**
  * Inject module for resolving DOM hierarchy and plugin ordering.
  */
 EventPluginHub.injection.injectEventPluginOrder(ReactNativeEventPluginOrder);
 
-ResponderEventPlugin.injection.injectGlobalResponderHandler(
-  ReactNativeGlobalResponderHandler,
-);
-
 /**
  * Some important event plugins included by default (without having to require
  * them).

From 2e757790751ab8d165fc4df37e90a59d914c4527 Mon Sep 17 00:00:00 2001
From: Crux <crux153@gmail.com>
Date: Fri, 15 Jun 2018 00:35:05 +0900
Subject: [PATCH 163/277] Fix incorrect data in compositionend event with
 Korean IME on IE11 (#10217) (#12563)

* Add isUsingKoreanIME function to check if a composition event was triggered by Korean IME

* Add Korean IME check alongside useFallbackCompositionData and disable fallback mode with Korean IME
---
 .../src/events/BeforeInputEventPlugin.js      | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/packages/react-dom/src/events/BeforeInputEventPlugin.js b/packages/react-dom/src/events/BeforeInputEventPlugin.js
index 9bdb8dab7d..445575173f 100644
--- a/packages/react-dom/src/events/BeforeInputEventPlugin.js
+++ b/packages/react-dom/src/events/BeforeInputEventPlugin.js
@@ -200,6 +200,20 @@ function getDataFromCustomEvent(nativeEvent) {
   return null;
 }
 
+/**
+ * Check if a composition event was triggered by Korean IME.
+ * Our fallback mode does not work well with IE's Korean IME,
+ * so just use native composition events when Korean IME is used.
+ * Although CompositionEvent.locale property is deprecated,
+ * it is available in IE, where our fallback mode is enabled.
+ *
+ * @param {object} nativeEvent
+ * @return {boolean}
+ */
+function isUsingKoreanIME(nativeEvent) {
+  return nativeEvent.locale === 'ko';
+}
+
 // Track the current IME composition status, if any.
 let isComposing = false;
 
@@ -229,7 +243,7 @@ function extractCompositionEvent(
     return null;
   }
 
-  if (useFallbackCompositionData) {
+  if (useFallbackCompositionData && !isUsingKoreanIME(nativeEvent)) {
     // The current composition is stored statically and must not be
     // overwritten while composition continues.
     if (!isComposing && eventType === eventTypes.compositionStart) {
@@ -378,7 +392,9 @@ function getFallbackBeforeInputChars(topLevelType: TopLevelType, nativeEvent) {
       }
       return null;
     case TOP_COMPOSITION_END:
-      return useFallbackCompositionData ? null : nativeEvent.data;
+      return useFallbackCompositionData && !isUsingKoreanIME(nativeEvent)
+        ? null
+        : nativeEvent.data;
     default:
       return null;
   }

From 9bda7b28f3b149c8f8ca826f0c395a81ed2d3bec Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Thu, 14 Jun 2018 15:29:27 -0700
Subject: [PATCH 164/277] Suspended high pri work forces lower priority work to
 expire early  (#12965)

* onFatal, onComplete, onSuspend, onYield

For every call to renderRoot, one of onFatal, onComplete, onSuspend,
and onYield is called upon exiting. We use these in lieu of returning a
tuple. I've also chosen not to inline them into renderRoot because these
will eventually be lifted into the renderer.

* Suspended high pri work forces lower priority work to expire early

If an error is thrown, and there is lower priority pending work, we
retry at the lower priority. The lower priority work should expire
at the same time at which the high priority work would have expired.
Effectively, this increases the priority of the low priority work.

Simple example: If an error is thrown during a synchronous render, and
there's an async update, the async update should flush synchronously in
case it's able to fix the error. I've added a unit test for
this scenario.

User provided timeouts should have the same behavior, but I'll leave
that for a future PR.
---
 .../src/ReactFiberExpirationTime.js           |   1 -
 .../src/ReactFiberPendingPriority.js          |  36 +++-
 .../react-reconciler/src/ReactFiberRoot.js    |   6 +-
 .../src/ReactFiberScheduler.js                | 204 +++++++++---------
 .../src/ReactFiberUnwindWork.js               |   3 +-
 ...tIncrementalErrorHandling-test.internal.js |  50 +++++
 6 files changed, 179 insertions(+), 121 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberExpirationTime.js b/packages/react-reconciler/src/ReactFiberExpirationTime.js
index 7143173c9c..46603eb4be 100644
--- a/packages/react-reconciler/src/ReactFiberExpirationTime.js
+++ b/packages/react-reconciler/src/ReactFiberExpirationTime.js
@@ -9,7 +9,6 @@
 
 import MAX_SIGNED_31_BIT_INT from './maxSigned31BitInt';
 
-// TODO: Use an opaque type once ESLint et al support the syntax
 export type ExpirationTime = number;
 
 export const NoWork = 0;
diff --git a/packages/react-reconciler/src/ReactFiberPendingPriority.js b/packages/react-reconciler/src/ReactFiberPendingPriority.js
index 2f30f53f72..f1e35ba894 100644
--- a/packages/react-reconciler/src/ReactFiberPendingPriority.js
+++ b/packages/react-reconciler/src/ReactFiberPendingPriority.js
@@ -35,6 +35,7 @@ export function markPendingPriorityLevel(
       }
     }
   }
+  findNextPendingPriorityLevel(root);
 }
 
 export function markCommittedPriorityLevels(
@@ -49,6 +50,7 @@ export function markCommittedPriorityLevels(
     root.earliestSuspendedTime = NoWork;
     root.latestSuspendedTime = NoWork;
     root.latestPingedTime = NoWork;
+    findNextPendingPriorityLevel(root);
     return;
   }
 
@@ -77,6 +79,7 @@ export function markCommittedPriorityLevels(
     // There's no suspended work. Treat the earliest remaining level as a
     // pending level.
     markPendingPriorityLevel(root, earliestRemainingTime);
+    findNextPendingPriorityLevel(root);
     return;
   }
 
@@ -91,6 +94,7 @@ export function markCommittedPriorityLevels(
     // There's no suspended work. Treat the earliest remaining level as a
     // pending level.
     markPendingPriorityLevel(root, earliestRemainingTime);
+    findNextPendingPriorityLevel(root);
     return;
   }
 
@@ -98,11 +102,13 @@ export function markCommittedPriorityLevels(
     // The earliest remaining time is earlier than all the suspended work.
     // Treat it as a pending update.
     markPendingPriorityLevel(root, earliestRemainingTime);
+    findNextPendingPriorityLevel(root);
     return;
   }
 
   // The earliest remaining time falls within the range of known suspended
   // levels. We should treat this as suspended work.
+  findNextPendingPriorityLevel(root);
 }
 
 export function markSuspendedPriorityLevel(
@@ -148,6 +154,7 @@ export function markSuspendedPriorityLevel(
       root.latestSuspendedTime = suspendedTime;
     }
   }
+  findNextPendingPriorityLevel(root);
 }
 
 export function markPingedPriorityLevel(
@@ -161,22 +168,29 @@ export function markPingedPriorityLevel(
       root.latestPingedTime = pingedTime;
     }
   }
+  findNextPendingPriorityLevel(root);
 }
 
-export function findNextPendingPriorityLevel(root: FiberRoot): ExpirationTime {
+function findNextPendingPriorityLevel(root) {
   const earliestSuspendedTime = root.earliestSuspendedTime;
   const earliestPendingTime = root.earliestPendingTime;
+  let nextExpirationTimeToWorkOn;
+  let expirationTime;
   if (earliestSuspendedTime === NoWork) {
     // Fast path. There's no suspended work.
-    return earliestPendingTime;
+    nextExpirationTimeToWorkOn = expirationTime = earliestPendingTime;
+  } else if (earliestPendingTime !== NoWork) {
+    // Check if there's known pending work.
+    nextExpirationTimeToWorkOn = earliestPendingTime;
+    expirationTime =
+      earliestSuspendedTime < earliestPendingTime
+        ? earliestSuspendedTime
+        : earliestPendingTime;
+  } else {
+    // Finally, if a suspended level was pinged, work on that. Otherwise there's
+    // nothing to work on.
+    nextExpirationTimeToWorkOn = expirationTime = root.latestPingedTime;
   }
-
-  // First, check if there's known pending work.
-  if (earliestPendingTime !== NoWork) {
-    return earliestPendingTime;
-  }
-
-  // Finally, if a suspended level was pinged, work on that. Otherwise there's
-  // nothing to work on.
-  return root.latestPingedTime;
+  root.nextExpirationTimeToWorkOn = nextExpirationTimeToWorkOn;
+  root.expirationTime = expirationTime;
 }
diff --git a/packages/react-reconciler/src/ReactFiberRoot.js b/packages/react-reconciler/src/ReactFiberRoot.js
index 302675ad3c..32a4a93892 100644
--- a/packages/react-reconciler/src/ReactFiberRoot.js
+++ b/packages/react-reconciler/src/ReactFiberRoot.js
@@ -57,7 +57,8 @@ export type FiberRoot = {
   +hydrate: boolean,
   // Remaining expiration time on this root.
   // TODO: Lift this into the renderer
-  remainingExpirationTime: ExpirationTime,
+  nextExpirationTimeToWorkOn: ExpirationTime,
+  expirationTime: ExpirationTime,
   // List of top-level batches. This list indicates whether a commit should be
   // deferred. Also contains completion callbacks.
   // TODO: Lift this into the renderer
@@ -90,7 +91,8 @@ export function createFiberRoot(
     context: null,
     pendingContext: null,
     hydrate,
-    remainingExpirationTime: NoWork,
+    nextExpirationTimeToWorkOn: NoWork,
+    expirationTime: NoWork,
     firstBatch: null,
     nextScheduledRoot: null,
   };
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 453db245a7..21c1300d15 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -60,7 +60,6 @@ import {
 import {
   markPendingPriorityLevel,
   markCommittedPriorityLevels,
-  findNextPendingPriorityLevel,
   markSuspendedPriorityLevel,
   markPingedPriorityLevel,
 } from './ReactFiberPendingPriority';
@@ -230,7 +229,6 @@ let nextRoot: FiberRoot | null = null;
 // The time at which we're currently rendering work.
 let nextRenderExpirationTime: ExpirationTime = NoWork;
 let nextLatestTimeoutMs: number = -1;
-let nextRenderIsExpired: boolean = false;
 
 // The next fiber with an effect that we're currently committing.
 let nextEffect: Fiber | null = null;
@@ -254,7 +252,7 @@ if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
   replayUnitOfWork = (
     failedUnitOfWork: Fiber,
     thrownValue: mixed,
-    isAsync: boolean,
+    isYieldy: boolean,
   ) => {
     if (
       thrownValue !== null &&
@@ -303,7 +301,7 @@ if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
     // Replay the begin phase.
     isReplayingFailedUnitOfWork = true;
     originalReplayError = thrownValue;
-    invokeGuardedCallback(null, workLoop, null, isAsync);
+    invokeGuardedCallback(null, workLoop, null, isYieldy);
     isReplayingFailedUnitOfWork = false;
     originalReplayError = null;
     if (hasCaughtError()) {
@@ -345,7 +343,6 @@ function resetStack() {
   nextRoot = null;
   nextRenderExpirationTime = NoWork;
   nextLatestTimeoutMs = -1;
-  nextRenderIsExpired = false;
   nextUnitOfWork = null;
 }
 
@@ -494,12 +491,11 @@ function markLegacyErrorBoundaryAsFailed(instance: mixed) {
   }
 }
 
-function commitRoot(finishedWork: Fiber): ExpirationTime {
+function commitRoot(root: FiberRoot, finishedWork: Fiber): void {
   isWorking = true;
   isCommitting = true;
   startCommitTimer();
 
-  const root: FiberRoot = finishedWork.stateNode;
   invariant(
     root.current !== finishedWork,
     'Cannot commit the same tree as before. This is probably a bug ' +
@@ -690,13 +686,13 @@ function commitRoot(finishedWork: Fiber): ExpirationTime {
     ReactFiberInstrumentation.debugTool.onCommitWork(finishedWork);
   }
 
-  const nextPendingPriorityLevel = findNextPendingPriorityLevel(root);
-  if (nextPendingPriorityLevel === NoWork) {
+  const expirationTime = root.expirationTime;
+  if (expirationTime === NoWork) {
     // If there's no remaining work, we can clear the set of already failed
     // error boundaries.
     legacyErrorBoundariesThatAlreadyFailed = null;
   }
-  return nextPendingPriorityLevel;
+  onCommit(root, expirationTime);
 }
 
 function resetExpirationTime(
@@ -853,11 +849,7 @@ function completeUnitOfWork(workInProgress: Fiber): Fiber | null {
       // This fiber did not complete because something threw. Pop values off
       // the stack without entering the complete phase. If this is a boundary,
       // capture values if possible.
-      const next = unwindWork(
-        workInProgress,
-        nextRenderIsExpired,
-        nextRenderExpirationTime,
-      );
+      const next = unwindWork(workInProgress, nextRenderExpirationTime);
       // Because this fiber did not complete, don't reset its expiration time.
       if (workInProgress.effectTag & DidCapture) {
         // Restarting an error boundary
@@ -973,9 +965,9 @@ function performUnitOfWork(workInProgress: Fiber): Fiber | null {
   return next;
 }
 
-function workLoop(isAsync) {
-  if (!isAsync) {
-    // Flush all expired work.
+function workLoop(isYieldy) {
+  if (!isYieldy) {
+    // Flush work without yielding
     while (nextUnitOfWork !== null) {
       nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
     }
@@ -993,11 +985,7 @@ function workLoop(isAsync) {
   }
 }
 
-function renderRoot(
-  root: FiberRoot,
-  expirationTime: ExpirationTime,
-  isAsync: boolean,
-): Fiber | null {
+function renderRoot(root: FiberRoot, isYieldy: boolean): void {
   invariant(
     !isWorking,
     'renderRoot was called recursively. This error is likely caused ' +
@@ -1005,6 +993,8 @@ function renderRoot(
   );
   isWorking = true;
 
+  const expirationTime = root.nextExpirationTimeToWorkOn;
+
   // Check if we're starting from a fresh stack, or if we're resuming from
   // previously yielded work.
   if (
@@ -1027,14 +1017,11 @@ function renderRoot(
 
   let didFatal = false;
 
-  nextRenderIsExpired =
-    !isAsync || nextRenderExpirationTime <= mostRecentCurrentTime;
-
   startWorkLoopTimer(nextUnitOfWork);
 
   do {
     try {
-      workLoop(isAsync);
+      workLoop(isYieldy);
     } catch (thrownValue) {
       if (enableProfilerTimer) {
         // Stop "base" render timer in the event of an error.
@@ -1054,7 +1041,7 @@ function renderRoot(
 
         const failedUnitOfWork: Fiber = nextUnitOfWork;
         if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
-          replayUnitOfWork(failedUnitOfWork, thrownValue, isAsync);
+          replayUnitOfWork(failedUnitOfWork, thrownValue, isYieldy);
         }
 
         // TODO: we already know this isn't true in some cases.
@@ -1085,7 +1072,6 @@ function renderRoot(
           returnFiber,
           sourceFiber,
           thrownValue,
-          nextRenderIsExpired,
           nextRenderExpirationTime,
           mostRecentCurrentTimeMs,
         );
@@ -1107,7 +1093,7 @@ function renderRoot(
     if (__DEV__) {
       resetStackAfterFatalErrorInDev();
     }
-    return null;
+    onFatal(root);
   } else if (nextUnitOfWork === null) {
     // We reached the root.
     const rootWorkInProgress = root.current.alternate;
@@ -1121,32 +1107,27 @@ function renderRoot(
       stopWorkLoopTimer(interruptedBy, didCompleteRoot);
       interruptedBy = null;
       // The root successfully completed.
-      root.pendingCommitExpirationTime = expirationTime;
-      // Return the completed work-in-progress.
-      return rootWorkInProgress;
+      onComplete(root, rootWorkInProgress, expirationTime);
     } else {
       // The root did not complete.
       const didCompleteRoot = false;
       stopWorkLoopTimer(interruptedBy, didCompleteRoot);
       interruptedBy = null;
-      if (nextLatestTimeoutMs >= 0) {
-        setTimeout(() => {
-          retrySuspendedRoot(root, expirationTime);
-        }, nextLatestTimeoutMs);
-      }
       markSuspendedPriorityLevel(root, expirationTime);
-      const firstUnblockedExpirationTime = findNextPendingPriorityLevel(root);
-      onBlock(firstUnblockedExpirationTime);
-      // Return null to indicate that the root did not complete.
-      return null;
+      const suspendedExpirationTime = expirationTime;
+      const newExpirationTime = root.expirationTime;
+      onSuspend(
+        root,
+        suspendedExpirationTime,
+        newExpirationTime,
+        nextLatestTimeoutMs,
+      );
     }
   } else {
     const didCompleteRoot = false;
     stopWorkLoopTimer(interruptedBy, didCompleteRoot);
     interruptedBy = null;
-    // There's more work to do, but we ran out of time. Yield back to
-    // the renderer.
-    return null;
+    onYield(root);
   }
 }
 
@@ -1311,9 +1292,9 @@ function markTimeout(
 
 function retrySuspendedRoot(root: FiberRoot, suspendedTime: ExpirationTime) {
   markPingedPriorityLevel(root, suspendedTime);
-  const retryTime = findNextPendingPriorityLevel(root);
+  const retryTime = root.expirationTime;
   if (retryTime !== NoWork) {
-    requestRetry(root, retryTime);
+    requestWork(root, retryTime);
   }
 }
 
@@ -1358,7 +1339,6 @@ function scheduleWork(fiber: Fiber, expirationTime: ExpirationTime) {
           resetStack();
         }
         markPendingPriorityLevel(root, expirationTime);
-        const nextExpirationTimeToWorkOn = findNextPendingPriorityLevel(root);
         if (
           // If we're in the render phase, we don't need to schedule this root
           // for an update, because we'll do it before we exit...
@@ -1367,7 +1347,8 @@ function scheduleWork(fiber: Fiber, expirationTime: ExpirationTime) {
           // ...unless this is a different root than the one we're rendering.
           nextRoot !== root
         ) {
-          requestWork(root, nextExpirationTimeToWorkOn);
+          const rootExpirationTime = root.expirationTime;
+          requestWork(root, rootExpirationTime);
         }
         if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
           invariant(
@@ -1454,7 +1435,7 @@ let nestedUpdateCount: number = 0;
 
 const timeHeuristicForUnitOfWork = 1;
 
-function scheduleCallbackWithExpiration(expirationTime) {
+function scheduleCallbackWithExpirationTime(expirationTime) {
   if (callbackExpirationTime !== NoWork) {
     // A callback is already scheduled. Check its expiration time (timeout).
     if (expirationTime > callbackExpirationTime) {
@@ -1472,25 +1453,52 @@ function scheduleCallbackWithExpiration(expirationTime) {
     startRequestCallbackTimer();
   }
 
-  // Compute a timeout for the given expiration time.
-  const currentMs = now() - originalStartTimeMs;
-  const expirationMs = expirationTimeToMs(expirationTime);
-  const timeout = expirationMs - currentMs;
-
   callbackExpirationTime = expirationTime;
+  const currentMs = now() - originalStartTimeMs;
+  const expirationTimeMs = expirationTimeToMs(expirationTime);
+  const timeout = expirationTimeMs - currentMs;
   callbackID = scheduleDeferredCallback(performAsyncWork, {timeout});
 }
 
-function requestRetry(root: FiberRoot, expirationTime: ExpirationTime) {
-  if (
-    root.remainingExpirationTime === NoWork ||
-    root.remainingExpirationTime < expirationTime
-  ) {
-    // For a retry, only update the remaining expiration time if it has a
-    // *lower priority* than the existing value. This is because, on a retry,
-    // we should attempt to coalesce as much as possible.
-    requestWork(root, expirationTime);
+// For every call to renderRoot, one of onFatal, onComplete, onSuspend, and
+// onYield is called upon exiting. We use these in lieu of returning a tuple.
+// I've also chosen not to inline them into renderRoot because these will
+// eventually be lifted into the renderer.
+function onFatal(root) {
+  root.finishedWork = null;
+}
+
+function onComplete(
+  root: FiberRoot,
+  finishedWork: Fiber,
+  expirationTime: ExpirationTime,
+) {
+  root.pendingCommitExpirationTime = expirationTime;
+  root.finishedWork = finishedWork;
+}
+
+function onSuspend(
+  root: FiberRoot,
+  suspendedExpirationTime: ExpirationTime,
+  expirationTime: ExpirationTime,
+  timeoutMs: number,
+) {
+  if (timeoutMs >= 0) {
+    const suspendedRoot = root;
+    setTimeout(() => {
+      retrySuspendedRoot(suspendedRoot, suspendedExpirationTime);
+    }, timeoutMs);
   }
+  root.expirationTime = expirationTime;
+}
+
+function onYield(root) {
+  root.finishedWork = null;
+}
+
+function onCommit(root, expirationTime) {
+  root.expirationTime = expirationTime;
+  root.finishedWork = null;
 }
 
 // requestWork is called by the scheduler whenever a root receives an update.
@@ -1520,7 +1528,7 @@ function requestWork(root: FiberRoot, expirationTime: ExpirationTime) {
   if (expirationTime === Sync) {
     performSyncWork();
   } else {
-    scheduleCallbackWithExpiration(expirationTime);
+    scheduleCallbackWithExpirationTime(expirationTime);
   }
 }
 
@@ -1529,7 +1537,7 @@ function addRootToSchedule(root: FiberRoot, expirationTime: ExpirationTime) {
   // Check if this root is already part of the schedule.
   if (root.nextScheduledRoot === null) {
     // This root is not already scheduled. Add it.
-    root.remainingExpirationTime = expirationTime;
+    root.expirationTime = expirationTime;
     if (lastScheduledRoot === null) {
       firstScheduledRoot = lastScheduledRoot = root;
       root.nextScheduledRoot = root;
@@ -1540,13 +1548,13 @@ function addRootToSchedule(root: FiberRoot, expirationTime: ExpirationTime) {
     }
   } else {
     // This root is already scheduled, but its priority may have increased.
-    const remainingExpirationTime = root.remainingExpirationTime;
+    const remainingExpirationTime = root.expirationTime;
     if (
       remainingExpirationTime === NoWork ||
       expirationTime < remainingExpirationTime
     ) {
       // Update the priority.
-      root.remainingExpirationTime = expirationTime;
+      root.expirationTime = expirationTime;
     }
   }
 }
@@ -1558,7 +1566,7 @@ function findHighestPriorityRoot() {
     let previousScheduledRoot = lastScheduledRoot;
     let root = firstScheduledRoot;
     while (root !== null) {
-      const remainingExpirationTime = root.remainingExpirationTime;
+      const remainingExpirationTime = root.expirationTime;
       if (remainingExpirationTime === NoWork) {
         // This root no longer has work. Remove it from the scheduler.
 
@@ -1628,18 +1636,14 @@ function findHighestPriorityRoot() {
 }
 
 function performAsyncWork(dl) {
-  performWork(NoWork, true, dl);
+  performWork(NoWork, dl);
 }
 
 function performSyncWork() {
-  performWork(Sync, false, null);
+  performWork(Sync, null);
 }
 
-function performWork(
-  minExpirationTime: ExpirationTime,
-  isAsync: boolean,
-  dl: Deadline | null,
-) {
+function performWork(minExpirationTime: ExpirationTime, dl: Deadline | null) {
   deadline = dl;
 
   // Keep working on roots until there's no more work, or until the we reach
@@ -1656,7 +1660,7 @@ function performWork(
     stopRequestCallbackTimer(didExpire, timeout);
   }
 
-  if (isAsync) {
+  if (deadline !== null) {
     while (
       nextFlushedRoot !== null &&
       nextFlushedExpirationTime !== NoWork &&
@@ -1666,11 +1670,7 @@ function performWork(
         recalculateCurrentTime() >= nextFlushedExpirationTime)
     ) {
       recalculateCurrentTime();
-      performWorkOnRoot(
-        nextFlushedRoot,
-        nextFlushedExpirationTime,
-        !deadlineDidExpire,
-      );
+      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, true);
       findHighestPriorityRoot();
     }
   } else {
@@ -1695,7 +1695,7 @@ function performWork(
   }
   // If there's work left over, schedule a new callback.
   if (nextFlushedExpirationTime !== NoWork) {
-    scheduleCallbackWithExpiration(nextFlushedExpirationTime);
+    scheduleCallbackWithExpirationTime(nextFlushedExpirationTime);
   }
 
   // Clean-up.
@@ -1752,7 +1752,7 @@ function finishRendering() {
 function performWorkOnRoot(
   root: FiberRoot,
   expirationTime: ExpirationTime,
-  isAsync: boolean,
+  isYieldy: boolean,
 ) {
   invariant(
     !isRendering,
@@ -1763,14 +1763,16 @@ function performWorkOnRoot(
   isRendering = true;
 
   // Check if this is async work or sync/expired work.
-  if (!isAsync) {
-    // Flush sync work.
+  if (!isYieldy) {
+    // Flush work without yielding.
     let finishedWork = root.finishedWork;
     if (finishedWork !== null) {
       // This root is already complete. We can commit it.
       completeRoot(root, finishedWork, expirationTime);
     } else {
-      finishedWork = renderRoot(root, expirationTime, false);
+      root.finishedWork = null;
+      renderRoot(root, false);
+      finishedWork = root.finishedWork;
       if (finishedWork !== null) {
         // We've completed the root. Commit it.
         completeRoot(root, finishedWork, expirationTime);
@@ -1783,7 +1785,9 @@ function performWorkOnRoot(
       // This root is already complete. We can commit it.
       completeRoot(root, finishedWork, expirationTime);
     } else {
-      finishedWork = renderRoot(root, expirationTime, true);
+      root.finishedWork = null;
+      renderRoot(root, true);
+      finishedWork = root.finishedWork;
       if (finishedWork !== null) {
         // We've completed the root. Check the deadline one more time
         // before committing.
@@ -1825,20 +1829,20 @@ function completeRoot(
       // This root is blocked from committing by a batch. Unschedule it until
       // we receive another update.
       root.finishedWork = finishedWork;
-      root.remainingExpirationTime = NoWork;
+      root.expirationTime = NoWork;
       return;
     }
   }
 
   // Commit the root.
   root.finishedWork = null;
-  root.remainingExpirationTime = commitRoot(finishedWork);
+  commitRoot(root, finishedWork);
 }
 
 // When working on async work, the reconciler asks the renderer if it should
 // yield execution. For DOM, we implement this with requestIdleCallback.
 function shouldYield() {
-  if (deadline === null) {
+  if (deadline === null || deadlineDidExpire) {
     return false;
   }
   if (deadline.timeRemaining() > timeHeuristicForUnitOfWork) {
@@ -1858,23 +1862,13 @@ function onUncaughtError(error: mixed) {
   );
   // Unschedule this root so we don't work on it again until there's
   // another update.
-  nextFlushedRoot.remainingExpirationTime = NoWork;
+  nextFlushedRoot.expirationTime = NoWork;
   if (!hasUnhandledError) {
     hasUnhandledError = true;
     unhandledError = error;
   }
 }
 
-function onBlock(remainingExpirationTime: ExpirationTime) {
-  invariant(
-    nextFlushedRoot !== null,
-    'Should be working on a root. This error is likely caused by a bug in ' +
-      'React. Please file an issue.',
-  );
-  // This root was blocked. Unschedule it until there's another update.
-  nextFlushedRoot.remainingExpirationTime = remainingExpirationTime;
-}
-
 // TODO: Batching should be implemented at the renderer level, not inside
 // the reconciler.
 function batchedUpdates<A, R>(fn: (a: A) => R, a: A): R {
@@ -1936,7 +1930,7 @@ function interactiveUpdates<A, B, R>(fn: (A, B) => R, a: A, b: B): R {
     lowestPendingInteractiveExpirationTime !== NoWork
   ) {
     // Synchronously flush pending interactive updates.
-    performWork(lowestPendingInteractiveExpirationTime, false, null);
+    performWork(lowestPendingInteractiveExpirationTime, null);
     lowestPendingInteractiveExpirationTime = NoWork;
   }
   const previousIsBatchingInteractiveUpdates = isBatchingInteractiveUpdates;
@@ -1957,7 +1951,7 @@ function interactiveUpdates<A, B, R>(fn: (A, B) => R, a: A, b: B): R {
 function flushInteractiveUpdates() {
   if (!isRendering && lowestPendingInteractiveExpirationTime !== NoWork) {
     // Synchronously flush pending interactive updates.
-    performWork(lowestPendingInteractiveExpirationTime, false, null);
+    performWork(lowestPendingInteractiveExpirationTime, null);
     lowestPendingInteractiveExpirationTime = NoWork;
   }
 }
@@ -1970,7 +1964,7 @@ function flushControlled(fn: () => mixed): void {
   } finally {
     isBatchingUpdates = previousIsBatchingUpdates;
     if (!isBatchingUpdates && !isRendering) {
-      performWork(Sync, false, null);
+      performWork(Sync, null);
     }
   }
 }
diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index ba441e7dd7..afefe81c5c 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -142,7 +142,6 @@ function throwException(
   returnFiber: Fiber,
   sourceFiber: Fiber,
   value: mixed,
-  renderIsExpired: boolean,
   renderExpirationTime: ExpirationTime,
   currentTimeMs: number,
 ) {
@@ -174,6 +173,7 @@ function throwException(
     // This is a thenable.
     const thenable: Thenable = (value: any);
 
+    // TODO: Should use the earliest known expiration time
     const expirationTimeMs = expirationTimeToMs(renderExpirationTime);
     const startTimeMs = expirationTimeMs - 5000;
     let elapsedMs = currentTimeMs - startTimeMs;
@@ -312,7 +312,6 @@ function throwException(
 
 function unwindWork(
   workInProgress: Fiber,
-  renderIsExpired: boolean,
   renderExpirationTime: ExpirationTime,
 ) {
   if (enableProfilerTimer) {
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
index 432a757c9f..c4c0d82959 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
@@ -229,6 +229,56 @@ describe('ReactIncrementalErrorHandling', () => {
     expect(ReactNoop.getChildren()).toEqual([span('Everything is fine.')]);
   });
 
+  it('on error, retries at a lower priority using the expiration of higher priority', () => {
+    class Parent extends React.Component {
+      state = {hideChild: false};
+      componentDidUpdate() {
+        ReactNoop.yield('commit: ' + this.state.hideChild);
+      }
+      render() {
+        if (this.state.hideChild) {
+          ReactNoop.yield('(empty)');
+          return <span prop="(empty)" />;
+        }
+        return <Child isBroken={this.props.childIsBroken} />;
+      }
+    }
+
+    function Child(props) {
+      if (props.isBroken) {
+        ReactNoop.yield('Error!');
+        throw new Error('Error!');
+      }
+      ReactNoop.yield('Child');
+      return <span prop="Child" />;
+    }
+
+    // Initial mount
+    const parent = React.createRef(null);
+    ReactNoop.render(<Parent ref={parent} childIsBroken={false} />);
+    expect(ReactNoop.flush()).toEqual(['Child']);
+    expect(ReactNoop.getChildren()).toEqual([span('Child')]);
+
+    // Schedule a low priority update to hide the child
+    parent.current.setState({hideChild: true});
+
+    // Before the low priority update is flushed, synchronsouly trigger an
+    // error in the child.
+    ReactNoop.flushSync(() => {
+      ReactNoop.render(<Parent ref={parent} childIsBroken={true} />);
+    });
+    expect(ReactNoop.clearYields()).toEqual([
+      // First the sync update triggers an error
+      'Error!',
+      // Because there's a pending low priority update, we restart at the
+      // lower priority. This hides the children, suppressing the error.
+      '(empty)',
+      // Now the tree can commit.
+      'commit: true',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([span('(empty)')]);
+  });
+
   it('calls componentDidCatch multiple times for multiple errors', () => {
     let id = 0;
     class BadMount extends React.Component {

From 9bd4d1fae21a6521c185cb114a15ca5dc74d6d9b Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Thu, 14 Jun 2018 16:37:30 -0700
Subject: [PATCH 165/277] Synchronously restart when an error is thrown during
 async rendering (#13041)

In async mode, events are interleaved with rendering. If one of those
events mutates state that is later accessed during render, it can lead
to inconsistencies/tearing.

Restarting the render from the root is often sufficient to fix the
inconsistency. We'll flush the restart synchronously to prevent yet
another mutation from happening during an interleaved event.

We'll only restart during an async render. Sync renders are already
sync, so there's no benefit in restarting. (Unless a mutation happens
during the render phase, but we don't support that.)
---
 .../src/ReactFiberPendingPriority.js          |  35 ++-
 .../react-reconciler/src/ReactFiberRoot.js    |   7 +
 .../src/ReactFiberScheduler.js                |  10 +-
 .../src/ReactFiberUnwindWork.js               |  30 ++-
 ...tIncrementalErrorHandling-test.internal.js | 239 +++++++++---------
 .../ReactIncrementalErrorReplay-test.js       |   4 +-
 .../__tests__/ReactSuspense-test.internal.js  |  12 +
 ...ReactIncrementalPerf-test.internal.js.snap |  10 +
 .../src/__tests__/forwardRef-test.internal.js |   8 +
 9 files changed, 224 insertions(+), 131 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberPendingPriority.js b/packages/react-reconciler/src/ReactFiberPendingPriority.js
index f1e35ba894..dc7ec20a9c 100644
--- a/packages/react-reconciler/src/ReactFiberPendingPriority.js
+++ b/packages/react-reconciler/src/ReactFiberPendingPriority.js
@@ -10,7 +10,7 @@
 import type {FiberRoot} from './ReactFiberRoot';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 
-import {NoWork} from './ReactFiberExpirationTime';
+import {NoWork, Sync} from './ReactFiberExpirationTime';
 
 // TODO: Offscreen updates
 
@@ -18,6 +18,11 @@ export function markPendingPriorityLevel(
   root: FiberRoot,
   expirationTime: ExpirationTime,
 ): void {
+  // If there's a gap between completing a failed root and retrying it,
+  // additional updates may be scheduled. Clear `didError`, in case the update
+  // is sufficient to fix the error.
+  root.didError = false;
+
   // Update the latest and earliest pending times
   const earliestPendingTime = root.earliestPendingTime;
   if (earliestPendingTime === NoWork) {
@@ -43,6 +48,8 @@ export function markCommittedPriorityLevels(
   currentTime: ExpirationTime,
   earliestRemainingTime: ExpirationTime,
 ): void {
+  root.didError = false;
+
   if (earliestRemainingTime === NoWork) {
     // Fast path. There's no remaining work. Clear everything.
     root.earliestPendingTime = NoWork;
@@ -111,10 +118,30 @@ export function markCommittedPriorityLevels(
   findNextPendingPriorityLevel(root);
 }
 
+export function hasLowerPriorityWork(
+  root: FiberRoot,
+  renderExpirationTime: ExpirationTime,
+) {
+  return (
+    renderExpirationTime !== root.latestPendingTime &&
+    renderExpirationTime !== root.latestSuspendedTime
+  );
+}
+
 export function markSuspendedPriorityLevel(
   root: FiberRoot,
   suspendedTime: ExpirationTime,
+  didError: boolean,
 ): void {
+  if (didError && !hasLowerPriorityWork(root, suspendedTime)) {
+    // TODO: When we add back resuming, we need to ensure the progressed work
+    // is thrown out and not reused during the restarted render. One way to
+    // invalidate the progressed work is to restart at expirationTime + 1.
+    root.didError = true;
+    findNextPendingPriorityLevel(root);
+    return;
+  }
+
   // First, check the known pending levels and update them if needed.
   const earliestPendingTime = root.earliestPendingTime;
   const latestPendingTime = root.latestPendingTime;
@@ -191,6 +218,12 @@ function findNextPendingPriorityLevel(root) {
     // nothing to work on.
     nextExpirationTimeToWorkOn = expirationTime = root.latestPingedTime;
   }
+
+  if (root.didError) {
+    // Revert to synchronous mode.
+    expirationTime = Sync;
+  }
+
   root.nextExpirationTimeToWorkOn = nextExpirationTimeToWorkOn;
   root.expirationTime = expirationTime;
 }
diff --git a/packages/react-reconciler/src/ReactFiberRoot.js b/packages/react-reconciler/src/ReactFiberRoot.js
index 32a4a93892..b747fc2e66 100644
--- a/packages/react-reconciler/src/ReactFiberRoot.js
+++ b/packages/react-reconciler/src/ReactFiberRoot.js
@@ -44,6 +44,11 @@ export type FiberRoot = {
   // be retried.
   latestPingedTime: ExpirationTime,
 
+  // If an error is thrown, and there are no more updates in the queue, we try
+  // rendering from the root one more time, synchronously, before handling
+  // the error.
+  didError: boolean,
+
   pendingCommitExpirationTime: ExpirationTime,
   // A finished work-in-progress HostRoot that's ready to be committed.
   // TODO: The reason this is separate from isReadyForCommit is because the
@@ -86,6 +91,8 @@ export function createFiberRoot(
     latestSuspendedTime: NoWork,
     latestPingedTime: NoWork,
 
+    didError: false,
+
     pendingCommitExpirationTime: NoWork,
     finishedWork: null,
     context: null,
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 21c1300d15..92b83f4414 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -229,6 +229,7 @@ let nextRoot: FiberRoot | null = null;
 // The time at which we're currently rendering work.
 let nextRenderExpirationTime: ExpirationTime = NoWork;
 let nextLatestTimeoutMs: number = -1;
+let nextRenderDidError: boolean = false;
 
 // The next fiber with an effect that we're currently committing.
 let nextEffect: Fiber | null = null;
@@ -343,6 +344,7 @@ function resetStack() {
   nextRoot = null;
   nextRenderExpirationTime = NoWork;
   nextLatestTimeoutMs = -1;
+  nextRenderDidError = false;
   nextUnitOfWork = null;
 }
 
@@ -1007,6 +1009,7 @@ function renderRoot(root: FiberRoot, isYieldy: boolean): void {
     nextRoot = root;
     nextRenderExpirationTime = expirationTime;
     nextLatestTimeoutMs = -1;
+    nextRenderDidError = false;
     nextUnitOfWork = createWorkInProgress(
       nextRoot.current,
       null,
@@ -1113,7 +1116,7 @@ function renderRoot(root: FiberRoot, isYieldy: boolean): void {
       const didCompleteRoot = false;
       stopWorkLoopTimer(interruptedBy, didCompleteRoot);
       interruptedBy = null;
-      markSuspendedPriorityLevel(root, expirationTime);
+      markSuspendedPriorityLevel(root, expirationTime, nextRenderDidError);
       const suspendedExpirationTime = expirationTime;
       const newExpirationTime = root.expirationTime;
       onSuspend(
@@ -1290,6 +1293,10 @@ function markTimeout(
   }
 }
 
+function markError(root: FiberRoot) {
+  nextRenderDidError = true;
+}
+
 function retrySuspendedRoot(root: FiberRoot, suspendedTime: ExpirationTime) {
   markPingedPriorityLevel(root, suspendedTime);
   const retryTime = root.expirationTime;
@@ -1975,6 +1982,7 @@ export {
   captureCommitPhaseError,
   onUncaughtError,
   markTimeout,
+  markError,
   retrySuspendedRoot,
   markLegacyErrorBoundaryAsFailed,
   isAlreadyFailedLegacyErrorBoundary,
diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index afefe81c5c..e419df6d7c 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -56,6 +56,7 @@ import {
 } from './ReactProfilerTimer';
 import {
   markTimeout,
+  markError,
   onUncaughtError,
   markLegacyErrorBoundaryAsFailed,
   isAlreadyFailedLegacyErrorBoundary,
@@ -64,6 +65,7 @@ import {
   scheduleWork,
   retrySuspendedRoot,
 } from './ReactFiberScheduler';
+import {hasLowerPriorityWork} from './ReactFiberPendingPriority';
 
 function createRootErrorUpdate(
   fiber: Fiber,
@@ -150,20 +152,6 @@ function throwException(
   // Its effect list is no longer valid.
   sourceFiber.firstEffect = sourceFiber.lastEffect = null;
 
-  // Check if there is lower priority work, regardless of whether it's pending.
-  // If so, it may have the effect of fixing the exception that was just thrown.
-  const latestPendingTime = root.latestPendingTime;
-  const latestSuspendedTime = root.latestSuspendedTime;
-  if (
-    renderExpirationTime !== latestPendingTime &&
-    renderExpirationTime !== latestSuspendedTime &&
-    renderExpirationTime !== Never
-  ) {
-    // There's lower priority work. Exit to suspend this render and retry at
-    // the lower priority.
-    return;
-  }
-
   if (
     enableSuspense &&
     value !== null &&
@@ -259,6 +247,20 @@ function throwException(
         workInProgress = workInProgress.return;
       } while (workInProgress !== null);
     }
+  } else {
+    // This is an error.
+    markError(root);
+    if (
+      // Retry (at the same priority) one more time before handling the error.
+      // The retry will flush synchronously. (Unless we're already rendering
+      // synchronously, in which case move to the next check.)
+      (!root.didError && renderExpirationTime !== Sync) ||
+      // There's lower priority work. If so, it may have the effect of fixing
+      // the exception that was just thrown.
+      hasLowerPriorityWork(root, renderExpirationTime)
+    ) {
+      return;
+    }
   }
 
   // We didn't find a boundary that could handle this type of exception. Start
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
index c4c0d82959..4e346dcba2 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
@@ -64,7 +64,7 @@ describe('ReactIncrementalErrorHandling', () => {
 
     function Indirection(props) {
       ReactNoop.yield('Indirection');
-      return props.children;
+      return props.children || null;
     }
 
     function BadRender() {
@@ -78,24 +78,41 @@ describe('ReactIncrementalErrorHandling', () => {
           <Indirection>
             <Indirection>
               <BadRender />
+              <Indirection />
+              <Indirection />
             </Indirection>
           </Indirection>
         </Indirection>
       </ErrorBoundary>,
     );
 
+    // Start rendering asynchronsouly
     ReactNoop.flushThrough([
       'ErrorBoundary (try)',
       'Indirection',
       'Indirection',
       'Indirection',
-      // The error was thrown, but React ran out of time and yielded
-      // before recovering.
+      // An error is thrown. React keeps rendering asynchronously.
       'throw',
     ]);
 
-    // Upon resuming, componentDidCatch is called
+    // Still rendering async...
+    ReactNoop.flushThrough(['Indirection']);
+
     ReactNoop.flushThrough([
+      'Indirection',
+      // Now that the tree is complete, and there's no remaining work, React
+      // reverts to sync mode to retry one more time before handling the error.
+
+      'ErrorBoundary (try)',
+      'Indirection',
+      'Indirection',
+      'Indirection',
+
+      // The error was thrown again. Now we can handle it.
+      'throw',
+      'Indirection',
+      'Indirection',
       'componentDidCatch',
       'ErrorBoundary (catch)',
       'ErrorMessage',
@@ -103,101 +120,6 @@ describe('ReactIncrementalErrorHandling', () => {
     expect(ReactNoop.getChildren()).toEqual([span('Caught an error: oops!')]);
   });
 
-  it('can recover from an error within a single render phase', () => {
-    class Sibling extends React.Component {
-      componentWillUnmount() {
-        ReactNoop.yield('Unmount Sibling');
-      }
-      render() {
-        return null;
-      }
-    }
-
-    class ErrorBoundary extends React.Component {
-      state = {error: null};
-      static getDerivedStateFromCatch(error) {
-        ReactNoop.yield('getDerivedStateFromCatch');
-        return {error};
-      }
-      render() {
-        if (this.state.error) {
-          ReactNoop.yield('ErrorBoundary (catch)');
-        } else {
-          ReactNoop.yield('ErrorBoundary (try)');
-        }
-        return (
-          <React.Fragment>
-            <Sibling />
-            {this.state.error ? (
-              <ErrorMessage error={this.state.error} />
-            ) : (
-              this.props.children
-            )}
-          </React.Fragment>
-        );
-      }
-    }
-
-    function ErrorMessage(props) {
-      ReactNoop.yield('ErrorMessage');
-      return <span prop={`Caught an error: ${props.error.message}`} />;
-    }
-
-    function Indirection(props) {
-      ReactNoop.yield('Indirection');
-      return props.children;
-    }
-
-    function BadRender() {
-      ReactNoop.yield('throw');
-      throw new Error('oops!');
-    }
-
-    function App(props) {
-      return (
-        <ErrorBoundary>
-          <Indirection>
-            <Indirection>
-              <Indirection>
-                {props.shouldThrow ? <BadRender /> : null}
-              </Indirection>
-            </Indirection>
-          </Indirection>
-        </ErrorBoundary>
-      );
-    }
-
-    ReactNoop.render(<App shouldThrow={false} />);
-    ReactNoop.flush();
-
-    ReactNoop.render(<App shouldThrow={true} />);
-    ReactNoop.flushThrough([
-      'ErrorBoundary (try)',
-      'Indirection',
-      'Indirection',
-      'Indirection',
-      // The error was thrown, but React ran out of time and yielded
-      // before recovering.
-      'throw',
-    ]);
-
-    // Nothing committed yet.
-    expect(ReactNoop.getChildren()).toEqual([]);
-
-    // Upon resuming, getDerivedStateFromCatch is called
-    ReactNoop.flushThrough([
-      'getDerivedStateFromCatch',
-      'ErrorBoundary (catch)',
-      'ErrorMessage',
-    ]);
-    // Still hasn't committed
-    expect(ReactNoop.getChildren()).toEqual([]);
-    // The sibling should be re-mounted because it is the child of a failed
-    // error boundary
-    expect(ReactNoop.flush()).toEqual(['Unmount Sibling']);
-    expect(ReactNoop.getChildren()).toEqual([span('Caught an error: oops!')]);
-  });
-
   it("retries at a lower priority if there's additional pending work", () => {
     function App(props) {
       if (props.isBroken) {
@@ -279,6 +201,50 @@ describe('ReactIncrementalErrorHandling', () => {
     expect(ReactNoop.getChildren()).toEqual([span('(empty)')]);
   });
 
+  it('retries one more time before handling error', () => {
+    let ops = [];
+    function BadRender() {
+      ops.push('BadRender');
+      ReactNoop.yield('BadRender');
+      throw new Error('oops');
+    }
+
+    function Sibling() {
+      ops.push('Sibling');
+      ReactNoop.yield('Sibling');
+      return <span prop="Sibling" />;
+    }
+
+    function Parent() {
+      ops.push('Parent');
+      ReactNoop.yield('Parent');
+      return (
+        <React.Fragment>
+          <BadRender />
+          <Sibling />
+        </React.Fragment>
+      );
+    }
+
+    ReactNoop.render(<Parent />);
+
+    // Render the bad component asynchronously
+    ReactNoop.flushThrough(['Parent', 'BadRender']);
+
+    // Finish the rest of the async work
+    ReactNoop.flushThrough(['Sibling']);
+
+    // Rendering one more unit of work should be enough to trigger the retry
+    // and synchronously throw an error.
+    ops = [];
+    expect(() => ReactNoop.flushUnitsOfWork(1)).toThrow('oops');
+    expect(ops).toEqual(['Parent', 'BadRender', 'Sibling']);
+  });
+
+  // TODO: This is currently unobservable, but will be once we lift renderRoot
+  // and commitRoot into the renderer.
+  // it("does not retry synchronously if there's an update between complete and commit");
+
   it('calls componentDidCatch multiple times for multiple errors', () => {
     let id = 0;
     class BadMount extends React.Component {
@@ -389,6 +355,11 @@ describe('ReactIncrementalErrorHandling', () => {
     expect(ReactNoop.getChildren()).toEqual([]);
 
     expect(ReactNoop.flush()).toEqual([
+      'BrokenRender',
+      // React retries one more time
+      'ErrorBoundary render success',
+
+      // Errored again on retry. Now handle it.
       'BrokenRender',
       'ErrorBoundary componentDidCatch',
       'ErrorBoundary render error',
@@ -432,6 +403,7 @@ describe('ReactIncrementalErrorHandling', () => {
     expect(ops).toEqual([
       'ErrorBoundary render success',
       'BrokenRender',
+      // React doesn't retry because we're already rendering synchronously.
       'ErrorBoundary componentDidCatch',
       'ErrorBoundary render error',
     ]);
@@ -475,6 +447,7 @@ describe('ReactIncrementalErrorHandling', () => {
     expect(ops).toEqual([
       'ErrorBoundary render success',
       'BrokenRender',
+      // React doesn't retry because we're already rendering synchronously.
       'ErrorBoundary componentDidCatch',
       'ErrorBoundary render error',
     ]);
@@ -511,6 +484,12 @@ describe('ReactIncrementalErrorHandling', () => {
     expect(ops).toEqual([
       'RethrowErrorBoundary render',
       'BrokenRender',
+
+      // React retries one more time
+      'RethrowErrorBoundary render',
+      'BrokenRender',
+
+      // Errored again on retry. Now handle it.
       'RethrowErrorBoundary componentDidCatch',
     ]);
     expect(ReactNoop.getChildren()).toEqual([]);
@@ -549,6 +528,12 @@ describe('ReactIncrementalErrorHandling', () => {
     }).toThrow('Hello');
     expect(ops).toEqual([
       'BrokenRender',
+
+      // React retries one more time
+      'RethrowErrorBoundary render',
+      'BrokenRender',
+
+      // Errored again on retry. Now handle it.
       'RethrowErrorBoundary componentDidCatch',
     ]);
     expect(ReactNoop.getChildren()).toEqual([]);
@@ -584,6 +569,7 @@ describe('ReactIncrementalErrorHandling', () => {
     expect(ops).toEqual([
       'RethrowErrorBoundary render',
       'BrokenRender',
+      // React doesn't retry because we're already rendering synchronously.
       'RethrowErrorBoundary componentDidCatch',
     ]);
     expect(ReactNoop.getChildren()).toEqual([]);
@@ -622,6 +608,7 @@ describe('ReactIncrementalErrorHandling', () => {
     expect(ops).toEqual([
       'RethrowErrorBoundary render',
       'BrokenRender',
+      // React doesn't retry because we're already rendering synchronously.
       'RethrowErrorBoundary componentDidCatch',
     ]);
     expect(ReactNoop.getChildren()).toEqual([]);
@@ -688,7 +675,12 @@ describe('ReactIncrementalErrorHandling', () => {
     expect(() => {
       ReactNoop.flush();
     }).toThrow('Hello');
-    expect(ops).toEqual(['BrokenRender']);
+    expect(ops).toEqual([
+      'BrokenRender',
+      // React retries one more time
+      'BrokenRender',
+      // Errored again on retry
+    ]);
     ops = [];
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
@@ -719,7 +711,12 @@ describe('ReactIncrementalErrorHandling', () => {
       ReactNoop.render(<BrokenRender throw={true} />);
       ReactNoop.flush();
     }).toThrow('Hello');
-    expect(ops).toEqual(['BrokenRender']);
+    expect(ops).toEqual([
+      'BrokenRender',
+      // React retries one more time
+      'BrokenRender',
+      // Errored again on retry
+    ]);
 
     ops = [];
     ReactNoop.render(<Foo />);
@@ -1032,9 +1029,11 @@ describe('ReactIncrementalErrorHandling', () => {
         <BrokenRender />
       </ErrorBoundary>,
     );
-    expect(ReactNoop.flush).toWarnDev(
+    expect(ReactNoop.flush).toWarnDev([
       'Warning: React.createElement: type is invalid -- expected a string',
-    );
+      // React retries once on error
+      'Warning: React.createElement: type is invalid -- expected a string',
+    ]);
     expect(ReactNoop.getChildren()).toEqual([
       span(
         'Element type is invalid: expected a string (for built-in components) or ' +
@@ -1079,9 +1078,11 @@ describe('ReactIncrementalErrorHandling', () => {
         <BrokenRender fail={true} />
       </ErrorBoundary>,
     );
-    expect(ReactNoop.flush).toWarnDev(
+    expect(ReactNoop.flush).toWarnDev([
       'Warning: React.createElement: type is invalid -- expected a string',
-    );
+      // React retries once on error
+      'Warning: React.createElement: type is invalid -- expected a string',
+    ]);
     expect(ReactNoop.getChildren()).toEqual([
       span(
         'Element type is invalid: expected a string (for built-in components) or ' +
@@ -1273,6 +1274,13 @@ describe('ReactIncrementalErrorHandling', () => {
       'ErrorBoundary (try)',
       'Indirection',
       'BadRender',
+
+      // React retries one more time
+      'ErrorBoundary (try)',
+      'Indirection',
+      'BadRender',
+
+      // Errored again on retry. Now handle it.
       'componentDidCatch',
       'ErrorBoundary (catch)',
     ]);
@@ -1337,7 +1345,14 @@ describe('ReactIncrementalErrorHandling', () => {
       // Continue rendering siblings after BadRender throws
       'BadRenderSibling',
       'BadRenderSibling',
-      // Recover from the error
+
+      // React retries one more time
+      'ErrorBoundary (try)',
+      'throw',
+      'BadRenderSibling',
+      'BadRenderSibling',
+
+      // Errored again on retry. Now handle it.
       'componentDidCatch',
       'ErrorBoundary (catch)',
       'ErrorMessage',
@@ -1354,7 +1369,6 @@ describe('ReactIncrementalErrorHandling', () => {
       throw new Error('oops!');
     }
 
-    let parent;
     class Parent extends React.Component {
       state = {error: null, other: false};
       componentDidCatch(error) {
@@ -1365,7 +1379,6 @@ describe('ReactIncrementalErrorHandling', () => {
         ReactNoop.yield('did update');
       }
       render() {
-        parent = this;
         if (this.state.error) {
           ReactNoop.yield('render error message');
           return <span prop={`Caught an error: ${this.state.error.message}`} />;
@@ -1376,11 +1389,11 @@ describe('ReactIncrementalErrorHandling', () => {
     }
 
     ReactNoop.render(<Parent step={1} />);
-    ReactNoop.flushThrough(['render', 'throw']);
-    expect(ReactNoop.getChildren()).toEqual([]);
-
-    parent.setState({other: true});
-    expect(ReactNoop.flush()).toEqual([
+    ReactNoop.flushThrough([
+      'render',
+      'throw',
+      'render',
+      'throw',
       'did catch',
       'render error message',
       'did update',
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.js
index a14c6a9b3e..be1096dead 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.js
@@ -36,7 +36,7 @@ describe('ReactIncrementalErrorReplay', () => {
     });
   });
 
-  it('should fail gracefully on error that does not reproduce on replay', () => {
+  it("should ignore error if it doesn't throw on retry", () => {
     let didInit = false;
 
     function badLazyInit() {
@@ -54,6 +54,6 @@ describe('ReactIncrementalErrorReplay', () => {
       }
     }
     ReactNoop.render(<App />);
-    expect(() => ReactNoop.flush()).toThrow('Hi');
+    expect(() => ReactNoop.flush()).not.toThrow();
   });
 });
diff --git a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
index 21e7eef299..9831990985 100644
--- a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
@@ -14,6 +14,7 @@ describe('ReactSuspense', () => {
     jest.resetModules();
     ReactFeatureFlags = require('shared/ReactFeatureFlags');
     ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
+    ReactFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback = false;
     ReactFeatureFlags.enableSuspense = true;
     React = require('react');
     Fragment = React.Fragment;
@@ -258,6 +259,11 @@ describe('ReactSuspense', () => {
     expect(ReactNoop.flush()).toEqual([
       'Promise rejected [Result]',
       'Error! [Result]',
+
+      // React retries one more time
+      'Error! [Result]',
+
+      // Errored again on retry. Now handle it.
       'Caught error: Failed to load: Result',
     ]);
     expect(ReactNoop.getChildren()).toEqual([
@@ -320,6 +326,12 @@ describe('ReactSuspense', () => {
     expect(ReactNoop.flush()).toEqual([
       'Promise rejected [Result]',
       'Error! [Result]',
+
+      // React retries one more time
+      'Error! [Result]',
+
+      // Errored again on retry. Now handle it.
+
       'Caught error: Failed to load: Result',
     ]);
     expect(ReactNoop.getChildren()).toEqual([
diff --git a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
index a1e4a1cd83..686d77b0e6 100644
--- a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
+++ b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
@@ -286,6 +286,12 @@ exports[`ReactDebugFiberPerf recovers from caught errors 1`] = `
 "⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Stop on Baddie and restart from Boundary
+⚛ (React Tree Reconciliation: Yielded)
+  ⚛ Parent [mount]
+    ⚛ Boundary [mount]
+      ⚛ Parent [mount]
+        ⚛ Baddie [mount]
+
 ⚛ (React Tree Reconciliation: Yielded)
   ⚛ Parent [mount]
     ⛔ Boundary [mount] Warning: An error was thrown inside this error boundary
@@ -320,6 +326,10 @@ exports[`ReactDebugFiberPerf recovers from fatal errors 1`] = `
   ⚛ Parent [mount]
     ⚛ Baddie [mount]
 
+⚛ (React Tree Reconciliation: Yielded)
+  ⚛ Parent [mount]
+    ⚛ Baddie [mount]
+
 ⚛ (React Tree Reconciliation: Completed Root)
 
 ⚛ (Committing Changes)
diff --git a/packages/react/src/__tests__/forwardRef-test.internal.js b/packages/react/src/__tests__/forwardRef-test.internal.js
index 358ed49e04..0fcc3284b6 100644
--- a/packages/react/src/__tests__/forwardRef-test.internal.js
+++ b/packages/react/src/__tests__/forwardRef-test.internal.js
@@ -18,6 +18,7 @@ describe('forwardRef', () => {
     jest.resetModules();
     ReactFeatureFlags = require('shared/ReactFeatureFlags');
     ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
+    ReactFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback = false;
     React = require('react');
     ReactNoop = require('react-noop-renderer');
   });
@@ -175,6 +176,13 @@ describe('forwardRef', () => {
       'ErrorBoundary.render: try',
       'Wrapper',
       'BadRender throw',
+
+      // React retries one more time
+      'ErrorBoundary.render: try',
+      'Wrapper',
+      'BadRender throw',
+
+      // Errored again on retry. Now handle it.
       'ErrorBoundary.componentDidCatch',
       'ErrorBoundary.render: catch',
     ]);

From 64c54edea4a1f41d87fb6d4c14767adedf652d90 Mon Sep 17 00:00:00 2001
From: Jason Williams <936006+jasonwilliams@users.noreply.github.com>
Date: Fri, 15 Jun 2018 14:15:36 +0100
Subject: [PATCH 166/277] Adding movementX and movementY to
 synthenticMouseEvent fixes #6723 (#9018)

* adding movementX and movementY into syntheticMouseEvent

* fixing case mistake

* Add test fixture for movementX/Y fields
---
 fixtures/dom/src/components/Header.js         |  1 +
 fixtures/dom/src/components/fixtures/index.js |  3 ++
 .../components/fixtures/mouse-events/index.js | 16 +++++++
 .../fixtures/mouse-events/mouse-movement.js   | 48 +++++++++++++++++++
 .../src/events/SyntheticMouseEvent.js         | 21 ++++++++
 5 files changed, 89 insertions(+)
 create mode 100644 fixtures/dom/src/components/fixtures/mouse-events/index.js
 create mode 100644 fixtures/dom/src/components/fixtures/mouse-events/mouse-movement.js

diff --git a/fixtures/dom/src/components/Header.js b/fixtures/dom/src/components/Header.js
index 4a7b1513e6..c78eaa6abf 100644
--- a/fixtures/dom/src/components/Header.js
+++ b/fixtures/dom/src/components/Header.js
@@ -65,6 +65,7 @@ class Header extends React.Component {
                 <option value="/custom-elements">Custom Elements</option>
                 <option value="/media-events">Media Events</option>
                 <option value="/pointer-events">Pointer Events</option>
+                <option value="/mouse-events">Mouse Events</option>
               </select>
             </label>
             <label htmlFor="react_version">
diff --git a/fixtures/dom/src/components/fixtures/index.js b/fixtures/dom/src/components/fixtures/index.js
index d43a94df34..4bbb20180c 100644
--- a/fixtures/dom/src/components/fixtures/index.js
+++ b/fixtures/dom/src/components/fixtures/index.js
@@ -12,6 +12,7 @@ import EventPooling from './event-pooling';
 import CustomElementFixtures from './custom-elements';
 import MediaEventsFixtures from './media-events';
 import PointerEventsFixtures from './pointer-events';
+import MouseEventsFixtures from './mouse-events';
 
 const React = window.React;
 
@@ -49,6 +50,8 @@ function FixturesPage() {
       return <MediaEventsFixtures />;
     case '/pointer-events':
       return <PointerEventsFixtures />;
+    case '/mouse-events':
+      return <MouseEventsFixtures />;
     default:
       return <p>Please select a test fixture.</p>;
   }
diff --git a/fixtures/dom/src/components/fixtures/mouse-events/index.js b/fixtures/dom/src/components/fixtures/mouse-events/index.js
new file mode 100644
index 0000000000..e18f8925db
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/mouse-events/index.js
@@ -0,0 +1,16 @@
+import FixtureSet from '../../FixtureSet';
+import MouseMovement from './mouse-movement';
+
+const React = window.React;
+
+class MouseEvents extends React.Component {
+  render() {
+    return (
+      <FixtureSet title="Mouse Events" description="">
+        <MouseMovement />
+      </FixtureSet>
+    );
+  }
+}
+
+export default MouseEvents;
diff --git a/fixtures/dom/src/components/fixtures/mouse-events/mouse-movement.js b/fixtures/dom/src/components/fixtures/mouse-events/mouse-movement.js
new file mode 100644
index 0000000000..e6706edc23
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/mouse-events/mouse-movement.js
@@ -0,0 +1,48 @@
+import TestCase from '../../TestCase';
+
+const React = window.React;
+
+class MouseMovement extends React.Component {
+  state = {
+    movement: {x: 0, y: 0},
+  };
+
+  onMove = event => {
+    this.setState({x: event.movementX, y: event.movementY});
+  };
+
+  render() {
+    const {x, y} = this.state;
+
+    const boxStyle = {
+      padding: '10px 20px',
+      border: '1px solid #d9d9d9',
+      margin: '10px 0 20px',
+    };
+
+    return (
+      <TestCase
+        title="Mouse Movement"
+        description="We polyfill the movementX and movementY fields."
+        affectedBrowsers="IE, Safari">
+        <TestCase.Steps>
+          <li>Mouse over the box below</li>
+        </TestCase.Steps>
+
+        <TestCase.ExpectedResult>
+          The reported values should equal the pixel (integer) difference
+          between mouse movements positions.
+        </TestCase.ExpectedResult>
+
+        <div style={boxStyle} onMouseMove={this.onMove}>
+          <p>Trace your mouse over this box.</p>
+          <p>
+            Last movement: {x},{y}
+          </p>
+        </div>
+      </TestCase>
+    );
+  }
+}
+
+export default MouseMovement;
diff --git a/packages/react-dom/src/events/SyntheticMouseEvent.js b/packages/react-dom/src/events/SyntheticMouseEvent.js
index d1ff4b32a1..d3319ec487 100644
--- a/packages/react-dom/src/events/SyntheticMouseEvent.js
+++ b/packages/react-dom/src/events/SyntheticMouseEvent.js
@@ -8,6 +8,9 @@
 import SyntheticUIEvent from './SyntheticUIEvent';
 import getEventModifierState from './getEventModifierState';
 
+let previousScreenX = null;
+let previousScreenY = null;
+
 /**
  * @interface MouseEvent
  * @see http://www.w3.org/TR/DOM-Level-3-Events/
@@ -34,6 +37,24 @@ const SyntheticMouseEvent = SyntheticUIEvent.extend({
         : event.fromElement)
     );
   },
+  movementX: function(event) {
+    if ('movementX' in event) {
+      return event.movementX;
+    }
+
+    const screenX = previousScreenX;
+    previousScreenX = event.screenX;
+    return screenX ? event.screenX - screenX : 0;
+  },
+  movementY: function(event) {
+    if ('movementY' in event) {
+      return event.movementY;
+    }
+
+    const screenY = previousScreenY;
+    previousScreenY = event.screenY;
+    return screenY ? event.screenY - screenY : 0;
+  },
 });
 
 export default SyntheticMouseEvent;

From 72434a7686035b4af766ee7d06c070d7f5d6a5f2 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 15 Jun 2018 18:12:45 +0100
Subject: [PATCH 167/277] Remove or inline some fbjs dependencies (#13046)

---
 packages/react-dom/src/client/ReactDOM.js     |  8 +--
 .../src/client/ReactInputSelection.js         | 43 +++++++++++-
 .../react-dom/src/client/getActiveElement.js  | 20 ++++++
 .../src/client/getTextContentAccessor.js      |  4 +-
 .../src/events/BeforeInputEventPlugin.js      | 11 ++-
 .../react-dom/src/events/ChangeEventPlugin.js |  4 +-
 .../react-dom/src/events/SelectEventPlugin.js | 10 ++-
 .../react-dom/src/events/TapEventPlugin.js    | 16 ++++-
 .../src/events/getVendorPrefixedEventName.js  |  4 +-
 .../react-dom/src/events/isEventSupported.js  |  7 +-
 .../src/server/ReactPartialRenderer.js        | 15 ++--
 .../src/shared/CSSPropertyOperations.js       |  2 +-
 .../src/shared/hyphenateStyleName.js          | 31 ++++++++
 .../react-dom/src/shared/warnValidStyle.js    | 14 +++-
 .../src/ReactFiberClassComponent.js           |  2 +-
 .../react-scheduler/src/ReactScheduler.js     |  9 +--
 .../src/ReactShallowRenderer.js               |  2 +-
 packages/shared/ExecutionEnvironment.js       | 14 ++++
 packages/shared/shallowEqual.js               | 70 +++++++++++++++++++
 19 files changed, 236 insertions(+), 50 deletions(-)
 create mode 100644 packages/react-dom/src/client/getActiveElement.js
 create mode 100644 packages/react-dom/src/shared/hyphenateStyleName.js
 create mode 100644 packages/shared/ExecutionEnvironment.js
 create mode 100644 packages/shared/shallowEqual.js

diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js
index ad0fd80d51..184e958142 100644
--- a/packages/react-dom/src/client/ReactDOM.js
+++ b/packages/react-dom/src/client/ReactDOM.js
@@ -21,7 +21,7 @@ import './ReactDOMClientInjection';
 
 import * as DOMRenderer from 'react-reconciler/inline.dom';
 import * as ReactPortal from 'shared/ReactPortal';
-import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
+import {canUseDOM} from 'shared/ExecutionEnvironment';
 import * as ReactGenericBatching from 'events/ReactGenericBatching';
 import * as ReactControlledComponent from 'events/ReactControlledComponent';
 import * as EventPluginHub from 'events/EventPluginHub';
@@ -768,11 +768,7 @@ const foundDevTools = DOMRenderer.injectIntoDevTools({
 });
 
 if (__DEV__) {
-  if (
-    !foundDevTools &&
-    ExecutionEnvironment.canUseDOM &&
-    window.top === window.self
-  ) {
+  if (!foundDevTools && canUseDOM && window.top === window.self) {
     // If we're in Chrome or Firefox, provide a download link if not installed.
     if (
       (navigator.userAgent.indexOf('Chrome') > -1 &&
diff --git a/packages/react-dom/src/client/ReactInputSelection.js b/packages/react-dom/src/client/ReactInputSelection.js
index 3eda615710..95337b3f47 100644
--- a/packages/react-dom/src/client/ReactInputSelection.js
+++ b/packages/react-dom/src/client/ReactInputSelection.js
@@ -5,11 +5,48 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import containsNode from 'fbjs/lib/containsNode';
-import getActiveElement from 'fbjs/lib/getActiveElement';
+import getActiveElement from './getActiveElement';
 
 import * as ReactDOMSelection from './ReactDOMSelection';
-import {ELEMENT_NODE} from '../shared/HTMLNodeType';
+import {ELEMENT_NODE, TEXT_NODE} from '../shared/HTMLNodeType';
+
+// TODO: this code is originally inlined from fbjs.
+// It is likely that we don't actually need all these checks
+// for the particular use case in this file.
+function isNode(object) {
+  const doc = object ? object.ownerDocument || object : document;
+  const defaultView = doc.defaultView || window;
+  return !!(
+    object &&
+    (typeof defaultView.Node === 'function'
+      ? object instanceof defaultView.Node
+      : typeof object === 'object' &&
+        typeof object.nodeType === 'number' &&
+        typeof object.nodeName === 'string')
+  );
+}
+
+function isTextNode(object) {
+  return isNode(object) && object.nodeType === TEXT_NODE;
+}
+
+function containsNode(outerNode, innerNode) {
+  if (!outerNode || !innerNode) {
+    return false;
+  } else if (outerNode === innerNode) {
+    return true;
+  } else if (isTextNode(outerNode)) {
+    return false;
+  } else if (isTextNode(innerNode)) {
+    return containsNode(outerNode, innerNode.parentNode);
+  } else if ('contains' in outerNode) {
+    return outerNode.contains(innerNode);
+  } else if (outerNode.compareDocumentPosition) {
+    return !!(outerNode.compareDocumentPosition(innerNode) & 16);
+  } else {
+    return false;
+  }
+}
 
 function isInDocument(node) {
   return containsNode(document.documentElement, node);
diff --git a/packages/react-dom/src/client/getActiveElement.js b/packages/react-dom/src/client/getActiveElement.js
new file mode 100644
index 0000000000..fe824110f0
--- /dev/null
+++ b/packages/react-dom/src/client/getActiveElement.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export default function getActiveElement(doc: ?Document): ?Element {
+  doc = doc || (typeof document !== 'undefined' ? document : undefined);
+  if (typeof doc === 'undefined') {
+    return null;
+  }
+  try {
+    return doc.activeElement || doc.body;
+  } catch (e) {
+    return doc.body;
+  }
+}
diff --git a/packages/react-dom/src/client/getTextContentAccessor.js b/packages/react-dom/src/client/getTextContentAccessor.js
index 07ebfd8636..dea93e86f2 100644
--- a/packages/react-dom/src/client/getTextContentAccessor.js
+++ b/packages/react-dom/src/client/getTextContentAccessor.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
+import {canUseDOM} from 'shared/ExecutionEnvironment';
 
 let contentKey = null;
 
@@ -16,7 +16,7 @@ let contentKey = null;
  * @internal
  */
 function getTextContentAccessor() {
-  if (!contentKey && ExecutionEnvironment.canUseDOM) {
+  if (!contentKey && canUseDOM) {
     // Prefer textContent to innerText because many browsers support both but
     // SVG <text> elements don't support innerText even when <div> does.
     contentKey =
diff --git a/packages/react-dom/src/events/BeforeInputEventPlugin.js b/packages/react-dom/src/events/BeforeInputEventPlugin.js
index 445575173f..52dc708bba 100644
--- a/packages/react-dom/src/events/BeforeInputEventPlugin.js
+++ b/packages/react-dom/src/events/BeforeInputEventPlugin.js
@@ -8,7 +8,7 @@
 import type {TopLevelType} from 'events/TopLevelEventTypes';
 
 import {accumulateTwoPhaseDispatches} from 'events/EventPropagators';
-import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
+import {canUseDOM} from 'shared/ExecutionEnvironment';
 
 import {
   TOP_BLUR,
@@ -29,11 +29,10 @@ import SyntheticInputEvent from './SyntheticInputEvent';
 const END_KEYCODES = [9, 13, 27, 32]; // Tab, Return, Esc, Space
 const START_KEYCODE = 229;
 
-const canUseCompositionEvent =
-  ExecutionEnvironment.canUseDOM && 'CompositionEvent' in window;
+const canUseCompositionEvent = canUseDOM && 'CompositionEvent' in window;
 
 let documentMode = null;
-if (ExecutionEnvironment.canUseDOM && 'documentMode' in document) {
+if (canUseDOM && 'documentMode' in document) {
   documentMode = document.documentMode;
 }
 
@@ -41,13 +40,13 @@ if (ExecutionEnvironment.canUseDOM && 'documentMode' in document) {
 // directly represent `beforeInput`. The IE `textinput` event is not as
 // useful, so we don't use it.
 const canUseTextInputEvent =
-  ExecutionEnvironment.canUseDOM && 'TextEvent' in window && !documentMode;
+  canUseDOM && 'TextEvent' in window && !documentMode;
 
 // 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.
 const useFallbackCompositionData =
-  ExecutionEnvironment.canUseDOM &&
+  canUseDOM &&
   (!canUseCompositionEvent ||
     (documentMode && documentMode > 8 && documentMode <= 11));
 
diff --git a/packages/react-dom/src/events/ChangeEventPlugin.js b/packages/react-dom/src/events/ChangeEventPlugin.js
index 2d04e5dd43..e5f65ceff2 100644
--- a/packages/react-dom/src/events/ChangeEventPlugin.js
+++ b/packages/react-dom/src/events/ChangeEventPlugin.js
@@ -11,7 +11,7 @@ import {enqueueStateRestore} from 'events/ReactControlledComponent';
 import {batchedUpdates} from 'events/ReactGenericBatching';
 import SyntheticEvent from 'events/SyntheticEvent';
 import isTextInputElement from 'shared/isTextInputElement';
-import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
+import {canUseDOM} from 'shared/ExecutionEnvironment';
 
 import {
   TOP_BLUR,
@@ -119,7 +119,7 @@ function getTargetInstForChangeEvent(topLevelType, targetInst) {
  * SECTION: handle `input` event
  */
 let isInputEventSupported = false;
-if (ExecutionEnvironment.canUseDOM) {
+if (canUseDOM) {
   // IE9 claims to support the input event but fails to trigger it when
   // deleting text, so we ignore its input events.
   isInputEventSupported =
diff --git a/packages/react-dom/src/events/SelectEventPlugin.js b/packages/react-dom/src/events/SelectEventPlugin.js
index 81cc5d5186..82d7bcd942 100644
--- a/packages/react-dom/src/events/SelectEventPlugin.js
+++ b/packages/react-dom/src/events/SelectEventPlugin.js
@@ -6,11 +6,10 @@
  */
 
 import {accumulateTwoPhaseDispatches} from 'events/EventPropagators';
-import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
+import {canUseDOM} from 'shared/ExecutionEnvironment';
 import SyntheticEvent from 'events/SyntheticEvent';
 import isTextInputElement from 'shared/isTextInputElement';
-import getActiveElement from 'fbjs/lib/getActiveElement';
-import shallowEqual from 'fbjs/lib/shallowEqual';
+import shallowEqual from 'shared/shallowEqual';
 
 import {
   TOP_BLUR,
@@ -23,14 +22,13 @@ import {
   TOP_SELECTION_CHANGE,
 } from './DOMTopLevelEventTypes';
 import {isListeningToAllDependencies} from './ReactBrowserEventEmitter';
+import getActiveElement from '../client/getActiveElement';
 import {getNodeFromInstance} from '../client/ReactDOMComponentTree';
 import * as ReactInputSelection from '../client/ReactInputSelection';
 import {DOCUMENT_NODE} from '../shared/HTMLNodeType';
 
 const skipSelectionChangeEvent =
-  ExecutionEnvironment.canUseDOM &&
-  'documentMode' in document &&
-  document.documentMode <= 11;
+  canUseDOM && 'documentMode' in document && document.documentMode <= 11;
 
 const eventTypes = {
   select: {
diff --git a/packages/react-dom/src/events/TapEventPlugin.js b/packages/react-dom/src/events/TapEventPlugin.js
index 9c4aab6e6c..61e51f7792 100644
--- a/packages/react-dom/src/events/TapEventPlugin.js
+++ b/packages/react-dom/src/events/TapEventPlugin.js
@@ -8,7 +8,6 @@
  */
 
 import {accumulateTwoPhaseDispatches} from 'events/EventPropagators';
-import TouchEventUtils from 'fbjs/lib/TouchEventUtils';
 import type {TopLevelType} from 'events/TopLevelEventTypes';
 
 import {
@@ -85,11 +84,24 @@ const Axis: AxisType = {
   y: {page: 'pageY', client: 'clientY', envScroll: 'currentPageScrollTop'},
 };
 
+function extractSingleTouch(nativeEvent) {
+  // $FlowFixMe: figure out why this is missing
+  const touches = nativeEvent.touches;
+  // $FlowFixMe: figure out why this is missing
+  const changedTouches = nativeEvent.changedTouches;
+  const hasTouches = touches && touches.length > 0;
+  const hasChangedTouches = changedTouches && changedTouches.length > 0;
+
+  return !hasTouches && hasChangedTouches
+    ? changedTouches[0]
+    : hasTouches ? touches[0] : nativeEvent;
+}
+
 function getAxisCoordOfEvent(
   axis: AxisCoordinateData,
   nativeEvent: _Touch,
 ): number {
-  const singleTouch = TouchEventUtils.extractSingleTouch(nativeEvent);
+  const singleTouch = extractSingleTouch(nativeEvent);
   if (singleTouch) {
     return singleTouch[axis.page];
   }
diff --git a/packages/react-dom/src/events/getVendorPrefixedEventName.js b/packages/react-dom/src/events/getVendorPrefixedEventName.js
index d3e210f4fa..1ba369e9d1 100644
--- a/packages/react-dom/src/events/getVendorPrefixedEventName.js
+++ b/packages/react-dom/src/events/getVendorPrefixedEventName.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
+import {canUseDOM} from 'shared/ExecutionEnvironment';
 
 /**
  * Generate a mapping of standard vendor prefixes using the defined style property and event name.
@@ -49,7 +49,7 @@ let style = {};
 /**
  * Bootstrap if a DOM exists.
  */
-if (ExecutionEnvironment.canUseDOM) {
+if (canUseDOM) {
   style = document.createElement('div').style;
 
   // On some platforms, in particular some releases of Android 4.x,
diff --git a/packages/react-dom/src/events/isEventSupported.js b/packages/react-dom/src/events/isEventSupported.js
index cf9e854c7a..f87ecba43a 100644
--- a/packages/react-dom/src/events/isEventSupported.js
+++ b/packages/react-dom/src/events/isEventSupported.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
+import {canUseDOM} from 'shared/ExecutionEnvironment';
 
 /**
  * Checks if an event is supported in the current execution environment.
@@ -22,10 +22,7 @@ import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
  * @license Modernizr 3.0.0pre (Custom Build) | MIT
  */
 function isEventSupported(eventNameSuffix, capture) {
-  if (
-    !ExecutionEnvironment.canUseDOM ||
-    (capture && !('addEventListener' in document))
-  ) {
+  if (!canUseDOM || (capture && !('addEventListener' in document))) {
     return false;
   }
 
diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index d3ca7a8c1c..39bec1d2cf 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -17,10 +17,8 @@ import type {
 import React from 'react';
 import emptyFunction from 'fbjs/lib/emptyFunction';
 import emptyObject from 'fbjs/lib/emptyObject';
-import hyphenateStyleName from 'fbjs/lib/hyphenateStyleName';
 import invariant from 'fbjs/lib/invariant';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
-import memoizeStringOnly from 'fbjs/lib/memoizeStringOnly';
 import warning from 'fbjs/lib/warning';
 import checkPropTypes from 'prop-types/checkPropTypes';
 import describeComponentFrame from 'shared/describeComponentFrame';
@@ -51,6 +49,7 @@ import {
 import ReactControlledValuePropTypes from '../shared/ReactControlledValuePropTypes';
 import assertValidProps from '../shared/assertValidProps';
 import dangerousStyleValue from '../shared/dangerousStyleValue';
+import hyphenateStyleName from '../shared/hyphenateStyleName';
 import isCustomComponent from '../shared/isCustomComponent';
 import omittedCloseTags from '../shared/omittedCloseTags';
 import warnValidStyle from '../shared/warnValidStyle';
@@ -162,9 +161,15 @@ function validateDangerousTag(tag) {
   }
 }
 
-const processStyleName = memoizeStringOnly(function(styleName) {
-  return hyphenateStyleName(styleName);
-});
+const styleNameCache = {};
+const processStyleName = function(styleName) {
+  if (styleNameCache.hasOwnProperty(styleName)) {
+    return styleNameCache[styleName];
+  }
+  const result = hyphenateStyleName(styleName);
+  styleNameCache[styleName] = result;
+  return result;
+};
 
 function createMarkupForStyles(styles): string | null {
   let serialized = '';
diff --git a/packages/react-dom/src/shared/CSSPropertyOperations.js b/packages/react-dom/src/shared/CSSPropertyOperations.js
index dd90ea1b81..f7a01331a0 100644
--- a/packages/react-dom/src/shared/CSSPropertyOperations.js
+++ b/packages/react-dom/src/shared/CSSPropertyOperations.js
@@ -6,7 +6,7 @@
  */
 
 import dangerousStyleValue from './dangerousStyleValue';
-import hyphenateStyleName from 'fbjs/lib/hyphenateStyleName';
+import hyphenateStyleName from './hyphenateStyleName';
 import warnValidStyle from './warnValidStyle';
 
 /**
diff --git a/packages/react-dom/src/shared/hyphenateStyleName.js b/packages/react-dom/src/shared/hyphenateStyleName.js
new file mode 100644
index 0000000000..0c9ace724b
--- /dev/null
+++ b/packages/react-dom/src/shared/hyphenateStyleName.js
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+const uppercasePattern = /([A-Z])/g;
+const msPattern = /^ms-/;
+
+/**
+ * Hyphenates a camelcased CSS property name, for example:
+ *
+ *   > hyphenateStyleName('backgroundColor')
+ *   < "background-color"
+ *   > hyphenateStyleName('MozTransition')
+ *   < "-moz-transition"
+ *   > hyphenateStyleName('msTransition')
+ *   < "-ms-transition"
+ *
+ * As Modernizr suggests (http://modernizr.com/docs/#prefixed), an `ms` prefix
+ * is converted to `-ms-`.
+ */
+export default function hyphenateStyleName(name: string): string {
+  return name
+    .replace(uppercasePattern, '-$1')
+    .toLowerCase()
+    .replace(msPattern, '-ms-');
+}
diff --git a/packages/react-dom/src/shared/warnValidStyle.js b/packages/react-dom/src/shared/warnValidStyle.js
index 1fb8686b11..0b91118722 100644
--- a/packages/react-dom/src/shared/warnValidStyle.js
+++ b/packages/react-dom/src/shared/warnValidStyle.js
@@ -6,7 +6,6 @@
  */
 
 import emptyFunction from 'fbjs/lib/emptyFunction';
-import camelizeStyleName from 'fbjs/lib/camelizeStyleName';
 import warning from 'fbjs/lib/warning';
 
 let warnValidStyle = emptyFunction;
@@ -14,6 +13,8 @@ let warnValidStyle = emptyFunction;
 if (__DEV__) {
   // 'msTransform' is correct, but the other prefixes should be capitalized
   const badVendoredStyleNamePattern = /^(?:webkit|moz|o)[A-Z]/;
+  const msPattern = /^-ms-/;
+  const hyphenPattern = /-(.)/g;
 
   // style values shouldn't contain a semicolon
   const badStyleValueWithSemicolonPattern = /;\s*$/;
@@ -23,6 +24,12 @@ if (__DEV__) {
   let warnedForNaNValue = false;
   let warnedForInfinityValue = false;
 
+  const camelize = function(string) {
+    return string.replace(hyphenPattern, function(_, character) {
+      return character.toUpperCase();
+    });
+  };
+
   const warnHyphenatedStyleName = function(name, getStack) {
     if (warnedStyleNames.hasOwnProperty(name) && warnedStyleNames[name]) {
       return;
@@ -33,7 +40,10 @@ if (__DEV__) {
       false,
       'Unsupported style property %s. Did you mean %s?%s',
       name,
-      camelizeStyleName(name),
+      // As Andi Smith suggests
+      // (http://www.andismith.com/blog/2012/02/modernizr-prefixed/), an `-ms` prefix
+      // is converted to lowercase `ms`.
+      camelize(name.replace(msPattern, 'ms-')),
       getStack(),
     );
   };
diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js
index c427af4240..dc74ec1778 100644
--- a/packages/react-reconciler/src/ReactFiberClassComponent.js
+++ b/packages/react-reconciler/src/ReactFiberClassComponent.js
@@ -19,9 +19,9 @@ import {
 import ReactStrictModeWarnings from './ReactStrictModeWarnings';
 import {isMounted} from 'react-reconciler/reflection';
 import * as ReactInstanceMap from 'shared/ReactInstanceMap';
+import shallowEqual from 'shared/shallowEqual';
 import emptyObject from 'fbjs/lib/emptyObject';
 import getComponentName from 'shared/getComponentName';
-import shallowEqual from 'fbjs/lib/shallowEqual';
 import invariant from 'fbjs/lib/invariant';
 import warning from 'fbjs/lib/warning';
 
diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index b8f9155995..4667cfc725 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -41,14 +41,11 @@ type CallbackConfigType = {|
 
 export type CallbackIdType = CallbackConfigType;
 
-import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
+import {canUseDOM} from 'shared/ExecutionEnvironment';
 import warning from 'fbjs/lib/warning';
 
 if (__DEV__) {
-  if (
-    ExecutionEnvironment.canUseDOM &&
-    typeof requestAnimationFrame !== 'function'
-  ) {
+  if (canUseDOM && typeof requestAnimationFrame !== 'function') {
     warning(
       false,
       // TODO: reword this when schedule is a stand-alone module
@@ -87,7 +84,7 @@ let scheduleWork: (
 ) => CallbackIdType;
 let cancelScheduledWork: (callbackId: CallbackIdType) => void;
 
-if (!ExecutionEnvironment.canUseDOM) {
+if (!canUseDOM) {
   const timeoutIds = new Map();
 
   scheduleWork = function(
diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js
index 0c1f717883..817e3dcb0c 100644
--- a/packages/react-test-renderer/src/ReactShallowRenderer.js
+++ b/packages/react-test-renderer/src/ReactShallowRenderer.js
@@ -10,9 +10,9 @@ import React from 'react';
 import {isForwardRef} from 'react-is';
 import describeComponentFrame from 'shared/describeComponentFrame';
 import getComponentName from 'shared/getComponentName';
+import shallowEqual from 'shared/shallowEqual';
 import emptyObject from 'fbjs/lib/emptyObject';
 import invariant from 'fbjs/lib/invariant';
-import shallowEqual from 'fbjs/lib/shallowEqual';
 import checkPropTypes from 'prop-types/checkPropTypes';
 
 class ReactShallowRenderer {
diff --git a/packages/shared/ExecutionEnvironment.js b/packages/shared/ExecutionEnvironment.js
new file mode 100644
index 0000000000..610346e2a0
--- /dev/null
+++ b/packages/shared/ExecutionEnvironment.js
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export const canUseDOM: boolean = !!(
+  typeof window !== 'undefined' &&
+  window.document &&
+  window.document.createElement
+);
diff --git a/packages/shared/shallowEqual.js b/packages/shared/shallowEqual.js
new file mode 100644
index 0000000000..1446f888ca
--- /dev/null
+++ b/packages/shared/shallowEqual.js
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+/*eslint-disable no-self-compare */
+
+const hasOwnProperty = Object.prototype.hasOwnProperty;
+
+/**
+ * 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
+ */
+function is(x, y) {
+  // SameValue algorithm
+  if (x === y) {
+    // Steps 1-5, 7-10
+    // Steps 6.b-6.e: +0 != -0
+    // Added the nonzero y check to make Flow happy, but it is redundant
+    return x !== 0 || y !== 0 || 1 / x === 1 / y;
+  } else {
+    // Step 6.a: NaN == NaN
+    return x !== x && y !== y;
+  }
+}
+
+/**
+ * Performs equality by iterating through keys on an object and returning false
+ * when any key has values which are not strictly equal between the arguments.
+ * Returns true when the values of all keys are strictly equal.
+ */
+function shallowEqual(objA: mixed, objB: mixed): boolean {
+  if (is(objA, objB)) {
+    return true;
+  }
+
+  if (
+    typeof objA !== 'object' ||
+    objA === null ||
+    typeof objB !== 'object' ||
+    objB === null
+  ) {
+    return false;
+  }
+
+  const keysA = Object.keys(objA);
+  const keysB = Object.keys(objB);
+
+  if (keysA.length !== keysB.length) {
+    return false;
+  }
+
+  // Test for A's keys different from B.
+  for (let i = 0; i < keysA.length; i++) {
+    if (
+      !hasOwnProperty.call(objB, keysA[i]) ||
+      !is(objA[keysA[i]], objB[keysA[i]])
+    ) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+export default shallowEqual;

From ae14317d6810d5b07d01308a2116a707e5e09983 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 15 Jun 2018 18:45:14 +0100
Subject: [PATCH 168/277] Inline fbjs/lib/emptyFunction (#13054)

---
 packages/events/SyntheticEvent.js             | 31 ++++++++++++-------
 .../src/__tests__/ReactDOMInput-test.js       |  2 +-
 .../src/__tests__/ReactDOMTextarea-test.js    |  2 +-
 .../src/client/ReactDOMFiberComponent.js      |  7 +++--
 .../src/client/validateDOMNesting.js          |  3 +-
 .../src/server/ReactPartialRenderer.js        |  5 ++-
 .../react-dom/src/shared/warnValidStyle.js    |  3 +-
 packages/react/src/ReactChildren.js           | 17 ++--------
 8 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/packages/events/SyntheticEvent.js b/packages/events/SyntheticEvent.js
index beaaa5947e..b8693d8d37 100644
--- a/packages/events/SyntheticEvent.js
+++ b/packages/events/SyntheticEvent.js
@@ -7,7 +7,6 @@
 
 /* eslint valid-typeof: 0 */
 
-import emptyFunction from 'fbjs/lib/emptyFunction';
 import invariant from 'fbjs/lib/invariant';
 import warning from 'fbjs/lib/warning';
 
@@ -32,7 +31,9 @@ const EventInterface = {
   type: null,
   target: null,
   // currentTarget is set when dispatching; no use in copying it here
-  currentTarget: emptyFunction.thatReturnsNull,
+  currentTarget: function() {
+    return null;
+  },
   eventPhase: null,
   bubbles: null,
   cancelable: null,
@@ -43,6 +44,14 @@ const EventInterface = {
   isTrusted: null,
 };
 
+function functionThatReturnsTrue() {
+  return true;
+}
+
+function functionThatReturnsFalse() {
+  return false;
+}
+
 /**
  * Synthetic events are dispatched by event plugins, typically in response to a
  * top-level event delegation handler.
@@ -103,11 +112,11 @@ function SyntheticEvent(
       ? nativeEvent.defaultPrevented
       : nativeEvent.returnValue === false;
   if (defaultPrevented) {
-    this.isDefaultPrevented = emptyFunction.thatReturnsTrue;
+    this.isDefaultPrevented = functionThatReturnsTrue;
   } else {
-    this.isDefaultPrevented = emptyFunction.thatReturnsFalse;
+    this.isDefaultPrevented = functionThatReturnsFalse;
   }
-  this.isPropagationStopped = emptyFunction.thatReturnsFalse;
+  this.isPropagationStopped = functionThatReturnsFalse;
   return this;
 }
 
@@ -124,7 +133,7 @@ Object.assign(SyntheticEvent.prototype, {
     } else if (typeof event.returnValue !== 'unknown') {
       event.returnValue = false;
     }
-    this.isDefaultPrevented = emptyFunction.thatReturnsTrue;
+    this.isDefaultPrevented = functionThatReturnsTrue;
   },
 
   stopPropagation: function() {
@@ -144,7 +153,7 @@ Object.assign(SyntheticEvent.prototype, {
       event.cancelBubble = true;
     }
 
-    this.isPropagationStopped = emptyFunction.thatReturnsTrue;
+    this.isPropagationStopped = functionThatReturnsTrue;
   },
 
   /**
@@ -153,7 +162,7 @@ Object.assign(SyntheticEvent.prototype, {
    * won't be added back into the pool.
    */
   persist: function() {
-    this.isPersistent = emptyFunction.thatReturnsTrue;
+    this.isPersistent = functionThatReturnsTrue;
   },
 
   /**
@@ -161,7 +170,7 @@ Object.assign(SyntheticEvent.prototype, {
    *
    * @return {boolean} True if this should not be released, false otherwise.
    */
-  isPersistent: emptyFunction.thatReturnsFalse,
+  isPersistent: functionThatReturnsFalse,
 
   /**
    * `PooledClass` looks for `destructor` on each instance it releases.
@@ -191,12 +200,12 @@ Object.assign(SyntheticEvent.prototype, {
       Object.defineProperty(
         this,
         'preventDefault',
-        getPooledWarningPropertyDefinition('preventDefault', emptyFunction),
+        getPooledWarningPropertyDefinition('preventDefault', () => {}),
       );
       Object.defineProperty(
         this,
         'stopPropagation',
-        getPooledWarningPropertyDefinition('stopPropagation', emptyFunction),
+        getPooledWarningPropertyDefinition('stopPropagation', () => {}),
       );
     }
   },
diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index ca4b999f5f..578e5b100e 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-const emptyFunction = require('fbjs/lib/emptyFunction');
+function emptyFunction() {}
 
 describe('ReactDOMInput', () => {
   let React;
diff --git a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
index 879be14fec..aa5714ded3 100644
--- a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-const emptyFunction = require('fbjs/lib/emptyFunction');
+function emptyFunction() {}
 
 describe('ReactDOMTextarea', () => {
   let React;
diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js
index e089b33098..4975e55f67 100644
--- a/packages/react-dom/src/client/ReactDOMFiberComponent.js
+++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js
@@ -10,7 +10,6 @@
 // TODO: direct imports like some-package/src/* are bad. Fix me.
 import ReactDebugCurrentFiber from 'react-reconciler/src/ReactDebugCurrentFiber';
 import {registrationNameModules} from 'events/EventPluginRegistry';
-import emptyFunction from 'fbjs/lib/emptyFunction';
 import warning from 'fbjs/lib/warning';
 
 import * as DOMPropertyOperations from './DOMPropertyOperations';
@@ -63,7 +62,7 @@ const HTML = '__html';
 
 const {html: HTML_NAMESPACE} = Namespaces;
 
-let getStack = emptyFunction.thatReturns('');
+let getStack = () => '';
 
 let warnedUnknownTags;
 let suppressHydrationWarning;
@@ -232,6 +231,8 @@ function getOwnerDocumentFromRootContainer(
     : rootContainerElement.ownerDocument;
 }
 
+function noop() {}
+
 function trapClickOnNonInteractiveElement(node: HTMLElement) {
   // Mobile Safari does not fire properly bubble click events on
   // non-interactive elements, which means delegated click listeners do not
@@ -242,7 +243,7 @@ function trapClickOnNonInteractiveElement(node: HTMLElement) {
   // bookkeeping for it. Not sure if we need to clear it when the listener is
   // removed.
   // TODO: Only do this for the relevant Safaris maybe?
-  node.onclick = emptyFunction;
+  node.onclick = noop;
 }
 
 function setInitialDOMProperties(
diff --git a/packages/react-dom/src/client/validateDOMNesting.js b/packages/react-dom/src/client/validateDOMNesting.js
index 9341bd1e3f..8f843f7a2f 100644
--- a/packages/react-dom/src/client/validateDOMNesting.js
+++ b/packages/react-dom/src/client/validateDOMNesting.js
@@ -5,13 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import emptyFunction from 'fbjs/lib/emptyFunction';
 import warning from 'fbjs/lib/warning';
 // TODO: direct imports like some-package/src/* are bad. Fix me.
 import ReactDebugCurrentFiber from 'react-reconciler/src/ReactDebugCurrentFiber';
 
 const {getCurrentFiberStackAddendum} = ReactDebugCurrentFiber;
-let validateDOMNesting = emptyFunction;
+let validateDOMNesting = () => {};
 
 if (__DEV__) {
   // This validation code was written based on the HTML5 parsing spec:
diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index 39bec1d2cf..ebe3ac8512 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -15,7 +15,6 @@ import type {
 } from 'shared/ReactTypes';
 
 import React from 'react';
-import emptyFunction from 'fbjs/lib/emptyFunction';
 import emptyObject from 'fbjs/lib/emptyObject';
 import invariant from 'fbjs/lib/invariant';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
@@ -66,8 +65,8 @@ const toArray = ((React.Children.toArray: any): toArrayType);
 let currentDebugStack;
 let currentDebugElementStack;
 
-let getStackAddendum = emptyFunction.thatReturns('');
-let describeStackFrame = emptyFunction.thatReturns('');
+let getStackAddendum = () => '';
+let describeStackFrame = element => '';
 
 let validatePropertiesInDevelopment = (type, props) => {};
 let setCurrentDebugStack = (stack: Array<Frame>) => {};
diff --git a/packages/react-dom/src/shared/warnValidStyle.js b/packages/react-dom/src/shared/warnValidStyle.js
index 0b91118722..0231d589bb 100644
--- a/packages/react-dom/src/shared/warnValidStyle.js
+++ b/packages/react-dom/src/shared/warnValidStyle.js
@@ -5,10 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import emptyFunction from 'fbjs/lib/emptyFunction';
 import warning from 'fbjs/lib/warning';
 
-let warnValidStyle = emptyFunction;
+let warnValidStyle = () => {};
 
 if (__DEV__) {
   // 'msTransform' is correct, but the other prefixes should be capitalized
diff --git a/packages/react/src/ReactChildren.js b/packages/react/src/ReactChildren.js
index b99056b439..e01f765c9b 100644
--- a/packages/react/src/ReactChildren.js
+++ b/packages/react/src/ReactChildren.js
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import emptyFunction from 'fbjs/lib/emptyFunction';
 import invariant from 'fbjs/lib/invariant';
 import warning from 'fbjs/lib/warning';
 import {
@@ -292,12 +291,7 @@ function mapSingleChildIntoContext(bookKeeping, child, childKey) {
 
   let mappedChild = func.call(context, child, bookKeeping.count++);
   if (Array.isArray(mappedChild)) {
-    mapIntoWithKeyPrefixInternal(
-      mappedChild,
-      result,
-      childKey,
-      emptyFunction.thatReturnsArgument,
-    );
+    mapIntoWithKeyPrefixInternal(mappedChild, result, childKey, c => c);
   } else if (mappedChild != null) {
     if (isValidElement(mappedChild)) {
       mappedChild = cloneAndReplaceKey(
@@ -362,7 +356,7 @@ function mapChildren(children, func, context) {
  * @return {number} The number of children.
  */
 function countChildren(children) {
-  return traverseAllChildren(children, emptyFunction.thatReturnsNull, null);
+  return traverseAllChildren(children, () => null, null);
 }
 
 /**
@@ -373,12 +367,7 @@ function countChildren(children) {
  */
 function toArray(children) {
   const result = [];
-  mapIntoWithKeyPrefixInternal(
-    children,
-    result,
-    null,
-    emptyFunction.thatReturnsArgument,
-  );
+  mapIntoWithKeyPrefixInternal(children, result, null, child => child);
   return result;
 }
 

From b1b3acbd6b5fad40558db790f59855116ec3ee93 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 19 Jun 2018 13:41:42 +0100
Subject: [PATCH 169/277] Inline fbjs/lib/emptyObject (#13055)

* Inline fbjs/lib/emptyObject

* Explicit naming

* Compare to undefined

* Another approach for detecting whether we can mutate

Each renderer would have its own local LegacyRefsObject function.

While in general we don't want `instanceof`, here it lets us do a simple check: did *we* create the refs object?
Then we can mutate it.

If the check didn't pass, either we're attaching ref for the first time (so we know to use the constructor),
or (unlikely) we're attaching a ref to a component owned by another renderer. In this case, to avoid "losing"
refs, we assign them onto the new object. Even in that case it shouldn't "hop" between renderers anymore.

* Clearer naming

* Add test case for strings refs across renderers

* Use a shared empty object for refs by reading it from React

* Remove string refs from ReactART test

It's not currently possible to resetModules() between several renderers
without also resetting the `React` module. However, that leads to losing
the referential identity of the empty ref object, and thus subsequent
checks in the renderers for whether it is pooled fail (and cause assignments
to a frozen object).

This has always been the case, but we used to work around it by shimming
fbjs/lib/emptyObject in tests and preserving its referential identity.
This won't work anymore because we've inlined it. And preserving referential
identity of React itself wouldn't be great because it could be confusing during
testing (although we might want to revisit this in the future by moving its
stateful parts into a separate package).

For now, I'm removing string ref usage from this test because only this is
the only place in our tests where we hit this problem, and it's only
related to string refs, and not just ref mechanism in general.

* Simplify the condition
---
 packages/react-art/src/ReactARTHostConfig.js  | 10 +++--
 .../react-art/src/__tests__/ReactART-test.js  | 22 ++++++----
 packages/react-dom/src/__tests__/refs-test.js | 43 +++++++++++++++++++
 .../src/server/ReactPartialRenderer.js        |  6 ++-
 .../src/ReactNativeFiberInspector.js          |  6 ++-
 .../src/ReactNativeHostConfig.js              |  8 +++-
 .../src/createReactNoop.js                    | 13 ++++--
 .../react-reconciler/src/ReactChildFiber.js   |  8 +++-
 .../src/ReactFiberClassComponent.js           | 11 +++--
 .../react-reconciler/src/ReactFiberContext.js | 16 ++++---
 .../src/ReactFiberReconciler.js               |  4 +-
 .../src/ReactShallowRenderer.js               |  6 ++-
 .../src/ReactTestHostConfig.js                | 15 ++++---
 packages/react/src/ReactBaseClasses.js        |  8 +++-
 scripts/jest/setupEnvironment.js              |  6 ---
 15 files changed, 136 insertions(+), 46 deletions(-)

diff --git a/packages/react-art/src/ReactARTHostConfig.js b/packages/react-art/src/ReactARTHostConfig.js
index 689303c086..2b10999416 100644
--- a/packages/react-art/src/ReactARTHostConfig.js
+++ b/packages/react-art/src/ReactARTHostConfig.js
@@ -9,13 +9,17 @@ import * as ReactScheduler from 'shared/ReactScheduler';
 import Transform from 'art/core/transform';
 import Mode from 'art/modes/current';
 import invariant from 'fbjs/lib/invariant';
-import emptyObject from 'fbjs/lib/emptyObject';
 
 import {TYPES, EVENT_TYPES, childrenAsString} from './ReactARTInternals';
 
 const pooledTransform = new Transform();
 
+const NO_CONTEXT = {};
 const UPDATE_SIGNAL = {};
+if (__DEV__) {
+  Object.freeze(NO_CONTEXT);
+  Object.freeze(UPDATE_SIGNAL);
+}
 
 /** Helper Methods */
 
@@ -318,11 +322,11 @@ export function shouldDeprioritizeSubtree(type, props) {
 }
 
 export function getRootHostContext() {
-  return emptyObject;
+  return NO_CONTEXT;
 }
 
 export function getChildHostContext() {
-  return emptyObject;
+  return NO_CONTEXT;
 }
 
 export const scheduleDeferredCallback = ReactScheduler.scheduleWork;
diff --git a/packages/react-art/src/__tests__/ReactART-test.js b/packages/react-art/src/__tests__/ReactART-test.js
index d948e84c5e..d2ce830aa8 100644
--- a/packages/react-art/src/__tests__/ReactART-test.js
+++ b/packages/react-art/src/__tests__/ReactART-test.js
@@ -71,6 +71,8 @@ describe('ReactART', () => {
     Surface = ReactART.Surface;
 
     TestComponent = class extends React.Component {
+      group = React.createRef();
+
       render() {
         const a = (
           <Shape
@@ -104,7 +106,7 @@ describe('ReactART', () => {
 
         return (
           <Surface width={150} height={200}>
-            <Group ref="group">
+            <Group ref={this.group}>
               {this.props.flipped ? [b, a, c] : [a, b, c]}
             </Group>
           </Surface>
@@ -121,7 +123,7 @@ describe('ReactART', () => {
   it('should have the correct lifecycle state', () => {
     let instance = <TestComponent />;
     instance = ReactTestUtils.renderIntoDocument(instance);
-    const group = instance.refs.group;
+    const group = instance.group.current;
     // Duck type test for an ART group
     expect(typeof group.indicate).toBe('function');
   });
@@ -260,15 +262,17 @@ describe('ReactART', () => {
     let ref = null;
 
     class Outer extends React.Component {
+      test = React.createRef();
+
       componentDidMount() {
-        ref = this.refs.test;
+        ref = this.test.current;
       }
 
       render() {
         return (
           <Surface>
             <Group>
-              <CustomShape ref="test" />
+              <CustomShape ref={this.test} />
             </Group>
           </Surface>
         );
@@ -289,26 +293,28 @@ describe('ReactART', () => {
     let ref = {};
 
     class Outer extends React.Component {
+      test = React.createRef();
+
       componentDidMount() {
-        ref = this.refs.test;
+        ref = this.test.current;
       }
 
       componentDidUpdate() {
-        ref = this.refs.test;
+        ref = this.test.current;
       }
 
       render() {
         return (
           <Surface>
             <Group>
-              {this.props.mountCustomShape && <CustomShape ref="test" />}
+              {this.props.mountCustomShape && <CustomShape ref={this.test} />}
             </Group>
           </Surface>
         );
       }
     }
     ReactDOM.render(<Outer />, container);
-    expect(ref).not.toBeDefined();
+    expect(ref).toBe(null);
     ReactDOM.render(<Outer mountCustomShape={true} />, container);
     expect(ref.constructor).toBe(CustomShape);
   });
diff --git a/packages/react-dom/src/__tests__/refs-test.js b/packages/react-dom/src/__tests__/refs-test.js
index 6ca2c981f6..04b4628d6f 100644
--- a/packages/react-dom/src/__tests__/refs-test.js
+++ b/packages/react-dom/src/__tests__/refs-test.js
@@ -412,3 +412,46 @@ describe('creating element with ref in constructor', () => {
     );
   });
 });
+
+describe('strings refs across renderers', () => {
+  it('does not break', () => {
+    class Parent extends React.Component {
+      render() {
+        // This component owns both refs.
+        return (
+          <Indirection
+            child1={<div ref="child1" />}
+            child2={<div ref="child2" />}
+          />
+        );
+      }
+    }
+
+    class Indirection extends React.Component {
+      componentDidUpdate() {
+        // One ref is being rendered later using another renderer copy.
+        jest.resetModules();
+        const AnotherCopyOfReactDOM = require('react-dom');
+        AnotherCopyOfReactDOM.render(this.props.child2, div2);
+      }
+      render() {
+        // The other one is being rendered directly.
+        return this.props.child1;
+      }
+    }
+
+    const div1 = document.createElement('div');
+    const div2 = document.createElement('div');
+    const inst = ReactDOM.render(<Parent />, div1);
+    // Only the first ref has rendered yet.
+    expect(inst.refs.child1.tagName).toBe('DIV');
+    expect(inst.refs.child1).toBe(div1.firstChild);
+
+    // Now both refs should be rendered.
+    ReactDOM.render(<Parent />, div1);
+    expect(inst.refs.child1.tagName).toBe('DIV');
+    expect(inst.refs.child1).toBe(div1.firstChild);
+    expect(inst.refs.child2.tagName).toBe('DIV');
+    expect(inst.refs.child2).toBe(div2.firstChild);
+  });
+});
diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index ebe3ac8512..87673bd4eb 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -15,7 +15,6 @@ import type {
 } from 'shared/ReactTypes';
 
 import React from 'react';
-import emptyObject from 'fbjs/lib/emptyObject';
 import invariant from 'fbjs/lib/invariant';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
 import warning from 'fbjs/lib/warning';
@@ -284,6 +283,11 @@ function flattenOptionChildren(children: mixed): string {
   return content;
 }
 
+const emptyObject = {};
+if (__DEV__) {
+  Object.freeze(emptyObject);
+}
+
 function maskContext(type, context) {
   const contextTypes = type.contextTypes;
   if (!contextTypes) {
diff --git a/packages/react-native-renderer/src/ReactNativeFiberInspector.js b/packages/react-native-renderer/src/ReactNativeFiberInspector.js
index 6a2877fb51..169e2f40ad 100644
--- a/packages/react-native-renderer/src/ReactNativeFiberInspector.js
+++ b/packages/react-native-renderer/src/ReactNativeFiberInspector.js
@@ -15,13 +15,17 @@ import {
 } from 'react-reconciler/reflection';
 import getComponentName from 'shared/getComponentName';
 import {HostComponent} from 'shared/ReactTypeOfWork';
-import emptyObject from 'fbjs/lib/emptyObject';
 import invariant from 'fbjs/lib/invariant';
 // Module provided by RN:
 import UIManager from 'UIManager';
 
 import {getClosestInstanceFromNode} from './ReactNativeComponentTree';
 
+const emptyObject = {};
+if (__DEV__) {
+  Object.freeze(emptyObject);
+}
+
 let getInspectorDataForViewTag;
 
 if (__DEV__) {
diff --git a/packages/react-native-renderer/src/ReactNativeHostConfig.js b/packages/react-native-renderer/src/ReactNativeHostConfig.js
index dcfeb8d90f..03ce2dc6e0 100644
--- a/packages/react-native-renderer/src/ReactNativeHostConfig.js
+++ b/packages/react-native-renderer/src/ReactNativeHostConfig.js
@@ -9,7 +9,6 @@
 
 import type {ReactNativeBaseComponentViewConfig} from './ReactNativeTypes';
 
-import emptyObject from 'fbjs/lib/emptyObject';
 import invariant from 'fbjs/lib/invariant';
 
 // Modules provided by RN:
@@ -43,6 +42,11 @@ export type HostContext = $ReadOnly<{|
 export type UpdatePayload = Object; // Unused
 export type ChildSet = void; // Unused
 
+const UPDATE_SIGNAL = {};
+if (__DEV__) {
+  Object.freeze(UPDATE_SIGNAL);
+}
+
 // Counter for uniquely identifying views.
 // % 10 === 1 means it is a rootTag.
 // % 2 === 0 means it is a Fabric tag.
@@ -218,7 +222,7 @@ export function prepareUpdate(
   rootContainerInstance: Container,
   hostContext: HostContext,
 ): null | Object {
-  return emptyObject;
+  return UPDATE_SIGNAL;
 }
 
 export function resetAfterCommit(containerInfo: Container): void {
diff --git a/packages/react-noop-renderer/src/createReactNoop.js b/packages/react-noop-renderer/src/createReactNoop.js
index 873dc88799..351a1cfe52 100644
--- a/packages/react-noop-renderer/src/createReactNoop.js
+++ b/packages/react-noop-renderer/src/createReactNoop.js
@@ -19,7 +19,6 @@ import type {UpdateQueue} from 'react-reconciler/src/ReactUpdateQueue';
 import type {ReactNodeList} from 'shared/ReactTypes';
 
 import * as ReactPortal from 'shared/ReactPortal';
-import emptyObject from 'fbjs/lib/emptyObject';
 import expect from 'expect';
 
 type Container = {rootID: string, children: Array<Instance | TextInstance>};
@@ -32,8 +31,14 @@ type Instance = {|
 |};
 type TextInstance = {|text: string, id: number|};
 
+const NO_CONTEXT = {};
+const UPDATE_SIGNAL = {};
+if (__DEV__) {
+  Object.freeze(NO_CONTEXT);
+  Object.freeze(UPDATE_SIGNAL);
+}
+
 function createReactNoop(reconciler: Function, useMutation: boolean) {
-  const UPDATE_SIGNAL = {};
   let scheduledCallback = null;
 
   let instanceCounter = 0;
@@ -84,11 +89,11 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
       if (failInBeginPhase) {
         throw new Error('Error in host config.');
       }
-      return emptyObject;
+      return NO_CONTEXT;
     },
 
     getChildHostContext() {
-      return emptyObject;
+      return NO_CONTEXT;
     },
 
     getPublicInstance(instance) {
diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js
index e3d1dd72ed..3caf4db2a1 100644
--- a/packages/react-reconciler/src/ReactChildFiber.js
+++ b/packages/react-reconciler/src/ReactChildFiber.js
@@ -28,7 +28,6 @@ import {
   Fragment,
 } from 'shared/ReactTypeOfWork';
 import {getStackAddendumByWorkInProgressFiber} from 'shared/ReactFiberComponentTreeHook';
-import emptyObject from 'fbjs/lib/emptyObject';
 import invariant from 'fbjs/lib/invariant';
 import warning from 'fbjs/lib/warning';
 
@@ -39,6 +38,7 @@ import {
   createFiberFromText,
   createFiberFromPortal,
 } from './ReactFiber';
+import {emptyRefsObject} from './ReactFiberClassComponent';
 import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
 import {StrictMode} from './ReactTypeOfMode';
 
@@ -157,7 +157,11 @@ function coerceRef(
         return current.ref;
       }
       const ref = function(value) {
-        const refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;
+        let refs = inst.refs;
+        if (refs === emptyRefsObject) {
+          // This is a lazy pooled frozen object, so we need to initialize.
+          refs = inst.refs = {};
+        }
         if (value === null) {
           delete refs[stringRef];
         } else {
diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js
index dc74ec1778..a158b9c0d1 100644
--- a/packages/react-reconciler/src/ReactFiberClassComponent.js
+++ b/packages/react-reconciler/src/ReactFiberClassComponent.js
@@ -10,6 +10,7 @@
 import type {Fiber} from './ReactFiber';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 
+import React from 'react';
 import {Update, Snapshot} from 'shared/ReactTypeOfSideEffect';
 import {
   debugRenderPhaseSideEffects,
@@ -20,7 +21,6 @@ import ReactStrictModeWarnings from './ReactStrictModeWarnings';
 import {isMounted} from 'react-reconciler/reflection';
 import * as ReactInstanceMap from 'shared/ReactInstanceMap';
 import shallowEqual from 'shared/shallowEqual';
-import emptyObject from 'fbjs/lib/emptyObject';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'fbjs/lib/invariant';
 import warning from 'fbjs/lib/warning';
@@ -43,6 +43,7 @@ import {
   getUnmaskedContext,
   isContextConsumer,
   hasContextChanged,
+  emptyContextObject,
 } from './ReactFiberContext';
 import {
   recalculateCurrentTime,
@@ -53,6 +54,10 @@ import {
 const fakeInternalInstance = {};
 const isArray = Array.isArray;
 
+// React.Component uses a shared frozen object by default.
+// We'll use it to determine whether we need to initialize legacy refs.
+export const emptyRefsObject = new React.Component().refs;
+
 let didWarnAboutStateAssignmentForComponent;
 let didWarnAboutUninitializedState;
 let didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate;
@@ -469,7 +474,7 @@ function constructClassInstance(
   const needsContext = isContextConsumer(workInProgress);
   const context = needsContext
     ? getMaskedContext(workInProgress, unmaskedContext)
-    : emptyObject;
+    : emptyContextObject;
 
   // Instantiate twice to help detect side-effects.
   if (__DEV__) {
@@ -658,7 +663,7 @@ function mountClassInstance(
 
   instance.props = props;
   instance.state = workInProgress.memoizedState;
-  instance.refs = emptyObject;
+  instance.refs = emptyRefsObject;
   instance.context = getMaskedContext(workInProgress, unmaskedContext);
 
   if (__DEV__) {
diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js
index 8faf154642..5cad370b96 100644
--- a/packages/react-reconciler/src/ReactFiberContext.js
+++ b/packages/react-reconciler/src/ReactFiberContext.js
@@ -13,7 +13,6 @@ import type {StackCursor} from './ReactFiberStack';
 import {isFiberMounted} from 'react-reconciler/reflection';
 import {ClassComponent, HostRoot} from 'shared/ReactTypeOfWork';
 import getComponentName from 'shared/getComponentName';
-import emptyObject from 'fbjs/lib/emptyObject';
 import invariant from 'fbjs/lib/invariant';
 import warning from 'fbjs/lib/warning';
 import checkPropTypes from 'prop-types/checkPropTypes';
@@ -28,14 +27,19 @@ if (__DEV__) {
   warnedAboutMissingGetChildContext = {};
 }
 
+export const emptyContextObject = {};
+if (__DEV__) {
+  Object.freeze(emptyContextObject);
+}
+
 // A cursor to the current merged context object on the stack.
-let contextStackCursor: StackCursor<Object> = createCursor(emptyObject);
+let contextStackCursor: StackCursor<Object> = createCursor(emptyContextObject);
 // A cursor to a boolean indicating whether the context has changed.
 let didPerformWorkStackCursor: StackCursor<boolean> = createCursor(false);
 // Keep track of the previous context object that was on the stack.
 // We use this to get access to the parent context after we have already
 // pushed the next context provider, and now need to merge their contexts.
-let previousContext: Object = emptyObject;
+let previousContext: Object = emptyContextObject;
 
 function getUnmaskedContext(workInProgress: Fiber): Object {
   const hasOwnContext = isContextProvider(workInProgress);
@@ -66,7 +70,7 @@ function getMaskedContext(
   const type = workInProgress.type;
   const contextTypes = type.contextTypes;
   if (!contextTypes) {
-    return emptyObject;
+    return emptyContextObject;
   }
 
   // Avoid recreating masked context unless unmasked context has changed.
@@ -137,7 +141,7 @@ function pushTopLevelContextObject(
   didChange: boolean,
 ): void {
   invariant(
-    contextStackCursor.current === emptyObject,
+    contextStackCursor.current === emptyContextObject,
     'Unexpected context found on stack. ' +
       'This error is likely caused by a bug in React. Please file an issue.',
   );
@@ -219,7 +223,7 @@ function pushContextProvider(workInProgress: Fiber): boolean {
   // and replace it on the stack later when invalidating the context.
   const memoizedMergedChildContext =
     (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
+    emptyContextObject;
 
   // Remember the parent context so we can merge with it later.
   // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js
index 2e3034522b..61ed86e323 100644
--- a/packages/react-reconciler/src/ReactFiberReconciler.js
+++ b/packages/react-reconciler/src/ReactFiberReconciler.js
@@ -24,7 +24,6 @@ import {
 } from 'react-reconciler/reflection';
 import * as ReactInstanceMap from 'shared/ReactInstanceMap';
 import {HostComponent} from 'shared/ReactTypeOfWork';
-import emptyObject from 'fbjs/lib/emptyObject';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'fbjs/lib/invariant';
 import warning from 'fbjs/lib/warning';
@@ -34,6 +33,7 @@ import {
   findCurrentUnmaskedContext,
   isContextProvider,
   processChildContext,
+  emptyContextObject,
 } from './ReactFiberContext';
 import {createFiberRoot} from './ReactFiberRoot';
 import * as ReactFiberDevToolsHook from './ReactFiberDevToolsHook';
@@ -86,7 +86,7 @@ function getContextForSubtree(
   parentComponent: ?React$Component<any, any>,
 ): Object {
   if (!parentComponent) {
-    return emptyObject;
+    return emptyContextObject;
   }
 
   const fiber = ReactInstanceMap.get(parentComponent);
diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js
index 817e3dcb0c..65020d4842 100644
--- a/packages/react-test-renderer/src/ReactShallowRenderer.js
+++ b/packages/react-test-renderer/src/ReactShallowRenderer.js
@@ -11,10 +11,14 @@ import {isForwardRef} from 'react-is';
 import describeComponentFrame from 'shared/describeComponentFrame';
 import getComponentName from 'shared/getComponentName';
 import shallowEqual from 'shared/shallowEqual';
-import emptyObject from 'fbjs/lib/emptyObject';
 import invariant from 'fbjs/lib/invariant';
 import checkPropTypes from 'prop-types/checkPropTypes';
 
+const emptyObject = {};
+if (__DEV__) {
+  Object.freeze(emptyObject);
+}
+
 class ReactShallowRenderer {
   static createRenderer = function() {
     return new ReactShallowRenderer();
diff --git a/packages/react-test-renderer/src/ReactTestHostConfig.js b/packages/react-test-renderer/src/ReactTestHostConfig.js
index 560011ab65..1a1e74a1e2 100644
--- a/packages/react-test-renderer/src/ReactTestHostConfig.js
+++ b/packages/react-test-renderer/src/ReactTestHostConfig.js
@@ -7,8 +7,6 @@
  * @flow
  */
 
-import emptyObject from 'fbjs/lib/emptyObject';
-
 import * as TestRendererScheduling from './ReactTestRendererScheduling';
 
 export type Type = string;
@@ -35,11 +33,16 @@ export type HostContext = Object;
 export type UpdatePayload = Object;
 export type ChildSet = void; // Unused
 
-const UPDATE_SIGNAL = {};
-
 export * from 'shared/HostConfigWithNoPersistence';
 export * from 'shared/HostConfigWithNoHydration';
 
+const NO_CONTEXT = {};
+const UPDATE_SIGNAL = {};
+if (__DEV__) {
+  Object.freeze(NO_CONTEXT);
+  Object.freeze(UPDATE_SIGNAL);
+}
+
 export function getPublicInstance(inst: Instance | TextInstance): * {
   switch (inst.tag) {
     case 'INSTANCE':
@@ -88,7 +91,7 @@ export function removeChild(
 export function getRootHostContext(
   rootContainerInstance: Container,
 ): HostContext {
-  return emptyObject;
+  return NO_CONTEXT;
 }
 
 export function getChildHostContext(
@@ -96,7 +99,7 @@ export function getChildHostContext(
   type: string,
   rootContainerInstance: Container,
 ): HostContext {
-  return emptyObject;
+  return NO_CONTEXT;
 }
 
 export function prepareForCommit(containerInfo: Container): void {
diff --git a/packages/react/src/ReactBaseClasses.js b/packages/react/src/ReactBaseClasses.js
index 1d2440e54c..3f92549e1a 100644
--- a/packages/react/src/ReactBaseClasses.js
+++ b/packages/react/src/ReactBaseClasses.js
@@ -5,18 +5,23 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import emptyObject from 'fbjs/lib/emptyObject';
 import invariant from 'fbjs/lib/invariant';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
 
 import ReactNoopUpdateQueue from './ReactNoopUpdateQueue';
 
+const emptyObject = {};
+if (__DEV__) {
+  Object.freeze(emptyObject);
+}
+
 /**
  * Base class helpers for the updating state of a component.
  */
 function Component(props, context, updater) {
   this.props = props;
   this.context = context;
+  // If a component has string refs, we will assign a different object later.
   this.refs = emptyObject;
   // We initialize the default updater but the real one gets injected by the
   // renderer.
@@ -126,6 +131,7 @@ ComponentDummy.prototype = Component.prototype;
 function PureComponent(props, context, updater) {
   this.props = props;
   this.context = context;
+  // If a component has string refs, we will assign a different object later.
   this.refs = emptyObject;
   this.updater = updater || ReactNoopUpdateQueue;
 }
diff --git a/scripts/jest/setupEnvironment.js b/scripts/jest/setupEnvironment.js
index 2b6fd8bd84..6780cdb062 100644
--- a/scripts/jest/setupEnvironment.js
+++ b/scripts/jest/setupEnvironment.js
@@ -46,9 +46,3 @@ if (typeof window !== 'undefined') {
     }
   });
 }
-
-// Preserve the empty object identity across module resets.
-// This is needed for some tests that rely on string refs
-// but reset modules between loading different renderers.
-const obj = require.requireActual('fbjs/lib/emptyObject');
-jest.mock('fbjs/lib/emptyObject', () => obj);

From aeda7b745d9c080150704feb20ea576238a1b9a1 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 19 Jun 2018 16:03:45 +0100
Subject: [PATCH 170/277] Remove fbjs dependency (#13069)

* Inline fbjs/lib/invariant

* Inline fbjs/lib/warning

* Remove remaining usage of fbjs in packages/*.js

* Fix lint

* Remove fbjs from dependencies

* Protect against accidental fbjs imports

* Fix broken test mocks

* Allow transitive deps on fbjs/ for UMD bundles

* Remove fbjs from release script
---
 package.json                                  |  1 -
 packages/create-subscription/package.json     |  3 --
 .../src/createSubscription.js                 |  4 +-
 packages/events/EventPluginHub.js             |  2 +-
 packages/events/EventPluginRegistry.js        |  2 +-
 packages/events/EventPluginUtils.js           |  4 +-
 packages/events/EventPropagators.js           |  2 +-
 packages/events/ReactControlledComponent.js   |  2 +-
 packages/events/ResponderTouchHistoryStore.js |  4 +-
 packages/events/SyntheticEvent.js             |  4 +-
 packages/events/accumulate.js                 |  2 +-
 packages/events/accumulateInto.js             |  2 +-
 packages/react-art/package.json               |  1 -
 packages/react-art/src/ReactARTHostConfig.js  |  2 +-
 packages/react-dom/package.json               |  1 -
 .../__tests__/ReactCompositeComponent-test.js | 52 ++++++++++++++----
 .../ReactDOMSelection-test.internal.js        |  9 ++--
 packages/react-dom/src/client/ReactDOM.js     |  4 +-
 .../src/client/ReactDOMComponentTree.js       |  2 +-
 .../src/client/ReactDOMFiberComponent.js      |  2 +-
 .../src/client/ReactDOMFiberInput.js          |  4 +-
 .../src/client/ReactDOMFiberOption.js         |  2 +-
 .../src/client/ReactDOMFiberSelect.js         |  2 +-
 .../src/client/ReactDOMFiberTextarea.js       |  4 +-
 .../src/client/validateDOMNesting.js          |  2 +-
 .../react-dom/src/events/SimpleEventPlugin.js |  2 +-
 .../src/server/ReactDOMServerBrowser.js       |  2 +-
 .../src/server/ReactPartialRenderer.js        |  4 +-
 packages/react-dom/src/shared/DOMProperty.js  |  2 +-
 .../src/shared/ReactDOMInvalidARIAHook.js     |  2 +-
 .../shared/ReactDOMNullInputValuePropHook.js  |  2 +-
 .../src/shared/ReactDOMUnknownPropertyHook.js |  2 +-
 .../react-dom/src/shared/assertValidProps.js  |  4 +-
 packages/react-dom/src/shared/checkReact.js   |  2 +-
 .../react-dom/src/shared/warnValidStyle.js    |  2 +-
 .../src/test-utils/ReactTestUtils.js          |  2 +-
 packages/react-native-renderer/package.json   |  1 -
 .../src/NativeMethodsMixin.js                 |  2 +-
 .../react-native-renderer/src/ReactFabric.js  |  2 +-
 .../src/ReactFabricComponentTree.js           |  2 +-
 .../src/ReactFabricHostConfig.js              |  2 +-
 .../src/ReactNativeBridgeEventPlugin.js       |  2 +-
 .../src/ReactNativeComponentTree.js           |  2 +-
 .../src/ReactNativeEventEmitter.js            |  2 +-
 .../src/ReactNativeFiberInspector.js          |  2 +-
 .../src/ReactNativeHostConfig.js              |  2 +-
 .../src/ReactNativeRenderer.js                |  2 +-
 .../src/__mocks__/FabricUIManager.js          |  2 +-
 .../ReactNativeViewConfigRegistry.js          |  2 +-
 .../src/__mocks__/UIManager.js                |  2 +-
 packages/react-noop-renderer/package.json     |  1 -
 packages/react-reconciler/package.json        |  1 -
 .../react-reconciler/src/ReactChildFiber.js   |  4 +-
 packages/react-reconciler/src/ReactFiber.js   |  2 +-
 .../src/ReactFiberBeginWork.js                |  4 +-
 .../src/ReactFiberClassComponent.js           |  4 +-
 .../src/ReactFiberCommitWork.js               |  4 +-
 .../src/ReactFiberCompleteWork.js             |  2 +-
 .../react-reconciler/src/ReactFiberContext.js |  4 +-
 .../src/ReactFiberDevToolsHook.js             |  2 +-
 .../src/ReactFiberHostConfig.js               |  2 +-
 .../src/ReactFiberHostContext.js              |  2 +-
 .../src/ReactFiberHydrationContext.js         |  2 +-
 .../src/ReactFiberNewContext.js               |  2 +-
 .../src/ReactFiberReconciler.js               |  4 +-
 .../src/ReactFiberScheduler.js                |  4 +-
 .../react-reconciler/src/ReactFiberStack.js   |  2 +-
 .../src/ReactFiberTreeReflection.js           |  4 +-
 .../src/ReactProfilerTimer.js                 |  2 +-
 .../src/ReactStrictModeWarnings.js            |  2 +-
 .../react-reconciler/src/ReactUpdateQueue.js  |  4 +-
 .../src/forks/ReactFiberErrorDialog.www.js    |  2 +-
 packages/react-scheduler/package.json         |  1 -
 .../react-scheduler/src/ReactScheduler.js     |  2 +-
 packages/react-test-renderer/package.json     |  1 -
 .../src/ReactShallowRenderer.js               |  2 +-
 .../src/ReactTestRenderer.js                  |  2 +-
 packages/react/package.json                   |  1 -
 packages/react/src/ReactBaseClasses.js        |  2 +-
 packages/react/src/ReactChildren.js           |  4 +-
 packages/react/src/ReactContext.js            |  2 +-
 packages/react/src/ReactElement.js            |  4 +-
 packages/react/src/ReactElementValidator.js   |  2 +-
 packages/react/src/ReactNoopUpdateQueue.js    |  2 +-
 packages/react/src/forwardRef.js              |  2 +-
 packages/shared/HostConfigWithNoHydration.js  |  2 +-
 packages/shared/HostConfigWithNoMutation.js   |  2 +-
 .../shared/HostConfigWithNoPersistence.js     |  2 +-
 packages/shared/ReactErrorUtils.js            |  2 +-
 packages/shared/ReactFeatureFlags.js          |  2 +-
 .../ReactFeatureFlags.native-fabric-fb.js     |  2 +-
 .../ReactFeatureFlags.native-fabric-oss.js    |  2 +-
 .../forks/ReactFeatureFlags.native-fb.js      |  2 +-
 .../forks/ReactFeatureFlags.native-oss.js     |  2 +-
 .../forks/ReactFeatureFlags.persistent.js     |  2 +-
 .../forks/ReactFeatureFlags.test-renderer.js  |  2 +-
 packages/shared/forks/invariant.www.js        |  8 +++
 .../shared/forks/invokeGuardedCallback.www.js |  2 +-
 packages/shared/forks/warning.www.js          |  8 +++
 packages/shared/invariant.js                  | 54 +++++++++++++++++++
 packages/shared/invokeGuardedCallback.js      |  2 +-
 packages/shared/reactProdInvariant.js         |  2 +-
 packages/shared/warning.js                    | 45 ++++++++++++++++
 packages/simple-cache-provider/package.json   |  3 --
 .../src/SimpleCacheProvider.js                |  2 +-
 .../replace-invariant-error-codes-test.js     | 20 +++----
 scripts/release/config.js                     |  2 +-
 scripts/rollup/build.js                       | 21 +++++++-
 scripts/rollup/forks.js                       | 22 ++++++++
 scripts/rollup/modules.js                     |  4 --
 110 files changed, 320 insertions(+), 156 deletions(-)
 create mode 100644 packages/shared/forks/invariant.www.js
 create mode 100644 packages/shared/forks/warning.www.js
 create mode 100644 packages/shared/invariant.js
 create mode 100644 packages/shared/warning.js

diff --git a/package.json b/package.json
index 939375b0a0..78e89495da 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,6 @@
     "eslint-plugin-no-for-of-loops": "^1.0.0",
     "eslint-plugin-react": "^6.7.1",
     "eslint-plugin-react-internal": "link:./scripts/eslint-rules/",
-    "fbjs": "^0.8.16",
     "fbjs-scripts": "^0.6.0",
     "filesize": "^3.5.6",
     "flow-bin": "^0.72.0",
diff --git a/packages/create-subscription/package.json b/packages/create-subscription/package.json
index a9e306e4b9..ccfcb5dfe8 100644
--- a/packages/create-subscription/package.json
+++ b/packages/create-subscription/package.json
@@ -9,9 +9,6 @@
     "index.js",
     "cjs/"
   ],
-  "dependencies": {
-    "fbjs": "^0.8.16"
-  },
   "peerDependencies": {
     "react": "^16.3.0"
   },
diff --git a/packages/create-subscription/src/createSubscription.js b/packages/create-subscription/src/createSubscription.js
index df18f8b3c7..dec0cc57ce 100644
--- a/packages/create-subscription/src/createSubscription.js
+++ b/packages/create-subscription/src/createSubscription.js
@@ -8,8 +8,8 @@
  */
 
 import React from 'react';
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 
 type Unsubscribe = () => void;
 
diff --git a/packages/events/EventPluginHub.js b/packages/events/EventPluginHub.js
index 27840402ef..a4849d98c9 100644
--- a/packages/events/EventPluginHub.js
+++ b/packages/events/EventPluginHub.js
@@ -7,7 +7,7 @@
  */
 
 import ReactErrorUtils from 'shared/ReactErrorUtils';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import {
   injectEventPluginOrder,
diff --git a/packages/events/EventPluginRegistry.js b/packages/events/EventPluginRegistry.js
index efebd984e8..77cf4429b8 100644
--- a/packages/events/EventPluginRegistry.js
+++ b/packages/events/EventPluginRegistry.js
@@ -14,7 +14,7 @@ import type {
   PluginModule,
 } from './PluginModuleType';
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 type NamesToPlugins = {[key: PluginName]: PluginModule<AnyNativeEvent>};
 type EventPluginOrder = null | Array<PluginName>;
diff --git a/packages/events/EventPluginUtils.js b/packages/events/EventPluginUtils.js
index 19a89e30de..28f8c7f89b 100644
--- a/packages/events/EventPluginUtils.js
+++ b/packages/events/EventPluginUtils.js
@@ -6,8 +6,8 @@
  */
 
 import ReactErrorUtils from 'shared/ReactErrorUtils';
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 
 export let getFiberCurrentPropsFromNode = null;
 export let getInstanceFromNode = null;
diff --git a/packages/events/EventPropagators.js b/packages/events/EventPropagators.js
index 451d18b852..12acf93606 100644
--- a/packages/events/EventPropagators.js
+++ b/packages/events/EventPropagators.js
@@ -10,7 +10,7 @@ import {
   traverseTwoPhase,
   traverseEnterLeave,
 } from 'shared/ReactTreeTraversal';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 import {getListener} from './EventPluginHub';
 import accumulateInto from './accumulateInto';
diff --git a/packages/events/ReactControlledComponent.js b/packages/events/ReactControlledComponent.js
index 499fb04927..378125181f 100644
--- a/packages/events/ReactControlledComponent.js
+++ b/packages/events/ReactControlledComponent.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import {
   getInstanceFromNode,
diff --git a/packages/events/ResponderTouchHistoryStore.js b/packages/events/ResponderTouchHistoryStore.js
index 807a5a08d9..a7bee3acd2 100644
--- a/packages/events/ResponderTouchHistoryStore.js
+++ b/packages/events/ResponderTouchHistoryStore.js
@@ -7,8 +7,8 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 
 import {isStartish, isMoveish, isEndish} from './ResponderTopLevelEventTypes';
 
diff --git a/packages/events/SyntheticEvent.js b/packages/events/SyntheticEvent.js
index b8693d8d37..cdb1382e17 100644
--- a/packages/events/SyntheticEvent.js
+++ b/packages/events/SyntheticEvent.js
@@ -7,8 +7,8 @@
 
 /* eslint valid-typeof: 0 */
 
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 
 let didWarnForAddedNewProperty = false;
 const EVENT_POOL_SIZE = 10;
diff --git a/packages/events/accumulate.js b/packages/events/accumulate.js
index 134e9333a3..c59f7abec8 100644
--- a/packages/events/accumulate.js
+++ b/packages/events/accumulate.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 /**
  * Accumulates items that must not be null or undefined.
diff --git a/packages/events/accumulateInto.js b/packages/events/accumulateInto.js
index 156c8411c7..6b5e6bffe0 100644
--- a/packages/events/accumulateInto.js
+++ b/packages/events/accumulateInto.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 /**
  * Accumulates items that must not be null or undefined into the first one. This
diff --git a/packages/react-art/package.json b/packages/react-art/package.json
index c3863c4838..bbd487f263 100644
--- a/packages/react-art/package.json
+++ b/packages/react-art/package.json
@@ -20,7 +20,6 @@
   "dependencies": {
     "art": "^0.10.1",
     "create-react-class": "^15.6.2",
-    "fbjs": "^0.8.16",
     "loose-envify": "^1.1.0",
     "object-assign": "^4.1.1",
     "prop-types": "^15.6.0"
diff --git a/packages/react-art/src/ReactARTHostConfig.js b/packages/react-art/src/ReactARTHostConfig.js
index 2b10999416..33f91a77d4 100644
--- a/packages/react-art/src/ReactARTHostConfig.js
+++ b/packages/react-art/src/ReactARTHostConfig.js
@@ -8,7 +8,7 @@
 import * as ReactScheduler from 'shared/ReactScheduler';
 import Transform from 'art/core/transform';
 import Mode from 'art/modes/current';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import {TYPES, EVENT_TYPES, childrenAsString} from './ReactARTInternals';
 
diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
index f6ba19cc43..f46a72eec7 100644
--- a/packages/react-dom/package.json
+++ b/packages/react-dom/package.json
@@ -13,7 +13,6 @@
   },
   "homepage": "https://reactjs.org/",
   "dependencies": {
-    "fbjs": "^0.8.16",
     "loose-envify": "^1.1.0",
     "object-assign": "^4.1.1",
     "prop-types": "^15.6.0"
diff --git a/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js b/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js
index d614d27dd3..182564111f 100644
--- a/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js
@@ -17,10 +17,50 @@ let ReactDOMServer;
 let ReactCurrentOwner;
 let ReactTestUtils;
 let PropTypes;
-let shallowEqual;
-let shallowCompare;
 
 describe('ReactCompositeComponent', () => {
+  const hasOwnProperty = Object.prototype.hasOwnProperty;
+
+  /**
+   * Performs equality by iterating through keys on an object and returning false
+   * when any key has values which are not strictly equal between the arguments.
+   * Returns true when the values of all keys are strictly equal.
+   */
+  function shallowEqual(objA: mixed, objB: mixed): boolean {
+    if (Object.is(objA, objB)) {
+      return true;
+    }
+    if (
+      typeof objA !== 'object' ||
+      objA === null ||
+      typeof objB !== 'object' ||
+      objB === null
+    ) {
+      return false;
+    }
+    const keysA = Object.keys(objA);
+    const keysB = Object.keys(objB);
+    if (keysA.length !== keysB.length) {
+      return false;
+    }
+    for (let i = 0; i < keysA.length; i++) {
+      if (
+        !hasOwnProperty.call(objB, keysA[i]) ||
+        !Object.is(objA[keysA[i]], objB[keysA[i]])
+      ) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  function shallowCompare(instance, nextProps, nextState) {
+    return (
+      !shallowEqual(instance.props, nextProps) ||
+      !shallowEqual(instance.state, nextState)
+    );
+  }
+
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
@@ -30,14 +70,6 @@ describe('ReactCompositeComponent', () => {
       .__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner;
     ReactTestUtils = require('react-dom/test-utils');
     PropTypes = require('prop-types');
-    shallowEqual = require('fbjs/lib/shallowEqual');
-
-    shallowCompare = function(instance, nextProps, nextState) {
-      return (
-        !shallowEqual(instance.props, nextProps) ||
-        !shallowEqual(instance.state, nextState)
-      );
-    };
 
     MorphingComponent = class extends React.Component {
       state = {activated: false};
diff --git a/packages/react-dom/src/__tests__/ReactDOMSelection-test.internal.js b/packages/react-dom/src/__tests__/ReactDOMSelection-test.internal.js
index b167084ad8..ec8850090b 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelection-test.internal.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelection-test.internal.js
@@ -12,7 +12,6 @@
 let React;
 let ReactDOM;
 let ReactDOMSelection;
-let invariant;
 
 let getModernOffsetsFromPoints;
 
@@ -21,7 +20,6 @@ describe('ReactDOMSelection', () => {
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMSelection = require('../client/ReactDOMSelection');
-    invariant = require('fbjs/lib/invariant');
 
     ({getModernOffsetsFromPoints} = ReactDOMSelection);
   });
@@ -68,10 +66,9 @@ describe('ReactDOMSelection', () => {
     }
     traverse(outerNode);
 
-    invariant(
-      start !== null && end !== null,
-      'Provided anchor/focus nodes were outside of root.',
-    );
+    if (start === null || end === null) {
+      throw new Error('Provided anchor/focus nodes were outside of root.');
+    }
     return {start, end};
   }
 
diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js
index 184e958142..363617fc7e 100644
--- a/packages/react-dom/src/client/ReactDOM.js
+++ b/packages/react-dom/src/client/ReactDOM.js
@@ -31,9 +31,9 @@ import * as ReactInstanceMap from 'shared/ReactInstanceMap';
 import ReactVersion from 'shared/ReactVersion';
 import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
 import getComponentName from 'shared/getComponentName';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 import * as ReactDOMComponentTree from './ReactDOMComponentTree';
 import * as ReactDOMFiberComponent from './ReactDOMFiberComponent';
diff --git a/packages/react-dom/src/client/ReactDOMComponentTree.js b/packages/react-dom/src/client/ReactDOMComponentTree.js
index d9c2e2d858..a683df5b06 100644
--- a/packages/react-dom/src/client/ReactDOMComponentTree.js
+++ b/packages/react-dom/src/client/ReactDOMComponentTree.js
@@ -6,7 +6,7 @@
  */
 
 import {HostComponent, HostText} from 'shared/ReactTypeOfWork';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 const randomKey = Math.random()
   .toString(36)
diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js
index 4975e55f67..c7ec03ed12 100644
--- a/packages/react-dom/src/client/ReactDOMFiberComponent.js
+++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js
@@ -10,7 +10,7 @@
 // TODO: direct imports like some-package/src/* are bad. Fix me.
 import ReactDebugCurrentFiber from 'react-reconciler/src/ReactDebugCurrentFiber';
 import {registrationNameModules} from 'events/EventPluginRegistry';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 import * as DOMPropertyOperations from './DOMPropertyOperations';
 import * as ReactDOMFiberInput from './ReactDOMFiberInput';
diff --git a/packages/react-dom/src/client/ReactDOMFiberInput.js b/packages/react-dom/src/client/ReactDOMFiberInput.js
index 9483279516..c164d98419 100644
--- a/packages/react-dom/src/client/ReactDOMFiberInput.js
+++ b/packages/react-dom/src/client/ReactDOMFiberInput.js
@@ -9,8 +9,8 @@
 
 // TODO: direct imports like some-package/src/* are bad. Fix me.
 import ReactDebugCurrentFiber from 'react-reconciler/src/ReactDebugCurrentFiber';
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 
 import * as DOMPropertyOperations from './DOMPropertyOperations';
 import {getFiberCurrentPropsFromNode} from './ReactDOMComponentTree';
diff --git a/packages/react-dom/src/client/ReactDOMFiberOption.js b/packages/react-dom/src/client/ReactDOMFiberOption.js
index 663b9cf22c..e5c04d2392 100644
--- a/packages/react-dom/src/client/ReactDOMFiberOption.js
+++ b/packages/react-dom/src/client/ReactDOMFiberOption.js
@@ -8,7 +8,7 @@
  */
 
 import React from 'react';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 let didWarnSelectedSetOnOption = false;
 
diff --git a/packages/react-dom/src/client/ReactDOMFiberSelect.js b/packages/react-dom/src/client/ReactDOMFiberSelect.js
index d0ed3ad01b..21c7e62ece 100644
--- a/packages/react-dom/src/client/ReactDOMFiberSelect.js
+++ b/packages/react-dom/src/client/ReactDOMFiberSelect.js
@@ -9,7 +9,7 @@
 
 // TODO: direct imports like some-package/src/* are bad. Fix me.
 import ReactDebugCurrentFiber from 'react-reconciler/src/ReactDebugCurrentFiber';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 import ReactControlledValuePropTypes from '../shared/ReactControlledValuePropTypes';
 
diff --git a/packages/react-dom/src/client/ReactDOMFiberTextarea.js b/packages/react-dom/src/client/ReactDOMFiberTextarea.js
index d167161435..4ff024895e 100644
--- a/packages/react-dom/src/client/ReactDOMFiberTextarea.js
+++ b/packages/react-dom/src/client/ReactDOMFiberTextarea.js
@@ -7,8 +7,8 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 // TODO: direct imports like some-package/src/* are bad. Fix me.
 import ReactDebugCurrentFiber from 'react-reconciler/src/ReactDebugCurrentFiber';
 
diff --git a/packages/react-dom/src/client/validateDOMNesting.js b/packages/react-dom/src/client/validateDOMNesting.js
index 8f843f7a2f..3d3e17cd25 100644
--- a/packages/react-dom/src/client/validateDOMNesting.js
+++ b/packages/react-dom/src/client/validateDOMNesting.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 // TODO: direct imports like some-package/src/* are bad. Fix me.
 import ReactDebugCurrentFiber from 'react-reconciler/src/ReactDebugCurrentFiber';
 
diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js
index 8473b546fb..b8b5c248a9 100644
--- a/packages/react-dom/src/events/SimpleEventPlugin.js
+++ b/packages/react-dom/src/events/SimpleEventPlugin.js
@@ -22,7 +22,7 @@ import {accumulateTwoPhaseDispatches} from 'events/EventPropagators';
 import SyntheticEvent from 'events/SyntheticEvent';
 
 import * as DOMTopLevelEventTypes from './DOMTopLevelEventTypes';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 import SyntheticAnimationEvent from './SyntheticAnimationEvent';
 import SyntheticClipboardEvent from './SyntheticClipboardEvent';
diff --git a/packages/react-dom/src/server/ReactDOMServerBrowser.js b/packages/react-dom/src/server/ReactDOMServerBrowser.js
index 1edfbce979..4304419147 100644
--- a/packages/react-dom/src/server/ReactDOMServerBrowser.js
+++ b/packages/react-dom/src/server/ReactDOMServerBrowser.js
@@ -6,7 +6,7 @@
  */
 
 import ReactVersion from 'shared/ReactVersion';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import {renderToString, renderToStaticMarkup} from './ReactDOMStringRenderer';
 
diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index 87673bd4eb..04234411f2 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -15,9 +15,9 @@ import type {
 } from 'shared/ReactTypes';
 
 import React from 'react';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 import checkPropTypes from 'prop-types/checkPropTypes';
 import describeComponentFrame from 'shared/describeComponentFrame';
 import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
diff --git a/packages/react-dom/src/shared/DOMProperty.js b/packages/react-dom/src/shared/DOMProperty.js
index b01c069dba..31f222b978 100644
--- a/packages/react-dom/src/shared/DOMProperty.js
+++ b/packages/react-dom/src/shared/DOMProperty.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 type PropertyType = 0 | 1 | 2 | 3 | 4 | 5 | 6;
 
diff --git a/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js b/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js
index 0020b4ba66..def8ce5a26 100644
--- a/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js
+++ b/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
 
 import {ATTRIBUTE_NAME_CHAR} from './DOMProperty';
diff --git a/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js b/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js
index 018054cb30..b8e5aeb231 100644
--- a/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js
+++ b/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js
@@ -6,7 +6,7 @@
  */
 
 import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 let didWarnValueNull = false;
 
diff --git a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js
index 399a7d89ce..80607b6b65 100644
--- a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js
+++ b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js
@@ -10,7 +10,7 @@ import {
   possibleRegistrationNames,
 } from 'events/EventPluginRegistry';
 import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 import {
   ATTRIBUTE_NAME_CHAR,
diff --git a/packages/react-dom/src/shared/assertValidProps.js b/packages/react-dom/src/shared/assertValidProps.js
index 60c0ff4f7c..b798585877 100644
--- a/packages/react-dom/src/shared/assertValidProps.js
+++ b/packages/react-dom/src/shared/assertValidProps.js
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 
 import voidElementTags from './voidElementTags';
 
diff --git a/packages/react-dom/src/shared/checkReact.js b/packages/react-dom/src/shared/checkReact.js
index ff7192c688..8ce3d0082b 100644
--- a/packages/react-dom/src/shared/checkReact.js
+++ b/packages/react-dom/src/shared/checkReact.js
@@ -8,7 +8,7 @@
  */
 
 import React from 'react';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 invariant(
   React,
diff --git a/packages/react-dom/src/shared/warnValidStyle.js b/packages/react-dom/src/shared/warnValidStyle.js
index 0231d589bb..d616c9b3c9 100644
--- a/packages/react-dom/src/shared/warnValidStyle.js
+++ b/packages/react-dom/src/shared/warnValidStyle.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 let warnValidStyle = () => {};
 
diff --git a/packages/react-dom/src/test-utils/ReactTestUtils.js b/packages/react-dom/src/test-utils/ReactTestUtils.js
index d9948291b3..cc0c5a89f7 100644
--- a/packages/react-dom/src/test-utils/ReactTestUtils.js
+++ b/packages/react-dom/src/test-utils/ReactTestUtils.js
@@ -16,7 +16,7 @@ import {
   HostText,
 } from 'shared/ReactTypeOfWork';
 import SyntheticEvent from 'events/SyntheticEvent';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import * as DOMTopLevelEventTypes from '../events/DOMTopLevelEventTypes';
 
diff --git a/packages/react-native-renderer/package.json b/packages/react-native-renderer/package.json
index 73e282f2c2..d5157f1254 100644
--- a/packages/react-native-renderer/package.json
+++ b/packages/react-native-renderer/package.json
@@ -4,7 +4,6 @@
   "private": true,
   "repository": "facebook/react",
   "dependencies": {
-    "fbjs": "^0.8.16",
     "object-assign": "^4.1.1",
     "prop-types": "^15.6.0"
   },
diff --git a/packages/react-native-renderer/src/NativeMethodsMixin.js b/packages/react-native-renderer/src/NativeMethodsMixin.js
index c7caa562c5..5c38b29656 100644
--- a/packages/react-native-renderer/src/NativeMethodsMixin.js
+++ b/packages/react-native-renderer/src/NativeMethodsMixin.js
@@ -15,7 +15,7 @@ import type {
   ReactNativeBaseComponentViewConfig,
 } from './ReactNativeTypes';
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 // Modules provided by RN:
 import TextInputState from 'TextInputState';
 import UIManager from 'UIManager';
diff --git a/packages/react-native-renderer/src/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js
index 0634921b68..63cc05480b 100644
--- a/packages/react-native-renderer/src/ReactFabric.js
+++ b/packages/react-native-renderer/src/ReactFabric.js
@@ -25,7 +25,7 @@ import {getInspectorDataForViewTag} from './ReactNativeFiberInspector';
 
 import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
 import getComponentName from 'shared/getComponentName';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 const findHostInstance = ReactFabricRenderer.findHostInstance;
 
diff --git a/packages/react-native-renderer/src/ReactFabricComponentTree.js b/packages/react-native-renderer/src/ReactFabricComponentTree.js
index 23f5ce9b95..4eca1b8fd9 100644
--- a/packages/react-native-renderer/src/ReactFabricComponentTree.js
+++ b/packages/react-native-renderer/src/ReactFabricComponentTree.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 function getInstanceFromInstance(instanceHandle) {
   return instanceHandle;
diff --git a/packages/react-native-renderer/src/ReactFabricHostConfig.js b/packages/react-native-renderer/src/ReactFabricHostConfig.js
index ef4525d8e5..65443762b1 100644
--- a/packages/react-native-renderer/src/ReactFabricHostConfig.js
+++ b/packages/react-native-renderer/src/ReactFabricHostConfig.js
@@ -21,7 +21,7 @@ import * as ReactNativeFrameScheduling from './ReactNativeFrameScheduling';
 import * as ReactNativeViewConfigRegistry from 'ReactNativeViewConfigRegistry';
 
 import deepFreezeAndThrowOnMutationInDev from 'deepFreezeAndThrowOnMutationInDev';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import {dispatchEvent} from './ReactFabricEventEmitter';
 
diff --git a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js
index 59cd7c8f28..f932968c45 100644
--- a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js
+++ b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js
@@ -15,7 +15,7 @@ import {
 import type {TopLevelType} from 'events/TopLevelEventTypes';
 import * as ReactNativeViewConfigRegistry from 'ReactNativeViewConfigRegistry';
 import SyntheticEvent from 'events/SyntheticEvent';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 const {
   customBubblingEventTypes,
diff --git a/packages/react-native-renderer/src/ReactNativeComponentTree.js b/packages/react-native-renderer/src/ReactNativeComponentTree.js
index 32554cd0bc..cd1e50f3b8 100644
--- a/packages/react-native-renderer/src/ReactNativeComponentTree.js
+++ b/packages/react-native-renderer/src/ReactNativeComponentTree.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 const instanceCache = {};
 const instanceProps = {};
diff --git a/packages/react-native-renderer/src/ReactNativeEventEmitter.js b/packages/react-native-renderer/src/ReactNativeEventEmitter.js
index 6b61de6331..760887abba 100644
--- a/packages/react-native-renderer/src/ReactNativeEventEmitter.js
+++ b/packages/react-native-renderer/src/ReactNativeEventEmitter.js
@@ -10,7 +10,7 @@
 import {getListener, runExtractedEventsInBatch} from 'events/EventPluginHub';
 import {registrationNameModules} from 'events/EventPluginRegistry';
 import {batchedUpdates} from 'events/ReactGenericBatching';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 import {getInstanceFromNode} from './ReactNativeComponentTree';
 
diff --git a/packages/react-native-renderer/src/ReactNativeFiberInspector.js b/packages/react-native-renderer/src/ReactNativeFiberInspector.js
index 169e2f40ad..766e05760e 100644
--- a/packages/react-native-renderer/src/ReactNativeFiberInspector.js
+++ b/packages/react-native-renderer/src/ReactNativeFiberInspector.js
@@ -15,7 +15,7 @@ import {
 } from 'react-reconciler/reflection';
 import getComponentName from 'shared/getComponentName';
 import {HostComponent} from 'shared/ReactTypeOfWork';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 // Module provided by RN:
 import UIManager from 'UIManager';
 
diff --git a/packages/react-native-renderer/src/ReactNativeHostConfig.js b/packages/react-native-renderer/src/ReactNativeHostConfig.js
index 03ce2dc6e0..8c01e0ec94 100644
--- a/packages/react-native-renderer/src/ReactNativeHostConfig.js
+++ b/packages/react-native-renderer/src/ReactNativeHostConfig.js
@@ -9,7 +9,7 @@
 
 import type {ReactNativeBaseComponentViewConfig} from './ReactNativeTypes';
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 // Modules provided by RN:
 import UIManager from 'UIManager';
diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js
index 6ddc034282..9ff1749c50 100644
--- a/packages/react-native-renderer/src/ReactNativeRenderer.js
+++ b/packages/react-native-renderer/src/ReactNativeRenderer.js
@@ -28,7 +28,7 @@ import {getInspectorDataForViewTag} from './ReactNativeFiberInspector';
 
 import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
 import getComponentName from 'shared/getComponentName';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 const findHostInstance = ReactNativeFiberRenderer.findHostInstance;
 
diff --git a/packages/react-native-renderer/src/__mocks__/FabricUIManager.js b/packages/react-native-renderer/src/__mocks__/FabricUIManager.js
index 3fcf573ab8..6e5a269079 100644
--- a/packages/react-native-renderer/src/__mocks__/FabricUIManager.js
+++ b/packages/react-native-renderer/src/__mocks__/FabricUIManager.js
@@ -9,7 +9,7 @@
 
 // Mock of the Native Hooks
 
-const invariant = require('fbjs/lib/invariant');
+import invariant from 'shared/invariant';
 
 const roots = new Map();
 const allocatedTags = new Set();
diff --git a/packages/react-native-renderer/src/__mocks__/ReactNativeViewConfigRegistry.js b/packages/react-native-renderer/src/__mocks__/ReactNativeViewConfigRegistry.js
index c8ed940a86..63476367e5 100644
--- a/packages/react-native-renderer/src/__mocks__/ReactNativeViewConfigRegistry.js
+++ b/packages/react-native-renderer/src/__mocks__/ReactNativeViewConfigRegistry.js
@@ -13,7 +13,7 @@ import type {
   ViewConfigGetter,
 } from './ReactNativeTypes';
 
-const invariant = require('fbjs/lib/invariant');
+import invariant from 'shared/invariant';
 
 // Event configs
 const customBubblingEventTypes = {};
diff --git a/packages/react-native-renderer/src/__mocks__/UIManager.js b/packages/react-native-renderer/src/__mocks__/UIManager.js
index 4a234fbdc1..b3f7ac6c5f 100644
--- a/packages/react-native-renderer/src/__mocks__/UIManager.js
+++ b/packages/react-native-renderer/src/__mocks__/UIManager.js
@@ -9,7 +9,7 @@
 
 // Mock of the Native Hooks
 
-const invariant = require('fbjs/lib/invariant');
+import invariant from 'shared/invariant';
 
 // Map of viewTag -> {children: [childTag], parent: ?parentTag}
 const roots = [];
diff --git a/packages/react-noop-renderer/package.json b/packages/react-noop-renderer/package.json
index 25b3a429e5..99b44fd289 100644
--- a/packages/react-noop-renderer/package.json
+++ b/packages/react-noop-renderer/package.json
@@ -7,7 +7,6 @@
   "repository": "facebook/react",
   "license": "MIT",
   "dependencies": {
-    "fbjs": "^0.8.16",
     "object-assign": "^4.1.1",
     "prop-types": "^15.6.0",
     "regenerator-runtime": "^0.11.0",
diff --git a/packages/react-reconciler/package.json b/packages/react-reconciler/package.json
index 586796e2fb..d6acdf4c7a 100644
--- a/packages/react-reconciler/package.json
+++ b/packages/react-reconciler/package.json
@@ -25,7 +25,6 @@
     "react": "^16.0.0"
   },
   "dependencies": {
-    "fbjs": "^0.8.16",
     "loose-envify": "^1.1.0",
     "object-assign": "^4.1.1",
     "prop-types": "^15.6.0"
diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js
index 3caf4db2a1..19bdfbd059 100644
--- a/packages/react-reconciler/src/ReactChildFiber.js
+++ b/packages/react-reconciler/src/ReactChildFiber.js
@@ -28,8 +28,8 @@ import {
   Fragment,
 } from 'shared/ReactTypeOfWork';
 import {getStackAddendumByWorkInProgressFiber} from 'shared/ReactFiberComponentTreeHook';
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 
 import {
   createWorkInProgress,
diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js
index 34ee91645d..2b29ea79aa 100644
--- a/packages/react-reconciler/src/ReactFiber.js
+++ b/packages/react-reconciler/src/ReactFiber.js
@@ -15,7 +15,7 @@ import type {TypeOfSideEffect} from 'shared/ReactTypeOfSideEffect';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 import type {UpdateQueue} from './ReactUpdateQueue';
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
 import {NoEffect} from 'shared/ReactTypeOfSideEffect';
 import {
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 135e85bb0b..d2573168ec 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -46,10 +46,10 @@ import {
   debugRenderPhaseSideEffectsForStrictMode,
   enableProfilerTimer,
 } from 'shared/ReactFeatureFlags';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 import getComponentName from 'shared/getComponentName';
 import ReactStrictModeWarnings from './ReactStrictModeWarnings';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
 import {cancelWorkTimer} from './ReactDebugFiberPerf';
 
diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js
index a158b9c0d1..444bd104c2 100644
--- a/packages/react-reconciler/src/ReactFiberClassComponent.js
+++ b/packages/react-reconciler/src/ReactFiberClassComponent.js
@@ -22,8 +22,8 @@ import {isMounted} from 'react-reconciler/reflection';
 import * as ReactInstanceMap from 'shared/ReactInstanceMap';
 import shallowEqual from 'shared/shallowEqual';
 import getComponentName from 'shared/getComponentName';
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 
 import {startPhaseTimer, stopPhaseTimer} from './ReactDebugFiberPerf';
 import {StrictMode} from './ReactTypeOfMode';
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index f9a3dce200..786c745b42 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -38,8 +38,8 @@ import {
   Update,
 } from 'shared/ReactTypeOfSideEffect';
 import {commitUpdateQueue} from './ReactUpdateQueue';
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 
 import {onCommitUnmount} from './ReactFiberDevToolsHook';
 import {startPhaseTimer, stopPhaseTimer} from './ReactDebugFiberPerf';
diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js
index d9b469c94d..e8db8f19e8 100644
--- a/packages/react-reconciler/src/ReactFiberCompleteWork.js
+++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js
@@ -39,7 +39,7 @@ import {
 } from 'shared/ReactTypeOfWork';
 import {Placement, Ref, Update} from 'shared/ReactTypeOfSideEffect';
 import {ProfileMode} from './ReactTypeOfMode';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import {
   createInstance,
diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js
index 5cad370b96..1a1a30f35e 100644
--- a/packages/react-reconciler/src/ReactFiberContext.js
+++ b/packages/react-reconciler/src/ReactFiberContext.js
@@ -13,8 +13,8 @@ import type {StackCursor} from './ReactFiberStack';
 import {isFiberMounted} from 'react-reconciler/reflection';
 import {ClassComponent, HostRoot} from 'shared/ReactTypeOfWork';
 import getComponentName from 'shared/getComponentName';
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 import checkPropTypes from 'prop-types/checkPropTypes';
 
 import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
diff --git a/packages/react-reconciler/src/ReactFiberDevToolsHook.js b/packages/react-reconciler/src/ReactFiberDevToolsHook.js
index e7d77fd99c..dd58854070 100644
--- a/packages/react-reconciler/src/ReactFiberDevToolsHook.js
+++ b/packages/react-reconciler/src/ReactFiberDevToolsHook.js
@@ -10,7 +10,7 @@
 import type {Fiber} from './ReactFiber';
 import type {FiberRoot} from './ReactFiberRoot';
 
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 declare var __REACT_DEVTOOLS_GLOBAL_HOOK__: Object | void;
 
diff --git a/packages/react-reconciler/src/ReactFiberHostConfig.js b/packages/react-reconciler/src/ReactFiberHostConfig.js
index d06b75b9a4..c55a36c9b8 100644
--- a/packages/react-reconciler/src/ReactFiberHostConfig.js
+++ b/packages/react-reconciler/src/ReactFiberHostConfig.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 // We expect that our Rollup, Jest, and Flow configurations
 // always shim this module with the corresponding host config
diff --git a/packages/react-reconciler/src/ReactFiberHostContext.js b/packages/react-reconciler/src/ReactFiberHostContext.js
index 4f091e610b..500d5815ad 100644
--- a/packages/react-reconciler/src/ReactFiberHostContext.js
+++ b/packages/react-reconciler/src/ReactFiberHostContext.js
@@ -11,7 +11,7 @@ import type {Fiber} from './ReactFiber';
 import type {StackCursor} from './ReactFiberStack';
 import type {Container, HostContext} from './ReactFiberHostConfig';
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import {getChildHostContext, getRootHostContext} from './ReactFiberHostConfig';
 import {createCursor, push, pop} from './ReactFiberStack';
diff --git a/packages/react-reconciler/src/ReactFiberHydrationContext.js b/packages/react-reconciler/src/ReactFiberHydrationContext.js
index bc4b9eae80..8983333a30 100644
--- a/packages/react-reconciler/src/ReactFiberHydrationContext.js
+++ b/packages/react-reconciler/src/ReactFiberHydrationContext.js
@@ -18,7 +18,7 @@ import type {
 
 import {HostComponent, HostText, HostRoot} from 'shared/ReactTypeOfWork';
 import {Deletion, Placement} from 'shared/ReactTypeOfSideEffect';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import {createFiberFromHostInstanceForDeletion} from './ReactFiber';
 import {
diff --git a/packages/react-reconciler/src/ReactFiberNewContext.js b/packages/react-reconciler/src/ReactFiberNewContext.js
index f2715acfb2..4826412dde 100644
--- a/packages/react-reconciler/src/ReactFiberNewContext.js
+++ b/packages/react-reconciler/src/ReactFiberNewContext.js
@@ -18,7 +18,7 @@ export type NewContext = {
   getContextChangedBits(context: ReactContext<any>): number,
 };
 
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 import {isPrimaryRenderer} from './ReactFiberHostConfig';
 import {createCursor, push, pop} from './ReactFiberStack';
 
diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js
index 61ed86e323..3e1c36866f 100644
--- a/packages/react-reconciler/src/ReactFiberReconciler.js
+++ b/packages/react-reconciler/src/ReactFiberReconciler.js
@@ -25,8 +25,8 @@ import {
 import * as ReactInstanceMap from 'shared/ReactInstanceMap';
 import {HostComponent} from 'shared/ReactTypeOfWork';
 import getComponentName from 'shared/getComponentName';
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 
 import {getPublicInstance} from './ReactFiberHostConfig';
 import {
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 92b83f4414..1272f69f96 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -45,8 +45,8 @@ import {
   warnAboutLegacyContextAPI,
 } from 'shared/ReactFeatureFlags';
 import getComponentName from 'shared/getComponentName';
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 
 import ReactFiberInstrumentation from './ReactFiberInstrumentation';
 import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
diff --git a/packages/react-reconciler/src/ReactFiberStack.js b/packages/react-reconciler/src/ReactFiberStack.js
index 9c45e11d1f..c108e89891 100644
--- a/packages/react-reconciler/src/ReactFiberStack.js
+++ b/packages/react-reconciler/src/ReactFiberStack.js
@@ -9,7 +9,7 @@
 
 import type {Fiber} from './ReactFiber';
 
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 export type StackCursor<T> = {
   current: T,
diff --git a/packages/react-reconciler/src/ReactFiberTreeReflection.js b/packages/react-reconciler/src/ReactFiberTreeReflection.js
index c988465b75..394a4b3871 100644
--- a/packages/react-reconciler/src/ReactFiberTreeReflection.js
+++ b/packages/react-reconciler/src/ReactFiberTreeReflection.js
@@ -9,8 +9,8 @@
 
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
 
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 
 import * as ReactInstanceMap from 'shared/ReactInstanceMap';
 import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
diff --git a/packages/react-reconciler/src/ReactProfilerTimer.js b/packages/react-reconciler/src/ReactProfilerTimer.js
index 7877d7d297..b1455195a8 100644
--- a/packages/react-reconciler/src/ReactProfilerTimer.js
+++ b/packages/react-reconciler/src/ReactProfilerTimer.js
@@ -12,7 +12,7 @@ import type {Fiber} from './ReactFiber';
 import getComponentName from 'shared/getComponentName';
 import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
 
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 import {now} from './ReactFiberHostConfig';
 
 export type ProfilerTimer = {
diff --git a/packages/react-reconciler/src/ReactStrictModeWarnings.js b/packages/react-reconciler/src/ReactStrictModeWarnings.js
index 9ca543583c..365f4bf4d6 100644
--- a/packages/react-reconciler/src/ReactStrictModeWarnings.js
+++ b/packages/react-reconciler/src/ReactStrictModeWarnings.js
@@ -13,7 +13,7 @@ import getComponentName from 'shared/getComponentName';
 import {getStackAddendumByWorkInProgressFiber} from 'shared/ReactFiberComponentTreeHook';
 import {StrictMode} from './ReactTypeOfMode';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 type LIFECYCLE =
   | 'UNSAFE_componentWillMount'
diff --git a/packages/react-reconciler/src/ReactUpdateQueue.js b/packages/react-reconciler/src/ReactUpdateQueue.js
index dc3791c4e1..1e28051d58 100644
--- a/packages/react-reconciler/src/ReactUpdateQueue.js
+++ b/packages/react-reconciler/src/ReactUpdateQueue.js
@@ -102,8 +102,8 @@ import {
 
 import {StrictMode} from './ReactTypeOfMode';
 
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 
 export type Update<State> = {
   expirationTime: ExpirationTime,
diff --git a/packages/react-reconciler/src/forks/ReactFiberErrorDialog.www.js b/packages/react-reconciler/src/forks/ReactFiberErrorDialog.www.js
index 16d9f71c4c..433448e0c3 100644
--- a/packages/react-reconciler/src/forks/ReactFiberErrorDialog.www.js
+++ b/packages/react-reconciler/src/forks/ReactFiberErrorDialog.www.js
@@ -9,7 +9,7 @@
 
 import type {CapturedError} from '../ReactCapturedValue';
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 // Provided by www
 const ReactFiberErrorDialogWWW = require('ReactFiberErrorDialog');
diff --git a/packages/react-scheduler/package.json b/packages/react-scheduler/package.json
index b5bc00dde1..633f48859b 100644
--- a/packages/react-scheduler/package.json
+++ b/packages/react-scheduler/package.json
@@ -14,7 +14,6 @@
   },
   "homepage": "https://reactjs.org/",
   "dependencies": {
-    "fbjs": "^0.8.16",
     "object-assign": "^4.1.1"
   },
   "files": [
diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index 4667cfc725..2b016f1275 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -42,7 +42,7 @@ type CallbackConfigType = {|
 export type CallbackIdType = CallbackConfigType;
 
 import {canUseDOM} from 'shared/ExecutionEnvironment';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 if (__DEV__) {
   if (canUseDOM && typeof requestAnimationFrame !== 'function') {
diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json
index 6aafaf967b..e1139ddf11 100644
--- a/packages/react-test-renderer/package.json
+++ b/packages/react-test-renderer/package.json
@@ -15,7 +15,6 @@
   },
   "homepage": "https://reactjs.org/",
   "dependencies": {
-    "fbjs": "^0.8.16",
     "object-assign": "^4.1.1",
     "prop-types": "^15.6.0",
     "react-is": "^16.4.1"
diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js
index 65020d4842..54f671e660 100644
--- a/packages/react-test-renderer/src/ReactShallowRenderer.js
+++ b/packages/react-test-renderer/src/ReactShallowRenderer.js
@@ -11,7 +11,7 @@ import {isForwardRef} from 'react-is';
 import describeComponentFrame from 'shared/describeComponentFrame';
 import getComponentName from 'shared/getComponentName';
 import shallowEqual from 'shared/shallowEqual';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 import checkPropTypes from 'prop-types/checkPropTypes';
 
 const emptyObject = {};
diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js
index 711f8f6a5e..669e1e7abd 100644
--- a/packages/react-test-renderer/src/ReactTestRenderer.js
+++ b/packages/react-test-renderer/src/ReactTestRenderer.js
@@ -28,7 +28,7 @@ import {
   ForwardRef,
   Profiler,
 } from 'shared/ReactTypeOfWork';
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import * as ReactTestHostConfig from './ReactTestHostConfig';
 import * as TestRendererScheduling from './ReactTestRendererScheduling';
diff --git a/packages/react/package.json b/packages/react/package.json
index a69208d563..f5a8ecd125 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -21,7 +21,6 @@
     "node": ">=0.10.0"
   },
   "dependencies": {
-    "fbjs": "^0.8.16",
     "loose-envify": "^1.1.0",
     "object-assign": "^4.1.1",
     "prop-types": "^15.6.0"
diff --git a/packages/react/src/ReactBaseClasses.js b/packages/react/src/ReactBaseClasses.js
index 3f92549e1a..e1682d128e 100644
--- a/packages/react/src/ReactBaseClasses.js
+++ b/packages/react/src/ReactBaseClasses.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
 
 import ReactNoopUpdateQueue from './ReactNoopUpdateQueue';
diff --git a/packages/react/src/ReactChildren.js b/packages/react/src/ReactChildren.js
index e01f765c9b..0bbe5bee14 100644
--- a/packages/react/src/ReactChildren.js
+++ b/packages/react/src/ReactChildren.js
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 import {
   getIteratorFn,
   REACT_ELEMENT_TYPE,
diff --git a/packages/react/src/ReactContext.js b/packages/react/src/ReactContext.js
index d15163e813..4c1b06bfed 100644
--- a/packages/react/src/ReactContext.js
+++ b/packages/react/src/ReactContext.js
@@ -11,7 +11,7 @@ import {REACT_PROVIDER_TYPE, REACT_CONTEXT_TYPE} from 'shared/ReactSymbols';
 
 import type {ReactContext} from 'shared/ReactTypes';
 
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 export function createContext<T>(
   defaultValue: T,
diff --git a/packages/react/src/ReactElement.js b/packages/react/src/ReactElement.js
index 9127453b9b..80cd607956 100644
--- a/packages/react/src/ReactElement.js
+++ b/packages/react/src/ReactElement.js
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import invariant from 'fbjs/lib/invariant';
-import warning from 'fbjs/lib/warning';
+import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 import {REACT_ELEMENT_TYPE} from 'shared/ReactSymbols';
 
 import ReactCurrentOwner from './ReactCurrentOwner';
diff --git a/packages/react/src/ReactElementValidator.js b/packages/react/src/ReactElementValidator.js
index 35dc391f43..f0ea9601b8 100644
--- a/packages/react/src/ReactElementValidator.js
+++ b/packages/react/src/ReactElementValidator.js
@@ -22,7 +22,7 @@ import {
   REACT_FRAGMENT_TYPE,
 } from 'shared/ReactSymbols';
 import checkPropTypes from 'prop-types/checkPropTypes';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 import ReactCurrentOwner from './ReactCurrentOwner';
 import {isValidElement, createElement, cloneElement} from './ReactElement';
diff --git a/packages/react/src/ReactNoopUpdateQueue.js b/packages/react/src/ReactNoopUpdateQueue.js
index ffd47dacb4..d21cd561ce 100644
--- a/packages/react/src/ReactNoopUpdateQueue.js
+++ b/packages/react/src/ReactNoopUpdateQueue.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 const didWarnStateUpdateForUnmountedComponent = {};
 
diff --git a/packages/react/src/forwardRef.js b/packages/react/src/forwardRef.js
index 6c3c1a4343..419af668a3 100644
--- a/packages/react/src/forwardRef.js
+++ b/packages/react/src/forwardRef.js
@@ -7,7 +7,7 @@
 
 import {REACT_FORWARD_REF_TYPE} from 'shared/ReactSymbols';
 
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 export default function forwardRef<Props, ElementType: React$ElementType>(
   render: (props: Props, ref: React$ElementRef<ElementType>) => React$Node,
diff --git a/packages/shared/HostConfigWithNoHydration.js b/packages/shared/HostConfigWithNoHydration.js
index 9458bd50ae..66bd02fb1b 100644
--- a/packages/shared/HostConfigWithNoHydration.js
+++ b/packages/shared/HostConfigWithNoHydration.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 // Renderers that don't support hydration
 // can re-export everything from this module.
diff --git a/packages/shared/HostConfigWithNoMutation.js b/packages/shared/HostConfigWithNoMutation.js
index 5bce3c671d..bb0b7f425b 100644
--- a/packages/shared/HostConfigWithNoMutation.js
+++ b/packages/shared/HostConfigWithNoMutation.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 // Renderers that don't support mutation
 // can re-export everything from this module.
diff --git a/packages/shared/HostConfigWithNoPersistence.js b/packages/shared/HostConfigWithNoPersistence.js
index 83e845d6e7..1977cb2f79 100644
--- a/packages/shared/HostConfigWithNoPersistence.js
+++ b/packages/shared/HostConfigWithNoPersistence.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 // Renderers that don't support persistence
 // can re-export everything from this module.
diff --git a/packages/shared/ReactErrorUtils.js b/packages/shared/ReactErrorUtils.js
index 2373e2527e..ef3cb31a78 100644
--- a/packages/shared/ReactErrorUtils.js
+++ b/packages/shared/ReactErrorUtils.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 import invokeGuardedCallback from './invokeGuardedCallback';
 
 const ReactErrorUtils = {
diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
index 003d96fe95..b3d2b48500 100644
--- a/packages/shared/ReactFeatureFlags.js
+++ b/packages/shared/ReactFeatureFlags.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 // Exports ReactDOM.createRoot
 export const enableUserTimingAPI = __DEV__;
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
index 1d45d79c79..bd55701519 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import typeof * as FeatureFlagsType from 'shared/ReactFeatureFlags';
 import typeof * as FabricFeatureFlagsType from './ReactFeatureFlags.native-fabric-fb';
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
index 80aa2d7e46..ea6c7cf6d9 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-oss.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import typeof * as FeatureFlagsType from 'shared/ReactFeatureFlags';
 import typeof * as FabricFeatureFlagsType from './ReactFeatureFlags.native-fabric-oss';
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js
index d36c0143c1..b0fdc77f3a 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import typeof * as FeatureFlagsType from 'shared/ReactFeatureFlags';
 import typeof * as FeatureFlagsShimType from './ReactFeatureFlags.native-fb';
diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js
index 5f4511c8dd..3c2b19bf1b 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-oss.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import typeof * as FeatureFlagsType from 'shared/ReactFeatureFlags';
 import typeof * as FeatureFlagsShimType from './ReactFeatureFlags.native-oss';
diff --git a/packages/shared/forks/ReactFeatureFlags.persistent.js b/packages/shared/forks/ReactFeatureFlags.persistent.js
index 8203c2c931..88773cf900 100644
--- a/packages/shared/forks/ReactFeatureFlags.persistent.js
+++ b/packages/shared/forks/ReactFeatureFlags.persistent.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import typeof * as FeatureFlagsType from 'shared/ReactFeatureFlags';
 import typeof * as PersistentFeatureFlagsType from './ReactFeatureFlags.persistent';
diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
index 70f055d5a2..1bc79a7b3f 100644
--- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js
+++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 import typeof * as FeatureFlagsType from 'shared/ReactFeatureFlags';
 import typeof * as PersistentFeatureFlagsType from './ReactFeatureFlags.persistent';
diff --git a/packages/shared/forks/invariant.www.js b/packages/shared/forks/invariant.www.js
new file mode 100644
index 0000000000..c2611b4cae
--- /dev/null
+++ b/packages/shared/forks/invariant.www.js
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+export default require('invariant');
diff --git a/packages/shared/forks/invokeGuardedCallback.www.js b/packages/shared/forks/invokeGuardedCallback.www.js
index 3cbe0d6536..c90129f441 100644
--- a/packages/shared/forks/invokeGuardedCallback.www.js
+++ b/packages/shared/forks/invokeGuardedCallback.www.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 const invokeGuardedCallback = require('ReactFbErrorUtils')
   .invokeGuardedCallback;
diff --git a/packages/shared/forks/warning.www.js b/packages/shared/forks/warning.www.js
new file mode 100644
index 0000000000..f47643d294
--- /dev/null
+++ b/packages/shared/forks/warning.www.js
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+export default require('warning');
diff --git a/packages/shared/invariant.js b/packages/shared/invariant.js
new file mode 100644
index 0000000000..4cea6d7c73
--- /dev/null
+++ b/packages/shared/invariant.js
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+/**
+ * Use invariant() to assert state which your program assumes to be true.
+ *
+ * Provide sprintf-style format (only %s is supported) and arguments
+ * to provide information about what broke and what you were
+ * expecting.
+ *
+ * The invariant message will be stripped in production, but the invariant
+ * will remain to ensure logic does not differ in production.
+ */
+
+let validateFormat = () => {};
+
+if (__DEV__) {
+  validateFormat = function(format) {
+    if (format === undefined) {
+      throw new Error('invariant requires an error message argument');
+    }
+  };
+}
+
+export default function invariant(condition, format, a, b, c, d, e, f) {
+  validateFormat(format);
+
+  if (!condition) {
+    let error;
+    if (format === undefined) {
+      error = new Error(
+        'Minified exception occurred; use the non-minified dev environment ' +
+          'for the full error message and additional helpful warnings.',
+      );
+    } else {
+      const args = [a, b, c, d, e, f];
+      let argIndex = 0;
+      error = new Error(
+        format.replace(/%s/g, function() {
+          return args[argIndex++];
+        }),
+      );
+      error.name = 'Invariant Violation';
+    }
+
+    error.framesToPop = 1; // we don't care about invariant's own frame
+    throw error;
+  }
+}
diff --git a/packages/shared/invokeGuardedCallback.js b/packages/shared/invokeGuardedCallback.js
index 6ad3bbc6e0..fa6ee451c9 100644
--- a/packages/shared/invokeGuardedCallback.js
+++ b/packages/shared/invokeGuardedCallback.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 let invokeGuardedCallback = function<A, B, C, D, E, F, Context>(
   name: string | null,
diff --git a/packages/shared/reactProdInvariant.js b/packages/shared/reactProdInvariant.js
index 476e440d54..a75c9b106d 100644
--- a/packages/shared/reactProdInvariant.js
+++ b/packages/shared/reactProdInvariant.js
@@ -9,7 +9,7 @@
 
 // Relying on the `invariant()` implementation lets us
 // have preserve the format and params in the www builds.
-import invariant from 'fbjs/lib/invariant';
+import invariant from 'shared/invariant';
 
 /**
  * WARNING: DO NOT manually require this module.
diff --git a/packages/shared/warning.js b/packages/shared/warning.js
new file mode 100644
index 0000000000..4a8ef4e465
--- /dev/null
+++ b/packages/shared/warning.js
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
+
+let warning = () => {};
+
+if (__DEV__) {
+  const printWarning = function(format, ...args) {
+    let argIndex = 0;
+    const message = 'Warning: ' + format.replace(/%s/g, () => args[argIndex++]);
+    if (typeof console !== 'undefined') {
+      console.error(message);
+    }
+    try {
+      // --- Welcome to debugging React ---
+      // This error was thrown as a convenience so that you can use this stack
+      // to find the callsite that caused this warning to fire.
+      throw new Error(message);
+    } catch (x) {}
+  };
+
+  warning = function(condition, format, ...args) {
+    if (format === undefined) {
+      throw new Error(
+        '`warning(condition, format, ...args)` requires a warning ' +
+          'message argument',
+      );
+    }
+    if (!condition) {
+      printWarning(format, ...args);
+    }
+  };
+}
+
+export default warning;
diff --git a/packages/simple-cache-provider/package.json b/packages/simple-cache-provider/package.json
index f785df0f2e..97458201d5 100644
--- a/packages/simple-cache-provider/package.json
+++ b/packages/simple-cache-provider/package.json
@@ -9,9 +9,6 @@
     "index.js",
     "cjs/"
   ],
-  "dependencies": {
-    "fbjs": "^0.8.16"
-  },
   "peerDependencies": {
     "react": "^16.3.0-alpha.1"
   }
diff --git a/packages/simple-cache-provider/src/SimpleCacheProvider.js b/packages/simple-cache-provider/src/SimpleCacheProvider.js
index b10721bd9f..13620cced1 100644
--- a/packages/simple-cache-provider/src/SimpleCacheProvider.js
+++ b/packages/simple-cache-provider/src/SimpleCacheProvider.js
@@ -8,7 +8,7 @@
  */
 
 import React from 'react';
-import warning from 'fbjs/lib/warning';
+import warning from 'shared/warning';
 
 function noop() {}
 
diff --git a/scripts/error-codes/__tests__/replace-invariant-error-codes-test.js b/scripts/error-codes/__tests__/replace-invariant-error-codes-test.js
index fe92a70dbc..c37bef2793 100644
--- a/scripts/error-codes/__tests__/replace-invariant-error-codes-test.js
+++ b/scripts/error-codes/__tests__/replace-invariant-error-codes-test.js
@@ -35,10 +35,10 @@ describe('error codes transform', () => {
 
   it('should replace simple invariant calls', () => {
     compare(
-      "import invariant from 'shared/reactProdInvariant';\n" +
+      "import invariant from 'shared/invariant';\n" +
         "invariant(condition, 'Do not override existing functions.');",
       "import _prodInvariant from 'shared/reactProdInvariant';\n" +
-        "import invariant from 'shared/reactProdInvariant';\n" +
+        "import invariant from 'shared/invariant';\n" +
         '!condition ? ' +
         '__DEV__ ? ' +
         "invariant(false, 'Do not override existing functions.') : " +
@@ -54,11 +54,11 @@ describe('error codes transform', () => {
       `_prodInvariant('16') : void 0;`;
 
     compare(
-      `import invariant from 'invariant';
+      `import invariant from 'shared/invariant';
 invariant(condition, 'Do not override existing functions.');
 invariant(condition, 'Do not override existing functions.');`,
       `import _prodInvariant from 'shared/reactProdInvariant';
-import invariant from 'invariant';
+import invariant from 'shared/invariant';
 ${expectedInvariantTransformResult}
 ${expectedInvariantTransformResult}`
     );
@@ -66,10 +66,10 @@ ${expectedInvariantTransformResult}`
 
   it('should support invariant calls with args', () => {
     compare(
-      "import invariant from 'shared/reactProdInvariant';\n" +
+      "import invariant from 'shared/invariant';\n" +
         "invariant(condition, 'Expected %s target to be an array; got %s', 'foo', 'bar');",
       "import _prodInvariant from 'shared/reactProdInvariant';\n" +
-        "import invariant from 'shared/reactProdInvariant';\n" +
+        "import invariant from 'shared/invariant';\n" +
         '!condition ? ' +
         '__DEV__ ? ' +
         "invariant(false, 'Expected %s target to be an array; got %s', 'foo', 'bar') : " +
@@ -79,10 +79,10 @@ ${expectedInvariantTransformResult}`
 
   it('should support invariant calls with a concatenated template string and args', () => {
     compare(
-      "import invariant from 'shared/reactProdInvariant';\n" +
+      "import invariant from 'shared/invariant';\n" +
         "invariant(condition, 'Expected a component class, ' + 'got %s.' + '%s', 'Foo', 'Bar');",
       "import _prodInvariant from 'shared/reactProdInvariant';\n" +
-        "import invariant from 'shared/reactProdInvariant';\n" +
+        "import invariant from 'shared/invariant';\n" +
         '!condition ? ' +
         '__DEV__ ? ' +
         "invariant(false, 'Expected a component class, got %s.%s', 'Foo', 'Bar') : " +
@@ -92,10 +92,10 @@ ${expectedInvariantTransformResult}`
 
   it('should correctly transform invariants that are not in the error codes map', () => {
     compare(
-      "import invariant from 'shared/reactProdInvariant';\n" +
+      "import invariant from 'shared/invariant';\n" +
         "invariant(condition, 'This is not a real error message.');",
       "import _prodInvariant from 'shared/reactProdInvariant';\n" +
-        "import invariant from 'shared/reactProdInvariant';\n" +
+        "import invariant from 'shared/invariant';\n" +
         "!condition ? invariant(false, 'This is not a real error message.') : void 0;"
     );
   });
diff --git a/scripts/release/config.js b/scripts/release/config.js
index e270967cbc..e58462c43a 100644
--- a/scripts/release/config.js
+++ b/scripts/release/config.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const dependencies = ['fbjs', 'object-assign', 'prop-types'];
+const dependencies = ['object-assign', 'prop-types'];
 
 const paramDefinitions = [
   {
diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index cafea350e8..7b4774506a 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -237,6 +237,20 @@ function isProfilingBundleType(bundleType) {
   }
 }
 
+function blacklistFBJS() {
+  return {
+    name: 'blacklistFBJS',
+    resolveId(importee, importer) {
+      if (/^fbjs\//.test(importee)) {
+        throw new Error(
+          `Don't import ${importee} (found in ${importer}). ` +
+            `Use the utilities in packages/shared/ instead.`
+        );
+      }
+    },
+  };
+}
+
 function getPlugins(
   entry,
   externals,
@@ -252,7 +266,7 @@ function getPlugins(
   const forks = Modules.getForks(bundleType, entry, moduleType);
   const isProduction = isProductionBundleType(bundleType);
   const isProfiling = isProfilingBundleType(bundleType);
-  const isInGlobalScope = bundleType === UMD_DEV || bundleType === UMD_PROD;
+  const isUMDBundle = bundleType === UMD_DEV || bundleType === UMD_PROD;
   const isFBBundle = bundleType === FB_WWW_DEV || bundleType === FB_WWW_PROD;
   const isRNBundle =
     bundleType === RN_OSS_DEV ||
@@ -271,6 +285,9 @@ function getPlugins(
     },
     // Shim any modules that need forking in this environment.
     useForks(forks),
+    // Ensure we don't try to bundle any fbjs modules
+    // unless they're transitive (e.g. through prop-types).
+    !isUMDBundle && blacklistFBJS(),
     // Use Node resolution mechanism.
     resolve({
       skip: externals,
@@ -309,7 +326,7 @@ function getPlugins(
         Object.assign({}, closureOptions, {
           // Don't let it create global variables in the browser.
           // https://github.com/facebook/react/issues/10909
-          assume_function_wrapper: !isInGlobalScope,
+          assume_function_wrapper: !isUMDBundle,
           // Works because `google-closure-compiler-js` is forked in Yarn lockfile.
           // We can remove this if GCC merges my PR:
           // https://github.com/google/closure-compiler/pull/2707
diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js
index 4c9802b369..64def9eb87 100644
--- a/scripts/rollup/forks.js
+++ b/scripts/rollup/forks.js
@@ -91,6 +91,17 @@ const forks = Object.freeze({
     }
   },
 
+  // This logic is forked on www to fork the formatting function.
+  'shared/invariant': (bundleType, entry) => {
+    switch (bundleType) {
+      case FB_WWW_DEV:
+      case FB_WWW_PROD:
+        return 'shared/forks/invariant.www.js';
+      default:
+        return null;
+    }
+  },
+
   // This logic is forked on www to blacklist warnings.
   'shared/lowPriorityWarning': (bundleType, entry) => {
     switch (bundleType) {
@@ -102,6 +113,17 @@ const forks = Object.freeze({
     }
   },
 
+  // This logic is forked on www to blacklist warnings.
+  'shared/warning': (bundleType, entry) => {
+    switch (bundleType) {
+      case FB_WWW_DEV:
+      case FB_WWW_PROD:
+        return 'shared/forks/warning.www.js';
+      default:
+        return null;
+    }
+  },
+
   // In FB bundles, we preserve an inline require to ReactCurrentOwner.
   // See the explanation in FB version of ReactCurrentOwner in www:
   'react/src/ReactCurrentOwner': (bundleType, entry) => {
diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js
index 598d7aa85e..f814bc195e 100644
--- a/scripts/rollup/modules.js
+++ b/scripts/rollup/modules.js
@@ -12,11 +12,7 @@ const UMD_PROD = bundleTypes.UMD_PROD;
 const HAS_NO_SIDE_EFFECTS_ON_IMPORT = false;
 // const HAS_SIDE_EFFECTS_ON_IMPORT = true;
 const importSideEffects = Object.freeze({
-  'fbjs/lib/invariant': HAS_NO_SIDE_EFFECTS_ON_IMPORT,
-  'fbjs/lib/warning': HAS_NO_SIDE_EFFECTS_ON_IMPORT,
   'prop-types/checkPropTypes': HAS_NO_SIDE_EFFECTS_ON_IMPORT,
-  'fbjs/lib/camelizeStyleName': HAS_NO_SIDE_EFFECTS_ON_IMPORT,
-  'fbjs/lib/hyphenateStyleName': HAS_NO_SIDE_EFFECTS_ON_IMPORT,
   deepFreezeAndThrowOnMutationInDev: HAS_NO_SIDE_EFFECTS_ON_IMPORT,
 });
 

From 8e87c139b490a60ef837ea93b91e639e1d7b0d90 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 19 Jun 2018 17:52:37 +0100
Subject: [PATCH 171/277] Remove transitive dependency on fbjs (#13075)

---
 package.json                                | 2 +-
 packages/react-art/package.json             | 2 +-
 packages/react-dom/package.json             | 2 +-
 packages/react-native-renderer/package.json | 2 +-
 packages/react-noop-renderer/package.json   | 2 +-
 packages/react-reconciler/package.json      | 2 +-
 packages/react-test-renderer/package.json   | 2 +-
 packages/react/package.json                 | 2 +-
 scripts/rollup/build.js                     | 5 ++---
 yarn.lock                                   | 9 ++++++++-
 10 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 78e89495da..01d3bbd9a5 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "object-assign": "^4.1.1",
     "platform": "^1.1.0",
     "prettier": "1.11.1",
-    "prop-types": "^15.6.0",
+    "prop-types": "^15.6.2",
     "random-seed": "^0.3.0",
     "react-lifecycles-compat": "^3.0.2",
     "rimraf": "^2.6.1",
diff --git a/packages/react-art/package.json b/packages/react-art/package.json
index bbd487f263..7a41213e1c 100644
--- a/packages/react-art/package.json
+++ b/packages/react-art/package.json
@@ -22,7 +22,7 @@
     "create-react-class": "^15.6.2",
     "loose-envify": "^1.1.0",
     "object-assign": "^4.1.1",
-    "prop-types": "^15.6.0"
+    "prop-types": "^15.6.2"
   },
   "peerDependencies": {
     "react": "^16.0.0"
diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
index f46a72eec7..8fbb203d04 100644
--- a/packages/react-dom/package.json
+++ b/packages/react-dom/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "loose-envify": "^1.1.0",
     "object-assign": "^4.1.1",
-    "prop-types": "^15.6.0"
+    "prop-types": "^15.6.2"
   },
   "peerDependencies": {
     "react": "^16.0.0"
diff --git a/packages/react-native-renderer/package.json b/packages/react-native-renderer/package.json
index d5157f1254..e50924169b 100644
--- a/packages/react-native-renderer/package.json
+++ b/packages/react-native-renderer/package.json
@@ -5,7 +5,7 @@
   "repository": "facebook/react",
   "dependencies": {
     "object-assign": "^4.1.1",
-    "prop-types": "^15.6.0"
+    "prop-types": "^15.6.2"
   },
   "peerDependencies": {
     "react": "^16.0.0"
diff --git a/packages/react-noop-renderer/package.json b/packages/react-noop-renderer/package.json
index 99b44fd289..22f5d5d8f9 100644
--- a/packages/react-noop-renderer/package.json
+++ b/packages/react-noop-renderer/package.json
@@ -8,7 +8,7 @@
   "license": "MIT",
   "dependencies": {
     "object-assign": "^4.1.1",
-    "prop-types": "^15.6.0",
+    "prop-types": "^15.6.2",
     "regenerator-runtime": "^0.11.0",
     "react-reconciler": "*"
   },
diff --git a/packages/react-reconciler/package.json b/packages/react-reconciler/package.json
index d6acdf4c7a..c6b033176a 100644
--- a/packages/react-reconciler/package.json
+++ b/packages/react-reconciler/package.json
@@ -27,7 +27,7 @@
   "dependencies": {
     "loose-envify": "^1.1.0",
     "object-assign": "^4.1.1",
-    "prop-types": "^15.6.0"
+    "prop-types": "^15.6.2"
   },
   "browserify": {
     "transform": [
diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json
index e1139ddf11..ff09dffa9a 100644
--- a/packages/react-test-renderer/package.json
+++ b/packages/react-test-renderer/package.json
@@ -16,7 +16,7 @@
   "homepage": "https://reactjs.org/",
   "dependencies": {
     "object-assign": "^4.1.1",
-    "prop-types": "^15.6.0",
+    "prop-types": "^15.6.2",
     "react-is": "^16.4.1"
   },
   "peerDependencies": {
diff --git a/packages/react/package.json b/packages/react/package.json
index f5a8ecd125..7be32deba4 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "loose-envify": "^1.1.0",
     "object-assign": "^4.1.1",
-    "prop-types": "^15.6.0"
+    "prop-types": "^15.6.2"
   },
   "browserify": {
     "transform": [
diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index 7b4774506a..42f5e46d9e 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -285,9 +285,8 @@ function getPlugins(
     },
     // Shim any modules that need forking in this environment.
     useForks(forks),
-    // Ensure we don't try to bundle any fbjs modules
-    // unless they're transitive (e.g. through prop-types).
-    !isUMDBundle && blacklistFBJS(),
+    // Ensure we don't try to bundle any fbjs modules.
+    blacklistFBJS(),
     // Use Node resolution mechanism.
     resolve({
       skip: externals,
diff --git a/yarn.lock b/yarn.lock
index 9e7bd01cea..51f12689e3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4603,7 +4603,7 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prop-types@^15.5.7, prop-types@^15.6.0:
+prop-types@^15.5.7:
   version "15.6.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
   dependencies:
@@ -4611,6 +4611,13 @@ prop-types@^15.5.7, prop-types@^15.6.0:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
+prop-types@^15.6.2:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
+  dependencies:
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 prop-types@~15.5.7:
   version "15.5.10"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"

From 4fe6eec15bc69737910e5c6c749ebc6187d67be0 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Tue, 19 Jun 2018 10:34:19 -0700
Subject: [PATCH 172/277] Always batch updates of like priority within the same
 event (#13071)

Expiration times are computed by adding to the current time (the start
time). However, if two updates are scheduled within the same event, we
should treat their start times as simultaneous, even if the actual clock
time has advanced between the first and second call.

In other words, because expiration times determine how updates are
batched, we want all updates of like priority that occur within the same
event to receive the same expiration time. Otherwise we get tearing.

We keep track of two separate times: the current "renderer" time and the
current "scheduler" time. The renderer time can be updated whenever; it
only exists to minimize the calls performance.now.

But the scheduler time can only be updated if there's no pending work,
or if we know for certain that we're not in the middle of an event.
---
 .../src/createReactNoop.js                    |   7 +-
 .../src/ReactFiberClassComponent.js           |   8 +-
 .../src/ReactFiberCommitWork.js               |   1 -
 .../src/ReactFiberPendingPriority.js          |   1 -
 .../src/ReactFiberReconciler.js               |   4 +-
 .../src/ReactFiberScheduler.js                | 110 ++++++++----
 .../src/ReactFiberUnwindWork.js               |   7 +-
 .../ReactExpiration-test.internal.js          | 162 ++++++++++++++++++
 .../src/__tests__/ReactExpiration-test.js     |  45 -----
 .../__tests__/ReactSuspense-test.internal.js  |   6 +-
 ...ReactIncrementalPerf-test.internal.js.snap |   2 +
 .../__tests__/ReactProfiler-test.internal.js  |   7 +-
 12 files changed, 261 insertions(+), 99 deletions(-)
 create mode 100644 packages/react-reconciler/src/__tests__/ReactExpiration-test.internal.js
 delete mode 100644 packages/react-reconciler/src/__tests__/ReactExpiration-test.js

diff --git a/packages/react-noop-renderer/src/createReactNoop.js b/packages/react-noop-renderer/src/createReactNoop.js
index 351a1cfe52..94cb025010 100644
--- a/packages/react-noop-renderer/src/createReactNoop.js
+++ b/packages/react-noop-renderer/src/createReactNoop.js
@@ -440,7 +440,12 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
       expect(actual).toEqual(expected);
     },
 
-    expire(ms: number): void {
+    expire(ms: number): Array<mixed> {
+      ReactNoop.advanceTime(ms);
+      return ReactNoop.flushExpired();
+    },
+
+    advanceTime(ms: number): void {
       elapsedTimeInMs += ms;
     },
 
diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js
index 444bd104c2..a0ae9fb782 100644
--- a/packages/react-reconciler/src/ReactFiberClassComponent.js
+++ b/packages/react-reconciler/src/ReactFiberClassComponent.js
@@ -46,7 +46,7 @@ import {
   emptyContextObject,
 } from './ReactFiberContext';
 import {
-  recalculateCurrentTime,
+  requestCurrentTime,
   computeExpirationForFiber,
   scheduleWork,
 } from './ReactFiberScheduler';
@@ -171,7 +171,7 @@ const classComponentUpdater = {
   isMounted,
   enqueueSetState(inst, payload, callback) {
     const fiber = ReactInstanceMap.get(inst);
-    const currentTime = recalculateCurrentTime();
+    const currentTime = requestCurrentTime();
     const expirationTime = computeExpirationForFiber(currentTime, fiber);
 
     const update = createUpdate(expirationTime);
@@ -188,7 +188,7 @@ const classComponentUpdater = {
   },
   enqueueReplaceState(inst, payload, callback) {
     const fiber = ReactInstanceMap.get(inst);
-    const currentTime = recalculateCurrentTime();
+    const currentTime = requestCurrentTime();
     const expirationTime = computeExpirationForFiber(currentTime, fiber);
 
     const update = createUpdate(expirationTime);
@@ -207,7 +207,7 @@ const classComponentUpdater = {
   },
   enqueueForceUpdate(inst, callback) {
     const fiber = ReactInstanceMap.get(inst);
-    const currentTime = recalculateCurrentTime();
+    const currentTime = requestCurrentTime();
     const expirationTime = computeExpirationForFiber(currentTime, fiber);
 
     const update = createUpdate(expirationTime);
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index 786c745b42..7fbaa7b725 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -224,7 +224,6 @@ function commitLifeCycles(
   finishedRoot: FiberRoot,
   current: Fiber | null,
   finishedWork: Fiber,
-  currentTime: ExpirationTime,
   committedExpirationTime: ExpirationTime,
 ): void {
   switch (finishedWork.tag) {
diff --git a/packages/react-reconciler/src/ReactFiberPendingPriority.js b/packages/react-reconciler/src/ReactFiberPendingPriority.js
index dc7ec20a9c..b77d874fbe 100644
--- a/packages/react-reconciler/src/ReactFiberPendingPriority.js
+++ b/packages/react-reconciler/src/ReactFiberPendingPriority.js
@@ -45,7 +45,6 @@ export function markPendingPriorityLevel(
 
 export function markCommittedPriorityLevels(
   root: FiberRoot,
-  currentTime: ExpirationTime,
   earliestRemainingTime: ExpirationTime,
 ): void {
   root.didError = false;
diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js
index 3e1c36866f..245b1654e2 100644
--- a/packages/react-reconciler/src/ReactFiberReconciler.js
+++ b/packages/react-reconciler/src/ReactFiberReconciler.js
@@ -39,7 +39,7 @@ import {createFiberRoot} from './ReactFiberRoot';
 import * as ReactFiberDevToolsHook from './ReactFiberDevToolsHook';
 import {
   computeUniqueAsyncExpiration,
-  recalculateCurrentTime,
+  requestCurrentTime,
   computeExpirationForFiber,
   scheduleWork,
   requestWork,
@@ -208,7 +208,7 @@ export function updateContainer(
   callback: ?Function,
 ): ExpirationTime {
   const current = container.current;
-  const currentTime = recalculateCurrentTime();
+  const currentTime = requestCurrentTime();
   const expirationTime = computeExpirationForFiber(currentTime, current);
   return updateContainerAtExpirationTime(
     element,
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 1272f69f96..c22bdfd97b 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -208,12 +208,7 @@ if (__DEV__) {
   };
 }
 
-// Represents the current time in ms.
-const originalStartTimeMs = now();
-let mostRecentCurrentTime: ExpirationTime = msToExpirationTime(0);
-let mostRecentCurrentTimeMs: number = originalStartTimeMs;
-
-// Used to ensure computeUniqueAsyncExpiration is monotonically increases.
+// Used to ensure computeUniqueAsyncExpiration is monotonically increasing.
 let lastUniqueAsyncExpiration: number = 0;
 
 // Represents the expiration time that incoming updates should use. (If this
@@ -432,7 +427,6 @@ function commitBeforeMutationLifecycles() {
 
 function commitAllLifeCycles(
   finishedRoot: FiberRoot,
-  currentTime: ExpirationTime,
   committedExpirationTime: ExpirationTime,
 ) {
   if (__DEV__) {
@@ -456,7 +450,6 @@ function commitAllLifeCycles(
         finishedRoot,
         current,
         nextEffect,
-        currentTime,
         committedExpirationTime,
       );
     }
@@ -516,8 +509,7 @@ function commitRoot(root: FiberRoot, finishedWork: Fiber): void {
   // about to commit. This needs to happen before calling the lifecycles, since
   // they may schedule additional updates.
   const earliestRemainingTime = finishedWork.expirationTime;
-  const currentTime = recalculateCurrentTime();
-  markCommittedPriorityLevels(root, currentTime, earliestRemainingTime);
+  markCommittedPriorityLevels(root, earliestRemainingTime);
 
   // Reset this to null before calling lifecycles
   ReactCurrentOwner.current = null;
@@ -642,7 +634,6 @@ function commitRoot(root: FiberRoot, finishedWork: Fiber): void {
         commitAllLifeCycles,
         null,
         root,
-        currentTime,
         committedExpirationTime,
       );
       if (hasCaughtError()) {
@@ -651,7 +642,7 @@ function commitRoot(root: FiberRoot, finishedWork: Fiber): void {
       }
     } else {
       try {
-        commitAllLifeCycles(root, currentTime, committedExpirationTime);
+        commitAllLifeCycles(root, committedExpirationTime);
       } catch (e) {
         didError = true;
         error = e;
@@ -1076,7 +1067,6 @@ function renderRoot(root: FiberRoot, isYieldy: boolean): void {
           sourceFiber,
           thrownValue,
           nextRenderExpirationTime,
-          mostRecentCurrentTimeMs,
         );
         nextUnitOfWork = completeUnitOfWork(sourceFiber);
       }
@@ -1192,7 +1182,7 @@ function captureCommitPhaseError(fiber: Fiber, error: mixed) {
   return dispatch(fiber, error, Sync);
 }
 
-function computeAsyncExpiration(currentTime: ExpirationTime) {
+function computeAsyncExpiration(currentTime) {
   // Given the current clock time, returns an expiration time. We use rounding
   // to batch like updates together.
   // Should complete within ~5000ms. 5250ms max.
@@ -1201,7 +1191,7 @@ function computeAsyncExpiration(currentTime: ExpirationTime) {
   return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
 }
 
-function computeInteractiveExpiration(currentTime: ExpirationTime) {
+function computeInteractiveExpiration(currentTime) {
   let expirationMs;
   // We intentionally set a higher expiration time for interactive updates in
   // dev than in production.
@@ -1224,7 +1214,7 @@ function computeInteractiveExpiration(currentTime: ExpirationTime) {
 
 // Creates a unique async expiration time.
 function computeUniqueAsyncExpiration(): ExpirationTime {
-  const currentTime = recalculateCurrentTime();
+  const currentTime = requestCurrentTime();
   let result = computeAsyncExpiration(currentTime);
   if (result <= lastUniqueAsyncExpiration) {
     // Since we assume the current time monotonically increases, we only hit
@@ -1379,16 +1369,9 @@ function scheduleWork(fiber: Fiber, expirationTime: ExpirationTime) {
   }
 }
 
-function recalculateCurrentTime(): ExpirationTime {
-  // Subtract initial time so it fits inside 32bits
-  mostRecentCurrentTimeMs = now() - originalStartTimeMs;
-  mostRecentCurrentTime = msToExpirationTime(mostRecentCurrentTimeMs);
-  return mostRecentCurrentTime;
-}
-
 function deferredUpdates<A>(fn: () => A): A {
+  const currentTime = requestCurrentTime();
   const previousExpirationContext = expirationContext;
-  const currentTime = recalculateCurrentTime();
   expirationContext = computeAsyncExpiration(currentTime);
   try {
     return fn();
@@ -1396,6 +1379,7 @@ function deferredUpdates<A>(fn: () => A): A {
     expirationContext = previousExpirationContext;
   }
 }
+
 function syncUpdates<A, B, C0, D, R>(
   fn: (A, B, C0, D) => R,
   a: A,
@@ -1436,12 +1420,23 @@ let isBatchingInteractiveUpdates: boolean = false;
 
 let completedBatches: Array<Batch> | null = null;
 
+let originalStartTimeMs: number = now();
+let currentRendererTime: ExpirationTime = msToExpirationTime(
+  originalStartTimeMs,
+);
+let currentSchedulerTime: ExpirationTime = currentRendererTime;
+
 // Use these to prevent an infinite loop of nested updates
 const NESTED_UPDATE_LIMIT = 1000;
 let nestedUpdateCount: number = 0;
 
 const timeHeuristicForUnitOfWork = 1;
 
+function recomputeCurrentRendererTime() {
+  const currentTimeMs = now() - originalStartTimeMs;
+  currentRendererTime = msToExpirationTime(currentTimeMs);
+}
+
 function scheduleCallbackWithExpirationTime(expirationTime) {
   if (callbackExpirationTime !== NoWork) {
     // A callback is already scheduled. Check its expiration time (timeout).
@@ -1508,6 +1503,50 @@ function onCommit(root, expirationTime) {
   root.finishedWork = null;
 }
 
+function requestCurrentTime() {
+  // requestCurrentTime is called by the scheduler to compute an expiration
+  // time.
+  //
+  // Expiration times are computed by adding to the current time (the start
+  // time). However, if two updates are scheduled within the same event, we
+  // should treat their start times as simultaneous, even if the actual clock
+  // time has advanced between the first and second call.
+
+  // In other words, because expiration times determine how updates are batched,
+  // we want all updates of like priority that occur within the same event to
+  // receive the same expiration time. Otherwise we get tearing.
+  //
+  // We keep track of two separate times: the current "renderer" time and the
+  // current "scheduler" time. The renderer time can be updated whenever; it
+  // only exists to minimize the calls performance.now.
+  //
+  // But the scheduler time can only be updated if there's no pending work, or
+  // if we know for certain that we're not in the middle of an event.
+
+  if (isRendering) {
+    // We're already rendering. Return the most recently read time.
+    return currentSchedulerTime;
+  }
+  // Check if there's pending work.
+  findHighestPriorityRoot();
+  if (
+    nextFlushedExpirationTime === NoWork ||
+    nextFlushedExpirationTime === Never
+  ) {
+    // If there's no pending work, or if the pending work is offscreen, we can
+    // read the current time without risk of tearing.
+    recomputeCurrentRendererTime();
+    currentSchedulerTime = currentRendererTime;
+    return currentSchedulerTime;
+  }
+  // There's already pending work. We might be in the middle of a browser
+  // event. If we were to read the current time, it could cause multiple updates
+  // within the same event to receive different expiration times, leading to
+  // tearing. Return the last read time. During the next idle callback, the
+  // time will be updated.
+  return currentSchedulerTime;
+}
+
 // requestWork is called by the scheduler whenever a root receives an update.
 // It's up to the renderer to call renderRoot at some point in the future.
 function requestWork(root: FiberRoot, expirationTime: ExpirationTime) {
@@ -1661,24 +1700,27 @@ function performWork(minExpirationTime: ExpirationTime, dl: Deadline | null) {
     resumeActualRenderTimerIfPaused();
   }
 
-  if (enableUserTimingAPI && deadline !== null) {
-    const didExpire = nextFlushedExpirationTime < recalculateCurrentTime();
-    const timeout = expirationTimeToMs(nextFlushedExpirationTime);
-    stopRequestCallbackTimer(didExpire, timeout);
-  }
-
   if (deadline !== null) {
+    recomputeCurrentRendererTime();
+    currentSchedulerTime = currentRendererTime;
+
+    if (enableUserTimingAPI) {
+      const didExpire = nextFlushedExpirationTime < currentRendererTime;
+      const timeout = expirationTimeToMs(nextFlushedExpirationTime);
+      stopRequestCallbackTimer(didExpire, timeout);
+    }
+
     while (
       nextFlushedRoot !== null &&
       nextFlushedExpirationTime !== NoWork &&
       (minExpirationTime === NoWork ||
         minExpirationTime >= nextFlushedExpirationTime) &&
-      (!deadlineDidExpire ||
-        recalculateCurrentTime() >= nextFlushedExpirationTime)
+      (!deadlineDidExpire || currentRendererTime >= nextFlushedExpirationTime)
     ) {
-      recalculateCurrentTime();
       performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, true);
       findHighestPriorityRoot();
+      recomputeCurrentRendererTime();
+      currentSchedulerTime = currentRendererTime;
     }
   } else {
     while (
@@ -1977,7 +2019,7 @@ function flushControlled(fn: () => mixed): void {
 }
 
 export {
-  recalculateCurrentTime,
+  requestCurrentTime,
   computeExpirationForFiber,
   captureCommitPhaseError,
   onUncaughtError,
diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index e419df6d7c..8bc5efa876 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -60,7 +60,7 @@ import {
   onUncaughtError,
   markLegacyErrorBoundaryAsFailed,
   isAlreadyFailedLegacyErrorBoundary,
-  recalculateCurrentTime,
+  requestCurrentTime,
   computeExpirationForFiber,
   scheduleWork,
   retrySuspendedRoot,
@@ -132,7 +132,7 @@ function createClassErrorUpdate(
 function schedulePing(finishedWork) {
   // Once the promise resolves, we should try rendering the non-
   // placeholder state again.
-  const currentTime = recalculateCurrentTime();
+  const currentTime = requestCurrentTime();
   const expirationTime = computeExpirationForFiber(currentTime, finishedWork);
   const recoveryUpdate = createUpdate(expirationTime);
   enqueueUpdate(finishedWork, recoveryUpdate, expirationTime);
@@ -145,7 +145,6 @@ function throwException(
   sourceFiber: Fiber,
   value: mixed,
   renderExpirationTime: ExpirationTime,
-  currentTimeMs: number,
 ) {
   // The source fiber did not complete.
   sourceFiber.effectTag |= Incomplete;
@@ -162,7 +161,9 @@ function throwException(
     const thenable: Thenable = (value: any);
 
     // TODO: Should use the earliest known expiration time
+    const currentTime = requestCurrentTime();
     const expirationTimeMs = expirationTimeToMs(renderExpirationTime);
+    const currentTimeMs = expirationTimeToMs(currentTime);
     const startTimeMs = expirationTimeMs - 5000;
     let elapsedMs = currentTimeMs - startTimeMs;
     if (elapsedMs < 0) {
diff --git a/packages/react-reconciler/src/__tests__/ReactExpiration-test.internal.js b/packages/react-reconciler/src/__tests__/ReactExpiration-test.internal.js
new file mode 100644
index 0000000000..fd82292d19
--- /dev/null
+++ b/packages/react-reconciler/src/__tests__/ReactExpiration-test.internal.js
@@ -0,0 +1,162 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @jest-environment node
+ */
+
+'use strict';
+
+let React;
+let ReactFeatureFlags;
+let ReactNoop;
+
+describe('ReactExpiration', () => {
+  beforeEach(() => {
+    jest.resetModules();
+    ReactFeatureFlags = require('shared/ReactFeatureFlags');
+    ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
+    React = require('react');
+    ReactNoop = require('react-noop-renderer');
+  });
+
+  function span(prop) {
+    return {type: 'span', children: [], prop};
+  }
+
+  it('increases priority of updates as time progresses', () => {
+    ReactNoop.render(<span prop="done" />);
+
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Nothing has expired yet because time hasn't advanced.
+    ReactNoop.flushExpired();
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Advance time a bit, but not enough to expire the low pri update.
+    ReactNoop.expire(4500);
+    ReactNoop.flushExpired();
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Advance by another second. Now the update should expire and flush.
+    ReactNoop.expire(1000);
+    ReactNoop.flushExpired();
+    expect(ReactNoop.getChildren()).toEqual([span('done')]);
+  });
+
+  it('two updates of like priority in the same event always flush within the same batch', () => {
+    class Text extends React.Component {
+      componentDidMount() {
+        ReactNoop.yield(`${this.props.text} [commit]`);
+      }
+      componentDidUpdate() {
+        ReactNoop.yield(`${this.props.text} [commit]`);
+      }
+      render() {
+        ReactNoop.yield(`${this.props.text} [render]`);
+        return <span prop={this.props.text} />;
+      }
+    }
+
+    // First, show what happens for updates in two separate events.
+    // Schedule an update.
+    ReactNoop.render(<Text text="A" />);
+    // Advance the timer and flush any work that expired. Flushing the expired
+    // work signals to the renderer that the event has ended.
+    ReactNoop.advanceTime(2000);
+    // Don't advance time by enough to expire the first update.
+    expect(ReactNoop.flushExpired()).toEqual([]);
+    expect(ReactNoop.getChildren()).toEqual([]);
+    // Schedule another update.
+    ReactNoop.render(<Text text="B" />);
+    // The updates should flush in separate batches, since sufficient time
+    // passed in between them *and* they occurred in separate events.
+    expect(ReactNoop.flush()).toEqual([
+      'A [render]',
+      'A [commit]',
+      'B [render]',
+      'B [commit]',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([span('B')]);
+
+    // Now do the same thing again, except this time don't flush any work in
+    // between the two updates.
+    ReactNoop.render(<Text text="A" />);
+    // Advance the timer, but don't flush the expired work. Because we still
+    // haven't entered an idle callback, the scheduler must assume that we're
+    // inside the same event.
+    ReactNoop.advanceTime(2000);
+    expect(ReactNoop.clearYields()).toEqual(null);
+    expect(ReactNoop.getChildren()).toEqual([span('B')]);
+    // Schedule another update.
+    ReactNoop.render(<Text text="B" />);
+    // The updates should flush in the same batch, since as far as the scheduler
+    // knows, they may have occurred inside the same event.
+    expect(ReactNoop.flush()).toEqual(['B [render]', 'B [commit]']);
+  });
+
+  it(
+    'two updates of like priority in the same event always flush within the ' +
+      "same batch, even if there's a sync update in between",
+    () => {
+      class Text extends React.Component {
+        componentDidMount() {
+          ReactNoop.yield(`${this.props.text} [commit]`);
+        }
+        componentDidUpdate() {
+          ReactNoop.yield(`${this.props.text} [commit]`);
+        }
+        render() {
+          ReactNoop.yield(`${this.props.text} [render]`);
+          return <span prop={this.props.text} />;
+        }
+      }
+
+      // First, show what happens for updates in two separate events.
+      // Schedule an update.
+      ReactNoop.render(<Text text="A" />);
+      // Advance the timer and flush any work that expired. Flushing the expired
+      // work signals to the renderer that the event has ended.
+      ReactNoop.advanceTime(2000);
+      // Don't advance time by enough to expire the first update.
+      expect(ReactNoop.flushExpired()).toEqual([]);
+      expect(ReactNoop.getChildren()).toEqual([]);
+      // Schedule another update.
+      ReactNoop.render(<Text text="B" />);
+      // The updates should flush in separate batches, since sufficient time
+      // passed in between them *and* they occurred in separate events.
+      expect(ReactNoop.flush()).toEqual([
+        'A [render]',
+        'A [commit]',
+        'B [render]',
+        'B [commit]',
+      ]);
+      expect(ReactNoop.getChildren()).toEqual([span('B')]);
+
+      // Now do the same thing again, except this time don't flush any work in
+      // between the two updates.
+      ReactNoop.render(<Text text="A" />);
+      // Advance the timer, but don't flush the expired work. Because we still
+      // haven't entered an idle callback, the scheduler must assume that we're
+      // inside the same event.
+      ReactNoop.advanceTime(2000);
+      expect(ReactNoop.clearYields()).toEqual(null);
+      expect(ReactNoop.getChildren()).toEqual([span('B')]);
+
+      // Perform some synchronous work. Again, the scheduler must assume we're
+      // inside the same event.
+      ReactNoop.flushSync(() => {
+        ReactNoop.renderToRootWithID('1', 'second-root');
+      });
+
+      // Even though React flushed a sync update, it should not have updated the
+      // current time. Schedule another update.
+      ReactNoop.render(<Text text="B" />);
+      // The updates should flush in the same batch, since as far as the scheduler
+      // knows, they may have occurred inside the same event.
+      expect(ReactNoop.flush()).toEqual(['B [render]', 'B [commit]']);
+    },
+  );
+});
diff --git a/packages/react-reconciler/src/__tests__/ReactExpiration-test.js b/packages/react-reconciler/src/__tests__/ReactExpiration-test.js
deleted file mode 100644
index 58d501cbfd..0000000000
--- a/packages/react-reconciler/src/__tests__/ReactExpiration-test.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @jest-environment node
- */
-
-'use strict';
-
-let React;
-let ReactNoop;
-
-describe('ReactExpiration', () => {
-  beforeEach(() => {
-    jest.resetModules();
-    React = require('react');
-    ReactNoop = require('react-noop-renderer');
-  });
-
-  function span(prop) {
-    return {type: 'span', children: [], prop};
-  }
-
-  it('increases priority of updates as time progresses', () => {
-    ReactNoop.render(<span prop="done" />);
-
-    expect(ReactNoop.getChildren()).toEqual([]);
-
-    // Nothing has expired yet because time hasn't advanced.
-    ReactNoop.flushExpired();
-    expect(ReactNoop.getChildren()).toEqual([]);
-
-    // Advance time a bit, but not enough to expire the low pri update.
-    ReactNoop.expire(4500);
-    ReactNoop.flushExpired();
-    expect(ReactNoop.getChildren()).toEqual([]);
-
-    // Advance by another second. Now the update should expire and flush.
-    ReactNoop.expire(1000);
-    ReactNoop.flushExpired();
-    expect(ReactNoop.getChildren()).toEqual([span('done')]);
-  });
-});
diff --git a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
index 9831990985..37f8be7c3a 100644
--- a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
@@ -711,9 +711,8 @@ describe('ReactSuspense', () => {
     );
     expect(ReactNoop.flush()).toEqual(['Suspend! [Async]']);
     await advanceTimers(10000);
-    ReactNoop.expire(10000);
     expect(() => {
-      expect(ReactNoop.flush()).toEqual(['Suspend! [Async]']);
+      ReactNoop.expire(10000);
     }).toThrow(
       'An update was suspended for longer than the timeout, but no fallback ' +
         'UI was provided.',
@@ -727,8 +726,7 @@ describe('ReactSuspense', () => {
         <AsyncText text="B" ms={100} />
       </Fallback>,
     );
-    ReactNoop.expire(10000);
-    expect(ReactNoop.flush()).toEqual(['Suspend! [A]', 'Suspend! [B]']);
+    expect(ReactNoop.expire(10000)).toEqual(['Suspend! [A]', 'Suspend! [B]']);
     expect(ReactNoop.getChildren()).toEqual([]);
 
     await advanceTimers(100);
diff --git a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
index 686d77b0e6..6b68f801dd 100644
--- a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
+++ b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
@@ -406,6 +406,8 @@ exports[`ReactDebugFiberPerf warns if an in-progress update is interrupted 1`] =
 exports[`ReactDebugFiberPerf warns if async work expires (starvation) 1`] = `
 "⛔ (Waiting for async callback... will force flush in 5250 ms) Warning: React was blocked by main thread
 
+⚛ (React Tree Reconciliation: Yielded)
+
 ⚛ (React Tree Reconciliation: Completed Root)
   ⚛ Foo [mount]
 
diff --git a/packages/react/src/__tests__/ReactProfiler-test.internal.js b/packages/react/src/__tests__/ReactProfiler-test.internal.js
index ccd3dc3be0..01d5d09514 100644
--- a/packages/react/src/__tests__/ReactProfiler-test.internal.js
+++ b/packages/react/src/__tests__/ReactProfiler-test.internal.js
@@ -177,11 +177,10 @@ describe('Profiler', () => {
         </div>,
       );
 
-      // Should only be called three times:
-      // Twice for normal expiration time purposes,
-      // And once to capture the commit time.
+      // Should be called twice: once to compute the update expiration time,
+      // and once to record the commit time.
       // No additional calls from ProfilerTimer are expected.
-      expect(mockNow).toHaveBeenCalledTimes(3);
+      expect(mockNow).toHaveBeenCalledTimes(2);
     });
 
     it('logs render times for both mount and update', () => {

From 97af3e1f3a6130dc38269b8389da057152868be2 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Tue, 19 Jun 2018 10:36:56 -0700
Subject: [PATCH 173/277]  Do not add additional work to a batch that is
 already rendering (#13072)

* Do not add additional work to a batch that is already rendering.

Otherwise, the part of the tree that hasn't rendered yet will receive
the latest state, but the already rendered part will show the state
as it was before the intervening update.

* Reduce non-helpfulness of comments
---
 .../src/ReactFiberScheduler.js                | 23 +++++++-
 .../ReactExpiration-test.internal.js          | 53 +++++++++++++++++++
 .../ReactIncrementalUpdates-test.internal.js  | 36 +++++++++++--
 3 files changed, 108 insertions(+), 4 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index c22bdfd97b..59a961e0a6 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -1086,6 +1086,10 @@ function renderRoot(root: FiberRoot, isYieldy: boolean): void {
     if (__DEV__) {
       resetStackAfterFatalErrorInDev();
     }
+    // `nextRoot` points to the in-progress root. A non-null value indicates
+    // that we're in the middle of an async render. Set it to null to indicate
+    // there's no more work to be done in the current batch.
+    nextRoot = null;
     onFatal(root);
   } else if (nextUnitOfWork === null) {
     // We reached the root.
@@ -1096,16 +1100,24 @@ function renderRoot(root: FiberRoot, isYieldy: boolean): void {
         'caused by a bug in React. Please file an issue.',
     );
     if ((rootWorkInProgress.effectTag & Incomplete) === NoEffect) {
+      // The root successfully completed.
       const didCompleteRoot = true;
       stopWorkLoopTimer(interruptedBy, didCompleteRoot);
       interruptedBy = null;
-      // The root successfully completed.
+      // `nextRoot` points to the in-progress root. A non-null value indicates
+      // that we're in the middle of an async render. Set it to null to indicate
+      // there's no more work to be done in the current batch.
+      nextRoot = null;
       onComplete(root, rootWorkInProgress, expirationTime);
     } else {
       // The root did not complete.
       const didCompleteRoot = false;
       stopWorkLoopTimer(interruptedBy, didCompleteRoot);
       interruptedBy = null;
+      // `nextRoot` points to the in-progress root. A non-null value indicates
+      // that we're in the middle of an async render. Set it to null to indicate
+      // there's no more work to be done in the current batch.
+      nextRoot = null;
       markSuspendedPriorityLevel(root, expirationTime, nextRenderDidError);
       const suspendedExpirationTime = expirationTime;
       const newExpirationTime = root.expirationTime;
@@ -1117,6 +1129,10 @@ function renderRoot(root: FiberRoot, isYieldy: boolean): void {
       );
     }
   } else {
+    // There's still remaining async work in this tree, but we ran out of time
+    // in the current frame. Yield back to the renderer. Unless we're
+    // interrupted by a higher priority update, we'll continue later from where
+    // we left off.
     const didCompleteRoot = false;
     stopWorkLoopTimer(interruptedBy, didCompleteRoot);
     interruptedBy = null;
@@ -1252,6 +1268,11 @@ function computeExpirationForFiber(currentTime: ExpirationTime, fiber: Fiber) {
         // This is an async update
         expirationTime = computeAsyncExpiration(currentTime);
       }
+      // If we're in the middle of rendering a tree, do not update at the same
+      // expiration time that is already rendering.
+      if (nextRoot !== null && expirationTime === nextRenderExpirationTime) {
+        expirationTime += 1;
+      }
     } else {
       // This is a sync update
       expirationTime = Sync;
diff --git a/packages/react-reconciler/src/__tests__/ReactExpiration-test.internal.js b/packages/react-reconciler/src/__tests__/ReactExpiration-test.internal.js
index fd82292d19..a5bdcf6aff 100644
--- a/packages/react-reconciler/src/__tests__/ReactExpiration-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactExpiration-test.internal.js
@@ -159,4 +159,57 @@ describe('ReactExpiration', () => {
       expect(ReactNoop.flush()).toEqual(['B [render]', 'B [commit]']);
     },
   );
+
+  it('cannot update at the same expiration time that is already rendering', () => {
+    let store = {text: 'initial'};
+    let subscribers = [];
+    class Connected extends React.Component {
+      state = {text: store.text};
+      componentDidMount() {
+        subscribers.push(this);
+        ReactNoop.yield(`${this.state.text} [${this.props.label}] [commit]`);
+      }
+      componentDidUpdate() {
+        ReactNoop.yield(`${this.state.text} [${this.props.label}] [commit]`);
+      }
+      render() {
+        ReactNoop.yield(`${this.state.text} [${this.props.label}] [render]`);
+        return <span prop={this.state.text} />;
+      }
+    }
+
+    function App() {
+      return (
+        <React.Fragment>
+          <Connected label="A" />
+          <Connected label="B" />
+          <Connected label="C" />
+          <Connected label="D" />
+        </React.Fragment>
+      );
+    }
+
+    // Initial mount
+    ReactNoop.render(<App />);
+    expect(ReactNoop.flush()).toEqual([
+      'initial [A] [render]',
+      'initial [B] [render]',
+      'initial [C] [render]',
+      'initial [D] [render]',
+      'initial [A] [commit]',
+      'initial [B] [commit]',
+      'initial [C] [commit]',
+      'initial [D] [commit]',
+    ]);
+
+    // Partial update
+    subscribers.forEach(s => s.setState({text: '1'}));
+    ReactNoop.flushThrough(['1 [A] [render]', '1 [B] [render]']);
+
+    // Before the update can finish, update again. Even though no time has
+    // advanced, this update should be given a different expiration time than
+    // the currently rendering one. So, C and D should render with 1, not 2.
+    subscribers.forEach(s => s.setState({text: '2'}));
+    ReactNoop.flushThrough(['1 [C] [render]', '1 [D] [render]']);
+  });
 });
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalUpdates-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalUpdates-test.internal.js
index c7d0cca072..ddf917d7e8 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalUpdates-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalUpdates-test.internal.js
@@ -163,7 +163,7 @@ describe('ReactIncrementalUpdates', () => {
     ReactNoop.flushThrough(['a', 'b', 'c']);
     expect(ReactNoop.getChildren()).toEqual([span('')]);
 
-    // Schedule some more updates at different priorities{
+    // Schedule some more updates at different priorities
     instance.setState(createUpdate('d'));
     ReactNoop.flushSync(() => {
       instance.setState(createUpdate('e'));
@@ -178,7 +178,22 @@ describe('ReactIncrementalUpdates', () => {
     // they should be processed again, to ensure that the terminal state
     // is deterministic.
     ReactNoop.clearYields();
-    expect(ReactNoop.flush()).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g']);
+    expect(ReactNoop.flush()).toEqual([
+      'a',
+      'b',
+      'c',
+
+      // e, f, and g are in a separate batch from a, b, and c because they
+      // were scheduled in the middle of a render
+      'e',
+      'f',
+      'g',
+
+      'd',
+      'e',
+      'f',
+      'g',
+    ]);
     expect(ReactNoop.getChildren()).toEqual([span('abcdefg')]);
   });
 
@@ -237,7 +252,22 @@ describe('ReactIncrementalUpdates', () => {
     // they should be processed again, to ensure that the terminal state
     // is deterministic.
     ReactNoop.clearYields();
-    expect(ReactNoop.flush()).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g']);
+    expect(ReactNoop.flush()).toEqual([
+      'a',
+      'b',
+      'c',
+
+      // e, f, and g are in a separate batch from a, b, and c because they
+      // were scheduled in the middle of a render
+      'e',
+      'f',
+      'g',
+
+      'd',
+      'e',
+      'f',
+      'g',
+    ]);
     expect(ReactNoop.getChildren()).toEqual([span('fg')]);
   });
 

From 0fcf92d06d7ade048f663e184e3d53b24844c889 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 20 Jun 2018 14:46:18 +0100
Subject: [PATCH 174/277] Add a link to custom renderer intro article

---
 packages/react-reconciler/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/react-reconciler/README.md b/packages/react-reconciler/README.md
index 744c4ab498..a3d5f96406 100644
--- a/packages/react-reconciler/README.md
+++ b/packages/react-reconciler/README.md
@@ -46,6 +46,8 @@ var HostConfig = {
 };
 ```
 
+**For an introduction to writing a very simple custom renderer, [check out this small guide](https://medium.com/@agent_hunt/hello-world-custom-react-renderer-9a95b7cd04bc).**
+
 The full list of supported methods [can be found here](https://github.com/facebook/react/blob/master/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js). For their signatures, we recommend looking at specific examples below.
 
 The React repository includes several renderers. Each of them has its own host config.

From ae8c6dd5347797f2279639a5bc644e9b6632bbbb Mon Sep 17 00:00:00 2001
From: Nathan Quarles <nateq314@gmail.com>
Date: Wed, 20 Jun 2018 11:35:03 -0400
Subject: [PATCH 175/277] remove some redundant lines (#13077)

* remove another couple of redundant lines

* a few more
---
 packages/react-reconciler/src/ReactFiberScheduler.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 59a961e0a6..9de7ce4300 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -999,8 +999,6 @@ function renderRoot(root: FiberRoot, isYieldy: boolean): void {
     resetStack();
     nextRoot = root;
     nextRenderExpirationTime = expirationTime;
-    nextLatestTimeoutMs = -1;
-    nextRenderDidError = false;
     nextUnitOfWork = createWorkInProgress(
       nextRoot.current,
       null,
@@ -1840,7 +1838,6 @@ function performWorkOnRoot(
       // This root is already complete. We can commit it.
       completeRoot(root, finishedWork, expirationTime);
     } else {
-      root.finishedWork = null;
       renderRoot(root, false);
       finishedWork = root.finishedWork;
       if (finishedWork !== null) {
@@ -1855,7 +1852,6 @@ function performWorkOnRoot(
       // This root is already complete. We can commit it.
       completeRoot(root, finishedWork, expirationTime);
     } else {
-      root.finishedWork = null;
       renderRoot(root, true);
       finishedWork = root.finishedWork;
       if (finishedWork !== null) {

From b0f60895f759253d4180dfa7e1901fe36d4abd3a Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Wed, 20 Jun 2018 09:24:52 -0700
Subject: [PATCH 176/277] Automatically Profile roots when DevTools is present
 (#13058)

* react-test-renderer injects itself into DevTools if present
* Fibers are always opted into ProfileMode if DevTools is present
* Added simple test for DevTools + always profiling behavior
---
 packages/react-reconciler/src/ReactFiber.js   |  11 +-
 .../src/ReactFiberDevToolsHook.js             |   3 +
 .../src/ReactTestRenderer.js                  |  11 ++
 ...ofilerDevToolsIntegration-test.internal.js | 111 ++++++++++++++++++
 4 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 packages/react/src/__tests__/ReactProfilerDevToolsIntegration-test.internal.js

diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js
index 2b29ea79aa..7e5a9dd3d6 100644
--- a/packages/react-reconciler/src/ReactFiber.js
+++ b/packages/react-reconciler/src/ReactFiber.js
@@ -35,6 +35,7 @@ import {
 } from 'shared/ReactTypeOfWork';
 import getComponentName from 'shared/getComponentName';
 
+import {isDevToolsPresent} from './ReactFiberDevToolsHook';
 import {NoWork} from './ReactFiberExpirationTime';
 import {NoContext, AsyncMode, ProfileMode, StrictMode} from './ReactTypeOfMode';
 import {
@@ -345,7 +346,15 @@ export function createWorkInProgress(
 }
 
 export function createHostRootFiber(isAsync: boolean): Fiber {
-  const mode = isAsync ? AsyncMode | StrictMode : NoContext;
+  let mode = isAsync ? AsyncMode | StrictMode : NoContext;
+
+  if (enableProfilerTimer && isDevToolsPresent) {
+    // Always collect profile timings when DevTools are present.
+    // This enables DevTools to start capturing timing at any point–
+    // Without some nodes in the tree having empty base times.
+    mode |= ProfileMode;
+  }
+
   return createFiber(HostRoot, null, null, mode);
 }
 
diff --git a/packages/react-reconciler/src/ReactFiberDevToolsHook.js b/packages/react-reconciler/src/ReactFiberDevToolsHook.js
index dd58854070..4995978b11 100644
--- a/packages/react-reconciler/src/ReactFiberDevToolsHook.js
+++ b/packages/react-reconciler/src/ReactFiberDevToolsHook.js
@@ -31,6 +31,9 @@ function catchErrors(fn) {
   };
 }
 
+export const isDevToolsPresent =
+  typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== 'undefined';
+
 export function injectInternals(internals: Object): boolean {
   if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === 'undefined') {
     // No DevTools
diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js
index 669e1e7abd..ed4c59fb38 100644
--- a/packages/react-test-renderer/src/ReactTestRenderer.js
+++ b/packages/react-test-renderer/src/ReactTestRenderer.js
@@ -29,6 +29,7 @@ import {
   Profiler,
 } from 'shared/ReactTypeOfWork';
 import invariant from 'shared/invariant';
+import ReactVersion from 'shared/ReactVersion';
 
 import * as ReactTestHostConfig from './ReactTestHostConfig';
 import * as TestRendererScheduling from './ReactTestRendererScheduling';
@@ -510,4 +511,14 @@ const ReactTestRendererFiber = {
   unstable_setNowImplementation: TestRendererScheduling.setNowImplementation,
 };
 
+// Enable ReactTestRenderer to be used to test DevTools integration.
+TestRenderer.injectIntoDevTools({
+  findFiberByHostInstance: (() => {
+    throw new Error('TestRenderer does not support findFiberByHostInstance()');
+  }: any),
+  bundleType: __DEV__ ? 1 : 0,
+  version: ReactVersion,
+  rendererPackageName: 'react-test-renderer',
+});
+
 export default ReactTestRendererFiber;
diff --git a/packages/react/src/__tests__/ReactProfilerDevToolsIntegration-test.internal.js b/packages/react/src/__tests__/ReactProfilerDevToolsIntegration-test.internal.js
new file mode 100644
index 0000000000..6fc396405e
--- /dev/null
+++ b/packages/react/src/__tests__/ReactProfilerDevToolsIntegration-test.internal.js
@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react-core
+ */
+
+'use strict';
+
+describe('ReactProfiler DevTools integration', () => {
+  let React;
+  let ReactFeatureFlags;
+  let ReactTestRenderer;
+  let AdvanceTime;
+  let advanceTimeBy;
+  let hook;
+  let mockNow;
+
+  const mockNowForTests = () => {
+    let currentTime = 0;
+
+    mockNow = jest.fn().mockImplementation(() => currentTime);
+
+    ReactTestRenderer.unstable_setNowImplementation(mockNow);
+    advanceTimeBy = amount => {
+      currentTime += amount;
+    };
+  };
+
+  beforeEach(() => {
+    global.__REACT_DEVTOOLS_GLOBAL_HOOK__ = hook = {
+      inject: () => {},
+      onCommitFiberRoot: jest.fn((rendererId, root) => {}),
+      onCommitFiberUnmount: () => {},
+      supportsFiber: true,
+    };
+
+    jest.resetModules();
+
+    ReactFeatureFlags = require('shared/ReactFeatureFlags');
+    ReactFeatureFlags.enableProfilerTimer = true;
+    React = require('react');
+    ReactTestRenderer = require('react-test-renderer');
+
+    mockNowForTests();
+
+    AdvanceTime = class extends React.Component {
+      static defaultProps = {
+        byAmount: 10,
+        shouldComponentUpdate: true,
+      };
+      shouldComponentUpdate(nextProps) {
+        return nextProps.shouldComponentUpdate;
+      }
+      render() {
+        // Simulate time passing when this component is rendered
+        advanceTimeBy(this.props.byAmount);
+        return this.props.children || null;
+      }
+    };
+  });
+
+  it('should auto-Profile all fibers if the DevTools hook is detected', () => {
+    const App = ({multiplier}) => {
+      advanceTimeBy(2);
+      return (
+        <React.unstable_Profiler id="Profiler" onRender={onRender}>
+          <AdvanceTime byAmount={3 * multiplier} shouldComponentUpdate={true} />
+          <AdvanceTime
+            byAmount={7 * multiplier}
+            shouldComponentUpdate={false}
+          />
+        </React.unstable_Profiler>
+      );
+    };
+
+    const onRender = jest.fn(() => {});
+    const rendered = ReactTestRenderer.create(<App multiplier={1} />);
+
+    expect(hook.onCommitFiberRoot).toHaveBeenCalledTimes(1);
+
+    // Measure observable timing using the Profiler component.
+    // The time spent in App (above the Profiler) won't be included in the durations,
+    // But needs to be accounted for in the offset times.
+    expect(onRender).toHaveBeenCalledTimes(1);
+    expect(onRender).toHaveBeenCalledWith('Profiler', 'mount', 10, 10, 2, 12);
+    onRender.mockClear();
+
+    // Measure unobservable timing required by the DevTools profiler.
+    // At this point, the base time should include both:
+    // The time 2ms in the App component itself, and
+    // The 10ms spend in the Profiler sub-tree beneath.
+    expect(rendered.root.findByType(App)._currentFiber().treeBaseTime).toBe(12);
+
+    rendered.update(<App multiplier={2} />);
+
+    // Measure observable timing using the Profiler component.
+    // The time spent in App (above the Profiler) won't be included in the durations,
+    // But needs to be accounted for in the offset times.
+    expect(onRender).toHaveBeenCalledTimes(1);
+    expect(onRender).toHaveBeenCalledWith('Profiler', 'update', 6, 13, 14, 20);
+
+    // Measure unobservable timing required by the DevTools profiler.
+    // At this point, the base time should include both:
+    // The initial 9ms for the components that do not re-render, and
+    // The updated 6ms for the component that does.
+    expect(rendered.root.findByType(App)._currentFiber().treeBaseTime).toBe(15);
+  });
+});

From 5b3d17a5f729eb204371ad1953a07ec3ae3dae00 Mon Sep 17 00:00:00 2001
From: Jason Williams <936006+jasonwilliams@users.noreply.github.com>
Date: Wed, 20 Jun 2018 22:48:53 +0100
Subject: [PATCH 177/277] setting a flag, so that the first movement will have
 the correct value (#13082)

---
 .../src/events/SyntheticMouseEvent.js         | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/packages/react-dom/src/events/SyntheticMouseEvent.js b/packages/react-dom/src/events/SyntheticMouseEvent.js
index d3319ec487..02a7926e68 100644
--- a/packages/react-dom/src/events/SyntheticMouseEvent.js
+++ b/packages/react-dom/src/events/SyntheticMouseEvent.js
@@ -8,8 +8,11 @@
 import SyntheticUIEvent from './SyntheticUIEvent';
 import getEventModifierState from './getEventModifierState';
 
-let previousScreenX = null;
-let previousScreenY = null;
+let previousScreenX = 0;
+let previousScreenY = 0;
+// Use flags to signal movementX/Y has already been set
+let isMovementXSet = false;
+let isMovementYSet = false;
 
 /**
  * @interface MouseEvent
@@ -44,7 +47,13 @@ const SyntheticMouseEvent = SyntheticUIEvent.extend({
 
     const screenX = previousScreenX;
     previousScreenX = event.screenX;
-    return screenX ? event.screenX - screenX : 0;
+
+    if (!isMovementXSet) {
+      isMovementXSet = true;
+      return 0;
+    }
+
+    return event.screenX - screenX;
   },
   movementY: function(event) {
     if ('movementY' in event) {
@@ -53,7 +62,13 @@ const SyntheticMouseEvent = SyntheticUIEvent.extend({
 
     const screenY = previousScreenY;
     previousScreenY = event.screenY;
-    return screenY ? event.screenY - screenY : 0;
+
+    if (!isMovementYSet) {
+      isMovementYSet = true;
+      return 0;
+    }
+
+    return event.screenY - screenY;
   },
 });
 

From a960d18bc76dfd2528536651efcd1b646d7d882f Mon Sep 17 00:00:00 2001
From: Nathan Quarles <nateq314@gmail.com>
Date: Thu, 21 Jun 2018 13:52:26 -0400
Subject: [PATCH 178/277] eliminate unnecessary do-while loop in renderRoot()
 (#13087)

---
 .../src/ReactFiberScheduler.js                | 87 +++++++++----------
 1 file changed, 42 insertions(+), 45 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 9de7ce4300..25a90af822 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -1011,54 +1011,52 @@ function renderRoot(root: FiberRoot, isYieldy: boolean): void {
 
   startWorkLoopTimer(nextUnitOfWork);
 
-  do {
-    try {
-      workLoop(isYieldy);
-    } catch (thrownValue) {
-      if (enableProfilerTimer) {
-        // Stop "base" render timer in the event of an error.
-        stopBaseRenderTimerIfRunning();
+  try {
+    workLoop(isYieldy);
+  } catch (thrownValue) {
+    if (enableProfilerTimer) {
+      // Stop "base" render timer in the event of an error.
+      stopBaseRenderTimerIfRunning();
+    }
+
+    if (nextUnitOfWork === null) {
+      // This is a fatal error.
+      didFatal = true;
+      onUncaughtError(thrownValue);
+    } else {
+      if (__DEV__) {
+        // Reset global debug state
+        // We assume this is defined in DEV
+        (resetCurrentlyProcessingQueue: any)();
       }
 
-      if (nextUnitOfWork === null) {
-        // This is a fatal error.
+      const failedUnitOfWork: Fiber = nextUnitOfWork;
+      if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+        replayUnitOfWork(failedUnitOfWork, thrownValue, isYieldy);
+      }
+
+      // TODO: we already know this isn't true in some cases.
+      // At least this shows a nicer error message until we figure out the cause.
+      // https://github.com/facebook/react/issues/12449#issuecomment-386727431
+      invariant(
+        nextUnitOfWork !== null,
+        'Failed to replay rendering after an error. This ' +
+          'is likely caused by a bug in React. Please file an issue ' +
+          'with a reproducing case to help us find it.',
+      );
+
+      const sourceFiber: Fiber = nextUnitOfWork;
+      let returnFiber = sourceFiber.return;
+      if (returnFiber === null) {
+        // This is the root. The root could capture its own errors. However,
+        // we don't know if it errors before or after we pushed the host
+        // context. This information is needed to avoid a stack mismatch.
+        // Because we're not sure, treat this as a fatal error. We could track
+        // which phase it fails in, but doesn't seem worth it. At least
+        // for now.
         didFatal = true;
         onUncaughtError(thrownValue);
       } else {
-        if (__DEV__) {
-          // Reset global debug state
-          // We assume this is defined in DEV
-          (resetCurrentlyProcessingQueue: any)();
-        }
-
-        const failedUnitOfWork: Fiber = nextUnitOfWork;
-        if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
-          replayUnitOfWork(failedUnitOfWork, thrownValue, isYieldy);
-        }
-
-        // TODO: we already know this isn't true in some cases.
-        // At least this shows a nicer error message until we figure out the cause.
-        // https://github.com/facebook/react/issues/12449#issuecomment-386727431
-        invariant(
-          nextUnitOfWork !== null,
-          'Failed to replay rendering after an error. This ' +
-            'is likely caused by a bug in React. Please file an issue ' +
-            'with a reproducing case to help us find it.',
-        );
-
-        const sourceFiber: Fiber = nextUnitOfWork;
-        let returnFiber = sourceFiber.return;
-        if (returnFiber === null) {
-          // This is the root. The root could capture its own errors. However,
-          // we don't know if it errors before or after we pushed the host
-          // context. This information is needed to avoid a stack mismatch.
-          // Because we're not sure, treat this as a fatal error. We could track
-          // which phase it fails in, but doesn't seem worth it. At least
-          // for now.
-          didFatal = true;
-          onUncaughtError(thrownValue);
-          break;
-        }
         throwException(
           root,
           returnFiber,
@@ -1069,8 +1067,7 @@ function renderRoot(root: FiberRoot, isYieldy: boolean): void {
         nextUnitOfWork = completeUnitOfWork(sourceFiber);
       }
     }
-    break;
-  } while (true);
+  }
 
   // We're done performing work. Time to clean up.
   isWorking = false;

From da5c87bdfa287b8493b6e40a02acbe9896fd554a Mon Sep 17 00:00:00 2001
From: Michael Ridgway <mcridgway@gmail.com>
Date: Thu, 21 Jun 2018 12:21:21 -0700
Subject: [PATCH 179/277] Fixes children when using dangerouslySetInnerHtml in
 a selected <option> (#13078)

* Fixes children when using dangerouslySetInnerHtml in a selected <option>

This fixes an inadvertent cast of undefined children to an empty string when creating an option tag that will be selected:

```
  <select defaultValue="test">
    <option value='test' dangerouslySetInnerHTML={{ __html: '&rlm; test'}} />
  </select>
```

This causes an invariant error because both children and dangerouslySetInnerHTML are set.

* PR fix and new ReactDOMServerIntegrationForms test

* Account for null case

* Combine test cases into single test

* Add tests for failure cases

* Fix lint
---
 .../src/__tests__/ReactDOMSelect-test.js      | 31 ++++++++
 .../ReactDOMServerIntegrationForms-test.js    | 76 +++++++++++++++++++
 .../src/server/ReactPartialRenderer.js        |  5 +-
 3 files changed, 111 insertions(+), 1 deletion(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index 5c2277c5ee..f2df03a5b0 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -443,6 +443,37 @@ describe('ReactDOMSelect', () => {
     expect(markup).not.toContain('<option selected="" value="gorilla"');
   });
 
+  it('should support server-side rendering with dangerouslySetInnerHTML', () => {
+    const stub = (
+      <select defaultValue="giraffe">
+        <option
+          value="monkey"
+          dangerouslySetInnerHTML={{
+            __html: 'A monkey!',
+          }}>
+          {undefined}
+        </option>
+        <option
+          value="giraffe"
+          dangerouslySetInnerHTML={{
+            __html: 'A giraffe!',
+          }}>
+          {null}
+        </option>
+        <option
+          value="gorilla"
+          dangerouslySetInnerHTML={{
+            __html: 'A gorilla!',
+          }}
+        />
+      </select>
+    );
+    const markup = ReactDOMServer.renderToString(stub);
+    expect(markup).toContain('<option selected="" value="giraffe"');
+    expect(markup).not.toContain('<option selected="" value="monkey"');
+    expect(markup).not.toContain('<option selected="" value="gorilla"');
+  });
+
   it('should support server-side rendering with multiple', () => {
     const stub = (
       <select multiple={true} value={['giraffe', 'gorilla']} onChange={noop}>
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js
index 2d873d20c6..8ae403c0f9 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js
@@ -35,6 +35,7 @@ const {
   resetModules,
   itRenders,
   itClientRenders,
+  itThrowsWhenRendering,
   renderIntoDom,
   serverRender,
 } = ReactDOMServerIntegrationUtils(initModules);
@@ -327,6 +328,81 @@ describe('ReactDOMServerIntegration', () => {
         expectSelectValue(e, 'bar');
       });
 
+      itRenders(
+        'a select with options that use dangerouslySetInnerHTML',
+        async render => {
+          const e = await render(
+            <select defaultValue="baz" value="bar" readOnly={true}>
+              <option
+                id="foo"
+                value="foo"
+                dangerouslySetInnerHTML={{
+                  __html: 'Foo',
+                }}>
+                {undefined}
+              </option>
+              <option
+                id="bar"
+                value="bar"
+                dangerouslySetInnerHTML={{
+                  __html: 'Bar',
+                }}>
+                {null}
+              </option>
+              <option
+                id="baz"
+                value="baz"
+                dangerouslySetInnerHTML={{
+                  __html: 'Baz',
+                }}
+              />
+            </select>,
+            1,
+          );
+          expectSelectValue(e, 'bar');
+        },
+      );
+
+      itThrowsWhenRendering(
+        'a select with option that uses dangerouslySetInnerHTML and 0 as child',
+        async render => {
+          await render(
+            <select defaultValue="baz" value="foo" readOnly={true}>
+              <option
+                id="foo"
+                value="foo"
+                dangerouslySetInnerHTML={{
+                  __html: 'Foo',
+                }}>
+                {0}
+              </option>
+            </select>,
+            1,
+          );
+        },
+        'Can only set one of `children` or `props.dangerouslySetInnerHTML`.',
+      );
+
+      itThrowsWhenRendering(
+        'a select with option that uses dangerouslySetInnerHTML and empty string as child',
+        async render => {
+          await render(
+            <select defaultValue="baz" value="foo" readOnly={true}>
+              <option
+                id="foo"
+                value="foo"
+                dangerouslySetInnerHTML={{
+                  __html: 'Foo',
+                }}>
+                {''}
+              </option>
+            </select>,
+            1,
+          );
+        },
+        'Can only set one of `children` or `props.dangerouslySetInnerHTML`.',
+      );
+
       itRenders(
         'a select value overriding defaultValue no matter the prop order',
         async render => {
diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index 04234411f2..f3c20cde34 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -258,7 +258,10 @@ function flattenTopLevelChildren(children: mixed): FlatReactChildren {
   return [fragmentChildElement];
 }
 
-function flattenOptionChildren(children: mixed): string {
+function flattenOptionChildren(children: mixed): ?string {
+  if (children === undefined || children === null) {
+    return children;
+  }
   let content = '';
   // Flatten children and warn if they aren't strings or numbers;
   // invalid types are ignored.

From 076bbeace7e089ee748a0b59466df654305bbe2b Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Fri, 22 Jun 2018 09:13:47 -0700
Subject: [PATCH 180/277] Fall back to 'setTimeout' when
 'requestAnimationFrame' is not called (#13091)

* Add fixture test for schedule running when tab is backgrounded

**what is the change?:**
Just adding a test to the fixture, where we can easily see whether
scheduled callbacks are called after switching away from the fixture
tab.

**why make this change?:**
We are about to fix the schedule module so that it still runs even when
the tab is in the backround.

**test plan:**
Manually tested the fixture, verified that it works as expected and
right now callbacks are not called when the tab is in the background.

**issue:**
Internal task T30754186

* Fall back to 'setTimeout' when 'requestAnimationFrame' is not called

**what is the change?:**
If 'requestAnimationFrame' is not called for 100ms we fall back to
'setTimeout' to schedule the postmessage.

**why make this change?:**
When you start loading a page, and then switch tabs,
'requestAnimationFrame' is throttled or not called until you come back
to that tab. That means React's rendering, any any other scheduled work,
are paused.

Users expect the page to continue loading, and rendering is part of the
page load in a React app. So we need to continue calling callbacks.

**test plan:**
Manually tested using the new fixture test, observed that the callbacks
were called while switched to another tab. They were called more
slowly, but that seems like a reasonable thing.

**issue:**
Internal task T30754186

* make arguments more explicit
---
 fixtures/schedule/index.html                  | 27 ++++++++++++++++++-
 .../react-scheduler/src/ReactScheduler.js     | 26 ++++++++++++++++--
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/fixtures/schedule/index.html b/fixtures/schedule/index.html
index d5b243a3c2..ad5f1042f5 100644
--- a/fixtures/schedule/index.html
+++ b/fixtures/schedule/index.html
@@ -23,7 +23,7 @@
     <ol>
       <li>
         <button onClick="runTestOne()">Run Test 1</button>
-        <p>Calls the callback with the frame when not blocked:</p>
+        <p>Calls the callback within the frame when not blocked:</p>
         <div><b>Expected:</b></div>
         <div id="test-1-expected">
         </div>
@@ -79,6 +79,15 @@
         <p><b>IMPORTANT:</b> Open the console when you run this! Inspect the logs there!</p>
         <button onClick="runTestSix()">Run Test 6</button>
       </li>
+      <li>
+        <p>Continues calling callbacks even when user switches away from this tab</p>
+        <button onClick="runTestSeven()">Run Test 7</button>
+        <div><b>Click the button above, observe the counter, then switch to
+            another tab and switch back:</b></div>
+        <div id="test-7">
+        </div>
+        <div> If the counter advanced while you were away from this tab, it's correct.</div>
+      </li>
     </ol>
     <script src="../../build/dist/react-scheduler.development.js"></script>
     <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
@@ -464,6 +473,22 @@ function runTestSix() {
     console.log('scheduled cbE');
   };
 }
+
+function runTestSeven() {
+  // Test 7
+  // Calls callbacks, continues calling them even when this tab is in the
+  // background
+  clearTestResult(7);
+  let counter = -1;
+  function incrementCounterAndScheduleNextCallback() {
+    const counterNode = document.getElementById('test-7');
+    counter++;
+    counterNode.innerHTML = counter;
+    waitForTimeToPass(100);
+    scheduleWork(incrementCounterAndScheduleNextCallback);
+  }
+  scheduleWork(incrementCounterAndScheduleNextCallback);
+}
     </script type="text/babel">
   </body>
 </html>
diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index 2b016f1275..79268af395 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -117,6 +117,7 @@ if (!canUseDOM) {
   };
 } else {
   const localRequestAnimationFrame = requestAnimationFrame;
+  const localCancelAnimationFrame = cancelAnimationFrame;
 
   let headOfPendingCallbacksLinkedList: CallbackConfigType | null = null;
   let tailOfPendingCallbacksLinkedList: CallbackConfigType | null = null;
@@ -128,6 +129,27 @@ if (!canUseDOM) {
   let isIdleScheduled = false;
   let isAnimationFrameScheduled = false;
 
+  // requestAnimationFrame does not run when the tab is in the background.
+  // if we're backgrounded we prefer for that work to happen so that the page
+  // continues	to load in the background.
+  // so we also schedule a 'setTimeout' as a fallback.
+  const animationFrameTimeout = 100;
+  let rafID;
+  let timeoutID;
+  const scheduleAnimationFrameWithFallbackSupport = function(callback) {
+    // schedule rAF and also a setTimeout
+    rafID = localRequestAnimationFrame(function(timestamp) {
+      // cancel the setTimeout
+      localClearTimeout(timeoutID);
+      callback(timestamp);
+    });
+    timeoutID = localSetTimeout(function() {
+      // cancel the requestAnimationFrame
+      localCancelAnimationFrame(rafID);
+      callback(now());
+    }, animationFrameTimeout);
+  };
+
   let frameDeadline = 0;
   // We start out assuming that we run at 30fps but then the heuristic tracking
   // will adjust this value to a faster fps if we get more frequent animation
@@ -266,7 +288,7 @@ if (!canUseDOM) {
       if (!isAnimationFrameScheduled) {
         // Schedule another animation callback so we retry later.
         isAnimationFrameScheduled = true;
-        localRequestAnimationFrame(animationTick);
+        scheduleAnimationFrameWithFallbackSupport(animationTick);
       }
     }
   };
@@ -347,7 +369,7 @@ if (!canUseDOM) {
       // might want to still have setTimeout trigger scheduleWork as a backup to ensure
       // that we keep performing work.
       isAnimationFrameScheduled = true;
-      localRequestAnimationFrame(animationTick);
+      scheduleAnimationFrameWithFallbackSupport(animationTick);
     }
     return scheduledCallbackConfig;
   };

From c35a1e74835d2b4c07f1e14779a22ae8ca5a0d10 Mon Sep 17 00:00:00 2001
From: Dustin Masters <ceo@dustinsoftware.com>
Date: Fri, 22 Jun 2018 12:07:54 -0700
Subject: [PATCH 181/277] Fix crash during server render in react 16.4.1.
 (#13088)

* Fix crash during server render.

setTimeout and clearTimeout may not be available in some server-render environments (such as ChakraCore in React.NET), and loading ReactScheduler.js will cause a crash unless the existence of the variables are checked via a typeof comparison.

https://github.com/reactjs/React.NET/issues/555

The crash did not occur in 16.4.0, and the change appears to have been introduced here: https://github.com/facebook/react/pull/12931/files#diff-bbebc3357e1fb99ab13ad796e04b69a6L47

I tested this by using yarn link and running it with a local copy of React.NET. I am unsure the best way to unit test this change, since assigning null to `setTimeout` causes an immediate crash within the Node REPL.

* Fix flow errors and log warning if setTimeout / clearTimeout are
not defined / not a function.

* Use invariant to assert setTimeout / clearTimeout are functions

* Remove use of invariant

* Explain
---
 packages/react-scheduler/src/ReactScheduler.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index 79268af395..50252a827a 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -60,8 +60,15 @@ if (__DEV__) {
 // this module is initially evaluated.
 // We want to be using a consistent implementation.
 const localDate = Date;
-const localSetTimeout = setTimeout;
-const localClearTimeout = clearTimeout;
+
+// This initialization code may run even on server environments
+// if a component just imports ReactDOM (e.g. for findDOMNode).
+// Some environments might not have setTimeout or clearTimeout.
+// https://github.com/facebook/react/pull/13088
+const localSetTimeout =
+  typeof setTimeout === 'function' ? setTimeout : (undefined: any);
+const localClearTimeout =
+  typeof clearTimeout === 'function' ? clearTimeout : (undefined: any);
 
 const hasNativePerformanceNow =
   typeof performance === 'object' && typeof performance.now === 'function';

From 6a530e3baa9c44a509979c5d7013d4e1617cbc76 Mon Sep 17 00:00:00 2001
From: Jason Williams <936006+jasonwilliams@users.noreply.github.com>
Date: Sun, 24 Jun 2018 10:24:54 +0100
Subject: [PATCH 182/277] adding check for mousemove (#13090)

* adding check for mousemove

* adding unit test for SyntheticMouseEvent

* changing test to start with 2, removing comments
---
 .../src/events/SyntheticMouseEvent.js         |  4 +-
 .../__tests__/SyntheticMouseEvent-test.js     | 80 +++++++++++++++++++
 2 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 packages/react-dom/src/events/__tests__/SyntheticMouseEvent-test.js

diff --git a/packages/react-dom/src/events/SyntheticMouseEvent.js b/packages/react-dom/src/events/SyntheticMouseEvent.js
index 02a7926e68..28894dff4a 100644
--- a/packages/react-dom/src/events/SyntheticMouseEvent.js
+++ b/packages/react-dom/src/events/SyntheticMouseEvent.js
@@ -53,7 +53,7 @@ const SyntheticMouseEvent = SyntheticUIEvent.extend({
       return 0;
     }
 
-    return event.screenX - screenX;
+    return event.type === 'mousemove' ? event.screenX - screenX : 0;
   },
   movementY: function(event) {
     if ('movementY' in event) {
@@ -68,7 +68,7 @@ const SyntheticMouseEvent = SyntheticUIEvent.extend({
       return 0;
     }
 
-    return event.screenY - screenY;
+    return event.type === 'mousemove' ? event.screenY - screenY : 0;
   },
 });
 
diff --git a/packages/react-dom/src/events/__tests__/SyntheticMouseEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticMouseEvent-test.js
new file mode 100644
index 0000000000..034a1aa8d6
--- /dev/null
+++ b/packages/react-dom/src/events/__tests__/SyntheticMouseEvent-test.js
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react-core
+ */
+
+'use strict';
+
+let React;
+let ReactDOM;
+
+describe('SyntheticMouseEvent', () => {
+  let container;
+
+  beforeEach(() => {
+    React = require('react');
+    ReactDOM = require('react-dom');
+
+    // The container has to be attached for events to fire.
+    container = document.createElement('div');
+    document.body.appendChild(container);
+  });
+
+  afterEach(() => {
+    document.body.removeChild(container);
+    container = null;
+  });
+
+  it('should only use values from movementX/Y when event type is mousemove', () => {
+    const events = [];
+    const onMouseMove = event => {
+      events.push(event.movementX);
+    };
+
+    const onMouseDown = event => {
+      events.push(event.movementX);
+    };
+
+    const node = ReactDOM.render(
+      <div onMouseMove={onMouseMove} onMouseDown={onMouseDown} />,
+      container,
+    );
+
+    let event = new MouseEvent('mousemove', {
+      relatedTarget: null,
+      bubbles: true,
+      screenX: 2,
+      screenY: 2,
+    });
+
+    node.dispatchEvent(event);
+
+    event = new MouseEvent('mousemove', {
+      relatedTarget: null,
+      bubbles: true,
+      screenX: 8,
+      screenY: 8,
+    });
+
+    node.dispatchEvent(event);
+
+    // Now trigger a mousedown event to see if movementX has changed back to 0
+    event = new MouseEvent('mousedown', {
+      relatedTarget: null,
+      bubbles: true,
+      screenX: 25,
+      screenY: 65,
+    });
+
+    node.dispatchEvent(event);
+
+    expect(events.length).toBe(3);
+    expect(events[0]).toBe(0);
+    expect(events[1]).toBe(6);
+    expect(events[2]).toBe(0); // mousedown event should have movementX at 0
+  });
+});

From baff5cc2f69d30589a5dc65b089e47765437294b Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 26 Jun 2018 01:31:36 +0100
Subject: [PATCH 183/277] Update links

---
 README.md | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index edacd88e0f..cacf998079 100644
--- a/README.md
+++ b/README.md
@@ -11,12 +11,15 @@ React is a JavaScript library for building user interfaces.
 ## Documentation
 
 You can find the React documentation [on the website](https://reactjs.org/docs).  
-It is divided into several sections:
 
-* [Quick Start](https://reactjs.org/docs/hello-world.html)
+Check out the [Getting Started](https://reactjs.org/docs/getting-started.html) page for a quick overview.
+
+The documentation is divided into several sections:
+
+* [Tutorial](https://reactjs.org/tutorial/tutorial.html)
+* [Main Concepts](https://reactjs.org/docs/hello-world.html)
 * [Advanced Guides](https://reactjs.org/docs/jsx-in-depth.html)
 * [API Reference](https://reactjs.org/docs/react-api.html)
-* [Tutorial](https://reactjs.org/tutorial/tutorial.html)
 * [Where to Get Support](https://reactjs.org/community/support.html)
 * [Contributing Guide](https://reactjs.org/docs/how-to-contribute.html)
 
@@ -45,16 +48,16 @@ You'll notice that we used an HTML-like syntax; [we call it JSX](https://reactjs
 
 ## Installation
 
+React is designed for gradual adoption, and **you can use as little or as much React as you need**.
+
+Whether you want to get a taste of React, add some interactivity to a simple HTML page, or start a complex React-powered app, the links in this section will help you get started:
+
+* [Online Plagrounds](https://reactjs.org/docs/getting-started.html#online-playgrounds)
+* [Add React to a Website](https://reactjs.org/docs/add-react-to-a-website.html)
+* [Create a New React App](https://reactjs.org/docs/create-a-new-react-app.html)
+
 React is available as the `react` package on [npm](https://www.npmjs.com/). It is also available on a [CDN](https://reactjs.org/docs/cdn-links.html).
 
-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.
-
-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://reactjs.org/docs/try-react.html)
-* [Creating a New Application](https://reactjs.org/docs/add-react-to-a-new-app.html)
-* [Adding React to an Existing Application](https://reactjs.org/docs/add-react-to-an-existing-app.html)
-
 ## Contributing
 
 The main purpose of this repository is to continue to evolve React core, making it faster and easier to use. Development of React happens in the open on GitHub, and we are grateful to the community for contributing bugfixes and improvements. Read below to learn how you can take part in improving React.

From 9e6c99ca2e56ff6ccdb9d7f816cd706228139cba Mon Sep 17 00:00:00 2001
From: Rauno Freiberg <freiberggg@gmail.com>
Date: Tue, 26 Jun 2018 14:17:02 +0300
Subject: [PATCH 184/277] Fix README typo (#13110)

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

diff --git a/README.md b/README.md
index cacf998079..896046f4ad 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ React is designed for gradual adoption, and **you can use as little or as much R
 
 Whether you want to get a taste of React, add some interactivity to a simple HTML page, or start a complex React-powered app, the links in this section will help you get started:
 
-* [Online Plagrounds](https://reactjs.org/docs/getting-started.html#online-playgrounds)
+* [Online Playgrounds](https://reactjs.org/docs/getting-started.html#online-playgrounds)
 * [Add React to a Website](https://reactjs.org/docs/add-react-to-a-website.html)
 * [Create a New React App](https://reactjs.org/docs/create-a-new-react-app.html)
 

From 71a60ddb16c413bd9a62f2a0c62694d57d473679 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 26 Jun 2018 16:45:03 +0100
Subject: [PATCH 185/277] Add link to another article about React renderers

---
 packages/react-reconciler/README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/react-reconciler/README.md b/packages/react-reconciler/README.md
index a3d5f96406..a12b898e1f 100644
--- a/packages/react-reconciler/README.md
+++ b/packages/react-reconciler/README.md
@@ -46,7 +46,10 @@ var HostConfig = {
 };
 ```
 
-**For an introduction to writing a very simple custom renderer, [check out this small guide](https://medium.com/@agent_hunt/hello-world-custom-react-renderer-9a95b7cd04bc).**
+**For an introduction to writing a very simple custom renderer, check out this article series:**
+
+* **[Building a simple custom renderer to DOM](https://medium.com/@agent_hunt/hello-world-custom-react-renderer-9a95b7cd04bc)**
+* **[Building a simple custom renderer to native](https://medium.com/@agent_hunt/introduction-to-react-native-renderers-aka-react-native-is-the-java-and-react-native-renderers-are-828a0022f433)**
 
 The full list of supported methods [can be found here](https://github.com/facebook/react/blob/master/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js). For their signatures, we recommend looking at specific examples below.
 

From 6d6de6011cf329fabe057186e9a65fc8eb4e175c Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Tue, 26 Jun 2018 13:28:41 -0700
Subject: [PATCH 186/277] Add PROFILE bundles for www+DOM and fbsource+RN/RF
 (#13112)

---
 .../ReactFeatureFlags.native-fabric-fb.js     |  2 +-
 .../forks/ReactFeatureFlags.native-fb.js      |  2 +-
 .../forks/ReactFeatureFlags.persistent.js     |  2 +-
 .../shared/forks/ReactFeatureFlags.www.js     |  3 +-
 scripts/rollup/build.js                       | 33 ++++++++++++++++---
 scripts/rollup/bundles.js                     |  9 +++--
 scripts/rollup/forks.js                       | 14 ++++++++
 scripts/rollup/packaging.js                   |  4 +++
 scripts/rollup/wrappers.js                    | 28 ++++++++++++++++
 9 files changed, 87 insertions(+), 10 deletions(-)

diff --git a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
index bd55701519..1c012dd10a 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fabric-fb.js
@@ -20,7 +20,7 @@ export const enableSuspense = false;
 export const warnAboutDeprecatedLifecycles = false;
 export const warnAboutLegacyContextAPI = __DEV__;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
-export const enableProfilerTimer = __DEV__;
+export const enableProfilerTimer = __PROFILE__;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js
index b0fdc77f3a..4efb4caf07 100644
--- a/packages/shared/forks/ReactFeatureFlags.native-fb.js
+++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js
@@ -20,12 +20,12 @@ export const {
   debugRenderPhaseSideEffectsForStrictMode,
   warnAboutDeprecatedLifecycles,
   replayFailedUnitOfWorkWithInvokeGuardedCallback,
-  enableProfilerTimer,
 } = require('ReactFeatureFlags');
 
 // The rest of the flags are static for better dead code elimination.
 export const enableUserTimingAPI = __DEV__;
 export const warnAboutLegacyContextAPI = __DEV__;
+export const enableProfilerTimer = __PROFILE__;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.persistent.js b/packages/shared/forks/ReactFeatureFlags.persistent.js
index 88773cf900..142f1449fd 100644
--- a/packages/shared/forks/ReactFeatureFlags.persistent.js
+++ b/packages/shared/forks/ReactFeatureFlags.persistent.js
@@ -20,7 +20,7 @@ export const enableSuspense = false;
 export const warnAboutDeprecatedLifecycles = false;
 export const warnAboutLegacyContextAPI = false;
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;
-export const enableProfilerTimer = false;
+export const enableProfilerTimer = __PROFILE__;
 
 // Only used in www builds.
 export function addUserTimingListener() {
diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js
index a50191a176..cebcf5f5cc 100644
--- a/packages/shared/forks/ReactFeatureFlags.www.js
+++ b/packages/shared/forks/ReactFeatureFlags.www.js
@@ -18,7 +18,6 @@ export const {
   enableGetDerivedStateFromCatch,
   replayFailedUnitOfWorkWithInvokeGuardedCallback,
   warnAboutDeprecatedLifecycles,
-  enableProfilerTimer,
 } = require('ReactFeatureFlags');
 
 // The rest of the flags are static for better dead code elimination.
@@ -32,6 +31,8 @@ export const warnAboutLegacyContextAPI = __DEV__;
 // as long as there is more than a single listener.
 export let enableUserTimingAPI = __DEV__;
 
+export const enableProfilerTimer = __PROFILE__;
+
 let refCount = 0;
 export function addUserTimingListener() {
   if (__DEV__) {
diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index 42f5e46d9e..1b7c767aba 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -42,11 +42,13 @@ const {
   NODE_PROFILING,
   FB_WWW_DEV,
   FB_WWW_PROD,
+  FB_WWW_PROFILING,
   RN_OSS_DEV,
   RN_OSS_PROD,
   RN_OSS_PROFILING,
   RN_FB_DEV,
   RN_FB_PROD,
+  RN_FB_PROFILING,
 } = Bundles.bundleTypes;
 
 const requestedBundleTypes = (argv.type || '')
@@ -87,6 +89,7 @@ function getBabelConfig(updateBabelOptions, bundleType, filename) {
   switch (bundleType) {
     case FB_WWW_DEV:
     case FB_WWW_PROD:
+    case FB_WWW_PROFILING:
       return Object.assign({}, options, {
         plugins: options.plugins.concat([
           // Minify invariant messages
@@ -100,6 +103,7 @@ function getBabelConfig(updateBabelOptions, bundleType, filename) {
     case RN_OSS_PROFILING:
     case RN_FB_DEV:
     case RN_FB_PROD:
+    case RN_FB_PROFILING:
       return Object.assign({}, options, {
         plugins: options.plugins.concat([
           // Wrap warning() calls in a __DEV__ check so they are stripped from production.
@@ -159,11 +163,13 @@ function getFormat(bundleType) {
     case NODE_PROFILING:
     case FB_WWW_DEV:
     case FB_WWW_PROD:
+    case FB_WWW_PROFILING:
     case RN_OSS_DEV:
     case RN_OSS_PROD:
     case RN_OSS_PROFILING:
     case RN_FB_DEV:
     case RN_FB_PROD:
+    case RN_FB_PROFILING:
       return `cjs`;
   }
 }
@@ -190,6 +196,8 @@ function getFilename(name, globalName, bundleType) {
     case RN_OSS_PROD:
     case RN_FB_PROD:
       return `${globalName}-prod.js`;
+    case FB_WWW_PROFILING:
+    case RN_FB_PROFILING:
     case RN_OSS_PROFILING:
       return `${globalName}-profiling.js`;
   }
@@ -207,9 +215,11 @@ function isProductionBundleType(bundleType) {
     case NODE_PROD:
     case NODE_PROFILING:
     case FB_WWW_PROD:
+    case FB_WWW_PROFILING:
     case RN_OSS_PROD:
     case RN_OSS_PROFILING:
     case RN_FB_PROD:
+    case RN_FB_PROFILING:
       return true;
     default:
       throw new Error(`Unknown type: ${bundleType}`);
@@ -229,7 +239,9 @@ function isProfilingBundleType(bundleType) {
     case UMD_DEV:
     case UMD_PROD:
       return false;
+    case FB_WWW_PROFILING:
     case NODE_PROFILING:
+    case RN_FB_PROFILING:
     case RN_OSS_PROFILING:
       return true;
     default:
@@ -267,13 +279,17 @@ function getPlugins(
   const isProduction = isProductionBundleType(bundleType);
   const isProfiling = isProfilingBundleType(bundleType);
   const isUMDBundle = bundleType === UMD_DEV || bundleType === UMD_PROD;
-  const isFBBundle = bundleType === FB_WWW_DEV || bundleType === FB_WWW_PROD;
+  const isFBBundle =
+    bundleType === FB_WWW_DEV ||
+    bundleType === FB_WWW_PROD ||
+    bundleType === FB_WWW_PROFILING;
   const isRNBundle =
     bundleType === RN_OSS_DEV ||
     bundleType === RN_OSS_PROD ||
     bundleType === RN_OSS_PROFILING ||
     bundleType === RN_FB_DEV ||
-    bundleType === RN_FB_PROD;
+    bundleType === RN_FB_PROD ||
+    bundleType === RN_FB_PROFILING;
   const shouldStayReadable = isFBBundle || isRNBundle || forcePrettyOutput;
   return [
     // Extract error codes from invariant() messages into a file.
@@ -404,7 +420,11 @@ async function createBundle(bundle, bundleType) {
   const packageName = Packaging.getPackageName(bundle.entry);
 
   let resolvedEntry = require.resolve(bundle.entry);
-  if (bundleType === FB_WWW_DEV || bundleType === FB_WWW_PROD) {
+  if (
+    bundleType === FB_WWW_DEV ||
+    bundleType === FB_WWW_PROD ||
+    bundleType === FB_WWW_PROFILING
+  ) {
     const resolvedFBEntry = resolvedEntry.replace('.js', '.fb.js');
     if (fs.existsSync(resolvedFBEntry)) {
       resolvedEntry = resolvedFBEntry;
@@ -451,7 +471,10 @@ async function createBundle(bundle, bundleType) {
       bundle.modulesToStub
     ),
     // We can't use getters in www.
-    legacy: bundleType === FB_WWW_DEV || bundleType === FB_WWW_PROD,
+    legacy:
+      bundleType === FB_WWW_DEV ||
+      bundleType === FB_WWW_PROD ||
+      bundleType === FB_WWW_PROFILING,
   };
   const [mainOutputPath, ...otherOutputPaths] = Packaging.getBundleOutputPaths(
     bundleType,
@@ -563,11 +586,13 @@ async function buildEverything() {
     await createBundle(bundle, NODE_PROFILING);
     await createBundle(bundle, FB_WWW_DEV);
     await createBundle(bundle, FB_WWW_PROD);
+    await createBundle(bundle, FB_WWW_PROFILING);
     await createBundle(bundle, RN_OSS_DEV);
     await createBundle(bundle, RN_OSS_PROD);
     await createBundle(bundle, RN_OSS_PROFILING);
     await createBundle(bundle, RN_FB_DEV);
     await createBundle(bundle, RN_FB_PROD);
+    await createBundle(bundle, RN_FB_PROFILING);
   }
 
   await Packaging.copyAllShims();
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index a9fc687f75..54fa892cc0 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -8,11 +8,13 @@ const bundleTypes = {
   NODE_PROFILING: 'NODE_PROFILING',
   FB_WWW_DEV: 'FB_WWW_DEV',
   FB_WWW_PROD: 'FB_WWW_PROD',
+  FB_WWW_PROFILING: 'FB_WWW_PROFILING',
   RN_OSS_DEV: 'RN_OSS_DEV',
   RN_OSS_PROD: 'RN_OSS_PROD',
   RN_OSS_PROFILING: 'RN_OSS_PROFILING',
   RN_FB_DEV: 'RN_FB_DEV',
   RN_FB_PROD: 'RN_FB_PROD',
+  RN_FB_PROFILING: 'RN_FB_PROFILING',
 };
 
 const UMD_DEV = bundleTypes.UMD_DEV;
@@ -22,11 +24,13 @@ const NODE_PROD = bundleTypes.NODE_PROD;
 const NODE_PROFILING = bundleTypes.NODE_PROFILING;
 const FB_WWW_DEV = bundleTypes.FB_WWW_DEV;
 const FB_WWW_PROD = bundleTypes.FB_WWW_PROD;
+const FB_WWW_PROFILING = bundleTypes.FB_WWW_PROFILING;
 const RN_OSS_DEV = bundleTypes.RN_OSS_DEV;
 const RN_OSS_PROD = bundleTypes.RN_OSS_PROD;
 const RN_OSS_PROFILING = bundleTypes.RN_OSS_PROFILING;
 const RN_FB_DEV = bundleTypes.RN_FB_DEV;
 const RN_FB_PROD = bundleTypes.RN_FB_PROD;
+const RN_FB_PROFILING = bundleTypes.RN_FB_PROFILING;
 
 const moduleTypes = {
   ISOMORPHIC: 'ISOMORPHIC',
@@ -76,6 +80,7 @@ const bundles = [
       NODE_PROFILING,
       FB_WWW_DEV,
       FB_WWW_PROD,
+      FB_WWW_PROFILING,
     ],
     moduleType: RENDERER,
     entry: 'react-dom',
@@ -160,7 +165,7 @@ const bundles = [
   /******* React Native *******/
   {
     label: 'native-fb',
-    bundleTypes: [RN_FB_DEV, RN_FB_PROD],
+    bundleTypes: [RN_FB_DEV, RN_FB_PROD, RN_FB_PROFILING],
     moduleType: RENDERER,
     entry: 'react-native-renderer',
     global: 'ReactNativeRenderer',
@@ -201,7 +206,7 @@ const bundles = [
   /******* React Native Fabric *******/
   {
     label: 'native-fabric-fb',
-    bundleTypes: [RN_FB_DEV, RN_FB_PROD],
+    bundleTypes: [RN_FB_DEV, RN_FB_PROD, RN_FB_PROFILING],
     moduleType: RENDERER,
     entry: 'react-native-renderer/fabric',
     global: 'ReactFabric',
diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js
index 64def9eb87..827050ac32 100644
--- a/scripts/rollup/forks.js
+++ b/scripts/rollup/forks.js
@@ -8,11 +8,13 @@ const UMD_DEV = bundleTypes.UMD_DEV;
 const UMD_PROD = bundleTypes.UMD_PROD;
 const FB_WWW_DEV = bundleTypes.FB_WWW_DEV;
 const FB_WWW_PROD = bundleTypes.FB_WWW_PROD;
+const FB_WWW_PROFILING = bundleTypes.FB_WWW_PROFILING;
 const RN_OSS_DEV = bundleTypes.RN_OSS_DEV;
 const RN_OSS_PROD = bundleTypes.RN_OSS_PROD;
 const RN_OSS_PROFILING = bundleTypes.RN_OSS_PROFILING;
 const RN_FB_DEV = bundleTypes.RN_FB_DEV;
 const RN_FB_PROD = bundleTypes.RN_FB_PROD;
+const RN_FB_PROFILING = bundleTypes.RN_FB_PROFILING;
 const RENDERER = moduleTypes.RENDERER;
 const RECONCILER = moduleTypes.RECONCILER;
 
@@ -43,6 +45,7 @@ const forks = Object.freeze({
         switch (bundleType) {
           case RN_FB_DEV:
           case RN_FB_PROD:
+          case RN_FB_PROFILING:
             return 'shared/forks/ReactFeatureFlags.native-fb.js';
           case RN_OSS_DEV:
           case RN_OSS_PROD:
@@ -57,6 +60,7 @@ const forks = Object.freeze({
         switch (bundleType) {
           case RN_FB_DEV:
           case RN_FB_PROD:
+          case RN_FB_PROFILING:
             return 'shared/forks/ReactFeatureFlags.native-fabric-fb.js';
           case RN_OSS_DEV:
           case RN_OSS_PROD:
@@ -75,6 +79,7 @@ const forks = Object.freeze({
         switch (bundleType) {
           case FB_WWW_DEV:
           case FB_WWW_PROD:
+          case FB_WWW_PROFILING:
             return 'shared/forks/ReactFeatureFlags.www.js';
         }
     }
@@ -85,6 +90,7 @@ const forks = Object.freeze({
     switch (bundleType) {
       case FB_WWW_DEV:
       case FB_WWW_PROD:
+      case FB_WWW_PROFILING:
         return 'shared/forks/ReactScheduler.www.js';
       default:
         return null;
@@ -96,6 +102,7 @@ const forks = Object.freeze({
     switch (bundleType) {
       case FB_WWW_DEV:
       case FB_WWW_PROD:
+      case FB_WWW_PROFILING:
         return 'shared/forks/invariant.www.js';
       default:
         return null;
@@ -107,6 +114,7 @@ const forks = Object.freeze({
     switch (bundleType) {
       case FB_WWW_DEV:
       case FB_WWW_PROD:
+      case FB_WWW_PROFILING:
         return 'shared/forks/lowPriorityWarning.www.js';
       default:
         return null;
@@ -118,6 +126,7 @@ const forks = Object.freeze({
     switch (bundleType) {
       case FB_WWW_DEV:
       case FB_WWW_PROD:
+      case FB_WWW_PROFILING:
         return 'shared/forks/warning.www.js';
       default:
         return null;
@@ -130,6 +139,7 @@ const forks = Object.freeze({
     switch (bundleType) {
       case FB_WWW_DEV:
       case FB_WWW_PROD:
+      case FB_WWW_PROFILING:
         return 'react/src/forks/ReactCurrentOwner.www.js';
       default:
         return null;
@@ -141,6 +151,7 @@ const forks = Object.freeze({
     switch (bundleType) {
       case FB_WWW_DEV:
       case FB_WWW_PROD:
+      case FB_WWW_PROFILING:
         return 'shared/forks/invokeGuardedCallback.www.js';
       default:
         return null;
@@ -152,6 +163,7 @@ const forks = Object.freeze({
     switch (bundleType) {
       case FB_WWW_DEV:
       case FB_WWW_PROD:
+      case FB_WWW_PROFILING:
         // Use the www fork which shows an error dialog.
         return 'react-reconciler/src/forks/ReactFiberErrorDialog.www.js';
       case RN_OSS_DEV:
@@ -159,6 +171,7 @@ const forks = Object.freeze({
       case RN_OSS_PROFILING:
       case RN_FB_DEV:
       case RN_FB_PROD:
+      case RN_FB_PROFILING:
         switch (entry) {
           case 'react-native-renderer':
           case 'react-native-renderer/fabric':
@@ -204,6 +217,7 @@ const forks = Object.freeze({
     switch (bundleType) {
       case FB_WWW_DEV:
       case FB_WWW_PROD:
+      case FB_WWW_PROFILING:
         // Use the www fork which is integrated with TimeSlice profiling.
         return 'react-dom/src/events/forks/EventListener-www.js';
       default:
diff --git a/scripts/rollup/packaging.js b/scripts/rollup/packaging.js
index 507b0d48cf..d2c8c96ad2 100644
--- a/scripts/rollup/packaging.js
+++ b/scripts/rollup/packaging.js
@@ -17,11 +17,13 @@ const {
   NODE_PROFILING,
   FB_WWW_DEV,
   FB_WWW_PROD,
+  FB_WWW_PROFILING,
   RN_OSS_DEV,
   RN_OSS_PROD,
   RN_OSS_PROFILING,
   RN_FB_DEV,
   RN_FB_PROD,
+  RN_FB_PROFILING,
 } = Bundles.bundleTypes;
 
 function getPackageName(name) {
@@ -45,6 +47,7 @@ function getBundleOutputPaths(bundleType, filename, packageName) {
       ];
     case FB_WWW_DEV:
     case FB_WWW_PROD:
+    case FB_WWW_PROFILING:
       return [`build/facebook-www/${filename}`];
     case RN_OSS_DEV:
     case RN_OSS_PROD:
@@ -57,6 +60,7 @@ function getBundleOutputPaths(bundleType, filename, packageName) {
       }
     case RN_FB_DEV:
     case RN_FB_PROD:
+    case RN_FB_PROFILING:
       switch (packageName) {
         case 'react-native-renderer':
           return [`build/react-native/fb/${filename}`];
diff --git a/scripts/rollup/wrappers.js b/scripts/rollup/wrappers.js
index 36bae238d0..3f7eacf487 100644
--- a/scripts/rollup/wrappers.js
+++ b/scripts/rollup/wrappers.js
@@ -10,11 +10,13 @@ const NODE_PROD = Bundles.bundleTypes.NODE_PROD;
 const NODE_PROFILING = Bundles.bundleTypes.NODE_PROFILING;
 const FB_WWW_DEV = Bundles.bundleTypes.FB_WWW_DEV;
 const FB_WWW_PROD = Bundles.bundleTypes.FB_WWW_PROD;
+const FB_WWW_PROFILING = Bundles.bundleTypes.FB_WWW_PROFILING;
 const RN_OSS_DEV = Bundles.bundleTypes.RN_OSS_DEV;
 const RN_OSS_PROD = Bundles.bundleTypes.RN_OSS_PROD;
 const RN_OSS_PROFILING = Bundles.bundleTypes.RN_OSS_PROFILING;
 const RN_FB_DEV = Bundles.bundleTypes.RN_FB_DEV;
 const RN_FB_PROD = Bundles.bundleTypes.RN_FB_PROD;
+const RN_FB_PROFILING = Bundles.bundleTypes.RN_FB_PROFILING;
 
 const RECONCILER = Bundles.moduleTypes.RECONCILER;
 
@@ -141,6 +143,19 @@ ${license}
  * @preserve-invariant-messages
  */
 
+${source}`;
+  },
+
+  /****************** FB_WWW_PROFILING ******************/
+  [FB_WWW_PROFILING](source, globalName, filename, moduleType) {
+    return `/**
+${license}
+ *
+ * @noflow
+ * @preventMunge
+ * @preserve-invariant-messages
+ */
+
 ${source}`;
   },
 
@@ -221,6 +236,19 @@ ${license}
  * ${'@gen' + 'erated'}
  */
 
+${source}`;
+  },
+
+  /****************** RN_FB_PROFILING ******************/
+  [RN_FB_PROFILING](source, globalName, filename, moduleType) {
+    return `/**
+${license}
+ *
+ * @noflow
+ * @preventMunge
+ * ${'@gen' + 'erated'}
+ */
+
 ${source}`;
   },
 };

From 3eedcb1fda8876868e2363e215b773bdb4de6d3b Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 27 Jun 2018 17:07:26 +0100
Subject: [PATCH 187/277] Tweak links in README

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

diff --git a/README.md b/README.md
index 896046f4ad..29e56e16b2 100644
--- a/README.md
+++ b/README.md
@@ -37,26 +37,24 @@ class HelloMessage extends React.Component {
 }
 
 ReactDOM.render(
-  <HelloMessage name="John" />,
+  <HelloMessage name="Taylor" />,
   document.getElementById('container')
 );
 ```
 
-This example will render "Hello John" into a container on the page.
+This example will render "Hello Taylor" into a container on the page.
 
-You'll notice that we used an HTML-like syntax; [we call it JSX](https://reactjs.org/docs/introducing-jsx.html). JSX is not required to use React, but it makes code more readable, and writing it feels like writing HTML. We recommend using [Babel](https://babeljs.io/) with a [React preset](https://babeljs.io/docs/plugins/preset-react/) to convert JSX into native JavaScript for browsers to digest.
+You'll notice that we used an HTML-like syntax; [we call it JSX](https://reactjs.org/docs/introducing-jsx.html). JSX is not required to use React, but it makes code more readable, and writing it feels like writing HTML. The next section contains instructions for integrating React and JSX (optionally) into your project.
 
 ## Installation
 
-React is designed for gradual adoption, and **you can use as little or as much React as you need**.
+React has been designed for gradual adoption from the start, and **you can use as little or as much React as you need**:
 
-Whether you want to get a taste of React, add some interactivity to a simple HTML page, or start a complex React-powered app, the links in this section will help you get started:
+* Use [Online Playgrounds](https://reactjs.org/docs/getting-started.html#online-playgrounds) to get a taste of React.
+* [Add React to a Website](https://reactjs.org/docs/add-react-to-a-website.html) as a `<script>` tag in one minute.
+* [Create a New React App](https://reactjs.org/docs/create-a-new-react-app.html) if you're looking for a powerful JavaScript toolchain.
 
-* [Online Playgrounds](https://reactjs.org/docs/getting-started.html#online-playgrounds)
-* [Add React to a Website](https://reactjs.org/docs/add-react-to-a-website.html)
-* [Create a New React App](https://reactjs.org/docs/create-a-new-react-app.html)
-
-React is available as the `react` package on [npm](https://www.npmjs.com/). It is also available on a [CDN](https://reactjs.org/docs/cdn-links.html).
+You can use React as a `<script>` tag from a [CDN](https://reactjs.org/docs/cdn-links.html), or as a `react` package on [npm](https://www.npmjs.com/).
 
 ## Contributing
 

From f4b6a9f8ee5266b6dbe258b05fc7e442e933c3a6 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 27 Jun 2018 17:09:45 +0100
Subject: [PATCH 188/277] Just remove this sentence

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

diff --git a/README.md b/README.md
index 29e56e16b2..8c28048f36 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ ReactDOM.render(
 
 This example will render "Hello Taylor" into a container on the page.
 
-You'll notice that we used an HTML-like syntax; [we call it JSX](https://reactjs.org/docs/introducing-jsx.html). JSX is not required to use React, but it makes code more readable, and writing it feels like writing HTML. The next section contains instructions for integrating React and JSX (optionally) into your project.
+You'll notice that we used an HTML-like syntax; [we call it JSX](https://reactjs.org/docs/introducing-jsx.html). JSX is not required to use React, but it makes code more readable, and writing it feels like writing HTML.
 
 ## Installation
 

From 3297102de6692a675aad239061eed7aa822115fe Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 27 Jun 2018 17:12:12 +0100
Subject: [PATCH 189/277] Reorder sections

---
 README.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 8c28048f36..c40e26c792 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,16 @@ React is a JavaScript library for building user interfaces.
 
 [Learn how to use React in your own project](https://reactjs.org/docs/getting-started.html).
 
+## Installation
+
+React has been designed for gradual adoption from the start, and **you can use as little or as much React as you need**:
+
+* Use [Online Playgrounds](https://reactjs.org/docs/getting-started.html#online-playgrounds) to get a taste of React.
+* [Add React to a Website](https://reactjs.org/docs/add-react-to-a-website.html) as a `<script>` tag in one minute.
+* [Create a New React App](https://reactjs.org/docs/create-a-new-react-app.html) if you're looking for a powerful JavaScript toolchain.
+
+You can use React as a `<script>` tag from a [CDN](https://reactjs.org/docs/cdn-links.html), or as a `react` package on [npm](https://www.npmjs.com/).
+
 ## Documentation
 
 You can find the React documentation [on the website](https://reactjs.org/docs).  
@@ -46,16 +56,6 @@ This example will render "Hello Taylor" into a container on the page.
 
 You'll notice that we used an HTML-like syntax; [we call it JSX](https://reactjs.org/docs/introducing-jsx.html). JSX is not required to use React, but it makes code more readable, and writing it feels like writing HTML.
 
-## Installation
-
-React has been designed for gradual adoption from the start, and **you can use as little or as much React as you need**:
-
-* Use [Online Playgrounds](https://reactjs.org/docs/getting-started.html#online-playgrounds) to get a taste of React.
-* [Add React to a Website](https://reactjs.org/docs/add-react-to-a-website.html) as a `<script>` tag in one minute.
-* [Create a New React App](https://reactjs.org/docs/create-a-new-react-app.html) if you're looking for a powerful JavaScript toolchain.
-
-You can use React as a `<script>` tag from a [CDN](https://reactjs.org/docs/cdn-links.html), or as a `react` package on [npm](https://www.npmjs.com/).
-
 ## Contributing
 
 The main purpose of this repository is to continue to evolve React core, making it faster and easier to use. Development of React happens in the open on GitHub, and we are grateful to the community for contributing bugfixes and improvements. Read below to learn how you can take part in improving React.

From 183aefa51f5b7b18bde05dccdd417b8983d741d0 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 27 Jun 2018 17:59:29 +0100
Subject: [PATCH 190/277] More links

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

diff --git a/README.md b/README.md
index c40e26c792..a1d1d976da 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ ReactDOM.render(
 
 This example will render "Hello Taylor" into a container on the page.
 
-You'll notice that we used an HTML-like syntax; [we call it JSX](https://reactjs.org/docs/introducing-jsx.html). JSX is not required to use React, but it makes code more readable, and writing it feels like writing HTML.
+You'll notice that we used an HTML-like syntax; [we call it JSX](https://reactjs.org/docs/introducing-jsx.html). JSX is not required to use React, but it makes code more readable, and writing it feels like writing HTML. If you're using React as a `<script>` tag, read [this section](https://reactjs.org/docs/add-react-to-a-website.html#optional-try-react-with-jsx) on integrating JSX; otherwise, the [recommended JavaScript toolchains](https://reactjs.org/docs/create-a-new-react-app.html) handle it automatically.
 
 ## Contributing
 

From bf32a3d1958290b055dc4c34189308a9417a45e4 Mon Sep 17 00:00:00 2001
From: Hilbrand Bouwkamp <hilbrand@h72.nl>
Date: Fri, 29 Jun 2018 14:27:24 +0200
Subject: [PATCH 191/277] Updated url to Code of Conduct page (#13126)

url is not working. Did a search on code.fb.com that returned the page I've put in the commit.
---
 CODE_OF_CONDUCT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 55203be746..0fb245803d 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,3 +1,3 @@
 # Code of Conduct
 
-Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.facebook.com/pages/876921332402685/open-source-code-of-conduct) so that you can understand what actions will and will not be tolerated.
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.fb.com/codeofconduct/) so that you can understand what actions will and will not be tolerated.

From 64e1921aab4f7ad7e2f345f392033ffe724e52e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= <sebastian@calyptus.eu>
Date: Fri, 29 Jun 2018 12:51:48 -0700
Subject: [PATCH 192/277] Fix Flow type that event target can be null (#13124)

We pass null sometimes when the event target has disappeared. E.g. when
touches fires on a deleted node.
---
 packages/events/EventPluginHub.js                             | 4 ++--
 packages/events/PluginModuleType.js                           | 2 +-
 packages/react-dom/src/events/SimpleEventPlugin.js            | 2 +-
 packages/react-native-renderer/src/ReactFabricEventEmitter.js | 4 ++--
 .../react-native-renderer/src/ReactNativeBridgeEventPlugin.js | 2 +-
 scripts/flow/react-native-host-hooks.js                       | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/events/EventPluginHub.js b/packages/events/EventPluginHub.js
index a4849d98c9..2ac994bafa 100644
--- a/packages/events/EventPluginHub.js
+++ b/packages/events/EventPluginHub.js
@@ -167,7 +167,7 @@ export function getListener(inst: Fiber, registrationName: string) {
  */
 function extractEvents(
   topLevelType: TopLevelType,
-  targetInst: Fiber,
+  targetInst: null | Fiber,
   nativeEvent: AnyNativeEvent,
   nativeEventTarget: EventTarget,
 ): Array<ReactSyntheticEvent> | ReactSyntheticEvent | null {
@@ -229,7 +229,7 @@ export function runEventsInBatch(
 
 export function runExtractedEventsInBatch(
   topLevelType: TopLevelType,
-  targetInst: Fiber,
+  targetInst: null | Fiber,
   nativeEvent: AnyNativeEvent,
   nativeEventTarget: EventTarget,
 ) {
diff --git a/packages/events/PluginModuleType.js b/packages/events/PluginModuleType.js
index 22d53b1ccb..75fabea6bc 100644
--- a/packages/events/PluginModuleType.js
+++ b/packages/events/PluginModuleType.js
@@ -24,7 +24,7 @@ export type PluginModule<NativeEvent> = {
   eventTypes: EventTypes,
   extractEvents: (
     topLevelType: TopLevelType,
-    targetInst: Fiber,
+    targetInst: null | Fiber,
     nativeTarget: NativeEvent,
     nativeEventTarget: EventTarget,
   ) => ?ReactSyntheticEvent,
diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js
index b8b5c248a9..e1b1203b9e 100644
--- a/packages/react-dom/src/events/SimpleEventPlugin.js
+++ b/packages/react-dom/src/events/SimpleEventPlugin.js
@@ -212,7 +212,7 @@ const SimpleEventPlugin: PluginModule<MouseEvent> & {
 
   extractEvents: function(
     topLevelType: TopLevelType,
-    targetInst: Fiber,
+    targetInst: null | Fiber,
     nativeEvent: MouseEvent,
     nativeEventTarget: EventTarget,
   ): null | ReactSyntheticEvent {
diff --git a/packages/react-native-renderer/src/ReactFabricEventEmitter.js b/packages/react-native-renderer/src/ReactFabricEventEmitter.js
index 9de89055ce..bfd4803bcb 100644
--- a/packages/react-native-renderer/src/ReactFabricEventEmitter.js
+++ b/packages/react-native-renderer/src/ReactFabricEventEmitter.js
@@ -19,11 +19,11 @@ import type {TopLevelType} from 'events/TopLevelEventTypes';
 export {getListener, registrationNameModules as registrationNames};
 
 export function dispatchEvent(
-  target: Object,
+  target: null | Object,
   topLevelType: TopLevelType,
   nativeEvent: AnyNativeEvent,
 ) {
-  const targetFiber = (target: Fiber);
+  const targetFiber = (target: null | Fiber);
   batchedUpdates(function() {
     runExtractedEventsInBatch(
       topLevelType,
diff --git a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js
index f932968c45..1c41dc51f5 100644
--- a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js
+++ b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js
@@ -31,7 +31,7 @@ const ReactNativeBridgeEventPlugin = {
    */
   extractEvents: function(
     topLevelType: TopLevelType,
-    targetInst: Object,
+    targetInst: null | Object,
     nativeEvent: AnyNativeEvent,
     nativeEventTarget: Object,
   ): ?Object {
diff --git a/scripts/flow/react-native-host-hooks.js b/scripts/flow/react-native-host-hooks.js
index d10f4d06b9..f92fbbd6f3 100644
--- a/scripts/flow/react-native-host-hooks.js
+++ b/scripts/flow/react-native-host-hooks.js
@@ -100,7 +100,7 @@ declare module 'FabricUIManager' {
     viewName: string,
     rootTag: number,
     props: ?Object,
-    instanceHandle: Object,
+    eventTarget: Object,
   ): Object;
   declare function cloneNode(node: Object, instanceHandle: Object): Object;
   declare function cloneNodeWithNewChildren(
@@ -124,7 +124,7 @@ declare module 'FabricUIManager' {
   declare function completeRoot(rootTag: number, childSet: Object): void;
   declare function registerEventHandler(
     callback: (
-      instanceHandle: Object,
+      eventTarget: null | Object,
       type: RNTopLevelEventType,
       payload: Object,
     ) => void,

From 6731bfbed7964fdcb9b0080bce3edefc2a65d196 Mon Sep 17 00:00:00 2001
From: Joseph Lin <josephlin55555@gmail.com>
Date: Sat, 30 Jun 2018 18:45:06 -0400
Subject: [PATCH 193/277]  Update README.md (#13085)

Fix grammatical error via addition of comma.
---
 fixtures/attribute-behavior/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fixtures/attribute-behavior/README.md b/fixtures/attribute-behavior/README.md
index 3c28bdd53e..d14c5e55cd 100644
--- a/fixtures/attribute-behavior/README.md
+++ b/fixtures/attribute-behavior/README.md
@@ -20,7 +20,7 @@ The left box shows the property (or attribute) assigned by React 15.\*, and the
 right box shows the property (or attribute) assigned by the latest version of
 React 16.
 
-Right now we use a purple outline to call out cases where the assigned property
+Right now, we use a purple outline to call out cases where the assigned property
 (or attribute) has changed between React 15 and 16.
 
 ---

From c039c16f21d7dd5172a3f46d65a4f484543a14ec Mon Sep 17 00:00:00 2001
From: Toru Kobayashi <koba0004@gmail.com>
Date: Wed, 4 Jul 2018 01:47:40 +0900
Subject: [PATCH 194/277] Fix this in a functional component for
 ShallowRenderer (#13144)

---
 .../react-test-renderer/src/ReactShallowRenderer.js   |  6 +++++-
 .../src/__tests__/ReactShallowRenderer-test.js        | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js
index 54f671e660..ceaf1e748a 100644
--- a/packages/react-test-renderer/src/ReactShallowRenderer.js
+++ b/packages/react-test-renderer/src/ReactShallowRenderer.js
@@ -107,7 +107,11 @@ class ReactShallowRenderer {
 
         this._mountClassComponent(element, this._context);
       } else {
-        this._rendered = element.type(element.props, this._context);
+        this._rendered = element.type.call(
+          undefined,
+          element.props,
+          this._context,
+        );
       }
     }
 
diff --git a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
index b47495bca9..15eb862fcf 100644
--- a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
@@ -1407,4 +1407,15 @@ describe('ReactShallowRenderer', () => {
     instance.setState(state => ({count: state.count + 1}));
     expect(log).toEqual(['render']);
   });
+
+  it('should not get this in a functional component', () => {
+    const logs = [];
+    function Foo() {
+      logs.push(this);
+      return <div>foo</div>;
+    }
+    const shallowRenderer = createRenderer();
+    shallowRenderer.render(<Foo foo="bar" />);
+    expect(logs).toEqual([undefined]);
+  });
 });

From aa8266c4f7da62788156bf0bdd95fd729c04388a Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Tue, 3 Jul 2018 19:22:41 -0700
Subject: [PATCH 195/277] Prepare placeholders before timing out (#13092)

* Prepare placeholders before timing out

While a tree is suspended, prepare for the timeout by pre-rendering the
placeholder state.

This simplifies the implementation a bit because every render now
results in a completed tree.

* Suspend inside an already timed out Placeholder

A component should be able to suspend inside an already timed out
placeholder. The time at which the placeholder committed is used as
the start time for a subsequent suspend.

So, if a placeholder times out after 3 seconds, and an inner
placeholder has a threshold of 2 seconds, the inner placeholder will
not time out until 5 seconds total have elapsed.
---
 packages/react-art/src/ReactARTHostConfig.js  |   4 +
 .../src/client/ReactDOMHostConfig.js          |   6 +
 .../src/ReactFabricHostConfig.js              |   7 +
 .../src/ReactNativeHostConfig.js              |   7 +
 .../src/createReactNoop.js                    |   4 +
 .../src/ReactFiberBeginWork.js                |  18 +-
 .../src/ReactFiberCommitWork.js               |  12 +-
 .../src/ReactFiberExpirationTime.js           |  43 +-
 .../src/ReactFiberPendingPriority.js          | 167 ++++---
 .../react-reconciler/src/ReactFiberRoot.js    |  10 +-
 .../src/ReactFiberScheduler.js                | 460 +++++++++++-------
 .../src/ReactFiberUnwindWork.js               | 202 ++++----
 ...tIncrementalErrorHandling-test.internal.js |   4 +-
 .../__tests__/ReactSuspense-test.internal.js  | 277 +++--------
 ...ReactIncrementalPerf-test.internal.js.snap |  10 +-
 .../src/forks/ReactFiberHostConfig.custom.js  |   5 +
 .../src/ReactTestHostConfig.js                |   6 +
 17 files changed, 677 insertions(+), 565 deletions(-)

diff --git a/packages/react-art/src/ReactARTHostConfig.js b/packages/react-art/src/ReactARTHostConfig.js
index 33f91a77d4..e6ce862766 100644
--- a/packages/react-art/src/ReactARTHostConfig.js
+++ b/packages/react-art/src/ReactARTHostConfig.js
@@ -332,6 +332,10 @@ export function getChildHostContext() {
 export const scheduleDeferredCallback = ReactScheduler.scheduleWork;
 export const cancelDeferredCallback = ReactScheduler.cancelScheduledWork;
 
+export const scheduleTimeout = setTimeout;
+export const cancelTimeout = clearTimeout;
+export const noTimeout = -1;
+
 export function shouldSetTextContent(type, props) {
   return (
     typeof props.children === 'string' || typeof props.children === 'number'
diff --git a/packages/react-dom/src/client/ReactDOMHostConfig.js b/packages/react-dom/src/client/ReactDOMHostConfig.js
index c19a2c7425..412f06a9aa 100644
--- a/packages/react-dom/src/client/ReactDOMHostConfig.js
+++ b/packages/react-dom/src/client/ReactDOMHostConfig.js
@@ -45,6 +45,8 @@ type HostContextProd = string;
 export type HostContext = HostContextDev | HostContextProd;
 export type UpdatePayload = Array<mixed>;
 export type ChildSet = void; // Unused
+export type TimeoutHandle = TimeoutID;
+export type NoTimeout = -1;
 
 const {
   createElement,
@@ -278,6 +280,10 @@ export const isPrimaryRenderer = true;
 export const scheduleDeferredCallback = ReactScheduler.scheduleWork;
 export const cancelDeferredCallback = ReactScheduler.cancelScheduledWork;
 
+export const scheduleTimeout = setTimeout;
+export const cancelTimeout = clearTimeout;
+export const noTimeout = -1;
+
 // -------------------
 //     Mutation
 // -------------------
diff --git a/packages/react-native-renderer/src/ReactFabricHostConfig.js b/packages/react-native-renderer/src/ReactFabricHostConfig.js
index 65443762b1..074e478c3f 100644
--- a/packages/react-native-renderer/src/ReactFabricHostConfig.js
+++ b/packages/react-native-renderer/src/ReactFabricHostConfig.js
@@ -66,6 +66,9 @@ export type HostContext = $ReadOnly<{|
 |}>;
 export type UpdatePayload = Object;
 
+export type TimeoutHandle = TimeoutID;
+export type NoTimeout = -1;
+
 // TODO: Remove this conditional once all changes have propagated.
 if (registerEventHandler) {
   /**
@@ -324,6 +327,10 @@ export const scheduleDeferredCallback =
 export const cancelDeferredCallback =
   ReactNativeFrameScheduling.cancelDeferredCallback;
 
+export const scheduleTimeout = setTimeout;
+export const cancelTimeout = clearTimeout;
+export const noTimeout = -1;
+
 // -------------------
 //     Persistence
 // -------------------
diff --git a/packages/react-native-renderer/src/ReactNativeHostConfig.js b/packages/react-native-renderer/src/ReactNativeHostConfig.js
index 8c01e0ec94..7a8f3d14de 100644
--- a/packages/react-native-renderer/src/ReactNativeHostConfig.js
+++ b/packages/react-native-renderer/src/ReactNativeHostConfig.js
@@ -42,6 +42,9 @@ export type HostContext = $ReadOnly<{|
 export type UpdatePayload = Object; // Unused
 export type ChildSet = void; // Unused
 
+export type TimeoutHandle = TimeoutID;
+export type NoTimeout = -1;
+
 const UPDATE_SIGNAL = {};
 if (__DEV__) {
   Object.freeze(UPDATE_SIGNAL);
@@ -236,6 +239,10 @@ export const scheduleDeferredCallback =
 export const cancelDeferredCallback =
   ReactNativeFrameScheduling.cancelDeferredCallback;
 
+export const scheduleTimeout = setTimeout;
+export const cancelTimeout = clearTimeout;
+export const noTimeout = -1;
+
 export function shouldDeprioritizeSubtree(type: string, props: Props): boolean {
   return false;
 }
diff --git a/packages/react-noop-renderer/src/createReactNoop.js b/packages/react-noop-renderer/src/createReactNoop.js
index 94cb025010..15f8170533 100644
--- a/packages/react-noop-renderer/src/createReactNoop.js
+++ b/packages/react-noop-renderer/src/createReactNoop.js
@@ -182,6 +182,10 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
       scheduledCallback = null;
     },
 
+    scheduleTimeout: setTimeout,
+    cancelTimeout: clearTimeout,
+    noTimeout: -1,
+
     prepareForCommit(): void {},
 
     resetAfterCommit(): void {},
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index d2573168ec..9e31aa36b2 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -708,7 +708,7 @@ function updateTimeoutComponent(current, workInProgress, renderExpirationTime) {
     const nextProps = workInProgress.pendingProps;
     const prevProps = workInProgress.memoizedProps;
 
-    const prevDidTimeout = workInProgress.memoizedState;
+    const prevDidTimeout = workInProgress.memoizedState === true;
 
     // Check if we already attempted to render the normal state. If we did,
     // and we timed out, render the placeholder state.
@@ -723,6 +723,16 @@ function updateTimeoutComponent(current, workInProgress, renderExpirationTime) {
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
 
+    if (nextDidTimeout) {
+      // If the timed-out view commits, schedule an update effect to record
+      // the committed time.
+      workInProgress.effectTag |= Update;
+    } else {
+      // The state node points to the time at which placeholder timed out.
+      // We can clear it once we switch back to the normal children.
+      workInProgress.stateNode = null;
+    }
+
     const render = nextProps.children;
     const nextChildren = render(nextDidTimeout);
     workInProgress.memoizedProps = nextProps;
@@ -785,8 +795,9 @@ function propagateContextChange<V>(
         if (fiber.type === context && (observedBits & changedBits) !== 0) {
           // Update the expiration time of all the ancestors, including
           // the alternates.
+
           let node = fiber;
-          while (node !== null) {
+          do {
             const alternate = node.alternate;
             if (
               node.expirationTime === NoWork ||
@@ -812,7 +823,8 @@ function propagateContextChange<V>(
               break;
             }
             node = node.return;
-          }
+          } while (node !== null);
+
           // Don't scan deeper than a matching consumer. When we render the
           // consumer, we'll continue scanning from that point. This way the
           // scanning work is time-sliced.
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index 7fbaa7b725..5b9a8dffb5 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -19,7 +19,7 @@ import type {FiberRoot} from './ReactFiberRoot';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 import type {CapturedValue, CapturedError} from './ReactCapturedValue';
 
-import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
+import {enableProfilerTimer, enableSuspense} from 'shared/ReactFeatureFlags';
 import {getCommitTime} from './ReactProfilerTimer';
 import {
   ClassComponent,
@@ -63,7 +63,10 @@ import {
   replaceContainerChildren,
   createContainerChildSet,
 } from './ReactFiberHostConfig';
-import {captureCommitPhaseError} from './ReactFiberScheduler';
+import {
+  captureCommitPhaseError,
+  requestCurrentTime,
+} from './ReactFiberScheduler';
 
 const {
   invokeGuardedCallback,
@@ -314,7 +317,10 @@ function commitLifeCycles(
       return;
     }
     case TimeoutComponent: {
-      // We have no life-cycles associated with Timeouts.
+      if (enableSuspense) {
+        const currentTime = requestCurrentTime();
+        finishedWork.stateNode = {timedOutAt: currentTime};
+      }
       return;
     }
     default: {
diff --git a/packages/react-reconciler/src/ReactFiberExpirationTime.js b/packages/react-reconciler/src/ReactFiberExpirationTime.js
index 46603eb4be..82d992019b 100644
--- a/packages/react-reconciler/src/ReactFiberExpirationTime.js
+++ b/packages/react-reconciler/src/ReactFiberExpirationTime.js
@@ -32,10 +32,10 @@ function ceiling(num: number, precision: number): number {
   return (((num / precision) | 0) + 1) * precision;
 }
 
-export function computeExpirationBucket(
-  currentTime: ExpirationTime,
-  expirationInMs: number,
-  bucketSizeMs: number,
+function computeExpirationBucket(
+  currentTime,
+  expirationInMs,
+  bucketSizeMs,
 ): ExpirationTime {
   return (
     MAGIC_NUMBER_OFFSET +
@@ -45,3 +45,38 @@ export function computeExpirationBucket(
     )
   );
 }
+
+export const LOW_PRIORITY_EXPIRATION = 5000;
+export const LOW_PRIORITY_BATCH_SIZE = 250;
+
+export function computeAsyncExpiration(
+  currentTime: ExpirationTime,
+): ExpirationTime {
+  return computeExpirationBucket(
+    currentTime,
+    LOW_PRIORITY_EXPIRATION,
+    LOW_PRIORITY_BATCH_SIZE,
+  );
+}
+
+// We intentionally set a higher expiration time for interactive updates in
+// dev than in production.
+//
+// If the main thread is being blocked so long that you hit the expiration,
+// it's a problem that could be solved with better scheduling.
+//
+// People will be more likely to notice this and fix it with the long
+// expiration time in development.
+//
+// In production we opt for better UX at the risk of masking scheduling
+// problems, by expiring fast.
+export const HIGH_PRIORITY_EXPIRATION = __DEV__ ? 500 : 150;
+export const HIGH_PRIORITY_BATCH_SIZE = 100;
+
+export function computeInteractiveExpiration(currentTime: ExpirationTime) {
+  return computeExpirationBucket(
+    currentTime,
+    HIGH_PRIORITY_EXPIRATION,
+    HIGH_PRIORITY_BATCH_SIZE,
+  );
+}
diff --git a/packages/react-reconciler/src/ReactFiberPendingPriority.js b/packages/react-reconciler/src/ReactFiberPendingPriority.js
index b77d874fbe..3e93ccbcfd 100644
--- a/packages/react-reconciler/src/ReactFiberPendingPriority.js
+++ b/packages/react-reconciler/src/ReactFiberPendingPriority.js
@@ -10,9 +10,11 @@
 import type {FiberRoot} from './ReactFiberRoot';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 
-import {NoWork, Sync} from './ReactFiberExpirationTime';
+import {NoWork} from './ReactFiberExpirationTime';
 
-// TODO: Offscreen updates
+// TODO: Offscreen updates should never suspend. However, a promise that
+// suspended inside an offscreen subtree should be able to ping at the priority
+// of the outer render.
 
 export function markPendingPriorityLevel(
   root: FiberRoot,
@@ -40,7 +42,7 @@ export function markPendingPriorityLevel(
       }
     }
   }
-  findNextPendingPriorityLevel(root);
+  findNextExpirationTimeToWorkOn(expirationTime, root);
 }
 
 export function markCommittedPriorityLevels(
@@ -56,7 +58,7 @@ export function markCommittedPriorityLevels(
     root.earliestSuspendedTime = NoWork;
     root.latestSuspendedTime = NoWork;
     root.latestPingedTime = NoWork;
-    findNextPendingPriorityLevel(root);
+    findNextExpirationTimeToWorkOn(NoWork, root);
     return;
   }
 
@@ -85,7 +87,7 @@ export function markCommittedPriorityLevels(
     // There's no suspended work. Treat the earliest remaining level as a
     // pending level.
     markPendingPriorityLevel(root, earliestRemainingTime);
-    findNextPendingPriorityLevel(root);
+    findNextExpirationTimeToWorkOn(NoWork, root);
     return;
   }
 
@@ -100,7 +102,7 @@ export function markCommittedPriorityLevels(
     // There's no suspended work. Treat the earliest remaining level as a
     // pending level.
     markPendingPriorityLevel(root, earliestRemainingTime);
-    findNextPendingPriorityLevel(root);
+    findNextExpirationTimeToWorkOn(NoWork, root);
     return;
   }
 
@@ -108,38 +110,50 @@ export function markCommittedPriorityLevels(
     // The earliest remaining time is earlier than all the suspended work.
     // Treat it as a pending update.
     markPendingPriorityLevel(root, earliestRemainingTime);
-    findNextPendingPriorityLevel(root);
+    findNextExpirationTimeToWorkOn(NoWork, root);
     return;
   }
 
   // The earliest remaining time falls within the range of known suspended
   // levels. We should treat this as suspended work.
-  findNextPendingPriorityLevel(root);
+  findNextExpirationTimeToWorkOn(NoWork, root);
 }
 
 export function hasLowerPriorityWork(
   root: FiberRoot,
-  renderExpirationTime: ExpirationTime,
-) {
+  erroredExpirationTime: ExpirationTime,
+): boolean {
+  const latestPendingTime = root.latestPendingTime;
+  const latestSuspendedTime = root.latestSuspendedTime;
+  const latestPingedTime = root.latestPingedTime;
   return (
-    renderExpirationTime !== root.latestPendingTime &&
-    renderExpirationTime !== root.latestSuspendedTime
+    (latestPendingTime !== NoWork &&
+      latestPendingTime > erroredExpirationTime) ||
+    (latestSuspendedTime !== NoWork &&
+      latestSuspendedTime > erroredExpirationTime) ||
+    (latestPingedTime !== NoWork && latestPingedTime > erroredExpirationTime)
+  );
+}
+
+export function isPriorityLevelSuspended(
+  root: FiberRoot,
+  expirationTime: ExpirationTime,
+): boolean {
+  const earliestSuspendedTime = root.earliestSuspendedTime;
+  const latestSuspendedTime = root.latestSuspendedTime;
+  return (
+    earliestSuspendedTime !== NoWork &&
+    expirationTime >= earliestSuspendedTime &&
+    expirationTime <= latestSuspendedTime
   );
 }
 
 export function markSuspendedPriorityLevel(
   root: FiberRoot,
   suspendedTime: ExpirationTime,
-  didError: boolean,
 ): void {
-  if (didError && !hasLowerPriorityWork(root, suspendedTime)) {
-    // TODO: When we add back resuming, we need to ensure the progressed work
-    // is thrown out and not reused during the restarted render. One way to
-    // invalidate the progressed work is to restart at expirationTime + 1.
-    root.didError = true;
-    findNextPendingPriorityLevel(root);
-    return;
-  }
+  root.didError = false;
+  clearPing(root, suspendedTime);
 
   // First, check the known pending levels and update them if needed.
   const earliestPendingTime = root.earliestPendingTime;
@@ -159,15 +173,9 @@ export function markSuspendedPriorityLevel(
     root.latestPendingTime = earliestPendingTime;
   }
 
-  // Next, if we're working on the lowest known suspended level, clear the ping.
-  // TODO: What if a promise suspends and pings before the root completes?
-  const latestSuspendedTime = root.latestSuspendedTime;
-  if (latestSuspendedTime === suspendedTime) {
-    root.latestPingedTime = NoWork;
-  }
-
   // Finally, update the known suspended levels.
   const earliestSuspendedTime = root.earliestSuspendedTime;
+  const latestSuspendedTime = root.latestSuspendedTime;
   if (earliestSuspendedTime === NoWork) {
     // No other suspended levels.
     root.earliestSuspendedTime = root.latestSuspendedTime = suspendedTime;
@@ -180,47 +188,92 @@ export function markSuspendedPriorityLevel(
       root.latestSuspendedTime = suspendedTime;
     }
   }
-  findNextPendingPriorityLevel(root);
+
+  findNextExpirationTimeToWorkOn(suspendedTime, root);
 }
 
 export function markPingedPriorityLevel(
   root: FiberRoot,
   pingedTime: ExpirationTime,
 ): void {
-  const latestSuspendedTime = root.latestSuspendedTime;
-  if (latestSuspendedTime !== NoWork && latestSuspendedTime <= pingedTime) {
-    const latestPingedTime = root.latestPingedTime;
-    if (latestPingedTime === NoWork || latestPingedTime < pingedTime) {
-      root.latestPingedTime = pingedTime;
-    }
+  root.didError = false;
+
+  // TODO: When we add back resuming, we need to ensure the progressed work
+  // is thrown out and not reused during the restarted render. One way to
+  // invalidate the progressed work is to restart at expirationTime + 1.
+  const latestPingedTime = root.latestPingedTime;
+  if (latestPingedTime === NoWork || latestPingedTime < pingedTime) {
+    root.latestPingedTime = pingedTime;
   }
-  findNextPendingPriorityLevel(root);
+  findNextExpirationTimeToWorkOn(pingedTime, root);
 }
 
-function findNextPendingPriorityLevel(root) {
-  const earliestSuspendedTime = root.earliestSuspendedTime;
+function clearPing(root, completedTime) {
+  // TODO: Track whether the root was pinged during the render phase. If so,
+  // we need to make sure we don't lose track of it.
+  const latestPingedTime = root.latestPingedTime;
+  if (latestPingedTime !== NoWork && latestPingedTime <= completedTime) {
+    root.latestPingedTime = NoWork;
+  }
+}
+
+export function findEarliestOutstandingPriorityLevel(
+  root: FiberRoot,
+  renderExpirationTime: ExpirationTime,
+): ExpirationTime {
+  let earliestExpirationTime = renderExpirationTime;
+
   const earliestPendingTime = root.earliestPendingTime;
-  let nextExpirationTimeToWorkOn;
-  let expirationTime;
-  if (earliestSuspendedTime === NoWork) {
-    // Fast path. There's no suspended work.
-    nextExpirationTimeToWorkOn = expirationTime = earliestPendingTime;
-  } else if (earliestPendingTime !== NoWork) {
-    // Check if there's known pending work.
-    nextExpirationTimeToWorkOn = earliestPendingTime;
-    expirationTime =
-      earliestSuspendedTime < earliestPendingTime
-        ? earliestSuspendedTime
-        : earliestPendingTime;
-  } else {
-    // Finally, if a suspended level was pinged, work on that. Otherwise there's
-    // nothing to work on.
-    nextExpirationTimeToWorkOn = expirationTime = root.latestPingedTime;
+  const earliestSuspendedTime = root.earliestSuspendedTime;
+  if (
+    earliestExpirationTime === NoWork ||
+    (earliestPendingTime !== NoWork &&
+      earliestPendingTime < earliestExpirationTime)
+  ) {
+    earliestExpirationTime = earliestPendingTime;
+  }
+  if (
+    earliestExpirationTime === NoWork ||
+    (earliestSuspendedTime !== NoWork &&
+      earliestSuspendedTime < earliestExpirationTime)
+  ) {
+    earliestExpirationTime = earliestSuspendedTime;
+  }
+  return earliestExpirationTime;
+}
+
+function findNextExpirationTimeToWorkOn(completedExpirationTime, root) {
+  const earliestSuspendedTime = root.earliestSuspendedTime;
+  const latestSuspendedTime = root.latestSuspendedTime;
+  const earliestPendingTime = root.earliestPendingTime;
+  const latestPingedTime = root.latestPingedTime;
+
+  // Work on the earliest pending time. Failing that, work on the latest
+  // pinged time.
+  let nextExpirationTimeToWorkOn =
+    earliestPendingTime !== NoWork ? earliestPendingTime : latestPingedTime;
+
+  // If there is no pending or pinted work, check if there's suspended work
+  // that's lower priority than what we just completed.
+  if (
+    nextExpirationTimeToWorkOn === NoWork &&
+    (completedExpirationTime === NoWork ||
+      latestSuspendedTime > completedExpirationTime)
+  ) {
+    // The lowest priority suspended work is the work most likely to be
+    // committed next. Let's start rendering it again, so that if it times out,
+    // it's ready to commit.
+    nextExpirationTimeToWorkOn = latestSuspendedTime;
   }
 
-  if (root.didError) {
-    // Revert to synchronous mode.
-    expirationTime = Sync;
+  let expirationTime = nextExpirationTimeToWorkOn;
+  if (
+    expirationTime !== NoWork &&
+    earliestSuspendedTime !== NoWork &&
+    earliestSuspendedTime < expirationTime
+  ) {
+    // Expire using the earliest known expiration time.
+    expirationTime = earliestSuspendedTime;
   }
 
   root.nextExpirationTimeToWorkOn = nextExpirationTimeToWorkOn;
diff --git a/packages/react-reconciler/src/ReactFiberRoot.js b/packages/react-reconciler/src/ReactFiberRoot.js
index b747fc2e66..22ee98db32 100644
--- a/packages/react-reconciler/src/ReactFiberRoot.js
+++ b/packages/react-reconciler/src/ReactFiberRoot.js
@@ -9,6 +9,9 @@
 
 import type {Fiber} from './ReactFiber';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
+import type {TimeoutHandle, NoTimeout} from './ReactFiberHostConfig';
+
+import {noTimeout} from './ReactFiberHostConfig';
 
 import {createHostRootFiber} from './ReactFiber';
 import {NoWork} from './ReactFiberExpirationTime';
@@ -51,10 +54,10 @@ export type FiberRoot = {
 
   pendingCommitExpirationTime: ExpirationTime,
   // A finished work-in-progress HostRoot that's ready to be committed.
-  // TODO: The reason this is separate from isReadyForCommit is because the
-  // FiberRoot concept will likely be lifted out of the reconciler and into
-  // the renderer.
   finishedWork: Fiber | null,
+  // Timeout handle returned by setTimeout. Used to cancel a pending timeout, if
+  // it's superseded by a new one.
+  timeoutHandle: TimeoutHandle | NoTimeout,
   // Top context object, used by renderSubtreeIntoContainer
   context: Object | null,
   pendingContext: Object | null,
@@ -95,6 +98,7 @@ export function createFiberRoot(
 
     pendingCommitExpirationTime: NoWork,
     finishedWork: null,
+    timeoutHandle: noTimeout,
     context: null,
     pendingContext: null,
     hydrate,
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 25a90af822..4bdd5efda3 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -43,11 +43,18 @@ import {
   replayFailedUnitOfWorkWithInvokeGuardedCallback,
   warnAboutDeprecatedLifecycles,
   warnAboutLegacyContextAPI,
+  enableSuspense,
 } from 'shared/ReactFeatureFlags';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'shared/invariant';
 import warning from 'shared/warning';
 
+import {
+  scheduleTimeout,
+  cancelTimeout,
+  noTimeout,
+} from './ReactFiberHostConfig';
+
 import ReactFiberInstrumentation from './ReactFiberInstrumentation';
 import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
 import {
@@ -62,6 +69,9 @@ import {
   markCommittedPriorityLevels,
   markSuspendedPriorityLevel,
   markPingedPriorityLevel,
+  hasLowerPriorityWork,
+  isPriorityLevelSuspended,
+  findEarliestOutstandingPriorityLevel,
 } from './ReactFiberPendingPriority';
 import {
   recordEffect,
@@ -90,7 +100,8 @@ import {
   Never,
   msToExpirationTime,
   expirationTimeToMs,
-  computeExpirationBucket,
+  computeAsyncExpiration,
+  computeInteractiveExpiration,
 } from './ReactFiberExpirationTime';
 import {AsyncMode, ProfileMode} from './ReactTypeOfMode';
 import {enqueueUpdate, resetCurrentlyProcessingQueue} from './ReactUpdateQueue';
@@ -223,7 +234,7 @@ let nextUnitOfWork: Fiber | null = null;
 let nextRoot: FiberRoot | null = null;
 // The time at which we're currently rendering work.
 let nextRenderExpirationTime: ExpirationTime = NoWork;
-let nextLatestTimeoutMs: number = -1;
+let nextLatestAbsoluteTimeoutMs: number = -1;
 let nextRenderDidError: boolean = false;
 
 // The next fiber with an effect that we're currently committing.
@@ -338,7 +349,7 @@ function resetStack() {
 
   nextRoot = null;
   nextRenderExpirationTime = NoWork;
-  nextLatestTimeoutMs = -1;
+  nextLatestAbsoluteTimeoutMs = -1;
   nextRenderDidError = false;
   nextUnitOfWork = null;
 }
@@ -978,7 +989,11 @@ function workLoop(isYieldy) {
   }
 }
 
-function renderRoot(root: FiberRoot, isYieldy: boolean): void {
+function renderRoot(
+  root: FiberRoot,
+  isYieldy: boolean,
+  isExpired: boolean,
+): void {
   invariant(
     !isWorking,
     'renderRoot was called recursively. This error is likely caused ' +
@@ -1086,44 +1101,10 @@ function renderRoot(root: FiberRoot, isYieldy: boolean): void {
     // there's no more work to be done in the current batch.
     nextRoot = null;
     onFatal(root);
-  } else if (nextUnitOfWork === null) {
-    // We reached the root.
-    const rootWorkInProgress = root.current.alternate;
-    invariant(
-      rootWorkInProgress !== null,
-      'Finished root should have a work-in-progress. This error is likely ' +
-        'caused by a bug in React. Please file an issue.',
-    );
-    if ((rootWorkInProgress.effectTag & Incomplete) === NoEffect) {
-      // The root successfully completed.
-      const didCompleteRoot = true;
-      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
-      interruptedBy = null;
-      // `nextRoot` points to the in-progress root. A non-null value indicates
-      // that we're in the middle of an async render. Set it to null to indicate
-      // there's no more work to be done in the current batch.
-      nextRoot = null;
-      onComplete(root, rootWorkInProgress, expirationTime);
-    } else {
-      // The root did not complete.
-      const didCompleteRoot = false;
-      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
-      interruptedBy = null;
-      // `nextRoot` points to the in-progress root. A non-null value indicates
-      // that we're in the middle of an async render. Set it to null to indicate
-      // there's no more work to be done in the current batch.
-      nextRoot = null;
-      markSuspendedPriorityLevel(root, expirationTime, nextRenderDidError);
-      const suspendedExpirationTime = expirationTime;
-      const newExpirationTime = root.expirationTime;
-      onSuspend(
-        root,
-        suspendedExpirationTime,
-        newExpirationTime,
-        nextLatestTimeoutMs,
-      );
-    }
-  } else {
+    return;
+  }
+
+  if (nextUnitOfWork !== null) {
     // There's still remaining async work in this tree, but we ran out of time
     // in the current frame. Yield back to the renderer. Unless we're
     // interrupted by a higher priority update, we'll continue later from where
@@ -1132,7 +1113,103 @@ function renderRoot(root: FiberRoot, isYieldy: boolean): void {
     stopWorkLoopTimer(interruptedBy, didCompleteRoot);
     interruptedBy = null;
     onYield(root);
+    return;
   }
+
+  // We completed the whole tree.
+  const didCompleteRoot = true;
+  stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+  const rootWorkInProgress = root.current.alternate;
+  invariant(
+    rootWorkInProgress !== null,
+    'Finished root should have a work-in-progress. This error is likely ' +
+      'caused by a bug in React. Please file an issue.',
+  );
+
+  // `nextRoot` points to the in-progress root. A non-null value indicates
+  // that we're in the middle of an async render. Set it to null to indicate
+  // there's no more work to be done in the current batch.
+  nextRoot = null;
+  interruptedBy = null;
+
+  if (nextRenderDidError) {
+    // There was an error
+    if (hasLowerPriorityWork(root, expirationTime)) {
+      // There's lower priority work. If so, it may have the effect of fixing
+      // the exception that was just thrown. Exit without committing. This is
+      // similar to a suspend, but without a timeout because we're not waiting
+      // for a promise to resolve. React will restart at the lower
+      // priority level.
+      markSuspendedPriorityLevel(root, expirationTime);
+      const suspendedExpirationTime = expirationTime;
+      const rootExpirationTime = root.expirationTime;
+      onSuspend(
+        root,
+        rootWorkInProgress,
+        suspendedExpirationTime,
+        rootExpirationTime,
+        -1, // Indicates no timeout
+      );
+      return;
+    } else if (!root.didError && expirationTime !== Sync) {
+      // There's no lower priority work, but we're rendering asynchronously.
+      // Synchronsouly attempt to render the same level one more time. This is
+      // similar to a suspend, but without a timeout because we're not waiting
+      // for a promise to resolve.
+      root.didError = true;
+      const suspendedExpirationTime = (root.nextExpirationTimeToWorkOn = expirationTime);
+      const rootExpirationTime = (root.expirationTime = Sync);
+      onSuspend(
+        root,
+        rootWorkInProgress,
+        suspendedExpirationTime,
+        rootExpirationTime,
+        -1, // Indicates no timeout
+      );
+      return;
+    }
+  }
+
+  if (enableSuspense && !isExpired && nextLatestAbsoluteTimeoutMs !== -1) {
+    // The tree was suspended.
+    const suspendedExpirationTime = expirationTime;
+    markSuspendedPriorityLevel(root, suspendedExpirationTime);
+
+    // Find the earliest uncommitted expiration time in the tree, including
+    // work that is suspended. The timeout threshold cannot be longer than
+    // the overall expiration.
+    const earliestExpirationTime = findEarliestOutstandingPriorityLevel(
+      root,
+      expirationTime,
+    );
+    const earliestExpirationTimeMs = expirationTimeToMs(earliestExpirationTime);
+    if (earliestExpirationTimeMs < nextLatestAbsoluteTimeoutMs) {
+      nextLatestAbsoluteTimeoutMs = earliestExpirationTimeMs;
+    }
+
+    // Subtract the current time from the absolute timeout to get the number
+    // of milliseconds until the timeout. In other words, convert an absolute
+    // timestamp to a relative time. This is the value that is passed
+    // to `setTimeout`.
+    const currentTimeMs = expirationTimeToMs(requestCurrentTime());
+    let msUntilTimeout = nextLatestAbsoluteTimeoutMs - currentTimeMs;
+    msUntilTimeout = msUntilTimeout < 0 ? 0 : msUntilTimeout;
+
+    // TODO: Account for the Just Noticable Difference
+
+    const rootExpirationTime = root.expirationTime;
+    onSuspend(
+      root,
+      rootWorkInProgress,
+      suspendedExpirationTime,
+      rootExpirationTime,
+      msUntilTimeout,
+    );
+    return;
+  }
+
+  // Ready to commit.
+  onComplete(root, rootWorkInProgress, expirationTime);
 }
 
 function dispatch(
@@ -1193,36 +1270,6 @@ function captureCommitPhaseError(fiber: Fiber, error: mixed) {
   return dispatch(fiber, error, Sync);
 }
 
-function computeAsyncExpiration(currentTime) {
-  // Given the current clock time, returns an expiration time. We use rounding
-  // to batch like updates together.
-  // Should complete within ~5000ms. 5250ms max.
-  const expirationMs = 5000;
-  const bucketSizeMs = 250;
-  return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
-}
-
-function computeInteractiveExpiration(currentTime) {
-  let expirationMs;
-  // We intentionally set a higher expiration time for interactive updates in
-  // dev than in production.
-  // If the main thread is being blocked so long that you hit the expiration,
-  // it's a problem that could be solved with better scheduling.
-  // People will be more likely to notice this and fix it with the long
-  // expiration time in development.
-  // In production we opt for better UX at the risk of masking scheduling
-  // problems, by expiring fast.
-  if (__DEV__) {
-    // Should complete within ~500ms. 600ms max.
-    expirationMs = 500;
-  } else {
-    // In production things should be more responsive, 150ms max.
-    expirationMs = 150;
-  }
-  const bucketSizeMs = 100;
-  return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
-}
-
 // Creates a unique async expiration time.
 function computeUniqueAsyncExpiration(): ExpirationTime {
   const currentTime = requestCurrentTime();
@@ -1287,30 +1334,84 @@ function computeExpirationForFiber(currentTime: ExpirationTime, fiber: Fiber) {
   return expirationTime;
 }
 
-function markTimeout(
+function renderDidSuspend(
   root: FiberRoot,
-  thenable: Thenable,
-  timeoutMs: number,
+  absoluteTimeoutMs: number,
   suspendedTime: ExpirationTime,
 ) {
   // Schedule the timeout.
-  if (timeoutMs >= 0 && nextLatestTimeoutMs < timeoutMs) {
-    nextLatestTimeoutMs = timeoutMs;
+  if (
+    absoluteTimeoutMs >= 0 &&
+    nextLatestAbsoluteTimeoutMs < absoluteTimeoutMs
+  ) {
+    nextLatestAbsoluteTimeoutMs = absoluteTimeoutMs;
   }
 }
 
-function markError(root: FiberRoot) {
+function renderDidError(root: FiberRoot) {
   nextRenderDidError = true;
 }
 
-function retrySuspendedRoot(root: FiberRoot, suspendedTime: ExpirationTime) {
-  markPingedPriorityLevel(root, suspendedTime);
-  const retryTime = root.expirationTime;
-  if (retryTime !== NoWork) {
-    requestWork(root, retryTime);
+function retrySuspendedRoot(
+  root: FiberRoot,
+  fiber: Fiber,
+  suspendedTime: ExpirationTime,
+) {
+  if (enableSuspense) {
+    let retryTime;
+
+    if (isPriorityLevelSuspended(root, suspendedTime)) {
+      // Ping at the original level
+      retryTime = suspendedTime;
+      markPingedPriorityLevel(root, retryTime);
+    } else {
+      // Placeholder already timed out. Compute a new expiration time
+      const currentTime = requestCurrentTime();
+      retryTime = computeExpirationForFiber(currentTime, fiber);
+      markPendingPriorityLevel(root, retryTime);
+    }
+
+    scheduleWorkToRoot(fiber, retryTime);
+    const rootExpirationTime = root.expirationTime;
+    if (rootExpirationTime !== NoWork) {
+      requestWork(root, rootExpirationTime);
+    }
   }
 }
 
+function scheduleWorkToRoot(fiber: Fiber, expirationTime): FiberRoot | null {
+  // Walk the parent path to the root and update each node's
+  // expiration time.
+  let node = fiber;
+  do {
+    const alternate = node.alternate;
+    if (
+      node.expirationTime === NoWork ||
+      node.expirationTime > expirationTime
+    ) {
+      node.expirationTime = expirationTime;
+      if (
+        alternate !== null &&
+        (alternate.expirationTime === NoWork ||
+          alternate.expirationTime > expirationTime)
+      ) {
+        alternate.expirationTime = expirationTime;
+      }
+    } else if (
+      alternate !== null &&
+      (alternate.expirationTime === NoWork ||
+        alternate.expirationTime > expirationTime)
+    ) {
+      alternate.expirationTime = expirationTime;
+    }
+    if (node.return === null && node.tag === HostRoot) {
+      return node.stateNode;
+    }
+    node = node.return;
+  } while (node !== null);
+  return null;
+}
+
 function scheduleWork(fiber: Fiber, expirationTime: ExpirationTime) {
   recordScheduleUpdate();
 
@@ -1321,67 +1422,43 @@ function scheduleWork(fiber: Fiber, expirationTime: ExpirationTime) {
     }
   }
 
-  let node = fiber;
-  while (node !== null) {
-    // Walk the parent path to the root and update each node's
-    // expiration time.
-    if (
-      node.expirationTime === NoWork ||
-      node.expirationTime > expirationTime
-    ) {
-      node.expirationTime = expirationTime;
+  const root = scheduleWorkToRoot(fiber, expirationTime);
+  if (root === null) {
+    if (__DEV__ && fiber.tag === ClassComponent) {
+      warnAboutUpdateOnUnmounted(fiber);
     }
-    if (node.alternate !== null) {
-      if (
-        node.alternate.expirationTime === NoWork ||
-        node.alternate.expirationTime > expirationTime
-      ) {
-        node.alternate.expirationTime = expirationTime;
-      }
-    }
-    if (node.return === null) {
-      if (node.tag === HostRoot) {
-        const root: FiberRoot = (node.stateNode: any);
-        if (
-          !isWorking &&
-          nextRenderExpirationTime !== NoWork &&
-          expirationTime < nextRenderExpirationTime
-        ) {
-          // This is an interruption. (Used for performance tracking.)
-          interruptedBy = fiber;
-          resetStack();
-        }
-        markPendingPriorityLevel(root, expirationTime);
-        if (
-          // If we're in the render phase, we don't need to schedule this root
-          // for an update, because we'll do it before we exit...
-          !isWorking ||
-          isCommitting ||
-          // ...unless this is a different root than the one we're rendering.
-          nextRoot !== root
-        ) {
-          const rootExpirationTime = root.expirationTime;
-          requestWork(root, rootExpirationTime);
-        }
-        if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
-          invariant(
-            false,
-            'Maximum update depth exceeded. This can happen when a ' +
-              'component repeatedly calls setState inside ' +
-              'componentWillUpdate or componentDidUpdate. React limits ' +
-              'the number of nested updates to prevent infinite loops.',
-          );
-        }
-      } else {
-        if (__DEV__) {
-          if (fiber.tag === ClassComponent) {
-            warnAboutUpdateOnUnmounted(fiber);
-          }
-        }
-        return;
-      }
-    }
-    node = node.return;
+    return;
+  }
+
+  if (
+    !isWorking &&
+    nextRenderExpirationTime !== NoWork &&
+    expirationTime < nextRenderExpirationTime
+  ) {
+    // This is an interruption. (Used for performance tracking.)
+    interruptedBy = fiber;
+    resetStack();
+  }
+  markPendingPriorityLevel(root, expirationTime);
+  if (
+    // If we're in the render phase, we don't need to schedule this root
+    // for an update, because we'll do it before we exit...
+    !isWorking ||
+    isCommitting ||
+    // ...unless this is a different root than the one we're rendering.
+    nextRoot !== root
+  ) {
+    const rootExpirationTime = root.expirationTime;
+    requestWork(root, rootExpirationTime);
+  }
+  if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
+    invariant(
+      false,
+      'Maximum update depth exceeded. This can happen when a ' +
+        'component repeatedly calls setState inside ' +
+        'componentWillUpdate or componentDidUpdate. React limits ' +
+        'the number of nested updates to prevent infinite loops.',
+    );
   }
 }
 
@@ -1497,23 +1574,43 @@ function onComplete(
 
 function onSuspend(
   root: FiberRoot,
+  finishedWork: Fiber,
   suspendedExpirationTime: ExpirationTime,
-  expirationTime: ExpirationTime,
-  timeoutMs: number,
-) {
-  if (timeoutMs >= 0) {
-    const suspendedRoot = root;
-    setTimeout(() => {
-      retrySuspendedRoot(suspendedRoot, suspendedExpirationTime);
-    }, timeoutMs);
+  rootExpirationTime: ExpirationTime,
+  msUntilTimeout: number,
+): void {
+  root.expirationTime = rootExpirationTime;
+  if (enableSuspense && msUntilTimeout === 0 && !shouldYield()) {
+    // Don't wait an additional tick. Commit the tree immediately.
+    root.pendingCommitExpirationTime = suspendedExpirationTime;
+    root.finishedWork = finishedWork;
+  } else if (msUntilTimeout > 0) {
+    // Wait `msUntilTimeout` milliseconds before committing.
+    root.timeoutHandle = scheduleTimeout(
+      onTimeout.bind(null, root, finishedWork, suspendedExpirationTime),
+      msUntilTimeout,
+    );
   }
-  root.expirationTime = expirationTime;
 }
 
 function onYield(root) {
   root.finishedWork = null;
 }
 
+function onTimeout(root, finishedWork, suspendedExpirationTime) {
+  if (enableSuspense) {
+    // The root timed out. Commit it.
+    root.pendingCommitExpirationTime = suspendedExpirationTime;
+    root.finishedWork = finishedWork;
+    // Read the current time before entering the commit phase. We can be
+    // certain this won't cause tearing related to batching of event updates
+    // because we're at the top of a timer event.
+    recomputeCurrentRendererTime();
+    currentSchedulerTime = currentRendererTime;
+    flushRoot(root, suspendedExpirationTime);
+  }
+}
+
 function onCommit(root, expirationTime) {
   root.expirationTime = expirationTime;
   root.finishedWork = null;
@@ -1567,7 +1664,6 @@ function requestCurrentTime() {
 // It's up to the renderer to call renderRoot at some point in the future.
 function requestWork(root: FiberRoot, expirationTime: ExpirationTime) {
   addRootToSchedule(root, expirationTime);
-
   if (isRendering) {
     // Prevent reentrancy. Remaining work will be scheduled at the end of
     // the currently rendering batch.
@@ -1581,7 +1677,7 @@ function requestWork(root: FiberRoot, expirationTime: ExpirationTime) {
       // flush it now.
       nextFlushedRoot = root;
       nextFlushedExpirationTime = Sync;
-      performWorkOnRoot(root, Sync, false);
+      performWorkOnRoot(root, Sync, true);
     }
     return;
   }
@@ -1733,7 +1829,11 @@ function performWork(minExpirationTime: ExpirationTime, dl: Deadline | null) {
         minExpirationTime >= nextFlushedExpirationTime) &&
       (!deadlineDidExpire || currentRendererTime >= nextFlushedExpirationTime)
     ) {
-      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, true);
+      performWorkOnRoot(
+        nextFlushedRoot,
+        nextFlushedExpirationTime,
+        currentRendererTime >= nextFlushedExpirationTime,
+      );
       findHighestPriorityRoot();
       recomputeCurrentRendererTime();
       currentSchedulerTime = currentRendererTime;
@@ -1745,7 +1845,7 @@ function performWork(minExpirationTime: ExpirationTime, dl: Deadline | null) {
       (minExpirationTime === NoWork ||
         minExpirationTime >= nextFlushedExpirationTime)
     ) {
-      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, false);
+      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, true);
       findHighestPriorityRoot();
     }
   }
@@ -1781,7 +1881,7 @@ function flushRoot(root: FiberRoot, expirationTime: ExpirationTime) {
   // including the given time.
   nextFlushedRoot = root;
   nextFlushedExpirationTime = expirationTime;
-  performWorkOnRoot(root, expirationTime, false);
+  performWorkOnRoot(root, expirationTime, true);
   // Flush any sync work that was scheduled by lifecycles
   performSyncWork();
   finishRendering();
@@ -1817,7 +1917,7 @@ function finishRendering() {
 function performWorkOnRoot(
   root: FiberRoot,
   expirationTime: ExpirationTime,
-  isYieldy: boolean,
+  isExpired: boolean,
 ) {
   invariant(
     !isRendering,
@@ -1828,14 +1928,28 @@ function performWorkOnRoot(
   isRendering = true;
 
   // Check if this is async work or sync/expired work.
-  if (!isYieldy) {
+  if (deadline === null || isExpired) {
     // Flush work without yielding.
+    // TODO: Non-yieldy work does not necessarily imply expired work. A renderer
+    // may want to perform some work without yielding, but also without
+    // requiring the root to complete (by triggering placeholders).
+
     let finishedWork = root.finishedWork;
     if (finishedWork !== null) {
       // This root is already complete. We can commit it.
       completeRoot(root, finishedWork, expirationTime);
     } else {
-      renderRoot(root, false);
+      root.finishedWork = null;
+      // If this root previously suspended, clear its existing timeout, since
+      // we're about to try rendering again.
+      const timeoutHandle = root.timeoutHandle;
+      if (enableSuspense && timeoutHandle !== noTimeout) {
+        root.timeoutHandle = noTimeout;
+        // $FlowFixMe Complains noTimeout is not a TimeoutID, despite the check above
+        cancelTimeout(timeoutHandle);
+      }
+      const isYieldy = false;
+      renderRoot(root, isYieldy, isExpired);
       finishedWork = root.finishedWork;
       if (finishedWork !== null) {
         // We've completed the root. Commit it.
@@ -1849,7 +1963,17 @@ function performWorkOnRoot(
       // This root is already complete. We can commit it.
       completeRoot(root, finishedWork, expirationTime);
     } else {
-      renderRoot(root, true);
+      root.finishedWork = null;
+      // If this root previously suspended, clear its existing timeout, since
+      // we're about to try rendering again.
+      const timeoutHandle = root.timeoutHandle;
+      if (enableSuspense && timeoutHandle !== noTimeout) {
+        root.timeoutHandle = noTimeout;
+        // $FlowFixMe Complains noTimeout is not a TimeoutID, despite the check above
+        cancelTimeout(timeoutHandle);
+      }
+      const isYieldy = true;
+      renderRoot(root, isYieldy, isExpired);
       finishedWork = root.finishedWork;
       if (finishedWork !== null) {
         // We've completed the root. Check the deadline one more time
@@ -1899,16 +2023,20 @@ function completeRoot(
 
   // Commit the root.
   root.finishedWork = null;
+
   commitRoot(root, finishedWork);
 }
 
 // When working on async work, the reconciler asks the renderer if it should
 // yield execution. For DOM, we implement this with requestIdleCallback.
 function shouldYield() {
-  if (deadline === null || deadlineDidExpire) {
-    return false;
+  if (deadlineDidExpire) {
+    return true;
   }
-  if (deadline.timeRemaining() > timeHeuristicForUnitOfWork) {
+  if (
+    deadline === null ||
+    deadline.timeRemaining() > timeHeuristicForUnitOfWork
+  ) {
     // Disregard deadline.didTimeout. Only expired work should be flushed
     // during a timeout. This path is only hit for non-expired work.
     return false;
@@ -2037,8 +2165,8 @@ export {
   computeExpirationForFiber,
   captureCommitPhaseError,
   onUncaughtError,
-  markTimeout,
-  markError,
+  renderDidSuspend,
+  renderDidError,
   retrySuspendedRoot,
   markLegacyErrorBoundaryAsFailed,
   isAlreadyFailedLegacyErrorBoundary,
diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index 8bc5efa876..0c355d62b2 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -39,11 +39,9 @@ import {createCapturedValue} from './ReactCapturedValue';
 import {
   enqueueCapturedUpdate,
   createUpdate,
-  enqueueUpdate,
   CaptureUpdate,
 } from './ReactUpdateQueue';
 import {logError} from './ReactFiberCommitWork';
-import {Never, Sync, expirationTimeToMs} from './ReactFiberExpirationTime';
 import {popHostContainer, popHostContext} from './ReactFiberHostContext';
 import {
   popContextProvider as popLegacyContextProvider,
@@ -55,23 +53,27 @@ import {
   recordElapsedActualRenderTime,
 } from './ReactProfilerTimer';
 import {
-  markTimeout,
-  markError,
+  renderDidSuspend,
+  renderDidError,
   onUncaughtError,
   markLegacyErrorBoundaryAsFailed,
   isAlreadyFailedLegacyErrorBoundary,
-  requestCurrentTime,
-  computeExpirationForFiber,
-  scheduleWork,
   retrySuspendedRoot,
 } from './ReactFiberScheduler';
-import {hasLowerPriorityWork} from './ReactFiberPendingPriority';
+
+import invariant from 'shared/invariant';
+import maxSigned31BitInt from './maxSigned31BitInt';
+import {
+  expirationTimeToMs,
+  LOW_PRIORITY_EXPIRATION,
+} from './ReactFiberExpirationTime';
+import {findEarliestOutstandingPriorityLevel} from './ReactFiberPendingPriority';
 
 function createRootErrorUpdate(
   fiber: Fiber,
   errorInfo: CapturedValue<mixed>,
   expirationTime: ExpirationTime,
-): Update<null> {
+): Update<mixed> {
   const update = createUpdate(expirationTime);
   // Unmount the root by rendering null.
   update.tag = CaptureUpdate;
@@ -129,16 +131,6 @@ function createClassErrorUpdate(
   return update;
 }
 
-function schedulePing(finishedWork) {
-  // Once the promise resolves, we should try rendering the non-
-  // placeholder state again.
-  const currentTime = requestCurrentTime();
-  const expirationTime = computeExpirationForFiber(currentTime, finishedWork);
-  const recoveryUpdate = createUpdate(expirationTime);
-  enqueueUpdate(finishedWork, recoveryUpdate, expirationTime);
-  scheduleWork(finishedWork, expirationTime);
-}
-
 function throwException(
   root: FiberRoot,
   returnFiber: Fiber,
@@ -160,113 +152,113 @@ function throwException(
     // This is a thenable.
     const thenable: Thenable = (value: any);
 
-    // TODO: Should use the earliest known expiration time
-    const currentTime = requestCurrentTime();
-    const expirationTimeMs = expirationTimeToMs(renderExpirationTime);
-    const currentTimeMs = expirationTimeToMs(currentTime);
-    const startTimeMs = expirationTimeMs - 5000;
-    let elapsedMs = currentTimeMs - startTimeMs;
-    if (elapsedMs < 0) {
-      elapsedMs = 0;
-    }
-    const remainingTimeMs = expirationTimeMs - currentTimeMs;
-
-    // Find the earliest timeout of all the timeouts in the ancestor path.
-    // TODO: Alternatively, we could store the earliest timeout on the context
-    // stack, rather than searching on every suspend.
+    // Find the earliest timeout of all the timeouts in the ancestor path. We
+    // could avoid this traversal by storing the timeouts on the stack, but we
+    // choose not to because we only hit this path if we're IO-bound (i.e. if
+    // something suspends). Whereas the stack is used even in the non-IO-
+    // bound case.
     let workInProgress = returnFiber;
     let earliestTimeoutMs = -1;
-    searchForEarliestTimeout: do {
+    let startTimeMs = -1;
+    do {
       if (workInProgress.tag === TimeoutComponent) {
         const current = workInProgress.alternate;
-        if (current !== null && current.memoizedState === true) {
-          // A parent Timeout already committed in a placeholder state. We
-          // need to handle this promise immediately. In other words, we
-          // should never suspend inside a tree that already expired.
-          earliestTimeoutMs = 0;
-          break searchForEarliestTimeout;
+        if (
+          current !== null &&
+          current.memoizedState === true &&
+          current.stateNode !== null
+        ) {
+          // Reached a placeholder that already timed out. Each timed out
+          // placeholder acts as the root of a new suspense boundary.
+
+          // Use the time at which the placeholder timed out as the start time
+          // for the current render.
+          const timedOutAt = current.stateNode.timedOutAt;
+          startTimeMs = expirationTimeToMs(timedOutAt);
+
+          // Do not search any further.
+          break;
         }
         let timeoutPropMs = workInProgress.pendingProps.ms;
         if (typeof timeoutPropMs === 'number') {
           if (timeoutPropMs <= 0) {
             earliestTimeoutMs = 0;
-            break searchForEarliestTimeout;
           } else if (
             earliestTimeoutMs === -1 ||
             timeoutPropMs < earliestTimeoutMs
           ) {
             earliestTimeoutMs = timeoutPropMs;
           }
-        } else if (earliestTimeoutMs === -1) {
-          earliestTimeoutMs = remainingTimeMs;
         }
       }
       workInProgress = workInProgress.return;
     } while (workInProgress !== null);
 
-    // Compute the remaining time until the timeout.
-    const msUntilTimeout = earliestTimeoutMs - elapsedMs;
-
-    if (renderExpirationTime === Never || msUntilTimeout > 0) {
-      // There's still time remaining.
-      markTimeout(root, thenable, msUntilTimeout, renderExpirationTime);
-      const onResolveOrReject = () => {
-        retrySuspendedRoot(root, renderExpirationTime);
-      };
-      thenable.then(onResolveOrReject, onResolveOrReject);
-      return;
+    let absoluteTimeoutMs;
+    if (earliestTimeoutMs === -1) {
+      // If no explicit threshold is given, default to an abitrarily large
+      // value. The actual size doesn't matter because the threshold for the
+      // whole tree will be clamped to the expiration time.
+      absoluteTimeoutMs = maxSigned31BitInt;
     } else {
-      // No time remaining. Need to fallback to placeholder.
-      // Find the nearest timeout that can be retried.
-      workInProgress = returnFiber;
-      do {
-        switch (workInProgress.tag) {
-          case HostRoot: {
-            // The root expired, but no fallback was provided. Throw a
-            // helpful error.
-            const message =
-              renderExpirationTime === Sync
-                ? 'A synchronous update was suspended, but no fallback UI ' +
-                  'was provided.'
-                : 'An update was suspended for longer than the timeout, ' +
-                  'but no fallback UI was provided.';
-            value = new Error(message);
-            break;
-          }
-          case TimeoutComponent: {
-            if ((workInProgress.effectTag & DidCapture) === NoEffect) {
-              workInProgress.effectTag |= ShouldCapture;
-              const onResolveOrReject = schedulePing.bind(null, workInProgress);
-              thenable.then(onResolveOrReject, onResolveOrReject);
-              return;
-            }
-            // Already captured during this render. Continue to the next
-            // Timeout ancestor.
-            break;
-          }
+      if (startTimeMs === -1) {
+        // This suspend happened outside of any already timed-out
+        // placeholders. We don't know exactly when the update was scheduled,
+        // but we can infer an approximate start time from the expiration
+        // time. First, find the earliest uncommitted expiration time in the
+        // tree, including work that is suspended. Then subtract the offset
+        // used to compute an async update's expiration time. This will cause
+        // high priority (interactive) work to expire earlier than neccessary,
+        // but we can account for this by adjusting for the Just Noticable
+        // Difference.
+        const earliestExpirationTime = findEarliestOutstandingPriorityLevel(
+          root,
+          renderExpirationTime,
+        );
+        const earliestExpirationTimeMs = expirationTimeToMs(
+          earliestExpirationTime,
+        );
+        startTimeMs = earliestExpirationTimeMs - LOW_PRIORITY_EXPIRATION;
+      }
+      absoluteTimeoutMs = startTimeMs + earliestTimeoutMs;
+    }
+
+    // Mark the earliest timeout in the suspended fiber's ancestor path. After
+    // completing the root, we'll take the largest of all the suspended
+    // fiber's timeouts and use it to compute a timeout for the whole tree.
+    renderDidSuspend(root, absoluteTimeoutMs, renderExpirationTime);
+
+    // Schedule the nearest Timeout to re-render using a placeholder.
+    workInProgress = returnFiber;
+    do {
+      if (workInProgress.tag === TimeoutComponent) {
+        if ((workInProgress.effectTag & DidCapture) === NoEffect) {
+          workInProgress.effectTag |= ShouldCapture;
+          // Attach a listener to the promise to "ping" the root and retry.
+          const onResolveOrReject = retrySuspendedRoot.bind(
+            null,
+            root,
+            workInProgress,
+            renderExpirationTime,
+          );
+          thenable.then(onResolveOrReject, onResolveOrReject);
+          return;
         }
-        workInProgress = workInProgress.return;
-      } while (workInProgress !== null);
-    }
-  } else {
-    // This is an error.
-    markError(root);
-    if (
-      // Retry (at the same priority) one more time before handling the error.
-      // The retry will flush synchronously. (Unless we're already rendering
-      // synchronously, in which case move to the next check.)
-      (!root.didError && renderExpirationTime !== Sync) ||
-      // There's lower priority work. If so, it may have the effect of fixing
-      // the exception that was just thrown.
-      hasLowerPriorityWork(root, renderExpirationTime)
-    ) {
-      return;
-    }
+        // Already captured during this render. Continue to the next
+        // Timeout ancestor.
+      }
+      workInProgress = workInProgress.return;
+    } while (workInProgress !== null);
+    // No Timeout was found. Fallthrough to error mode.
+    value = new Error(
+      'An update was suspended, but no placeholder UI was provided.',
+    );
   }
 
   // We didn't find a boundary that could handle this type of exception. Start
   // over and traverse parent path again, this time treating the exception
   // as an error.
+  renderDidError(root);
   value = createCapturedValue(value, sourceFiber);
   let workInProgress = returnFiber;
   do {
@@ -337,11 +329,13 @@ function unwindWork(
       popHostContainer(workInProgress);
       popTopLevelLegacyContextObject(workInProgress);
       const effectTag = workInProgress.effectTag;
-      if (effectTag & ShouldCapture) {
-        workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
-        return workInProgress;
-      }
-      return null;
+      invariant(
+        (effectTag & DidCapture) === NoEffect,
+        'The root failed to unmount after an error. This is likely a bug in ' +
+          'React. Please file an issue.',
+      );
+      workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
+      return workInProgress;
     }
     case HostComponent: {
       popHostContext(workInProgress);
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
index 4e346dcba2..88e49e24c7 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
@@ -234,10 +234,10 @@ describe('ReactIncrementalErrorHandling', () => {
     // Finish the rest of the async work
     ReactNoop.flushThrough(['Sibling']);
 
-    // Rendering one more unit of work should be enough to trigger the retry
+    // Rendering two more units of work should be enough to trigger the retry
     // and synchronously throw an error.
     ops = [];
-    expect(() => ReactNoop.flushUnitsOfWork(1)).toThrow('oops');
+    expect(() => ReactNoop.flushUnitsOfWork(2)).toThrow('oops');
     expect(ops).toEqual(['Parent', 'BadRender', 'Sibling']);
   });
 
diff --git a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
index 37f8be7c3a..206dc2b707 100644
--- a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
@@ -92,6 +92,7 @@ describe('ReactSuspense', () => {
       </Timeout>
     );
   }
+
   it('suspends rendering and continues later', async () => {
     function Bar(props) {
       ReactNoop.yield('Bar');
@@ -152,19 +153,19 @@ describe('ReactSuspense', () => {
         </Fallback>
       </Fragment>,
     );
-    expect(ReactNoop.flush()).toEqual(['Suspend! [A]', 'Suspend! [B]']);
-    expect(ReactNoop.getChildren()).toEqual([]);
-
-    // Advance time by enough to timeout both components and commit their placeholders
-    ReactNoop.expire(4000);
-    await advanceTimers(4000);
-
     expect(ReactNoop.flush()).toEqual([
       'Suspend! [A]',
       'Loading A...',
       'Suspend! [B]',
       'Loading B...',
     ]);
+    expect(ReactNoop.getChildren()).toEqual([]);
+
+    // Advance time by enough to timeout both components and commit their placeholders
+    ReactNoop.expire(4000);
+    await advanceTimers(4000);
+
+    expect(ReactNoop.flush()).toEqual([]);
     expect(ReactNoop.getChildren()).toEqual([
       span('Loading A...'),
       span('Loading B...'),
@@ -310,12 +311,12 @@ describe('ReactSuspense', () => {
     }
 
     ReactNoop.render(<App />);
-    expect(ReactNoop.flush()).toEqual(['Suspend! [Result]']);
+    expect(ReactNoop.flush()).toEqual(['Suspend! [Result]', 'Loading...']);
     expect(ReactNoop.getChildren()).toEqual([]);
 
     ReactNoop.expire(2000);
     await advanceTimers(2000);
-    expect(ReactNoop.flush()).toEqual(['Suspend! [Result]', 'Loading...']);
+    expect(ReactNoop.flush()).toEqual([]);
     expect(ReactNoop.getChildren()).toEqual([span('Loading...')]);
 
     textResourceShouldFail = true;
@@ -342,7 +343,7 @@ describe('ReactSuspense', () => {
     errorBoundary.current.reset();
     cache.invalidate();
 
-    expect(ReactNoop.flush()).toEqual(['Suspend! [Result]']);
+    expect(ReactNoop.flush()).toEqual(['Suspend! [Result]', 'Loading...']);
     ReactNoop.expire(3000);
     await advanceTimers(3000);
     expect(ReactNoop.flush()).toEqual(['Promise resolved [Result]', 'Result']);
@@ -443,53 +444,6 @@ describe('ReactSuspense', () => {
     expect(ReactNoop.getChildren()).toEqual([span('(empty)')]);
   });
 
-  it('coalesces all async updates when in a suspended state', async () => {
-    ReactNoop.render(
-      <Fallback>
-        <AsyncText text="A" />
-      </Fallback>,
-    );
-    ReactNoop.flush();
-    await advanceTimers(0);
-    ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([span('A')]);
-
-    ReactNoop.render(
-      <Fallback>
-        <AsyncText text="B" ms={50} />
-      </Fallback>,
-    );
-    expect(ReactNoop.flush()).toEqual(['Suspend! [B]']);
-    expect(ReactNoop.getChildren()).toEqual([span('A')]);
-
-    // Advance React's virtual time so that C falls into a new expiration bucket
-    ReactNoop.expire(1000);
-    ReactNoop.render(
-      <Fallback>
-        <AsyncText text="C" ms={100} />
-      </Fallback>,
-    );
-    expect(ReactNoop.flush()).toEqual([
-      // Tries C first, since it has a later expiration time
-      'Suspend! [C]',
-      // Does not retry B, because its promise has not resolved yet.
-    ]);
-
-    expect(ReactNoop.getChildren()).toEqual([span('A')]);
-
-    // Unblock B
-    await advanceTimers(90);
-    // Even though B's promise resolved, the view is still suspended because it
-    // coalesced with C.
-    expect(ReactNoop.flush()).toEqual(['Promise resolved [B]']);
-    expect(ReactNoop.getChildren()).toEqual([span('A')]);
-
-    // Unblock C
-    await advanceTimers(50);
-    expect(ReactNoop.flush()).toEqual(['Promise resolved [C]', 'C']);
-    expect(ReactNoop.getChildren()).toEqual([span('C')]);
-  });
-
   it('forces an expiration after an update times out', async () => {
     ReactNoop.render(
       <Fragment>
@@ -503,6 +457,8 @@ describe('ReactSuspense', () => {
     expect(ReactNoop.flush()).toEqual([
       // The async child suspends
       'Suspend! [Async]',
+      // Render the placeholder
+      'Loading...',
       // Continue on the sibling
       'Sync',
     ]);
@@ -513,13 +469,10 @@ describe('ReactSuspense', () => {
     // the update, but not by enough to flush the suspending promise.
     ReactNoop.expire(10000);
     await advanceTimers(10000);
-    expect(ReactNoop.flushExpired()).toEqual([
-      // Still suspended.
-      'Suspend! [Async]',
-      // Now that the update has expired, we render the fallback UI
-      'Loading...',
-      'Sync',
-    ]);
+    // No additional rendering work is required, since we already prepared
+    // the placeholder.
+    expect(ReactNoop.flushExpired()).toEqual([]);
+    // Should have committed the placeholder.
     expect(ReactNoop.getChildren()).toEqual([span('Loading...'), span('Sync')]);
 
     // Once the promise resolves, we render the suspended view
@@ -535,9 +488,9 @@ describe('ReactSuspense', () => {
         <Fallback timeout={1000} placeholder={<Text text="Loading outer..." />}>
           <AsyncText text="Outer content" ms={2000} />
           <Fallback
-            timeout={3000}
+            timeout={2500}
             placeholder={<Text text="Loading inner..." />}>
-            <AsyncText text="Inner content" ms={4000} />
+            <AsyncText text="Inner content" ms={5000} />
           </Fallback>
         </Fallback>
       </Fragment>,
@@ -548,6 +501,8 @@ describe('ReactSuspense', () => {
       // The async content suspends
       'Suspend! [Outer content]',
       'Suspend! [Inner content]',
+      'Loading inner...',
+      'Loading outer...',
     ]);
     // The update hasn't expired yet, so we commit nothing.
     expect(ReactNoop.getChildren()).toEqual([]);
@@ -556,34 +511,36 @@ describe('ReactSuspense', () => {
     // We should see the outer loading placeholder.
     ReactNoop.expire(1500);
     await advanceTimers(1500);
-    expect(ReactNoop.flush()).toEqual([
-      'Sync',
-      // Still suspended.
-      'Suspend! [Outer content]',
-      'Suspend! [Inner content]',
-      // We attempt to fallback to the inner placeholder
-      'Loading inner...',
-      // But the outer content is still suspended, so we need to fallback to
-      // the outer placeholder.
-      'Loading outer...',
-    ]);
-
+    expect(ReactNoop.flush()).toEqual([]);
     expect(ReactNoop.getChildren()).toEqual([
       span('Sync'),
       span('Loading outer...'),
     ]);
 
-    // Resolve the outer content's promise
-    ReactNoop.expire(1000);
-    await advanceTimers(1000);
+    // Resolve the outer promise.
+    ReactNoop.expire(2000);
+    await advanceTimers(2000);
+    // At this point, 3.5 seconds have elapsed total. The outer placeholder
+    // timed out at 1.5 seconds. So, 2 seconds have elapsed since the
+    // placeholder timed out. That means we still haven't reached the 2.5 second
+    // threshold of the inner placeholder.
     expect(ReactNoop.flush()).toEqual([
       'Promise resolved [Outer content]',
       'Outer content',
-      // Inner content still hasn't loaded
       'Suspend! [Inner content]',
       'Loading inner...',
     ]);
-    // We should now see the inner fallback UI.
+    // Don't commit the inner placeholder yet.
+    expect(ReactNoop.getChildren()).toEqual([
+      span('Sync'),
+      span('Loading outer...'),
+    ]);
+
+    // Expire the inner timeout.
+    ReactNoop.expire(500);
+    await advanceTimers(500);
+    // Now that 2.5 seconds have elapsed since the outer placeholder timed out,
+    // we can timeout the inner placeholder.
     expect(ReactNoop.getChildren()).toEqual([
       span('Sync'),
       span('Outer content'),
@@ -591,8 +548,8 @@ describe('ReactSuspense', () => {
     ]);
 
     // Finally, flush the inner promise. We should see the complete screen.
-    ReactNoop.expire(3000);
-    await advanceTimers(3000);
+    ReactNoop.expire(1000);
+    await advanceTimers(1000);
     expect(ReactNoop.flush()).toEqual([
       'Promise resolved [Inner content]',
       'Inner content',
@@ -669,6 +626,7 @@ describe('ReactSuspense', () => {
     expect(ReactNoop.flush()).toEqual([
       // The async child suspends
       'Suspend! [Async]',
+      'Loading...',
       // Continue on the sibling
       'Sync',
     ]);
@@ -680,13 +638,7 @@ describe('ReactSuspense', () => {
     // expiration time.
     ReactNoop.expire(2000);
     await advanceTimers(2000);
-    expect(ReactNoop.flush()).toEqual([
-      // Still suspended.
-      'Suspend! [Async]',
-      // Now that the expiration view has timed out, we render the fallback UI
-      'Loading...',
-      'Sync',
-    ]);
+    expect(ReactNoop.flush()).toEqual([]);
     expect(ReactNoop.getChildren()).toEqual([span('Loading...'), span('Sync')]);
 
     // Once the promise resolves, we render the suspended view
@@ -695,28 +647,12 @@ describe('ReactSuspense', () => {
     expect(ReactNoop.getChildren()).toEqual([span('Async'), span('Sync')]);
   });
 
-  it('throws a helpful error when a synchronous update is suspended', () => {
+  it('throws a helpful error when an update is suspends without a placeholder', () => {
     expect(() => {
       ReactNoop.flushSync(() =>
         ReactNoop.render(<Timeout>{() => <AsyncText text="Async" />}</Timeout>),
       );
-    }).toThrow(
-      'A synchronous update was suspended, but no fallback UI was provided.',
-    );
-  });
-
-  it('throws a helpful error when an expired update is suspended', async () => {
-    ReactNoop.render(
-      <Timeout>{() => <AsyncText text="Async" ms={20000} />}</Timeout>,
-    );
-    expect(ReactNoop.flush()).toEqual(['Suspend! [Async]']);
-    await advanceTimers(10000);
-    expect(() => {
-      ReactNoop.expire(10000);
-    }).toThrow(
-      'An update was suspended for longer than the timeout, but no fallback ' +
-        'UI was provided.',
-    );
+    }).toThrow('An update was suspended, but no placeholder UI was provided.');
   });
 
   it('a Timeout component correctly handles more than one suspended child', async () => {
@@ -746,7 +682,7 @@ describe('ReactSuspense', () => {
         <AsyncText text="Async" ms={100} />
       </Fallback>,
     );
-    expect(ReactNoop.flush()).toEqual(['Suspend! [Async]']);
+    expect(ReactNoop.flush()).toEqual(['Suspend! [Async]', 'Loading...']);
     expect(ReactNoop.getChildren()).toEqual([]);
 
     // Advance time by an amount slightly smaller than what's necessary to
@@ -830,16 +766,12 @@ describe('ReactSuspense', () => {
     }
 
     ReactNoop.render(<App />);
-    expect(ReactNoop.flush()).toEqual(['Suspend! [Async]']);
+    expect(ReactNoop.flush()).toEqual(['Suspend! [Async]', 'Loading...']);
     expect(ReactNoop.getChildren()).toEqual([]);
 
     ReactNoop.expire(2000);
     await advanceTimers(2000);
-    expect(ReactNoop.flush()).toEqual([
-      'Suspend! [Async]',
-      'Loading...',
-      'Suspend! [Async]',
-    ]);
+    expect(ReactNoop.flush()).toEqual([]);
     expect(ReactNoop.getChildren()).toEqual([div(), span('Loading...')]);
 
     ReactNoop.expire(1000);
@@ -849,109 +781,6 @@ describe('ReactSuspense', () => {
     expect(ReactNoop.getChildren()).toEqual([div(span('Async'))]);
   });
 
-  describe('splitting a high-pri update into high and low', () => {
-    React = require('react');
-
-    class AsyncValue extends React.Component {
-      state = {asyncValue: this.props.defaultValue};
-      componentDidMount() {
-        ReactNoop.deferredUpdates(() => {
-          this.setState((state, props) => ({asyncValue: props.value}));
-        });
-      }
-      componentDidUpdate() {
-        if (this.props.value !== this.state.asyncValue) {
-          ReactNoop.deferredUpdates(() => {
-            this.setState((state, props) => ({asyncValue: props.value}));
-          });
-        }
-      }
-      render() {
-        return this.props.children(this.state.asyncValue);
-      }
-    }
-
-    it('coalesces async values when in a suspended state', async () => {
-      function App(props) {
-        const highPriText = props.text;
-        return (
-          <Fallback>
-            <AsyncValue value={highPriText} defaultValue={null}>
-              {lowPriText => (
-                <Fragment>
-                  <Text text={`High-pri: ${highPriText}`} />
-                  {lowPriText && (
-                    <AsyncText text={`Low-pri: ${lowPriText}`} ms={100} />
-                  )}
-                </Fragment>
-              )}
-            </AsyncValue>
-          </Fallback>
-        );
-      }
-
-      function renderAppSync(props) {
-        ReactNoop.flushSync(() => ReactNoop.render(<App {...props} />));
-      }
-
-      // Initial mount
-      renderAppSync({text: 'A'});
-      expect(ReactNoop.flush()).toEqual([
-        // First we render at high priority
-        'High-pri: A',
-        // Then we come back later to render a low priority
-        'High-pri: A',
-        // The low-pri view suspends
-        'Suspend! [Low-pri: A]',
-      ]);
-      expect(ReactNoop.getChildren()).toEqual([span('High-pri: A')]);
-
-      // Partially flush the promise for 'A', not by enough to resolve it.
-      await advanceTimers(99);
-
-      // Advance React's virtual time so that the next update falls into a new
-      // expiration bucket
-      ReactNoop.expire(2000);
-      // Update to B. At this point, the low-pri view still hasn't updated
-      // to 'A'.
-      renderAppSync({text: 'B'});
-      expect(ReactNoop.flush()).toEqual([
-        // First we render at high priority
-        'High-pri: B',
-        // Then we come back later to render a low priority
-        'High-pri: B',
-        // The low-pri view suspends
-        'Suspend! [Low-pri: B]',
-      ]);
-      expect(ReactNoop.getChildren()).toEqual([span('High-pri: B')]);
-
-      // Flush the rest of the promise for 'A', without flushing the one
-      // for 'B'.
-      await advanceTimers(1);
-      expect(ReactNoop.flush()).toEqual([
-        // A is unblocked
-        'Promise resolved [Low-pri: A]',
-        // But we don't try to render it, because there's a lower priority
-        // update that is also suspended.
-      ]);
-      expect(ReactNoop.getChildren()).toEqual([span('High-pri: B')]);
-
-      // Flush the remaining work.
-      await advanceTimers(99);
-      expect(ReactNoop.flush()).toEqual([
-        // B is unblocked
-        'Promise resolved [Low-pri: B]',
-        // Now we can continue rendering the async view
-        'High-pri: B',
-        'Low-pri: B',
-      ]);
-      expect(ReactNoop.getChildren()).toEqual([
-        span('High-pri: B'),
-        span('Low-pri: B'),
-      ]);
-    });
-  });
-
   describe('a Delay component', () => {
     function Never() {
       // Throws a promise that resolves after some arbitrarily large
@@ -1001,3 +830,11 @@ describe('ReactSuspense', () => {
     });
   });
 });
+
+// TODO:
+// An update suspends, timeout is scheduled. Update again with different timeout.
+// An update suspends, a higher priority update also suspends, each has different timeouts.
+// Can update siblings of a timed out placeholder without suspending
+// Pinging during the render phase
+// Synchronous thenable
+// Start time is computed using earliest suspended time
diff --git a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
index 6b68f801dd..08f139f806 100644
--- a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
+++ b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
@@ -288,10 +288,14 @@ exports[`ReactDebugFiberPerf recovers from caught errors 1`] = `
 // Stop on Baddie and restart from Boundary
 ⚛ (React Tree Reconciliation: Yielded)
   ⚛ Parent [mount]
-    ⚛ Boundary [mount]
+    ⛔ Boundary [mount] Warning: An error was thrown inside this error boundary
       ⚛ Parent [mount]
         ⚛ Baddie [mount]
 
+⚛ (React Tree Reconciliation: Completed Root)
+  ⚛ Parent [mount]
+    ⚛ Boundary [mount]
+
 ⚛ (React Tree Reconciliation: Yielded)
   ⚛ Parent [mount]
     ⛔ Boundary [mount] Warning: An error was thrown inside this error boundary
@@ -326,6 +330,8 @@ exports[`ReactDebugFiberPerf recovers from fatal errors 1`] = `
   ⚛ Parent [mount]
     ⚛ Baddie [mount]
 
+⚛ (React Tree Reconciliation: Completed Root)
+
 ⚛ (React Tree Reconciliation: Yielded)
   ⚛ Parent [mount]
     ⚛ Baddie [mount]
@@ -406,8 +412,6 @@ exports[`ReactDebugFiberPerf warns if an in-progress update is interrupted 1`] =
 exports[`ReactDebugFiberPerf warns if async work expires (starvation) 1`] = `
 "⛔ (Waiting for async callback... will force flush in 5250 ms) Warning: React was blocked by main thread
 
-⚛ (React Tree Reconciliation: Yielded)
-
 ⚛ (React Tree Reconciliation: Completed Root)
   ⚛ Foo [mount]
 
diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js
index dc989aec71..5c898b6ffb 100644
--- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js
+++ b/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js
@@ -34,6 +34,8 @@ export opaque type PublicInstance = mixed; // eslint-disable-line no-undef
 export opaque type HostContext = mixed; // eslint-disable-line no-undef
 export opaque type UpdatePayload = mixed; // eslint-disable-line no-undef
 export opaque type ChildSet = mixed; // eslint-disable-line no-undef
+export opaque type TimeoutHandle = mixed; // eslint-disable-line no-undef
+export opaque type NoTimeout = mixed; // eslint-disable-line no-undef
 
 export const getPublicInstance = $$$hostConfig.getPublicInstance;
 export const getRootHostContext = $$$hostConfig.getRootHostContext;
@@ -50,6 +52,9 @@ export const shouldDeprioritizeSubtree =
 export const createTextInstance = $$$hostConfig.createTextInstance;
 export const scheduleDeferredCallback = $$$hostConfig.scheduleDeferredCallback;
 export const cancelDeferredCallback = $$$hostConfig.cancelDeferredCallback;
+export const scheduleTimeout = $$$hostConfig.setTimeout;
+export const cancelTimeout = $$$hostConfig.clearTimeout;
+export const noTimeout = $$$hostConfig.noTimeout;
 export const now = $$$hostConfig.now;
 export const isPrimaryRenderer = $$$hostConfig.isPrimaryRenderer;
 export const supportsMutation = $$$hostConfig.supportsMutation;
diff --git a/packages/react-test-renderer/src/ReactTestHostConfig.js b/packages/react-test-renderer/src/ReactTestHostConfig.js
index 1a1e74a1e2..7c7bf958ab 100644
--- a/packages/react-test-renderer/src/ReactTestHostConfig.js
+++ b/packages/react-test-renderer/src/ReactTestHostConfig.js
@@ -32,6 +32,8 @@ export type PublicInstance = Instance | TextInstance;
 export type HostContext = Object;
 export type UpdatePayload = Object;
 export type ChildSet = void; // Unused
+export type TimeoutHandle = TimeoutID;
+export type NoTimeout = -1;
 
 export * from 'shared/HostConfigWithNoPersistence';
 export * from 'shared/HostConfigWithNoHydration';
@@ -187,6 +189,10 @@ export const scheduleDeferredCallback =
 export const cancelDeferredCallback =
   TestRendererScheduling.cancelDeferredCallback;
 
+export const scheduleTimeout = setTimeout;
+export const cancelTimeout = clearTimeout;
+export const noTimeout = -1;
+
 // -------------------
 //     Mutation
 // -------------------

From f128fdea4840f494991054f608b99757a5ce5764 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Tue, 3 Jul 2018 19:44:19 -0700
Subject: [PATCH 196/277] Suspending outside of strict trees and async trees
 (#13098)

We can support components that suspend outside of an async mode tree
by immediately committing their placeholders.

In strict mode, the Timeout acts effectively like an error boundary.
Within a single render pass, we unwind to the nearest Timeout and
re-render the placeholder view.

Outside of strict mode, it's not safe to unwind and re-render the
siblings without committing. (Technically, this is true of error
boundaries, too, though probably not a huge deal, since we don't support
using error boundaries for control flow (yet, at least)). We need to be
clever. What we do is pretend the suspended component rendered null.*
There's no unwinding. The siblings commit like normal.

Then, in the commit phase, schedule an update on the Timeout to
synchronously re-render the placeholder. Although this requires an extra
commit, it will not be observable. And because the siblings were not
blocked from committing, they don't have to be strict mode compatible.

Another caveat is that if a component suspends during an async render,
but it's captured by a non-async Timeout, we need to revert to sync
mode. In other words, if any non-async component renders, the entire
tree must complete and commit without yielding.

* The downside of rendering null is that the existing children will be
deleted. We should hide them instead. I'll work on this in a follow-up.
---
 .../src/createReactNoop.js                    |  23 +
 packages/react-reconciler/src/ReactFiber.js   |   3 -
 .../src/ReactFiberBeginWork.js                |  53 +-
 .../src/ReactFiberCommitWork.js               |  22 +-
 .../src/ReactFiberScheduler.js                | 110 +++--
 .../src/ReactFiberUnwindWork.js               | 127 +++--
 .../__tests__/ReactSuspense-test.internal.js  | 459 ++++++++++++++++++
 ...ReactIncrementalPerf-test.internal.js.snap |  16 +-
 8 files changed, 690 insertions(+), 123 deletions(-)

diff --git a/packages/react-noop-renderer/src/createReactNoop.js b/packages/react-noop-renderer/src/createReactNoop.js
index 15f8170533..e0aeffa546 100644
--- a/packages/react-noop-renderer/src/createReactNoop.js
+++ b/packages/react-noop-renderer/src/createReactNoop.js
@@ -357,6 +357,19 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
       ReactNoop.renderToRootWithID(element, DEFAULT_ROOT_ID, callback);
     },
 
+    renderLegacySyncRoot(element: React$Element<any>, callback: ?Function) {
+      const rootID = DEFAULT_ROOT_ID;
+      let root = roots.get(rootID);
+      if (!root) {
+        const container = {rootID: rootID, children: []};
+        rootContainers.set(rootID, container);
+        const isAsync = false;
+        root = NoopRenderer.createContainer(container, isAsync, false);
+        roots.set(rootID, root);
+      }
+      NoopRenderer.updateContainer(element, root, null, callback);
+    },
+
     renderToRootWithID(
       element: React$Element<any>,
       rootID: string,
@@ -444,6 +457,16 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
       expect(actual).toEqual(expected);
     },
 
+    flushNextYield(): Array<mixed> {
+      let actual = null;
+      // eslint-disable-next-line no-for-of-loops/no-for-of-loops
+      for (const value of flushUnitsOfWork(Infinity)) {
+        actual = value;
+        break;
+      }
+      return actual !== null ? actual : [];
+    },
+
     expire(ms: number): Array<mixed> {
       ReactNoop.advanceTime(ms);
       return ReactNoop.flushExpired();
diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js
index 7e5a9dd3d6..cc13e9ecd2 100644
--- a/packages/react-reconciler/src/ReactFiber.js
+++ b/packages/react-reconciler/src/ReactFiber.js
@@ -399,9 +399,6 @@ export function createFiberFromElement(
         return createFiberFromProfiler(pendingProps, mode, expirationTime, key);
       case REACT_TIMEOUT_TYPE:
         fiberTag = TimeoutComponent;
-        // Suspense does not require async, but its children should be strict
-        // mode compatible.
-        mode |= StrictMode;
         break;
       default:
         fiberTag = getFiberTagFromObjectType(type, owner);
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 9e31aa36b2..9a8fc5f028 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -120,11 +120,11 @@ function reconcileChildren(current, workInProgress, nextChildren) {
   );
 }
 
-function reconcileChildrenAtExpirationTime(
-  current,
-  workInProgress,
-  nextChildren,
-  renderExpirationTime,
+export function reconcileChildrenAtExpirationTime(
+  current: Fiber | null,
+  workInProgress: Fiber,
+  nextChildren: any,
+  renderExpirationTime: ExpirationTime,
 ) {
   if (current === null) {
     // If this is a fresh new component that hasn't been rendered yet, we
@@ -376,7 +376,7 @@ function finishClassComponent(
 
   // React DevTools reads this flag.
   workInProgress.effectTag |= PerformedWork;
-  if (didCaptureError) {
+  if (current !== null && didCaptureError) {
     // If we're recovering from an error, reconcile twice: first to delete
     // all the existing children.
     reconcileChildrenAtExpirationTime(
@@ -714,7 +714,28 @@ function updateTimeoutComponent(current, workInProgress, renderExpirationTime) {
     // and we timed out, render the placeholder state.
     const alreadyCaptured =
       (workInProgress.effectTag & DidCapture) === NoEffect;
-    const nextDidTimeout = !alreadyCaptured;
+
+    let nextDidTimeout;
+    if (current !== null && workInProgress.updateQueue !== null) {
+      // We're outside strict mode. Something inside this Timeout boundary
+      // suspended during the last commit. Switch to the placholder.
+      workInProgress.updateQueue = null;
+      nextDidTimeout = true;
+      // If we're recovering from an error, reconcile twice: first to delete
+      // all the existing children.
+      reconcileChildrenAtExpirationTime(
+        current,
+        workInProgress,
+        null,
+        renderExpirationTime,
+      );
+      current.child = null;
+      // Now we can continue reconciling like normal. This has the effect of
+      // remounting all children regardless of whether their their
+      // identity matches.
+    } else {
+      nextDidTimeout = !alreadyCaptured;
+    }
 
     if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
@@ -723,14 +744,16 @@ function updateTimeoutComponent(current, workInProgress, renderExpirationTime) {
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
 
-    if (nextDidTimeout) {
-      // If the timed-out view commits, schedule an update effect to record
-      // the committed time.
-      workInProgress.effectTag |= Update;
-    } else {
-      // The state node points to the time at which placeholder timed out.
-      // We can clear it once we switch back to the normal children.
-      workInProgress.stateNode = null;
+    if ((workInProgress.mode & StrictMode) !== NoEffect) {
+      if (nextDidTimeout) {
+        // If the timed-out view commits, schedule an update effect to record
+        // the committed time.
+        workInProgress.effectTag |= Update;
+      } else {
+        // The state node points to the time at which placeholder timed out.
+        // We can clear it once we switch back to the normal children.
+        workInProgress.stateNode = null;
+      }
     }
 
     const render = nextProps.children;
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index 5b9a8dffb5..c995099791 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -32,6 +32,7 @@ import {
 } from 'shared/ReactTypeOfWork';
 import ReactErrorUtils from 'shared/ReactErrorUtils';
 import {
+  NoEffect,
   ContentReset,
   Placement,
   Snapshot,
@@ -41,6 +42,7 @@ import {commitUpdateQueue} from './ReactUpdateQueue';
 import invariant from 'shared/invariant';
 import warning from 'shared/warning';
 
+import {Sync} from './ReactFiberExpirationTime';
 import {onCommitUnmount} from './ReactFiberDevToolsHook';
 import {startPhaseTimer, stopPhaseTimer} from './ReactDebugFiberPerf';
 import getComponentName from 'shared/getComponentName';
@@ -66,7 +68,9 @@ import {
 import {
   captureCommitPhaseError,
   requestCurrentTime,
+  scheduleWork,
 } from './ReactFiberScheduler';
+import {StrictMode} from './ReactTypeOfMode';
 
 const {
   invokeGuardedCallback,
@@ -74,6 +78,8 @@ const {
   clearCaughtError,
 } = ReactErrorUtils;
 
+const emptyObject = {};
+
 let didWarnAboutUndefinedSnapshotBeforeUpdate: Set<mixed> | null = null;
 if (__DEV__) {
   didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
@@ -318,8 +324,20 @@ function commitLifeCycles(
     }
     case TimeoutComponent: {
       if (enableSuspense) {
-        const currentTime = requestCurrentTime();
-        finishedWork.stateNode = {timedOutAt: currentTime};
+        if ((finishedWork.mode & StrictMode) === NoEffect) {
+          // In loose mode, a placeholder times out by scheduling a synchronous
+          // update in the commit phase. Use `updateQueue` field to signal that
+          // the Timeout needs to switch to the placeholder. We don't need an
+          // entire queue. Any non-null value works.
+          // $FlowFixMe - Intentionally using a value other than an UpdateQueue.
+          finishedWork.updateQueue = emptyObject;
+          scheduleWork(finishedWork, Sync);
+        } else {
+          // In strict mode, the Update effect is used to record the time at
+          // which the placeholder timed out.
+          const currentTime = requestCurrentTime();
+          finishedWork.stateNode = {timedOutAt: currentTime};
+        }
       }
       return;
     }
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 4bdd5efda3..83fbb45b65 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -871,6 +871,7 @@ function completeUnitOfWork(workInProgress: Fiber): Fiber | null {
         if (__DEV__ && ReactFiberInstrumentation.debugTool) {
           ReactFiberInstrumentation.debugTool.onCompleteWork(workInProgress);
         }
+
         // If completing this work spawned new work, do that next. We'll come
         // back here again.
         // Since we're restarting, remove anything that is not a host effect
@@ -1026,63 +1027,67 @@ function renderRoot(
 
   startWorkLoopTimer(nextUnitOfWork);
 
-  try {
-    workLoop(isYieldy);
-  } catch (thrownValue) {
-    if (enableProfilerTimer) {
-      // Stop "base" render timer in the event of an error.
-      stopBaseRenderTimerIfRunning();
-    }
-
-    if (nextUnitOfWork === null) {
-      // This is a fatal error.
-      didFatal = true;
-      onUncaughtError(thrownValue);
-    } else {
-      if (__DEV__) {
-        // Reset global debug state
-        // We assume this is defined in DEV
-        (resetCurrentlyProcessingQueue: any)();
+  do {
+    try {
+      workLoop(isYieldy);
+    } catch (thrownValue) {
+      if (enableProfilerTimer) {
+        // Stop "base" render timer in the event of an error.
+        stopBaseRenderTimerIfRunning();
       }
 
-      const failedUnitOfWork: Fiber = nextUnitOfWork;
-      if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
-        replayUnitOfWork(failedUnitOfWork, thrownValue, isYieldy);
-      }
-
-      // TODO: we already know this isn't true in some cases.
-      // At least this shows a nicer error message until we figure out the cause.
-      // https://github.com/facebook/react/issues/12449#issuecomment-386727431
-      invariant(
-        nextUnitOfWork !== null,
-        'Failed to replay rendering after an error. This ' +
-          'is likely caused by a bug in React. Please file an issue ' +
-          'with a reproducing case to help us find it.',
-      );
-
-      const sourceFiber: Fiber = nextUnitOfWork;
-      let returnFiber = sourceFiber.return;
-      if (returnFiber === null) {
-        // This is the root. The root could capture its own errors. However,
-        // we don't know if it errors before or after we pushed the host
-        // context. This information is needed to avoid a stack mismatch.
-        // Because we're not sure, treat this as a fatal error. We could track
-        // which phase it fails in, but doesn't seem worth it. At least
-        // for now.
+      if (nextUnitOfWork === null) {
+        // This is a fatal error.
         didFatal = true;
         onUncaughtError(thrownValue);
       } else {
-        throwException(
-          root,
-          returnFiber,
-          sourceFiber,
-          thrownValue,
-          nextRenderExpirationTime,
+        if (__DEV__) {
+          // Reset global debug state
+          // We assume this is defined in DEV
+          (resetCurrentlyProcessingQueue: any)();
+        }
+
+        const failedUnitOfWork: Fiber = nextUnitOfWork;
+        if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+          replayUnitOfWork(failedUnitOfWork, thrownValue, isYieldy);
+        }
+
+        // TODO: we already know this isn't true in some cases.
+        // At least this shows a nicer error message until we figure out the cause.
+        // https://github.com/facebook/react/issues/12449#issuecomment-386727431
+        invariant(
+          nextUnitOfWork !== null,
+          'Failed to replay rendering after an error. This ' +
+            'is likely caused by a bug in React. Please file an issue ' +
+            'with a reproducing case to help us find it.',
         );
-        nextUnitOfWork = completeUnitOfWork(sourceFiber);
+
+        const sourceFiber: Fiber = nextUnitOfWork;
+        let returnFiber = sourceFiber.return;
+        if (returnFiber === null) {
+          // This is the root. The root could capture its own errors. However,
+          // we don't know if it errors before or after we pushed the host
+          // context. This information is needed to avoid a stack mismatch.
+          // Because we're not sure, treat this as a fatal error. We could track
+          // which phase it fails in, but doesn't seem worth it. At least
+          // for now.
+          didFatal = true;
+          onUncaughtError(thrownValue);
+        } else {
+          throwException(
+            root,
+            returnFiber,
+            sourceFiber,
+            thrownValue,
+            nextRenderExpirationTime,
+          );
+          nextUnitOfWork = completeUnitOfWork(sourceFiber);
+          continue;
+        }
       }
     }
-  }
+    break;
+  } while (true);
 
   // We're done performing work. Time to clean up.
   isWorking = false;
@@ -1151,11 +1156,14 @@ function renderRoot(
         -1, // Indicates no timeout
       );
       return;
-    } else if (!root.didError && expirationTime !== Sync) {
+    } else if (
       // There's no lower priority work, but we're rendering asynchronously.
       // Synchronsouly attempt to render the same level one more time. This is
       // similar to a suspend, but without a timeout because we're not waiting
       // for a promise to resolve.
+      !root.didError &&
+      !isExpired
+    ) {
       root.didError = true;
       const suspendedExpirationTime = (root.nextExpirationTimeToWorkOn = expirationTime);
       const rootExpirationTime = (root.expirationTime = Sync);
@@ -1348,7 +1356,7 @@ function renderDidSuspend(
   }
 }
 
-function renderDidError(root: FiberRoot) {
+function renderDidError() {
   nextRenderDidError = true;
 }
 
diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index 0c355d62b2..63f6b02dfa 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -15,6 +15,8 @@ import type {Update} from './ReactUpdateQueue';
 import type {Thenable} from './ReactFiberScheduler';
 
 import {
+  IndeterminateComponent,
+  FunctionalComponent,
   ClassComponent,
   HostRoot,
   HostComponent,
@@ -27,13 +29,14 @@ import {
   Incomplete,
   NoEffect,
   ShouldCapture,
+  Update as UpdateEffect,
 } from 'shared/ReactTypeOfSideEffect';
 import {
   enableGetDerivedStateFromCatch,
   enableProfilerTimer,
   enableSuspense,
 } from 'shared/ReactFeatureFlags';
-import {ProfileMode} from './ReactTypeOfMode';
+import {ProfileMode, StrictMode, AsyncMode} from './ReactTypeOfMode';
 
 import {createCapturedValue} from './ReactCapturedValue';
 import {
@@ -60,6 +63,7 @@ import {
   isAlreadyFailedLegacyErrorBoundary,
   retrySuspendedRoot,
 } from './ReactFiberScheduler';
+import {Sync} from './ReactFiberExpirationTime';
 
 import invariant from 'shared/invariant';
 import maxSigned31BitInt from './maxSigned31BitInt';
@@ -68,6 +72,7 @@ import {
   LOW_PRIORITY_EXPIRATION,
 } from './ReactFiberExpirationTime';
 import {findEarliestOutstandingPriorityLevel} from './ReactFiberPendingPriority';
+import {reconcileChildrenAtExpirationTime} from './ReactFiberBeginWork';
 
 function createRootErrorUpdate(
   fiber: Fiber,
@@ -194,54 +199,98 @@ function throwException(
       workInProgress = workInProgress.return;
     } while (workInProgress !== null);
 
-    let absoluteTimeoutMs;
-    if (earliestTimeoutMs === -1) {
-      // If no explicit threshold is given, default to an abitrarily large
-      // value. The actual size doesn't matter because the threshold for the
-      // whole tree will be clamped to the expiration time.
-      absoluteTimeoutMs = maxSigned31BitInt;
-    } else {
-      if (startTimeMs === -1) {
-        // This suspend happened outside of any already timed-out
-        // placeholders. We don't know exactly when the update was scheduled,
-        // but we can infer an approximate start time from the expiration
-        // time. First, find the earliest uncommitted expiration time in the
-        // tree, including work that is suspended. Then subtract the offset
-        // used to compute an async update's expiration time. This will cause
-        // high priority (interactive) work to expire earlier than neccessary,
-        // but we can account for this by adjusting for the Just Noticable
-        // Difference.
-        const earliestExpirationTime = findEarliestOutstandingPriorityLevel(
-          root,
-          renderExpirationTime,
-        );
-        const earliestExpirationTimeMs = expirationTimeToMs(
-          earliestExpirationTime,
-        );
-        startTimeMs = earliestExpirationTimeMs - LOW_PRIORITY_EXPIRATION;
-      }
-      absoluteTimeoutMs = startTimeMs + earliestTimeoutMs;
-    }
-
-    // Mark the earliest timeout in the suspended fiber's ancestor path. After
-    // completing the root, we'll take the largest of all the suspended
-    // fiber's timeouts and use it to compute a timeout for the whole tree.
-    renderDidSuspend(root, absoluteTimeoutMs, renderExpirationTime);
-
     // Schedule the nearest Timeout to re-render using a placeholder.
     workInProgress = returnFiber;
     do {
       if (workInProgress.tag === TimeoutComponent) {
-        if ((workInProgress.effectTag & DidCapture) === NoEffect) {
-          workInProgress.effectTag |= ShouldCapture;
+        const didTimeout = workInProgress.memoizedState;
+        if (!didTimeout) {
+          // Found the nearest Timeout.
+
+          // If the Timeout is not in async mode, we should not suspend, and
+          // likewise, when the promise resolves, we should ping synchronously.
+          const pingTime =
+            (workInProgress.mode & AsyncMode) === NoEffect
+              ? Sync
+              : renderExpirationTime;
+
           // Attach a listener to the promise to "ping" the root and retry.
           const onResolveOrReject = retrySuspendedRoot.bind(
             null,
             root,
             workInProgress,
-            renderExpirationTime,
+            pingTime,
           );
           thenable.then(onResolveOrReject, onResolveOrReject);
+
+          // If the Timeout component is outside of strict mode, we should *not*
+          // suspend the commit. Pretend as if the suspended component rendered
+          // null and keep rendering. In the commit phase, we'll schedule a
+          // subsequent synchronous update to re-render the Timeout.
+          //
+          // Note: It doesn't matter whether the component that suspended was
+          // inside a strict mode tree. If the Timeout is outside of it, we
+          // should *not* suspend the commit.
+          if ((workInProgress.mode & StrictMode) === NoEffect) {
+            workInProgress.effectTag |= UpdateEffect;
+
+            // Unmount the source fiber's children
+            const nextChildren = null;
+            reconcileChildrenAtExpirationTime(
+              sourceFiber.alternate,
+              sourceFiber,
+              nextChildren,
+              renderExpirationTime,
+            );
+            sourceFiber.effectTag &= ~Incomplete;
+            if (sourceFiber.tag === IndeterminateComponent) {
+              // Let's just assume it's a functional component. This fiber will
+              // be unmounted in the immediate next commit, anyway.
+              sourceFiber.tag = FunctionalComponent;
+            }
+
+            // Exit without suspending.
+            return;
+          }
+
+          // Confirmed that the Timeout is in a strict mode tree. Continue with
+          // the normal suspend path.
+
+          let absoluteTimeoutMs;
+          if (earliestTimeoutMs === -1) {
+            // If no explicit threshold is given, default to an abitrarily large
+            // value. The actual size doesn't matter because the threshold for the
+            // whole tree will be clamped to the expiration time.
+            absoluteTimeoutMs = maxSigned31BitInt;
+          } else {
+            if (startTimeMs === -1) {
+              // This suspend happened outside of any already timed-out
+              // placeholders. We don't know exactly when the update was scheduled,
+              // but we can infer an approximate start time from the expiration
+              // time. First, find the earliest uncommitted expiration time in the
+              // tree, including work that is suspended. Then subtract the offset
+              // used to compute an async update's expiration time. This will cause
+              // high priority (interactive) work to expire earlier than neccessary,
+              // but we can account for this by adjusting for the Just Noticable
+              // Difference.
+              const earliestExpirationTime = findEarliestOutstandingPriorityLevel(
+                root,
+                renderExpirationTime,
+              );
+              const earliestExpirationTimeMs = expirationTimeToMs(
+                earliestExpirationTime,
+              );
+              startTimeMs = earliestExpirationTimeMs - LOW_PRIORITY_EXPIRATION;
+            }
+            absoluteTimeoutMs = startTimeMs + earliestTimeoutMs;
+          }
+
+          // Mark the earliest timeout in the suspended fiber's ancestor path. After
+          // completing the root, we'll take the largest of all the suspended
+          // fiber's timeouts and use it to compute a timeout for the whole tree.
+          renderDidSuspend(root, absoluteTimeoutMs, renderExpirationTime);
+
+          workInProgress.effectTag |= ShouldCapture;
           return;
         }
         // Already captured during this render. Continue to the next
@@ -258,7 +307,7 @@ function throwException(
   // We didn't find a boundary that could handle this type of exception. Start
   // over and traverse parent path again, this time treating the exception
   // as an error.
-  renderDidError(root);
+  renderDidError();
   value = createCapturedValue(value, sourceFiber);
   let workInProgress = returnFiber;
   do {
diff --git a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
index 206dc2b707..13e51f738f 100644
--- a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
@@ -4,6 +4,8 @@ let Fragment;
 let ReactNoop;
 let SimpleCacheProvider;
 let Timeout;
+let StrictMode;
+let AsyncMode;
 
 let cache;
 let TextResource;
@@ -21,6 +23,8 @@ describe('ReactSuspense', () => {
     ReactNoop = require('react-noop-renderer');
     SimpleCacheProvider = require('simple-cache-provider');
     Timeout = React.Timeout;
+    StrictMode = React.StrictMode;
+    AsyncMode = React.unstable_AsyncMode;
 
     function invalidateCache() {
       cache = SimpleCacheProvider.createCache(invalidateCache);
@@ -829,6 +833,461 @@ describe('ReactSuspense', () => {
       expect(ReactNoop.getChildren()).toEqual([span('A')]);
     });
   });
+
+  describe('sync mode', () => {
+    it('times out immediately', async () => {
+      function App() {
+        return (
+          <Fallback timeout={1000} placeholder={<Text text="Loading..." />}>
+            <AsyncText ms={100} text="Result" />
+          </Fallback>
+        );
+      }
+
+      // Times out immediately, ignoring the specified threshold.
+      ReactNoop.renderLegacySyncRoot(<App />);
+      expect(ReactNoop.clearYields()).toEqual([
+        'Suspend! [Result]',
+        'Loading...',
+      ]);
+      expect(ReactNoop.getChildren()).toEqual([span('Loading...')]);
+
+      await advanceTimers(100);
+      expect(ReactNoop.expire(100)).toEqual([
+        'Promise resolved [Result]',
+        'Result',
+      ]);
+
+      expect(ReactNoop.getChildren()).toEqual([span('Result')]);
+    });
+
+    it('times out immediately when Timeout is in loose mode, even if the suspender is async', async () => {
+      class UpdatingText extends React.Component {
+        state = {step: 1};
+        render() {
+          return <AsyncText ms={100} text={`Step: ${this.state.step}`} />;
+        }
+      }
+
+      function Placeholder() {
+        return (
+          <Fragment>
+            <Text text="Loading (1)" />
+            <Text text="Loading (2)" />
+            <Text text="Loading (3)" />
+          </Fragment>
+        );
+      }
+
+      const text = React.createRef(null);
+      function App() {
+        return (
+          <Fallback timeout={1000} placeholder={<Placeholder />}>
+            <AsyncMode>
+              <UpdatingText ref={text} />
+              <Text text="Sibling" />
+            </AsyncMode>
+          </Fallback>
+        );
+      }
+
+      // Initial mount. This is synchronous, because the root is sync.
+      ReactNoop.renderLegacySyncRoot(<App />);
+      await advanceTimers(100);
+      expect(ReactNoop.clearYields()).toEqual([
+        'Suspend! [Step: 1]',
+        'Sibling',
+        'Loading (1)',
+        'Loading (2)',
+        'Loading (3)',
+        'Promise resolved [Step: 1]',
+        'Step: 1',
+        'Sibling',
+      ]);
+      expect(ReactNoop.getChildren()).toEqual([
+        span('Step: 1'),
+        span('Sibling'),
+      ]);
+
+      // Update. This starts out asynchronously.
+      text.current.setState({step: 2}, () =>
+        ReactNoop.yield('Update did commit'),
+      );
+
+      // Suspend during an async render.
+      expect(ReactNoop.flushNextYield()).toEqual(['Suspend! [Step: 2]']);
+      expect(ReactNoop.flush()).toEqual([
+        'Update did commit',
+        // Switch to the placeholder in a subsequent commit
+        'Loading (1)',
+        'Loading (2)',
+        'Loading (3)',
+      ]);
+      expect(ReactNoop.getChildren()).toEqual([
+        span('Loading (1)'),
+        span('Loading (2)'),
+        span('Loading (3)'),
+      ]);
+
+      await advanceTimers(100);
+      expect(ReactNoop.flush()).toEqual([
+        'Promise resolved [Step: 2]',
+        // TODO: The state of the children is lost when switching back. Revisit
+        // this in the follow up PR.
+        'Step: 1',
+        'Sibling',
+      ]);
+      expect(ReactNoop.getChildren()).toEqual([
+        span('Step: 1'),
+        span('Sibling'),
+      ]);
+    });
+
+    it(
+      'continues rendering asynchronously even if a promise is captured by ' +
+        'a sync boundary (strict)',
+      async () => {
+        class UpdatingText extends React.Component {
+          state = {text: this.props.initialText};
+          render() {
+            return this.props.children(this.state.text);
+          }
+        }
+
+        const text1 = React.createRef(null);
+        const text2 = React.createRef(null);
+        function App() {
+          return (
+            <StrictMode>
+              <Fallback timeout={1000} placeholder={<Text text="Loading..." />}>
+                <AsyncMode>
+                  <UpdatingText ref={text1} initialText="Async: 1">
+                    {text => (
+                      <Fragment>
+                        <Text text="Before" />
+                        <AsyncText text={text} />
+                        <Text text="After" />
+                      </Fragment>
+                    )}
+                  </UpdatingText>
+                </AsyncMode>
+              </Fallback>
+              <AsyncMode>
+                <UpdatingText ref={text2} initialText="Sync: 1">
+                  {text => (
+                    <Fragment>
+                      <Text text="Before" />
+                      <Text text={text} />
+                      <Text text="After" />
+                    </Fragment>
+                  )}
+                </UpdatingText>
+              </AsyncMode>
+            </StrictMode>
+          );
+        }
+
+        // Initial mount
+        ReactNoop.renderLegacySyncRoot(<App />, () =>
+          ReactNoop.yield('Did mount'),
+        );
+        await advanceTimers(100);
+        expect(ReactNoop.clearYields()).toEqual([
+          'Before',
+          'Suspend! [Async: 1]',
+          'After',
+          'Loading...',
+          'Before',
+          'Sync: 1',
+          'After',
+          'Did mount',
+          'Promise resolved [Async: 1]',
+          'Before',
+          'Async: 1',
+          'After',
+        ]);
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Before'),
+          span('Async: 1'),
+          span('After'),
+
+          span('Before'),
+          span('Sync: 1'),
+          span('After'),
+        ]);
+
+        // Update. This starts out asynchronously.
+        text1.current.setState({text: 'Async: 2'}, () =>
+          ReactNoop.yield('Update 1 did commit'),
+        );
+        text2.current.setState({text: 'Sync: 2'}, () =>
+          ReactNoop.yield('Update 2 did commit'),
+        );
+
+        // Start rendering asynchronously
+        ReactNoop.flushThrough([
+          'Before',
+          // This child suspends
+          'Suspend! [Async: 2]',
+          // But we can still render the rest of the async tree asynchronously
+          'After',
+        ]);
+
+        // Suspend during an async render.
+        expect(ReactNoop.flushNextYield()).toEqual(['Loading...']);
+        expect(ReactNoop.flush()).toEqual(['Before', 'Sync: 2', 'After']);
+        // Commit was suspended.
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Before'),
+          span('Async: 1'),
+          span('After'),
+
+          span('Before'),
+          span('Sync: 1'),
+          span('After'),
+        ]);
+
+        // When the placeholder is pinged, the boundary re-
+        // renders asynchronously.
+        ReactNoop.expire(100);
+        await advanceTimers(100);
+        expect(ReactNoop.flush()).toEqual([
+          'Promise resolved [Async: 2]',
+          'Before',
+          'Async: 2',
+          'After',
+          'Before',
+          'Sync: 2',
+          'After',
+          'Update 1 did commit',
+          'Update 2 did commit',
+        ]);
+
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Before'),
+          span('Async: 2'),
+          span('After'),
+
+          span('Before'),
+          span('Sync: 2'),
+          span('After'),
+        ]);
+      },
+    );
+
+    it(
+      'continues rendering asynchronously even if a promise is captured by ' +
+        'a sync boundary (loose)',
+      async () => {
+        class UpdatingText extends React.Component {
+          state = {text: this.props.initialText};
+          render() {
+            return this.props.children(this.state.text);
+          }
+        }
+
+        const text1 = React.createRef(null);
+        const text2 = React.createRef(null);
+        function App() {
+          return (
+            <Fragment>
+              <Fallback timeout={1000} placeholder={<Text text="Loading..." />}>
+                <AsyncMode>
+                  <UpdatingText ref={text1} initialText="Async: 1">
+                    {text => (
+                      <Fragment>
+                        <Text text="Before" />
+                        <AsyncText text={text} />
+                        <Text text="After" />
+                      </Fragment>
+                    )}
+                  </UpdatingText>
+                </AsyncMode>
+              </Fallback>
+              <AsyncMode>
+                <UpdatingText ref={text2} initialText="Sync: 1">
+                  {text => (
+                    <Fragment>
+                      <Text text="Before" />
+                      <Text text={text} />
+                      <Text text="After" />
+                    </Fragment>
+                  )}
+                </UpdatingText>
+              </AsyncMode>
+            </Fragment>
+          );
+        }
+
+        // Initial mount
+        ReactNoop.renderLegacySyncRoot(<App />, () =>
+          ReactNoop.yield('Did mount'),
+        );
+        await advanceTimers(100);
+        expect(ReactNoop.clearYields()).toEqual([
+          'Before',
+          'Suspend! [Async: 1]',
+          'After',
+          'Before',
+          'Sync: 1',
+          'After',
+          'Did mount',
+          // The placeholder is rendered in a subsequent commit
+          'Loading...',
+          'Promise resolved [Async: 1]',
+          'Before',
+          'Async: 1',
+          'After',
+        ]);
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Before'),
+          span('Async: 1'),
+          span('After'),
+
+          span('Before'),
+          span('Sync: 1'),
+          span('After'),
+        ]);
+
+        // Update. This starts out asynchronously.
+        text1.current.setState({text: 'Async: 2'}, () =>
+          ReactNoop.yield('Update 1 did commit'),
+        );
+        text2.current.setState({text: 'Sync: 2'}, () =>
+          ReactNoop.yield('Update 2 did commit'),
+        );
+
+        // Start rendering asynchronously
+        ReactNoop.flushThrough(['Before']);
+
+        // Now render the next child, which suspends
+        expect(ReactNoop.flushNextYield()).toEqual([
+          // This child suspends
+          'Suspend! [Async: 2]',
+        ]);
+        expect(ReactNoop.flush()).toEqual([
+          'After',
+          'Before',
+          'Sync: 2',
+          'After',
+          'Update 1 did commit',
+          'Update 2 did commit',
+
+          // Switch to the placeholder in a subsequent commit
+          'Loading...',
+        ]);
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Loading...'),
+
+          span('Before'),
+          span('Sync: 2'),
+          span('After'),
+        ]);
+
+        // When the placeholder is pinged, the boundary must be re-rendered
+        // synchronously.
+        await advanceTimers(100);
+        expect(ReactNoop.clearYields()).toEqual([
+          'Promise resolved [Async: 2]',
+          'Before',
+          'Async: 1',
+          'After',
+        ]);
+
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Before'),
+          // TODO: The state of the children is lost when switching back. Revisit
+          // this in the follow up PR.
+          span('Async: 1'),
+          span('After'),
+
+          span('Before'),
+          span('Sync: 2'),
+          span('After'),
+        ]);
+      },
+    );
+
+    it('does not re-render siblings in loose mode', async () => {
+      class TextWithLifecycle extends React.Component {
+        componentDidMount() {
+          ReactNoop.yield(`Mount [${this.props.text}]`);
+        }
+        componentDidUpdate() {
+          ReactNoop.yield(`Update [${this.props.text}]`);
+        }
+        render() {
+          return <Text {...this.props} />;
+        }
+      }
+
+      class AsyncTextWithLifecycle extends React.Component {
+        componentDidMount() {
+          ReactNoop.yield(`Mount [${this.props.text}]`);
+        }
+        componentDidUpdate() {
+          ReactNoop.yield(`Update [${this.props.text}]`);
+        }
+        render() {
+          return <AsyncText {...this.props} />;
+        }
+      }
+
+      function App() {
+        return (
+          <Fallback
+            timeout={1000}
+            placeholder={<TextWithLifecycle text="Loading..." />}>
+            <TextWithLifecycle text="A" />
+            <AsyncTextWithLifecycle ms={100} text="B" />
+            <TextWithLifecycle text="C" />
+          </Fallback>
+        );
+      }
+
+      ReactNoop.renderLegacySyncRoot(<App />, () =>
+        ReactNoop.yield('Commit root'),
+      );
+      expect(ReactNoop.clearYields()).toEqual([
+        'A',
+        'Suspend! [B]',
+        'C',
+
+        'Mount [A]',
+        'Mount [B]',
+        'Mount [C]',
+        'Commit root',
+
+        // In a subsequent commit, render a placeholder
+        'Loading...',
+        // Force delete all the existing children when switching to the
+        // placeholder. This should be a mount, not an update.
+        'Mount [Loading...]',
+      ]);
+      expect(ReactNoop.getChildren()).toEqual([span('Loading...')]);
+
+      await advanceTimers(1000);
+      expect(ReactNoop.expire(1000)).toEqual([
+        'Promise resolved [B]',
+        'A',
+        'B',
+        'C',
+        // 'A' matched with the placeholder. It's ok to reuse children when
+        // switching back. Though in a real app you probably don't want to.
+        // TODO: This is wrong. The timed out children and the placeholder
+        // should be siblings in async mode. Revisit in follow-up PR.
+        'Update [A]',
+        'Mount [B]',
+        'Mount [C]',
+      ]);
+
+      expect(ReactNoop.getChildren()).toEqual([
+        span('A'),
+        span('B'),
+        span('C'),
+      ]);
+    });
+  });
 });
 
 // TODO:
diff --git a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
index 08f139f806..a6b1b1caf1 100644
--- a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
+++ b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
@@ -286,24 +286,18 @@ exports[`ReactDebugFiberPerf recovers from caught errors 1`] = `
 "⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Stop on Baddie and restart from Boundary
-⚛ (React Tree Reconciliation: Yielded)
+⚛ (React Tree Reconciliation: Completed Root)
   ⚛ Parent [mount]
     ⛔ Boundary [mount] Warning: An error was thrown inside this error boundary
       ⚛ Parent [mount]
         ⚛ Baddie [mount]
-
-⚛ (React Tree Reconciliation: Completed Root)
-  ⚛ Parent [mount]
     ⚛ Boundary [mount]
 
-⚛ (React Tree Reconciliation: Yielded)
+⚛ (React Tree Reconciliation: Completed Root)
   ⚛ Parent [mount]
     ⛔ Boundary [mount] Warning: An error was thrown inside this error boundary
       ⚛ Parent [mount]
         ⚛ Baddie [mount]
-
-⚛ (React Tree Reconciliation: Completed Root)
-  ⚛ Parent [mount]
     ⚛ Boundary [mount]
 
 ⛔ (Committing Changes) Warning: Lifecycle hook scheduled a cascading update
@@ -326,18 +320,14 @@ exports[`ReactDebugFiberPerf recovers from fatal errors 1`] = `
 "⚛ (Waiting for async callback... will force flush in 5250 ms)
 
 // Will fatal
-⚛ (React Tree Reconciliation: Yielded)
+⚛ (React Tree Reconciliation: Completed Root)
   ⚛ Parent [mount]
     ⚛ Baddie [mount]
 
 ⚛ (React Tree Reconciliation: Completed Root)
-
-⚛ (React Tree Reconciliation: Yielded)
   ⚛ Parent [mount]
     ⚛ Baddie [mount]
 
-⚛ (React Tree Reconciliation: Completed Root)
-
 ⚛ (Committing Changes)
   ⚛ (Committing Snapshot Effects: 0 Total)
   ⚛ (Committing Host Effects: 1 Total)

From 88d7ed8bfbccd860c3e309da39d356d0a3127aa7 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Tue, 3 Jul 2018 19:47:00 -0700
Subject: [PATCH 197/277] React.Timeout -> React.Placeholder (#13105)

Changed the API to match what we've been using in our latest discussions.

Our tentative plans are for <Placeholder> to automatically hide the timed-out
children, instead of removing them, so their state is not lost. This part is
not yet implemented. We'll likely have a lower level API that does not include
the hiding behavior. This is also not yet implemented.
---
 packages/react-reconciler/src/ReactFiber.js   |   8 +-
 .../src/ReactFiberBeginWork.js                |  26 +++-
 .../src/ReactFiberCommitWork.js               |   6 +-
 .../src/ReactFiberCompleteWork.js             |   4 +-
 .../src/ReactFiberUnwindWork.js               |  51 +++---
 .../__tests__/ReactSuspense-test.internal.js  | 147 +++++++++---------
 packages/react/src/React.js                   |   4 +-
 packages/shared/ReactSymbols.js               |   4 +-
 packages/shared/ReactTypeOfWork.js            |   2 +-
 packages/shared/getComponentName.js           |   6 +-
 packages/shared/isValidElementType.js         |   4 +-
 11 files changed, 135 insertions(+), 127 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js
index cc13e9ecd2..e73ca22142 100644
--- a/packages/react-reconciler/src/ReactFiber.js
+++ b/packages/react-reconciler/src/ReactFiber.js
@@ -31,7 +31,7 @@ import {
   ContextProvider,
   ContextConsumer,
   Profiler,
-  TimeoutComponent,
+  PlaceholderComponent,
 } from 'shared/ReactTypeOfWork';
 import getComponentName from 'shared/getComponentName';
 
@@ -46,7 +46,7 @@ import {
   REACT_PROVIDER_TYPE,
   REACT_CONTEXT_TYPE,
   REACT_ASYNC_MODE_TYPE,
-  REACT_TIMEOUT_TYPE,
+  REACT_PLACEHOLDER_TYPE,
 } from 'shared/ReactSymbols';
 
 let hasBadMapPolyfill;
@@ -397,8 +397,8 @@ export function createFiberFromElement(
         break;
       case REACT_PROFILER_TYPE:
         return createFiberFromProfiler(pendingProps, mode, expirationTime, key);
-      case REACT_TIMEOUT_TYPE:
-        fiberTag = TimeoutComponent;
+      case REACT_PLACEHOLDER_TYPE:
+        fiberTag = PlaceholderComponent;
         break;
       default:
         fiberTag = getFiberTagFromObjectType(type, owner);
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 9a8fc5f028..9c95166258 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -27,7 +27,7 @@ import {
   ContextProvider,
   ContextConsumer,
   Profiler,
-  TimeoutComponent,
+  PlaceholderComponent,
 } from 'shared/ReactTypeOfWork';
 import {
   NoEffect,
@@ -703,7 +703,11 @@ function mountIndeterminateComponent(
   }
 }
 
-function updateTimeoutComponent(current, workInProgress, renderExpirationTime) {
+function updatePlaceholderComponent(
+  current,
+  workInProgress,
+  renderExpirationTime,
+) {
   if (enableSuspense) {
     const nextProps = workInProgress.pendingProps;
     const prevProps = workInProgress.memoizedProps;
@@ -717,7 +721,7 @@ function updateTimeoutComponent(current, workInProgress, renderExpirationTime) {
 
     let nextDidTimeout;
     if (current !== null && workInProgress.updateQueue !== null) {
-      // We're outside strict mode. Something inside this Timeout boundary
+      // We're outside strict mode. Something inside this Placeholder boundary
       // suspended during the last commit. Switch to the placholder.
       workInProgress.updateQueue = null;
       nextDidTimeout = true;
@@ -756,8 +760,16 @@ function updateTimeoutComponent(current, workInProgress, renderExpirationTime) {
       }
     }
 
-    const render = nextProps.children;
-    const nextChildren = render(nextDidTimeout);
+    // If the `children` prop is a function, treat it like a render prop.
+    // TODO: This is temporary until we finalize a lower level API.
+    const children = nextProps.children;
+    let nextChildren;
+    if (typeof children === 'function') {
+      nextChildren = children(nextDidTimeout);
+    } else {
+      nextChildren = nextDidTimeout ? nextProps.fallback : children;
+    }
+
     workInProgress.memoizedProps = nextProps;
     workInProgress.memoizedState = nextDidTimeout;
     reconcileChildren(current, workInProgress, nextChildren);
@@ -1197,8 +1209,8 @@ function beginWork(
       return updateHostComponent(current, workInProgress, renderExpirationTime);
     case HostText:
       return updateHostText(current, workInProgress);
-    case TimeoutComponent:
-      return updateTimeoutComponent(
+    case PlaceholderComponent:
+      return updatePlaceholderComponent(
         current,
         workInProgress,
         renderExpirationTime,
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index c995099791..f0af9ff180 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -28,7 +28,7 @@ import {
   HostText,
   HostPortal,
   Profiler,
-  TimeoutComponent,
+  PlaceholderComponent,
 } from 'shared/ReactTypeOfWork';
 import ReactErrorUtils from 'shared/ReactErrorUtils';
 import {
@@ -322,7 +322,7 @@ function commitLifeCycles(
       // We have no life-cycles associated with Profiler.
       return;
     }
-    case TimeoutComponent: {
+    case PlaceholderComponent: {
       if (enableSuspense) {
         if ((finishedWork.mode & StrictMode) === NoEffect) {
           // In loose mode, a placeholder times out by scheduling a synchronous
@@ -837,7 +837,7 @@ function commitWork(current: Fiber | null, finishedWork: Fiber): void {
       }
       return;
     }
-    case TimeoutComponent: {
+    case PlaceholderComponent: {
       return;
     }
     default: {
diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js
index e8db8f19e8..6103312430 100644
--- a/packages/react-reconciler/src/ReactFiberCompleteWork.js
+++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js
@@ -35,7 +35,7 @@ import {
   Fragment,
   Mode,
   Profiler,
-  TimeoutComponent,
+  PlaceholderComponent,
 } from 'shared/ReactTypeOfWork';
 import {Placement, Ref, Update} from 'shared/ReactTypeOfSideEffect';
 import {ProfileMode} from './ReactTypeOfMode';
@@ -490,7 +490,7 @@ function completeWork(
     }
     case ForwardRef:
       return null;
-    case TimeoutComponent:
+    case PlaceholderComponent:
       return null;
     case Fragment:
       return null;
diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index 63f6b02dfa..22f3cd1310 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -22,7 +22,7 @@ import {
   HostComponent,
   HostPortal,
   ContextProvider,
-  TimeoutComponent,
+  PlaceholderComponent,
 } from 'shared/ReactTypeOfWork';
 import {
   DidCapture,
@@ -157,16 +157,16 @@ function throwException(
     // This is a thenable.
     const thenable: Thenable = (value: any);
 
-    // Find the earliest timeout of all the timeouts in the ancestor path. We
-    // could avoid this traversal by storing the timeouts on the stack, but we
-    // choose not to because we only hit this path if we're IO-bound (i.e. if
-    // something suspends). Whereas the stack is used even in the non-IO-
-    // bound case.
+    // Find the earliest timeout threshold of all the placeholders in the
+    // ancestor path. We could avoid this traversal by storing the thresholds on
+    // the stack, but we choose not to because we only hit this path if we're
+    // IO-bound (i.e. if something suspends). Whereas the stack is used even in
+    // the non-IO- bound case.
     let workInProgress = returnFiber;
     let earliestTimeoutMs = -1;
     let startTimeMs = -1;
     do {
-      if (workInProgress.tag === TimeoutComponent) {
+      if (workInProgress.tag === PlaceholderComponent) {
         const current = workInProgress.alternate;
         if (
           current !== null &&
@@ -184,7 +184,7 @@ function throwException(
           // Do not search any further.
           break;
         }
-        let timeoutPropMs = workInProgress.pendingProps.ms;
+        let timeoutPropMs = workInProgress.pendingProps.delayMs;
         if (typeof timeoutPropMs === 'number') {
           if (timeoutPropMs <= 0) {
             earliestTimeoutMs = 0;
@@ -199,15 +199,15 @@ function throwException(
       workInProgress = workInProgress.return;
     } while (workInProgress !== null);
 
-    // Schedule the nearest Timeout to re-render using a placeholder.
+    // Schedule the nearest Placeholder to re-render the timed out view.
     workInProgress = returnFiber;
     do {
-      if (workInProgress.tag === TimeoutComponent) {
+      if (workInProgress.tag === PlaceholderComponent) {
         const didTimeout = workInProgress.memoizedState;
         if (!didTimeout) {
-          // Found the nearest Timeout.
+          // Found the nearest boundary.
 
-          // If the Timeout is not in async mode, we should not suspend, and
+          // If the boundary is not in async mode, we should not suspend, and
           // likewise, when the promise resolves, we should ping synchronously.
           const pingTime =
             (workInProgress.mode & AsyncMode) === NoEffect
@@ -223,13 +223,13 @@ function throwException(
           );
           thenable.then(onResolveOrReject, onResolveOrReject);
 
-          // If the Timeout component is outside of strict mode, we should *not*
-          // suspend the commit. Pretend as if the suspended component rendered
-          // null and keep rendering. In the commit phase, we'll schedule a
-          // subsequent synchronous update to re-render the Timeout.
+          // If the boundary is outside of strict mode, we should *not* suspend
+          // the commit. Pretend as if the suspended component rendered null and
+          // keep rendering. In the commit phase, we'll schedule a subsequent
+          // synchronous update to re-render the Placeholder.
           //
           // Note: It doesn't matter whether the component that suspended was
-          // inside a strict mode tree. If the Timeout is outside of it, we
+          // inside a strict mode tree. If the Placeholder is outside of it, we
           // should *not* suspend the commit.
           if ((workInProgress.mode & StrictMode) === NoEffect) {
             workInProgress.effectTag |= UpdateEffect;
@@ -253,7 +253,7 @@ function throwException(
             return;
           }
 
-          // Confirmed that the Timeout is in a strict mode tree. Continue with
+          // Confirmed that the bounary is in a strict mode tree. Continue with
           // the normal suspend path.
 
           let absoluteTimeoutMs;
@@ -285,20 +285,21 @@ function throwException(
             absoluteTimeoutMs = startTimeMs + earliestTimeoutMs;
           }
 
-          // Mark the earliest timeout in the suspended fiber's ancestor path. After
-          // completing the root, we'll take the largest of all the suspended
-          // fiber's timeouts and use it to compute a timeout for the whole tree.
+          // Mark the earliest timeout in the suspended fiber's ancestor path.
+          // After completing the root, we'll take the largest of all the
+          // suspended fiber's timeouts and use it to compute a timeout for the
+          // whole tree.
           renderDidSuspend(root, absoluteTimeoutMs, renderExpirationTime);
 
           workInProgress.effectTag |= ShouldCapture;
           return;
         }
-        // Already captured during this render. Continue to the next
-        // Timeout ancestor.
+        // This boundary already captured during this render. Continue to the
+        // next boundary.
       }
       workInProgress = workInProgress.return;
     } while (workInProgress !== null);
-    // No Timeout was found. Fallthrough to error mode.
+    // No boundary was found. Fallthrough to error mode.
     value = new Error(
       'An update was suspended, but no placeholder UI was provided.',
     );
@@ -390,7 +391,7 @@ function unwindWork(
       popHostContext(workInProgress);
       return null;
     }
-    case TimeoutComponent: {
+    case PlaceholderComponent: {
       const effectTag = workInProgress.effectTag;
       if (effectTag & ShouldCapture) {
         workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
diff --git a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
index 13e51f738f..12b4ce001b 100644
--- a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
@@ -3,7 +3,7 @@ let ReactFeatureFlags;
 let Fragment;
 let ReactNoop;
 let SimpleCacheProvider;
-let Timeout;
+let Placeholder;
 let StrictMode;
 let AsyncMode;
 
@@ -22,7 +22,7 @@ describe('ReactSuspense', () => {
     Fragment = React.Fragment;
     ReactNoop = require('react-noop-renderer');
     SimpleCacheProvider = require('simple-cache-provider');
-    Timeout = React.Timeout;
+    Placeholder = React.Placeholder;
     StrictMode = React.StrictMode;
     AsyncMode = React.unstable_AsyncMode;
 
@@ -89,14 +89,6 @@ describe('ReactSuspense', () => {
     }
   }
 
-  function Fallback(props) {
-    return (
-      <Timeout ms={props.timeout}>
-        {didExpire => (didExpire ? props.placeholder : props.children)}
-      </Timeout>
-    );
-  }
-
   it('suspends rendering and continues later', async () => {
     function Bar(props) {
       ReactNoop.yield('Bar');
@@ -106,12 +98,12 @@ describe('ReactSuspense', () => {
     function Foo() {
       ReactNoop.yield('Foo');
       return (
-        <Fallback>
+        <Placeholder>
           <Bar>
             <AsyncText text="A" ms={100} />
             <Text text="B" />
           </Bar>
-        </Fallback>
+        </Placeholder>
       );
     }
 
@@ -146,15 +138,15 @@ describe('ReactSuspense', () => {
   });
 
   it('suspends siblings and later recovers each independently', async () => {
-    // Render two sibling Timeout components
+    // Render two sibling Placeholder components
     ReactNoop.render(
       <Fragment>
-        <Fallback timeout={1000} placeholder={<Text text="Loading A..." />}>
+        <Placeholder delayMs={1000} fallback={<Text text="Loading A..." />}>
           <AsyncText text="A" ms={5000} />
-        </Fallback>
-        <Fallback timeout={3000} placeholder={<Text text="Loading B..." />}>
+        </Placeholder>
+        <Placeholder delayMs={3000} fallback={<Text text="Loading B..." />}>
           <AsyncText text="B" ms={6000} />
-        </Fallback>
+        </Placeholder>
       </Fragment>,
     );
     expect(ReactNoop.flush()).toEqual([
@@ -175,15 +167,16 @@ describe('ReactSuspense', () => {
       span('Loading B...'),
     ]);
 
-    // Advance time by enough that the first Timeout's promise resolves
-    // and switches back to the normal view. The second Timeout should still show the placeholder
+    // Advance time by enough that the first Placeholder's promise resolves and
+    // switches back to the normal view. The second Placeholder should still
+    // show the placeholder
     ReactNoop.expire(1000);
     await advanceTimers(1000);
 
     expect(ReactNoop.flush()).toEqual(['Promise resolved [A]', 'A']);
     expect(ReactNoop.getChildren()).toEqual([span('A'), span('Loading B...')]);
 
-    // Advance time by enough that the second Timeout's promise resolves
+    // Advance time by enough that the second Placeholder's promise resolves
     // and switches back to the normal view
     ReactNoop.expire(1000);
     await advanceTimers(1000);
@@ -194,12 +187,12 @@ describe('ReactSuspense', () => {
 
   it('continues rendering siblings after suspending', async () => {
     ReactNoop.render(
-      <Fallback>
+      <Placeholder>
         <Text text="A" />
         <AsyncText text="B" />
         <Text text="C" />
         <Text text="D" />
-      </Fallback>,
+      </Placeholder>,
     );
     // B suspends. Continue rendering the remaining siblings.
     expect(ReactNoop.flush()).toEqual(['A', 'Suspend! [B]', 'C', 'D']);
@@ -244,11 +237,11 @@ describe('ReactSuspense', () => {
     const errorBoundary = React.createRef();
     function App() {
       return (
-        <Fallback>
+        <Placeholder>
           <ErrorBoundary ref={errorBoundary}>
             <AsyncText text="Result" ms={1000} />
           </ErrorBoundary>
-        </Fallback>
+        </Placeholder>
       );
     }
 
@@ -306,11 +299,11 @@ describe('ReactSuspense', () => {
     const errorBoundary = React.createRef();
     function App() {
       return (
-        <Fallback timeout={1000} placeholder={<Text text="Loading..." />}>
+        <Placeholder delayMs={1000} fallback={<Text text="Loading..." />}>
           <ErrorBoundary ref={errorBoundary}>
             <AsyncText text="Result" ms={3000} />
           </ErrorBoundary>
-        </Fallback>
+        </Placeholder>
       );
     }
 
@@ -357,10 +350,10 @@ describe('ReactSuspense', () => {
   it('can update at a higher priority while in a suspended state', async () => {
     function App(props) {
       return (
-        <Fallback>
+        <Placeholder>
           <Text text={props.highPri} />
           <AsyncText text={props.lowPri} />
-        </Fallback>
+        </Placeholder>
       );
     }
 
@@ -396,10 +389,10 @@ describe('ReactSuspense', () => {
   it('keeps working on lower priority work after being pinged', async () => {
     function App(props) {
       return (
-        <Fallback>
+        <Placeholder>
           <AsyncText text="A" />
           {props.showB && <Text text="B" />}
-        </Fallback>
+        </Placeholder>
       );
     }
 
@@ -424,9 +417,9 @@ describe('ReactSuspense', () => {
         return <Text text="(empty)" />;
       }
       return (
-        <Fallback>
+        <Placeholder>
           <AsyncText ms={2000} text="Async" />
-        </Fallback>
+        </Placeholder>
       );
     }
 
@@ -451,9 +444,9 @@ describe('ReactSuspense', () => {
   it('forces an expiration after an update times out', async () => {
     ReactNoop.render(
       <Fragment>
-        <Fallback placeholder={<Text text="Loading..." />}>
+        <Placeholder fallback={<Text text="Loading..." />}>
           <AsyncText text="Async" ms={20000} />
-        </Fallback>
+        </Placeholder>
         <Text text="Sync" />
       </Fragment>,
     );
@@ -489,14 +482,14 @@ describe('ReactSuspense', () => {
     ReactNoop.render(
       <Fragment>
         <Text text="Sync" />
-        <Fallback timeout={1000} placeholder={<Text text="Loading outer..." />}>
+        <Placeholder delayMs={1000} fallback={<Text text="Loading outer..." />}>
           <AsyncText text="Outer content" ms={2000} />
-          <Fallback
-            timeout={2500}
-            placeholder={<Text text="Loading inner..." />}>
+          <Placeholder
+            delayMs={2500}
+            fallback={<Text text="Loading inner..." />}>
             <AsyncText text="Inner content" ms={5000} />
-          </Fallback>
-        </Fallback>
+          </Placeholder>
+        </Placeholder>
       </Fragment>,
     );
 
@@ -570,9 +563,9 @@ describe('ReactSuspense', () => {
     ReactNoop.flushSync(() =>
       ReactNoop.render(
         <Fragment>
-          <Fallback placeholder={<Text text="Loading..." />}>
+          <Placeholder fallback={<Text text="Loading..." />}>
             <AsyncText text="Async" />
-          </Fallback>
+          </Placeholder>
           <Text text="Sync" />
         </Fragment>,
       ),
@@ -598,12 +591,12 @@ describe('ReactSuspense', () => {
     ReactNoop.flushSync(() =>
       ReactNoop.render(
         <Fragment>
-          <Fallback placeholder={<Text text="Loading (outer)..." />}>
-            <Fallback placeholder={<AsyncText text="Loading (inner)..." />}>
+          <Placeholder fallback={<Text text="Loading (outer)..." />}>
+            <Placeholder fallback={<AsyncText text="Loading (inner)..." />}>
               <AsyncText text="Async" />
-            </Fallback>
+            </Placeholder>
             <Text text="Sync" />
-          </Fallback>
+          </Placeholder>
         </Fragment>,
       ),
     );
@@ -617,12 +610,12 @@ describe('ReactSuspense', () => {
     expect(ReactNoop.getChildren()).toEqual([span('Loading (outer)...')]);
   });
 
-  it('expires early with a `timeout` option', async () => {
+  it('expires early with a `delayMs` option', async () => {
     ReactNoop.render(
       <Fragment>
-        <Fallback timeout={1000} placeholder={<Text text="Loading..." />}>
+        <Placeholder delayMs={1000} fallback={<Text text="Loading..." />}>
           <AsyncText text="Async" ms={3000} />
-        </Fallback>
+        </Placeholder>
         <Text text="Sync" />
       </Fragment>,
     );
@@ -654,17 +647,19 @@ describe('ReactSuspense', () => {
   it('throws a helpful error when an update is suspends without a placeholder', () => {
     expect(() => {
       ReactNoop.flushSync(() =>
-        ReactNoop.render(<Timeout>{() => <AsyncText text="Async" />}</Timeout>),
+        ReactNoop.render(
+          <Placeholder>{() => <AsyncText text="Async" />}</Placeholder>,
+        ),
       );
     }).toThrow('An update was suspended, but no placeholder UI was provided.');
   });
 
-  it('a Timeout component correctly handles more than one suspended child', async () => {
+  it('a Placeholder component correctly handles more than one suspended child', async () => {
     ReactNoop.render(
-      <Fallback timeout={0}>
+      <Placeholder delayMs={0}>
         <AsyncText text="A" ms={100} />
         <AsyncText text="B" ms={100} />
-      </Fallback>,
+      </Placeholder>,
     );
     expect(ReactNoop.expire(10000)).toEqual(['Suspend! [A]', 'Suspend! [B]']);
     expect(ReactNoop.getChildren()).toEqual([]);
@@ -682,9 +677,9 @@ describe('ReactSuspense', () => {
 
   it('can resume rendering earlier than a timeout', async () => {
     ReactNoop.render(
-      <Fallback timeout={1000} placeholder={<Text text="Loading..." />}>
+      <Placeholder delayMs={1000} fallback={<Text text="Loading..." />}>
         <AsyncText text="Async" ms={100} />
-      </Fallback>,
+      </Placeholder>,
     );
     expect(ReactNoop.flush()).toEqual(['Suspend! [Async]', 'Loading...']);
     expect(ReactNoop.getChildren()).toEqual([]);
@@ -707,13 +702,13 @@ describe('ReactSuspense', () => {
   it('starts working on an update even if its priority falls between two suspended levels', async () => {
     function App(props) {
       return (
-        <Fallback timeout={10000}>
+        <Placeholder delayMs={10000}>
           {props.text === 'C' ? (
             <Text text="C" />
           ) : (
             <AsyncText text={props.text} ms={10000} />
           )}
-        </Fallback>
+        </Placeholder>
       );
     }
 
@@ -756,7 +751,7 @@ describe('ReactSuspense', () => {
   it('can hide a tree to unblock its surroundings', async () => {
     function App() {
       return (
-        <Timeout ms={1000}>
+        <Placeholder delayMs={1000}>
           {didTimeout => (
             <Fragment>
               <div hidden={didTimeout}>
@@ -765,7 +760,7 @@ describe('ReactSuspense', () => {
               {didTimeout ? <Text text="Loading..." /> : null}
             </Fragment>
           )}
-        </Timeout>
+        </Placeholder>
       );
     }
 
@@ -789,13 +784,13 @@ describe('ReactSuspense', () => {
     function Never() {
       // Throws a promise that resolves after some arbitrarily large
       // number of seconds. The idea is that this component will never
-      // resolve. It's always wrapped by a Timeout.
+      // resolve. It's always wrapped by a Placeholder.
       throw new Promise(resolve => setTimeout(() => resolve(), 10000));
     }
 
     function Delay({ms}) {
       return (
-        <Timeout ms={ms}>
+        <Placeholder delayMs={ms}>
           {didTimeout => {
             if (didTimeout) {
               // Once ms has elapsed, render null. This allows the rest of the
@@ -804,7 +799,7 @@ describe('ReactSuspense', () => {
             }
             return <Never />;
           }}
-        </Timeout>
+        </Placeholder>
       );
     }
 
@@ -838,9 +833,9 @@ describe('ReactSuspense', () => {
     it('times out immediately', async () => {
       function App() {
         return (
-          <Fallback timeout={1000} placeholder={<Text text="Loading..." />}>
+          <Placeholder delayMs={1000} fallback={<Text text="Loading..." />}>
             <AsyncText ms={100} text="Result" />
-          </Fallback>
+          </Placeholder>
         );
       }
 
@@ -861,7 +856,7 @@ describe('ReactSuspense', () => {
       expect(ReactNoop.getChildren()).toEqual([span('Result')]);
     });
 
-    it('times out immediately when Timeout is in loose mode, even if the suspender is async', async () => {
+    it('times out immediately when Placeholder is in loose mode, even if the suspender is async', async () => {
       class UpdatingText extends React.Component {
         state = {step: 1};
         render() {
@@ -869,7 +864,7 @@ describe('ReactSuspense', () => {
         }
       }
 
-      function Placeholder() {
+      function Spinner() {
         return (
           <Fragment>
             <Text text="Loading (1)" />
@@ -882,12 +877,12 @@ describe('ReactSuspense', () => {
       const text = React.createRef(null);
       function App() {
         return (
-          <Fallback timeout={1000} placeholder={<Placeholder />}>
+          <Placeholder delayMs={1000} fallback={<Spinner />}>
             <AsyncMode>
               <UpdatingText ref={text} />
               <Text text="Sibling" />
             </AsyncMode>
-          </Fallback>
+          </Placeholder>
         );
       }
 
@@ -959,7 +954,7 @@ describe('ReactSuspense', () => {
         function App() {
           return (
             <StrictMode>
-              <Fallback timeout={1000} placeholder={<Text text="Loading..." />}>
+              <Placeholder delayMs={1000} fallback={<Text text="Loading..." />}>
                 <AsyncMode>
                   <UpdatingText ref={text1} initialText="Async: 1">
                     {text => (
@@ -971,7 +966,7 @@ describe('ReactSuspense', () => {
                     )}
                   </UpdatingText>
                 </AsyncMode>
-              </Fallback>
+              </Placeholder>
               <AsyncMode>
                 <UpdatingText ref={text2} initialText="Sync: 1">
                   {text => (
@@ -1091,7 +1086,7 @@ describe('ReactSuspense', () => {
         function App() {
           return (
             <Fragment>
-              <Fallback timeout={1000} placeholder={<Text text="Loading..." />}>
+              <Placeholder delayMs={1000} fallback={<Text text="Loading..." />}>
                 <AsyncMode>
                   <UpdatingText ref={text1} initialText="Async: 1">
                     {text => (
@@ -1103,7 +1098,7 @@ describe('ReactSuspense', () => {
                     )}
                   </UpdatingText>
                 </AsyncMode>
-              </Fallback>
+              </Placeholder>
               <AsyncMode>
                 <UpdatingText ref={text2} initialText="Sync: 1">
                   {text => (
@@ -1235,13 +1230,13 @@ describe('ReactSuspense', () => {
 
       function App() {
         return (
-          <Fallback
-            timeout={1000}
-            placeholder={<TextWithLifecycle text="Loading..." />}>
+          <Placeholder
+            delayMs={1000}
+            fallback={<TextWithLifecycle text="Loading..." />}>
             <TextWithLifecycle text="A" />
             <AsyncTextWithLifecycle ms={100} text="B" />
             <TextWithLifecycle text="C" />
-          </Fallback>
+          </Placeholder>
         );
       }
 
diff --git a/packages/react/src/React.js b/packages/react/src/React.js
index 50ce68dc3c..01df1b4ed6 100644
--- a/packages/react/src/React.js
+++ b/packages/react/src/React.js
@@ -12,7 +12,7 @@ import {
   REACT_FRAGMENT_TYPE,
   REACT_PROFILER_TYPE,
   REACT_STRICT_MODE_TYPE,
-  REACT_TIMEOUT_TYPE,
+  REACT_PLACEHOLDER_TYPE,
 } from 'shared/ReactSymbols';
 import {enableSuspense} from 'shared/ReactFeatureFlags';
 
@@ -71,7 +71,7 @@ const React = {
 };
 
 if (enableSuspense) {
-  React.Timeout = REACT_TIMEOUT_TYPE;
+  React.Placeholder = REACT_PLACEHOLDER_TYPE;
 }
 
 if (__DEV__) {
diff --git a/packages/shared/ReactSymbols.js b/packages/shared/ReactSymbols.js
index 339c7372ca..7a99c57da8 100644
--- a/packages/shared/ReactSymbols.js
+++ b/packages/shared/ReactSymbols.js
@@ -38,8 +38,8 @@ export const REACT_ASYNC_MODE_TYPE = hasSymbol
 export const REACT_FORWARD_REF_TYPE = hasSymbol
   ? Symbol.for('react.forward_ref')
   : 0xead0;
-export const REACT_TIMEOUT_TYPE = hasSymbol
-  ? Symbol.for('react.timeout')
+export const REACT_PLACEHOLDER_TYPE = hasSymbol
+  ? Symbol.for('react.placeholder')
   : 0xead1;
 
 const MAYBE_ITERATOR_SYMBOL = typeof Symbol === 'function' && Symbol.iterator;
diff --git a/packages/shared/ReactTypeOfWork.js b/packages/shared/ReactTypeOfWork.js
index 5ac284818a..9cd5ecb095 100644
--- a/packages/shared/ReactTypeOfWork.js
+++ b/packages/shared/ReactTypeOfWork.js
@@ -42,4 +42,4 @@ export const ContextConsumer = 12;
 export const ContextProvider = 13;
 export const ForwardRef = 14;
 export const Profiler = 15;
-export const TimeoutComponent = 16;
+export const PlaceholderComponent = 16;
diff --git a/packages/shared/getComponentName.js b/packages/shared/getComponentName.js
index ac4f872d44..f51f6862b3 100644
--- a/packages/shared/getComponentName.js
+++ b/packages/shared/getComponentName.js
@@ -18,7 +18,7 @@ import {
   REACT_PROFILER_TYPE,
   REACT_PROVIDER_TYPE,
   REACT_STRICT_MODE_TYPE,
-  REACT_TIMEOUT_TYPE,
+  REACT_PLACEHOLDER_TYPE,
 } from 'shared/ReactSymbols';
 
 function getComponentName(fiber: Fiber): string | null {
@@ -44,8 +44,8 @@ function getComponentName(fiber: Fiber): string | null {
       return 'Context.Provider';
     case REACT_STRICT_MODE_TYPE:
       return 'StrictMode';
-    case REACT_TIMEOUT_TYPE:
-      return 'Timeout';
+    case REACT_PLACEHOLDER_TYPE:
+      return 'Placeholder';
   }
   if (typeof type === 'object' && type !== null) {
     switch (type.$$typeof) {
diff --git a/packages/shared/isValidElementType.js b/packages/shared/isValidElementType.js
index 3e99627225..c52354495f 100644
--- a/packages/shared/isValidElementType.js
+++ b/packages/shared/isValidElementType.js
@@ -15,7 +15,7 @@ import {
   REACT_PROFILER_TYPE,
   REACT_PROVIDER_TYPE,
   REACT_STRICT_MODE_TYPE,
-  REACT_TIMEOUT_TYPE,
+  REACT_PLACEHOLDER_TYPE,
 } from 'shared/ReactSymbols';
 
 export default function isValidElementType(type: mixed) {
@@ -27,7 +27,7 @@ export default function isValidElementType(type: mixed) {
     type === REACT_ASYNC_MODE_TYPE ||
     type === REACT_PROFILER_TYPE ||
     type === REACT_STRICT_MODE_TYPE ||
-    type === REACT_TIMEOUT_TYPE ||
+    type === REACT_PLACEHOLDER_TYPE ||
     (typeof type === 'object' &&
       type !== null &&
       (type.$$typeof === REACT_PROVIDER_TYPE ||

From 07fefe33310849df81836c1c2e773b7d50c3ec2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rouven=20We=C3=9Fling?= <me@rouvenwessling.de>
Date: Wed, 4 Jul 2018 19:20:02 +0200
Subject: [PATCH 198/277] Drop handling for ms and O prefixes for CSS
 transition and animation events. (#13133)

Internet Explorer never needed the prefix and Opera 11.5 is no longer supported by React.
---
 packages/react-dom/src/events/getVendorPrefixedEventName.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/react-dom/src/events/getVendorPrefixedEventName.js b/packages/react-dom/src/events/getVendorPrefixedEventName.js
index 1ba369e9d1..bed5532fcb 100644
--- a/packages/react-dom/src/events/getVendorPrefixedEventName.js
+++ b/packages/react-dom/src/events/getVendorPrefixedEventName.js
@@ -20,8 +20,6 @@ function makePrefixMap(styleProp, eventName) {
   prefixes[styleProp.toLowerCase()] = eventName.toLowerCase();
   prefixes['Webkit' + styleProp] = 'webkit' + eventName;
   prefixes['Moz' + styleProp] = 'moz' + eventName;
-  prefixes['ms' + styleProp] = 'MS' + eventName;
-  prefixes['O' + styleProp] = 'o' + eventName.toLowerCase();
 
   return prefixes;
 }

From 85fe4ddce7ae4d8c93a8107db9e7e65a0631baeb Mon Sep 17 00:00:00 2001
From: XuMM_12 <owiatsq@sina.cn>
Date: Thu, 5 Jul 2018 04:00:42 +0800
Subject: [PATCH 199/277] Fix - issue #12765 / the checked attribute is not
 initially set on the input (#13114)

---
 packages/react-dom/src/__tests__/ReactDOMInput-test.js | 10 ++++++++--
 packages/react-dom/src/client/ReactDOMFiberInput.js    |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index 578e5b100e..feed5963eb 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -739,9 +739,12 @@ describe('ReactDOMInput', () => {
     const cNode = stub.refs.c;
 
     expect(aNode.checked).toBe(true);
+    expect(aNode.hasAttribute('checked')).toBe(true);
     expect(bNode.checked).toBe(false);
+    expect(bNode.hasAttribute('checked')).toBe(false);
     // c is in a separate form and shouldn't be affected at all here
     expect(cNode.checked).toBe(true);
+    expect(cNode.hasAttribute('checked')).toBe(true);
 
     bNode.checked = true;
     // This next line isn't necessary in a proper browser environment, but
@@ -750,6 +753,11 @@ describe('ReactDOMInput', () => {
     aNode.checked = false;
     expect(cNode.checked).toBe(true);
 
+    // The original 'checked' attribute should be unchanged
+    expect(aNode.hasAttribute('checked')).toBe(true);
+    expect(bNode.hasAttribute('checked')).toBe(false);
+    expect(cNode.hasAttribute('checked')).toBe(true);
+
     // Now let's run the actual ReactDOMInput change event handler
     ReactTestUtils.Simulate.change(bNode);
 
@@ -1324,7 +1332,6 @@ describe('ReactDOMInput', () => {
       'set property value',
       'set attribute value',
       'set attribute checked',
-      'set attribute checked',
     ]);
   });
 
@@ -1389,7 +1396,6 @@ describe('ReactDOMInput', () => {
       'node.value = "1980-01-01"',
       'node.setAttribute("value", "1980-01-01")',
       'node.setAttribute("checked", "")',
-      'node.setAttribute("checked", "")',
     ]);
   });
 
diff --git a/packages/react-dom/src/client/ReactDOMFiberInput.js b/packages/react-dom/src/client/ReactDOMFiberInput.js
index c164d98419..07b4752182 100644
--- a/packages/react-dom/src/client/ReactDOMFiberInput.js
+++ b/packages/react-dom/src/client/ReactDOMFiberInput.js
@@ -243,7 +243,7 @@ export function postMountWrapper(
     node.name = '';
   }
   node.defaultChecked = !node.defaultChecked;
-  node.defaultChecked = !node.defaultChecked;
+  node.defaultChecked = !!node._wrapperState.initialChecked;
   if (name !== '') {
     node.name = name;
   }

From 9faf389e79c647d7792e631f3d8e9a9ce1a70625 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Thu, 5 Jul 2018 11:38:06 -0700
Subject: [PATCH 200/277] Reset profiler timer correctly after errors (#13123)

* Reset ReactProfilerTimer's DEV-only Fiber stack after an error

* Added ReactNoop functionality to error during "complete" phase

* Added failing profiler stack unwinding test

* Potential fix for unwinding time bug

* Renamed test

* Don't record time until complete phase succeeds. Simplifies unwinding.

* Expanded ReactProfilerDevToolsIntegration-test coverage a bit

* Added unstable_flushWithoutCommitting method to noop renderer

* Added failing multi-root/batch test to ReactProfiler-test

* Beefed up tests a bit and added some TODOs

* Profiler timer differentiates between batched commits and in-progress async work

This was a two-part change:
1) Don't count time spent working on a batched commit against yielded async work.
2) Don't assert an empty stack after processing a batched commit (because there may be yielded async work)

This is kind of a hacky solution, and may have problems that I haven't thought of yet. I need to commit this so I can mentally clock out for a bit without worrying about it. I will think about it more when I'm back from PTO. In the meanwhile, input is welcome.

* Removed TODO

* Replaced FiberRoot map with boolean

* Removed unnecessary whitespace edit
---
 .../src/createReactNoop.js                    |  42 ++++++-
 .../src/ReactFiberCompleteWork.js             |  47 +++----
 .../src/ReactFiberScheduler.js                |  24 +++-
 .../src/ReactFiberUnwindWork.js               |   7 +-
 .../src/ReactProfilerTimer.js                 |  34 ++++--
 ...tIncrementalErrorHandling-test.internal.js |   2 +-
 .../ReactIncrementalErrorReplay-test.js       |  11 +-
 .../__tests__/ReactProfiler-test.internal.js  | 115 +++++++++++++++++-
 ...ofilerDevToolsIntegration-test.internal.js |  37 ++++++
 9 files changed, 261 insertions(+), 58 deletions(-)

diff --git a/packages/react-noop-renderer/src/createReactNoop.js b/packages/react-noop-renderer/src/createReactNoop.js
index e0aeffa546..648b72d7ee 100644
--- a/packages/react-noop-renderer/src/createReactNoop.js
+++ b/packages/react-noop-renderer/src/createReactNoop.js
@@ -43,6 +43,7 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
 
   let instanceCounter = 0;
   let failInBeginPhase = false;
+  let failInCompletePhase = false;
 
   function appendChild(
     parentInstance: Instance | Container,
@@ -101,6 +102,9 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
     },
 
     createInstance(type: string, props: Props): Instance {
+      if (failInCompletePhase) {
+        throw new Error('Error in host config.');
+      }
       const inst = {
         id: instanceCounter++,
         type: type,
@@ -606,7 +610,7 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
       console.log(...bufferedLog);
     },
 
-    simulateErrorInHostConfig(fn: () => void) {
+    simulateErrorInHostConfigDuringBeginPhase(fn: () => void) {
       failInBeginPhase = true;
       try {
         fn();
@@ -614,6 +618,42 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
         failInBeginPhase = false;
       }
     },
+
+    simulateErrorInHostConfigDuringCompletePhase(fn: () => void) {
+      failInCompletePhase = true;
+      try {
+        fn();
+      } finally {
+        failInCompletePhase = false;
+      }
+    },
+
+    flushWithoutCommitting(
+      expectedFlush: Array<mixed>,
+      rootID: string = DEFAULT_ROOT_ID,
+    ) {
+      const root: any = roots.get(rootID);
+      const batch = {
+        _defer: true,
+        _expirationTime: 1,
+        _onComplete: () => {
+          root.firstBatch = null;
+        },
+        _next: null,
+      };
+      root.firstBatch = batch;
+      const actual = ReactNoop.flush();
+      expect(actual).toEqual(expectedFlush);
+      return (expectedCommit: Array<mixed>) => {
+        batch._defer = false;
+        NoopRenderer.flushRoot(root, 1);
+        expect(yieldedValues).toEqual(expectedCommit);
+      };
+    },
+
+    getRoot(rootID: string = DEFAULT_ROOT_ID) {
+      return roots.get(rootID);
+    },
   };
 
   return ReactNoop;
diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js
index 6103312430..492809c02f 100644
--- a/packages/react-reconciler/src/ReactFiberCompleteWork.js
+++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js
@@ -314,19 +314,13 @@ function completeWork(
 ): Fiber | null {
   const newProps = workInProgress.pendingProps;
 
-  if (enableProfilerTimer) {
-    if (workInProgress.mode & ProfileMode) {
-      recordElapsedActualRenderTime(workInProgress);
-    }
-  }
-
   switch (workInProgress.tag) {
     case FunctionalComponent:
-      return null;
+      break;
     case ClassComponent: {
       // We are leaving this subtree, so pop context if any.
       popLegacyContextProvider(workInProgress);
-      return null;
+      break;
     }
     case HostRoot: {
       popHostContainer(workInProgress);
@@ -345,7 +339,7 @@ function completeWork(
         workInProgress.effectTag &= ~Placement;
       }
       updateHostContainer(workInProgress);
-      return null;
+      break;
     }
     case HostComponent: {
       popHostContext(workInProgress);
@@ -395,7 +389,7 @@ function completeWork(
               'caused by a bug in React. Please file an issue.',
           );
           // This can happen when we abort work.
-          return null;
+          break;
         }
 
         const currentHostContext = getHostContext();
@@ -451,7 +445,7 @@ function completeWork(
           markRef(workInProgress);
         }
       }
-      return null;
+      break;
     }
     case HostText: {
       let newText = newProps;
@@ -468,7 +462,6 @@ function completeWork(
               'caused by a bug in React. Please file an issue.',
           );
           // This can happen when we abort work.
-          return null;
         }
         const rootContainerInstance = getRootHostContainer();
         const currentHostContext = getHostContext();
@@ -486,28 +479,28 @@ function completeWork(
           );
         }
       }
-      return null;
+      break;
     }
     case ForwardRef:
-      return null;
+      break;
     case PlaceholderComponent:
-      return null;
+      break;
     case Fragment:
-      return null;
+      break;
     case Mode:
-      return null;
+      break;
     case Profiler:
-      return null;
+      break;
     case HostPortal:
       popHostContainer(workInProgress);
       updateHostContainer(workInProgress);
-      return null;
+      break;
     case ContextProvider:
       // Pop provider fiber
       popProvider(workInProgress);
-      return null;
+      break;
     case ContextConsumer:
-      return null;
+      break;
     // Error cases
     case IndeterminateComponent:
       invariant(
@@ -524,6 +517,18 @@ function completeWork(
           'React. Please file an issue.',
       );
   }
+
+  if (enableProfilerTimer) {
+    if (workInProgress.mode & ProfileMode) {
+      // Don't record elapsed time unless the "complete" phase has succeeded.
+      // Certain renderers may error during this phase (i.e. ReactNative View/Text nesting validation).
+      // If an error occurs, we'll mark the time while unwinding.
+      // This simplifies the unwinding logic and ensures consistency.
+      recordElapsedActualRenderTime(workInProgress);
+    }
+  }
+
+  return null;
 }
 
 export {completeWork};
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 83fbb45b65..2f10fb537f 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -118,7 +118,7 @@ import {
   recordCommitTime,
   recordElapsedActualRenderTime,
   recordElapsedBaseRenderTimeIfRunning,
-  resetActualRenderTimer,
+  resetActualRenderTimerStackAfterFatalErrorInDev,
   resumeActualRenderTimerIfPaused,
   startBaseRenderTimer,
   stopBaseRenderTimerIfRunning,
@@ -337,6 +337,12 @@ function resetStack() {
   if (nextUnitOfWork !== null) {
     let interruptedWork = nextUnitOfWork.return;
     while (interruptedWork !== null) {
+      if (enableProfilerTimer) {
+        if (interruptedWork.mode & ProfileMode) {
+          // Resume in case we're picking up on work that was paused.
+          resumeActualRenderTimerIfPaused(false);
+        }
+      }
       unwindInterruptedWork(interruptedWork);
       interruptedWork = interruptedWork.return;
     }
@@ -674,9 +680,13 @@ function commitRoot(root: FiberRoot, finishedWork: Fiber): void {
 
   if (enableProfilerTimer) {
     if (__DEV__) {
-      checkActualRenderTimeStackEmpty();
+      if (nextRoot === null) {
+        // Only check this stack once we're done processing async work.
+        // This prevents a false positive that occurs after a batched commit,
+        // If there was in-progress async work before the commit.
+        checkActualRenderTimeStackEmpty();
+      }
     }
-    resetActualRenderTimer();
   }
 
   isCommitting = false;
@@ -1100,6 +1110,10 @@ function renderRoot(
     // There was a fatal error.
     if (__DEV__) {
       resetStackAfterFatalErrorInDev();
+
+      // Reset the DEV fiber stack in case we're profiling roots.
+      // (We do this for profiling bulds when DevTools is detected.)
+      resetActualRenderTimerStackAfterFatalErrorInDev();
     }
     // `nextRoot` points to the in-progress root. A non-null value indicates
     // that we're in the middle of an async render. Set it to null to indicate
@@ -1817,7 +1831,7 @@ function performWork(minExpirationTime: ExpirationTime, dl: Deadline | null) {
   findHighestPriorityRoot();
 
   if (enableProfilerTimer) {
-    resumeActualRenderTimerIfPaused();
+    resumeActualRenderTimerIfPaused(minExpirationTime === Sync);
   }
 
   if (deadline !== null) {
@@ -1892,7 +1906,7 @@ function flushRoot(root: FiberRoot, expirationTime: ExpirationTime) {
   performWorkOnRoot(root, expirationTime, true);
   // Flush any sync work that was scheduled by lifecycles
   performSyncWork();
-  finishRendering();
+  pauseActualRenderTimerIfRunning();
 }
 
 function finishRendering() {
diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index 22f3cd1310..192d083c17 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -51,10 +51,7 @@ import {
   popTopLevelContextObject as popTopLevelLegacyContextObject,
 } from './ReactFiberContext';
 import {popProvider} from './ReactFiberNewContext';
-import {
-  resumeActualRenderTimerIfPaused,
-  recordElapsedActualRenderTime,
-} from './ReactProfilerTimer';
+import {recordElapsedActualRenderTime} from './ReactProfilerTimer';
 import {
   renderDidSuspend,
   renderDidError,
@@ -413,8 +410,6 @@ function unwindWork(
 function unwindInterruptedWork(interruptedWork: Fiber) {
   if (enableProfilerTimer) {
     if (interruptedWork.mode & ProfileMode) {
-      // Resume in case we're picking up on work that was paused.
-      resumeActualRenderTimerIfPaused();
       recordElapsedActualRenderTime(interruptedWork);
     }
   }
diff --git a/packages/react-reconciler/src/ReactProfilerTimer.js b/packages/react-reconciler/src/ReactProfilerTimer.js
index b1455195a8..fe43dac6fb 100644
--- a/packages/react-reconciler/src/ReactProfilerTimer.js
+++ b/packages/react-reconciler/src/ReactProfilerTimer.js
@@ -21,10 +21,10 @@ export type ProfilerTimer = {
   markActualRenderTimeStarted(fiber: Fiber): void,
   pauseActualRenderTimerIfRunning(): void,
   recordElapsedActualRenderTime(fiber: Fiber): void,
-  resetActualRenderTimer(): void,
-  resumeActualRenderTimerIfPaused(): void,
+  resumeActualRenderTimerIfPaused(isProcessingBatchCommit: boolean): void,
   recordCommitTime(): void,
   recordElapsedBaseRenderTimeIfRunning(fiber: Fiber): void,
+  resetActualRenderTimerStackAfterFatalErrorInDev(): void,
   startBaseRenderTimer(): void,
   stopBaseRenderTimerIfRunning(): void,
 };
@@ -55,6 +55,7 @@ if (__DEV__) {
   fiberStack = [];
 }
 
+let syncCommitStartTime: number = 0;
 let timerPausedAt: number = 0;
 let totalElapsedPauseTime: number = 0;
 
@@ -90,6 +91,14 @@ function pauseActualRenderTimerIfRunning(): void {
   if (timerPausedAt === 0) {
     timerPausedAt = now();
   }
+  if (syncCommitStartTime > 0) {
+    // Don't count the time spent processing sycn work,
+    // Against yielded async work that will be resumed later.
+    totalElapsedPauseTime += now() - syncCommitStartTime;
+    syncCommitStartTime = 0;
+  } else {
+    totalElapsedPauseTime = 0;
+  }
 }
 
 function recordElapsedActualRenderTime(fiber: Fiber): void {
@@ -108,16 +117,12 @@ function recordElapsedActualRenderTime(fiber: Fiber): void {
     now() - totalElapsedPauseTime - ((fiber.actualDuration: any): number);
 }
 
-function resetActualRenderTimer(): void {
+function resumeActualRenderTimerIfPaused(isProcessingSyncWork: boolean): void {
   if (!enableProfilerTimer) {
     return;
   }
-  totalElapsedPauseTime = 0;
-}
-
-function resumeActualRenderTimerIfPaused(): void {
-  if (!enableProfilerTimer) {
-    return;
+  if (isProcessingSyncWork && syncCommitStartTime === 0) {
+    syncCommitStartTime = now();
   }
   if (timerPausedAt > 0) {
     totalElapsedPauseTime += now() - timerPausedAt;
@@ -125,6 +130,15 @@ function resumeActualRenderTimerIfPaused(): void {
   }
 }
 
+function resetActualRenderTimerStackAfterFatalErrorInDev(): void {
+  if (!enableProfilerTimer) {
+    return;
+  }
+  if (__DEV__) {
+    fiberStack.length = 0;
+  }
+}
+
 /**
  * The "base" render time is the duration of the “begin” phase of work for a particular fiber.
  * This time is measured and stored on each fiber.
@@ -174,7 +188,7 @@ export {
   pauseActualRenderTimerIfRunning,
   recordCommitTime,
   recordElapsedActualRenderTime,
-  resetActualRenderTimer,
+  resetActualRenderTimerStackAfterFatalErrorInDev,
   resumeActualRenderTimerIfPaused,
   recordElapsedBaseRenderTimeIfRunning,
   startBaseRenderTimer,
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
index 88e49e24c7..00dd06e660 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
@@ -1211,7 +1211,7 @@ describe('ReactIncrementalErrorHandling', () => {
   });
 
   it('handles error thrown by host config while working on failed root', () => {
-    ReactNoop.simulateErrorInHostConfig(() => {
+    ReactNoop.simulateErrorInHostConfigDuringBeginPhase(() => {
       ReactNoop.render(<span />);
       expect(() => ReactNoop.flush()).toThrow('Error in host config.');
     });
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.js
index be1096dead..57bd42bc05 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.js
@@ -20,17 +20,8 @@ describe('ReactIncrementalErrorReplay', () => {
     ReactNoop = require('react-noop-renderer');
   });
 
-  function div(...children) {
-    children = children.map(c => (typeof c === 'string' ? {text: c} : c));
-    return {type: 'div', children, prop: undefined};
-  }
-
-  function span(prop) {
-    return {type: 'span', children: [], prop};
-  }
-
   it('should fail gracefully on error in the host environment', () => {
-    ReactNoop.simulateErrorInHostConfig(() => {
+    ReactNoop.simulateErrorInHostConfigDuringBeginPhase(() => {
       ReactNoop.render(<span />);
       expect(() => ReactNoop.flush()).toThrow('Error in host config.');
     });
diff --git a/packages/react/src/__tests__/ReactProfiler-test.internal.js b/packages/react/src/__tests__/ReactProfiler-test.internal.js
index 01d5d09514..48e9d1e6d5 100644
--- a/packages/react/src/__tests__/ReactProfiler-test.internal.js
+++ b/packages/react/src/__tests__/ReactProfiler-test.internal.js
@@ -11,11 +11,13 @@
 
 let React;
 let ReactFeatureFlags;
+let ReactNoop;
 let ReactTestRenderer;
 
 function loadModules({
   enableProfilerTimer = true,
   replayFailedUnitOfWorkWithInvokeGuardedCallback = false,
+  useNoopRenderer = false,
 } = {}) {
   ReactFeatureFlags = require('shared/ReactFeatureFlags');
   ReactFeatureFlags.debugRenderPhaseSideEffects = false;
@@ -24,9 +26,21 @@ function loadModules({
   ReactFeatureFlags.enableGetDerivedStateFromCatch = true;
   ReactFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback = replayFailedUnitOfWorkWithInvokeGuardedCallback;
   React = require('react');
-  ReactTestRenderer = require('react-test-renderer');
+
+  if (useNoopRenderer) {
+    ReactNoop = require('react-noop-renderer');
+  } else {
+    ReactTestRenderer = require('react-test-renderer');
+  }
 }
 
+const mockDevToolsForTest = () => {
+  jest.mock('react-reconciler/src/ReactFiberDevToolsHook', () => ({
+    injectInternals: () => {},
+    isDevToolsPresent: true,
+  }));
+};
+
 describe('Profiler', () => {
   describe('works in profiling and non-profiling bundles', () => {
     [true, false].forEach(flagEnabled => {
@@ -174,13 +188,17 @@ describe('Profiler', () => {
           <AdvanceTime />
           <AdvanceTime />
           <AdvanceTime />
+          <AdvanceTime />
+          <AdvanceTime />
         </div>,
       );
 
-      // Should be called twice: once to compute the update expiration time,
-      // and once to record the commit time.
+      // Should be called two times:
+      // 1. To mark the start (resuming) of work
+      // 2. To compute the update expiration time,
+      // 3. To record the commit time.
       // No additional calls from ProfilerTimer are expected.
-      expect(mockNow).toHaveBeenCalledTimes(2);
+      expect(mockNow).toHaveBeenCalledTimes(3);
     });
 
     it('logs render times for both mount and update', () => {
@@ -960,6 +978,35 @@ describe('Profiler', () => {
             // commit time
             expect(mountCall[5]).toBe(flagEnabled && __DEV__ ? 54 : 44);
           });
+
+          it('should reset the fiber stack correct after a "complete" phase error', () => {
+            jest.resetModules();
+
+            loadModules({
+              useNoopRenderer: true,
+              replayFailedUnitOfWorkWithInvokeGuardedCallback: flagEnabled,
+            });
+
+            // Simulate a renderer error during the "complete" phase.
+            // This mimics behavior like React Native's View/Text nesting validation.
+            ReactNoop.simulateErrorInHostConfigDuringCompletePhase(() => {
+              ReactNoop.render(
+                <React.unstable_Profiler id="profiler" onRender={jest.fn()}>
+                  <span>hi</span>
+                </React.unstable_Profiler>,
+              );
+              expect(ReactNoop.flush).toThrow('Error in host config.');
+            });
+
+            // So long as the profiler timer's fiber stack is reset correctly,
+            // Subsequent renders should not error.
+            ReactNoop.render(
+              <React.unstable_Profiler id="profiler" onRender={jest.fn()}>
+                <span>hi</span>
+              </React.unstable_Profiler>,
+            );
+            ReactNoop.flush();
+          });
         });
       });
     });
@@ -1002,4 +1049,64 @@ describe('Profiler', () => {
       expect(updateCall[4]).toBe(27); // start time
     });
   });
+
+  it('should handle interleaved async yields and batched commits', () => {
+    jest.resetModules();
+    mockDevToolsForTest();
+    loadModules({useNoopRenderer: true});
+
+    const Child = ({duration, id}) => {
+      ReactNoop.advanceTime(duration);
+      ReactNoop.yield(`Child:render:${id}`);
+      return null;
+    };
+
+    class Parent extends React.Component {
+      componentDidMount() {
+        ReactNoop.yield(`Parent:componentDidMount:${this.props.id}`);
+      }
+      render() {
+        const {duration, id} = this.props;
+        return (
+          <React.Fragment>
+            <Child duration={duration} id={id} />
+            <Child duration={duration} id={id} />
+          </React.Fragment>
+        );
+      }
+    }
+
+    ReactNoop.advanceTime(50);
+
+    ReactNoop.renderToRootWithID(<Parent duration={3} id="one" />, 'one');
+
+    // Process up to the <Parent> component, but yield before committing.
+    // This ensures that the profiler timer still has paused fibers.
+    const commitFirstRender = ReactNoop.flushWithoutCommitting(
+      ['Child:render:one', 'Child:render:one'],
+      'one',
+    );
+
+    expect(ReactNoop.getRoot('one').current.actualDuration).toBe(0);
+
+    ReactNoop.advanceTime(100);
+
+    // Process some async work, but yield before committing it.
+    ReactNoop.renderToRootWithID(<Parent duration={7} id="two" />, 'two');
+    ReactNoop.flushThrough(['Child:render:two']);
+
+    ReactNoop.advanceTime(150);
+
+    // Commit the previously paused, batched work.
+    commitFirstRender(['Parent:componentDidMount:one']);
+
+    expect(ReactNoop.getRoot('one').current.actualDuration).toBe(6);
+    expect(ReactNoop.getRoot('two').current.actualDuration).toBe(0);
+
+    ReactNoop.advanceTime(200);
+
+    ReactNoop.flush();
+
+    expect(ReactNoop.getRoot('two').current.actualDuration).toBe(14);
+  });
 });
diff --git a/packages/react/src/__tests__/ReactProfilerDevToolsIntegration-test.internal.js b/packages/react/src/__tests__/ReactProfilerDevToolsIntegration-test.internal.js
index 6fc396405e..2e20c376f3 100644
--- a/packages/react/src/__tests__/ReactProfilerDevToolsIntegration-test.internal.js
+++ b/packages/react/src/__tests__/ReactProfilerDevToolsIntegration-test.internal.js
@@ -108,4 +108,41 @@ describe('ReactProfiler DevTools integration', () => {
     // The updated 6ms for the component that does.
     expect(rendered.root.findByType(App)._currentFiber().treeBaseTime).toBe(15);
   });
+
+  it('should reset the fiber stack correctly after an error when profiling host roots', () => {
+    advanceTimeBy(20);
+
+    const rendered = ReactTestRenderer.create(
+      <div>
+        <AdvanceTime byAmount={2} />
+      </div>,
+    );
+
+    advanceTimeBy(20);
+
+    expect(() => {
+      rendered.update(
+        <div ref="this-will-cause-an-error">
+          <AdvanceTime byAmount={3} />
+        </div>,
+      );
+    }).toThrow();
+
+    advanceTimeBy(20);
+
+    // But this should render correctly, if the profiler's fiber stack has been reset.
+    rendered.update(
+      <div>
+        <AdvanceTime byAmount={7} />
+      </div>,
+    );
+
+    // Measure unobservable timing required by the DevTools profiler.
+    // At this point, the base time should include only the most recent (not failed) render.
+    // It should not include time spent on the initial render,
+    // Or time that elapsed between any of the above renders.
+    expect(rendered.root.findByType('div')._currentFiber().treeBaseTime).toBe(
+      7,
+    );
+  });
 });

From f5779bbc10ce85ac78fb54c9f20e71b5e32bb393 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 5 Jul 2018 19:42:22 +0100
Subject: [PATCH 201/277] Run server rendering test on bundles (#13153)

---
 ...verRendering-test.internal.js => ReactServerRendering-test.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/react-dom/src/__tests__/{ReactServerRendering-test.internal.js => ReactServerRendering-test.js} (100%)

diff --git a/packages/react-dom/src/__tests__/ReactServerRendering-test.internal.js b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
similarity index 100%
rename from packages/react-dom/src/__tests__/ReactServerRendering-test.internal.js
rename to packages/react-dom/src/__tests__/ReactServerRendering-test.js

From 1386ccddd8cecc5979d79c0e9bbbd59373c6a2fc Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 5 Jul 2018 19:42:45 +0100
Subject: [PATCH 202/277] Fix ReferenceError when requestAnimationFrame isn't
 defined (#13152)

* Make the test fail

* Fix rAF detection to avoid a ReferenceError
---
 .../react-dom/src/__tests__/ReactDOM-test.js  |  4 +-
 .../react-scheduler/src/ReactScheduler.js     | 42 ++++++++++++-------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOM-test.js b/packages/react-dom/src/__tests__/ReactDOM-test.js
index 8c21143d52..0b9e9ce44c 100644
--- a/packages/react-dom/src/__tests__/ReactDOM-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOM-test.js
@@ -434,10 +434,10 @@ describe('ReactDOM', () => {
     }
   });
 
-  it('warns when requestAnimationFrame is not polyfilled in the browser', () => {
+  it('warns when requestAnimationFrame is not polyfilled', () => {
     const previousRAF = global.requestAnimationFrame;
     try {
-      global.requestAnimationFrame = undefined;
+      delete global.requestAnimationFrame;
       jest.resetModules();
       expect(() => require('react-dom')).toWarnDev(
         "This browser doesn't support requestAnimationFrame.",
diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index 50252a827a..e59176411d 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -44,18 +44,6 @@ export type CallbackIdType = CallbackConfigType;
 import {canUseDOM} from 'shared/ExecutionEnvironment';
 import warning from 'shared/warning';
 
-if (__DEV__) {
-  if (canUseDOM && typeof requestAnimationFrame !== 'function') {
-    warning(
-      false,
-      // TODO: reword this when schedule is a stand-alone module
-      "This browser doesn't support requestAnimationFrame. " +
-        'Make sure that you load a ' +
-        'polyfill in older browsers. https://fb.me/react-polyfills',
-    );
-  }
-}
-
 // We capture a local reference to any global, in case it gets polyfilled after
 // this module is initially evaluated.
 // We want to be using a consistent implementation.
@@ -64,12 +52,24 @@ const localDate = Date;
 // This initialization code may run even on server environments
 // if a component just imports ReactDOM (e.g. for findDOMNode).
 // Some environments might not have setTimeout or clearTimeout.
+// However, we always expect them to be defined on the client.
 // https://github.com/facebook/react/pull/13088
 const localSetTimeout =
   typeof setTimeout === 'function' ? setTimeout : (undefined: any);
 const localClearTimeout =
   typeof clearTimeout === 'function' ? clearTimeout : (undefined: any);
 
+// We don't expect either of these to necessarily be defined,
+// but we will error later if they are missing on the client.
+const localRequestAnimationFrame =
+  typeof requestAnimationFrame === 'function'
+    ? requestAnimationFrame
+    : (undefined: any);
+const localCancelAnimationFrame =
+  typeof cancelAnimationFrame === 'function'
+    ? cancelAnimationFrame
+    : (undefined: any);
+
 const hasNativePerformanceNow =
   typeof performance === 'object' && typeof performance.now === 'function';
 
@@ -123,8 +123,22 @@ if (!canUseDOM) {
     localClearTimeout(timeoutId);
   };
 } else {
-  const localRequestAnimationFrame = requestAnimationFrame;
-  const localCancelAnimationFrame = cancelAnimationFrame;
+  if (typeof localRequestAnimationFrame !== 'function') {
+    warning(
+      false,
+      "This browser doesn't support requestAnimationFrame. " +
+        'Make sure that you load a ' +
+        'polyfill in older browsers. https://fb.me/react-polyfills',
+    );
+  }
+  if (typeof localCancelAnimationFrame !== 'function') {
+    warning(
+      false,
+      "This browser doesn't support cancelAnimationFrame. " +
+        'Make sure that you load a ' +
+        'polyfill in older browsers. https://fb.me/react-polyfills',
+    );
+  }
 
   let headOfPendingCallbacksLinkedList: CallbackConfigType | null = null;
   let tailOfPendingCallbacksLinkedList: CallbackConfigType | null = null;

From 6f6b560a645adb595ba1e40630a3915d8abdf038 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Fri, 6 Jul 2018 08:25:29 -0700
Subject: [PATCH 203/277] Renamed selfBaseTime/treeBaseTime Fiber attributes to
 selfBaseDuration/treeBaseDuration (#13156)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is an unobservable change to all but the (under development) DevTools Profiler plugin. It is being done so that the plugin can safely feature detect a version of React that supports it. The profiler API has existed since the 16.4.0 release, but it did not support the DevTools plugin prior to PR #13058.

Side note: I am not a big fan of the term "base duration". Both it and "actual duration" are kind of awkward and vague. If anyone has suggestions for better names– this is the best time to bikeshed about them.
---
 packages/react-reconciler/src/ReactFiber.js      | 16 ++++++++--------
 .../react-reconciler/src/ReactFiberCommitWork.js |  2 +-
 .../react-reconciler/src/ReactFiberScheduler.js  |  6 +++---
 .../react-reconciler/src/ReactProfilerTimer.js   |  2 +-
 ...tProfilerDevToolsIntegration-test.internal.js | 14 +++++++++-----
 5 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js
index e73ca22142..0b40046856 100644
--- a/packages/react-reconciler/src/ReactFiber.js
+++ b/packages/react-reconciler/src/ReactFiber.js
@@ -166,12 +166,12 @@ export type Fiber = {|
   // Duration of the most recent render time for this Fiber.
   // This value is not updated when we bailout for memoization purposes.
   // This field is only set when the enableProfilerTimer flag is enabled.
-  selfBaseTime?: number,
+  selfBaseDuration?: number,
 
   // Sum of base times for all descedents of this Fiber.
   // This value bubbles up during the "complete" phase.
   // This field is only set when the enableProfilerTimer flag is enabled.
-  treeBaseTime?: number,
+  treeBaseDuration?: number,
 
   // Conceptual aliases
   // workInProgress : Fiber ->  alternate The alternate used for reuse happens
@@ -230,8 +230,8 @@ function FiberNode(
   if (enableProfilerTimer) {
     this.actualDuration = 0;
     this.actualStartTime = 0;
-    this.selfBaseTime = 0;
-    this.treeBaseTime = 0;
+    this.selfBaseDuration = 0;
+    this.treeBaseDuration = 0;
   }
 
   if (__DEV__) {
@@ -338,8 +338,8 @@ export function createWorkInProgress(
   workInProgress.ref = current.ref;
 
   if (enableProfilerTimer) {
-    workInProgress.selfBaseTime = current.selfBaseTime;
-    workInProgress.treeBaseTime = current.treeBaseTime;
+    workInProgress.selfBaseDuration = current.selfBaseDuration;
+    workInProgress.treeBaseDuration = current.treeBaseDuration;
   }
 
   return workInProgress;
@@ -569,8 +569,8 @@ export function assignFiberPropertiesInDEV(
   if (enableProfilerTimer) {
     target.actualDuration = source.actualDuration;
     target.actualStartTime = source.actualStartTime;
-    target.selfBaseTime = source.selfBaseTime;
-    target.treeBaseTime = source.treeBaseTime;
+    target.selfBaseDuration = source.selfBaseDuration;
+    target.treeBaseDuration = source.treeBaseDuration;
   }
   target._debugID = source._debugID;
   target._debugSource = source._debugSource;
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index f0af9ff180..9eb54495a9 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -830,7 +830,7 @@ function commitWork(current: Fiber | null, finishedWork: Fiber): void {
           finishedWork.memoizedProps.id,
           current === null ? 'mount' : 'update',
           finishedWork.actualDuration,
-          finishedWork.treeBaseTime,
+          finishedWork.treeBaseDuration,
           finishedWork.actualStartTime,
           getCommitTime(),
         );
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 2f10fb537f..c4f3c8aeec 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -736,10 +736,10 @@ function resetExpirationTime(
   // Bubble up the earliest expiration time.
   // (And "base" render timers if that feature flag is enabled)
   if (enableProfilerTimer && workInProgress.mode & ProfileMode) {
-    let treeBaseTime = workInProgress.selfBaseTime;
+    let treeBaseDuration = workInProgress.selfBaseDuration;
     let child = workInProgress.child;
     while (child !== null) {
-      treeBaseTime += child.treeBaseTime;
+      treeBaseDuration += child.treeBaseDuration;
       if (
         child.expirationTime !== NoWork &&
         (newExpirationTime === NoWork ||
@@ -749,7 +749,7 @@ function resetExpirationTime(
       }
       child = child.sibling;
     }
-    workInProgress.treeBaseTime = treeBaseTime;
+    workInProgress.treeBaseDuration = treeBaseDuration;
   } else {
     let child = workInProgress.child;
     while (child !== null) {
diff --git a/packages/react-reconciler/src/ReactProfilerTimer.js b/packages/react-reconciler/src/ReactProfilerTimer.js
index fe43dac6fb..7f707141d9 100644
--- a/packages/react-reconciler/src/ReactProfilerTimer.js
+++ b/packages/react-reconciler/src/ReactProfilerTimer.js
@@ -153,7 +153,7 @@ function recordElapsedBaseRenderTimeIfRunning(fiber: Fiber): void {
     return;
   }
   if (baseStartTime !== -1) {
-    fiber.selfBaseTime = now() - baseStartTime;
+    fiber.selfBaseDuration = now() - baseStartTime;
   }
 }
 
diff --git a/packages/react/src/__tests__/ReactProfilerDevToolsIntegration-test.internal.js b/packages/react/src/__tests__/ReactProfilerDevToolsIntegration-test.internal.js
index 2e20c376f3..bff7ad131c 100644
--- a/packages/react/src/__tests__/ReactProfilerDevToolsIntegration-test.internal.js
+++ b/packages/react/src/__tests__/ReactProfilerDevToolsIntegration-test.internal.js
@@ -92,7 +92,9 @@ describe('ReactProfiler DevTools integration', () => {
     // At this point, the base time should include both:
     // The time 2ms in the App component itself, and
     // The 10ms spend in the Profiler sub-tree beneath.
-    expect(rendered.root.findByType(App)._currentFiber().treeBaseTime).toBe(12);
+    expect(rendered.root.findByType(App)._currentFiber().treeBaseDuration).toBe(
+      12,
+    );
 
     rendered.update(<App multiplier={2} />);
 
@@ -106,7 +108,9 @@ describe('ReactProfiler DevTools integration', () => {
     // At this point, the base time should include both:
     // The initial 9ms for the components that do not re-render, and
     // The updated 6ms for the component that does.
-    expect(rendered.root.findByType(App)._currentFiber().treeBaseTime).toBe(15);
+    expect(rendered.root.findByType(App)._currentFiber().treeBaseDuration).toBe(
+      15,
+    );
   });
 
   it('should reset the fiber stack correctly after an error when profiling host roots', () => {
@@ -141,8 +145,8 @@ describe('ReactProfiler DevTools integration', () => {
     // At this point, the base time should include only the most recent (not failed) render.
     // It should not include time spent on the initial render,
     // Or time that elapsed between any of the above renders.
-    expect(rendered.root.findByType('div')._currentFiber().treeBaseTime).toBe(
-      7,
-    );
+    expect(
+      rendered.root.findByType('div')._currentFiber().treeBaseDuration,
+    ).toBe(7);
   });
 });

From f762b3abb1d951b366f3c8a2354aeedb7fbc32ff Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 6 Jul 2018 16:43:43 +0100
Subject: [PATCH 204/277] Run react-dom SSR import test in jsdom-less
 environment (#13157)

---
 .../react-dom/src/__tests__/ReactDOM-test.js  | 22 -----------
 .../__tests__/ReactServerRendering-test.js    | 21 ++++++++++
 scripts/jest/setupEnvironment.js              | 38 +++++++++----------
 3 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOM-test.js b/packages/react-dom/src/__tests__/ReactDOM-test.js
index 0b9e9ce44c..97842417dc 100644
--- a/packages/react-dom/src/__tests__/ReactDOM-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOM-test.js
@@ -446,26 +446,4 @@ describe('ReactDOM', () => {
       global.requestAnimationFrame = previousRAF;
     }
   });
-
-  // We're just testing importing, not using it.
-  // It is important because even isomorphic components may import it.
-  it('can import findDOMNode in Node environment', () => {
-    const previousRAF = global.requestAnimationFrame;
-    const previousRIC = global.requestIdleCallback;
-    const prevWindow = global.window;
-    try {
-      global.requestAnimationFrame = undefined;
-      global.requestIdleCallback = undefined;
-      // Simulate the Node environment:
-      delete global.window;
-      jest.resetModules();
-      expect(() => {
-        require('react-dom');
-      }).not.toThrow();
-    } finally {
-      global.requestAnimationFrame = previousRAF;
-      global.requestIdleCallback = previousRIC;
-      global.window = prevWindow;
-    }
-  });
 });
diff --git a/packages/react-dom/src/__tests__/ReactServerRendering-test.js b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
index b7c6eca3de..a07a842b33 100644
--- a/packages/react-dom/src/__tests__/ReactServerRendering-test.js
+++ b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
@@ -643,4 +643,25 @@ describe('ReactDOMServer', () => {
       ReactDOMServer.renderToString(<ClassWithRenderNotExtended />);
     }).toThrow(TypeError);
   });
+
+  // We're just testing importing, not using it.
+  // It is important because even isomorphic components may import it.
+  it('can import react-dom in Node environment', () => {
+    if (
+      typeof requestAnimationFrame !== 'undefined' ||
+      global.hasOwnProperty('requestAnimationFrame') ||
+      typeof requestIdleCallback !== 'undefined' ||
+      global.hasOwnProperty('requestIdleCallback') ||
+      typeof window !== 'undefined' ||
+      global.hasOwnProperty('window')
+    ) {
+      // Don't remove this. This test is specifically checking
+      // what happens when they *don't* exist. It's useless otherwise.
+      throw new Error('Expected this test to run in a Node environment.');
+    }
+    jest.resetModules();
+    expect(() => {
+      require('react-dom');
+    }).not.toThrow();
+  });
 });
diff --git a/scripts/jest/setupEnvironment.js b/scripts/jest/setupEnvironment.js
index 6780cdb062..cacaf1db9d 100644
--- a/scripts/jest/setupEnvironment.js
+++ b/scripts/jest/setupEnvironment.js
@@ -7,24 +7,6 @@ if (NODE_ENV !== 'development' && NODE_ENV !== 'production') {
 global.__DEV__ = NODE_ENV === 'development';
 global.__PROFILE__ = NODE_ENV === 'development';
 
-global.requestAnimationFrame = function(callback) {
-  setTimeout(callback);
-};
-
-global.requestIdleCallback = function(callback) {
-  return setTimeout(() => {
-    callback({
-      timeRemaining() {
-        return Infinity;
-      },
-    });
-  });
-};
-
-global.cancelIdleCallback = function(callbackID) {
-  clearTimeout(callbackID);
-};
-
 // By default React console.error()'s any errors, caught or uncaught.
 // However it is annoying to assert that a warning fired each time
 // we assert that there is an exception in our tests. This lets us
@@ -34,7 +16,25 @@ global.cancelIdleCallback = function(callbackID) {
 Error.prototype.suppressReactErrorLogging = true;
 
 if (typeof window !== 'undefined') {
-  // Same as above.
+  global.requestAnimationFrame = function(callback) {
+    setTimeout(callback);
+  };
+
+  global.requestIdleCallback = function(callback) {
+    return setTimeout(() => {
+      callback({
+        timeRemaining() {
+          return Infinity;
+        },
+      });
+    });
+  };
+
+  global.cancelIdleCallback = function(callbackID) {
+    clearTimeout(callbackID);
+  };
+
+  // Same as we did with Error.prototype above.
   DOMException.prototype.suppressReactErrorLogging = true;
 
   // Also prevent JSDOM from logging intentionally thrown errors.

From 449f6ddd5c075da965ec430015c66977c38db8d3 Mon Sep 17 00:00:00 2001
From: Chang Yan <cyan.binary@gmail.com>
Date: Fri, 6 Jul 2018 12:55:29 -0700
Subject: [PATCH 205/277] create a new FeatureFlags file for test renderer on
 www (#13159)

---
 .../ReactFeatureFlags.test-renderer.www.js    | 34 +++++++++++++++++++
 scripts/rollup/forks.js                       |  6 ++++
 2 files changed, 40 insertions(+)
 create mode 100644 packages/shared/forks/ReactFeatureFlags.test-renderer.www.js

diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js
new file mode 100644
index 0000000000..bb02dc0296
--- /dev/null
+++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import invariant from 'shared/invariant';
+
+import typeof * as FeatureFlagsType from 'shared/ReactFeatureFlags';
+import typeof * as PersistentFeatureFlagsType from './ReactFeatureFlags.persistent';
+
+export const debugRenderPhaseSideEffects = false;
+export const debugRenderPhaseSideEffectsForStrictMode = false;
+export const enableUserTimingAPI = __DEV__;
+export const enableGetDerivedStateFromCatch = false;
+export const enableSuspense = true;
+export const warnAboutDeprecatedLifecycles = false;
+export const warnAboutLegacyContextAPI = false;
+export const replayFailedUnitOfWorkWithInvokeGuardedCallback = false;
+export const enableProfilerTimer = false;
+
+// Only used in www builds.
+export function addUserTimingListener() {
+  invariant(false, 'Not implemented.');
+}
+
+// Flow magic to verify the exports of this file match the original version.
+// eslint-disable-next-line no-unused-vars
+type Check<_X, Y: _X, X: Y = _X> = null;
+// eslint-disable-next-line no-unused-expressions
+(null: Check<PersistentFeatureFlagsType, FeatureFlagsType>);
diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js
index 827050ac32..682a4cd767 100644
--- a/scripts/rollup/forks.js
+++ b/scripts/rollup/forks.js
@@ -74,6 +74,12 @@ const forks = Object.freeze({
       case 'react-reconciler/persistent':
         return 'shared/forks/ReactFeatureFlags.persistent.js';
       case 'react-test-renderer':
+        switch (bundleType) {
+          case FB_WWW_DEV:
+          case FB_WWW_PROD:
+          case FB_WWW_PROFILING:
+            return 'shared/forks/ReactFeatureFlags.test-renderer.www.js';
+        }
         return 'shared/forks/ReactFeatureFlags.test-renderer.js';
       default:
         switch (bundleType) {

From 3596e40b394385713049d996c5ba293f746b7561 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Fri, 6 Jul 2018 13:55:18 -0700
Subject: [PATCH 206/277] Fix nested update bug (#13160)

A recent change to the scheduler caused a regression when scheduling
many updates within a single batch. Added a test case that would
have caught this.
---
 .../src/__tests__/ReactUpdates-test.js        | 33 +++++++++++++++++++
 .../src/ReactFiberScheduler.js                | 28 ++++++++--------
 2 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactUpdates-test.js b/packages/react-dom/src/__tests__/ReactUpdates-test.js
index ecf5c34671..b29af8f52f 100644
--- a/packages/react-dom/src/__tests__/ReactUpdates-test.js
+++ b/packages/react-dom/src/__tests__/ReactUpdates-test.js
@@ -1364,4 +1364,37 @@ describe('ReactUpdates', () => {
       ReactDOM.render(<NonTerminating />, container);
     }).toThrow('Maximum');
   });
+
+  it('can schedule ridiculously many updates within the same batch without triggering a maximum update error', () => {
+    const subscribers = [];
+
+    class Child extends React.Component {
+      state = {value: 'initial'};
+      componentDidMount() {
+        subscribers.push(this);
+      }
+      render() {
+        return null;
+      }
+    }
+
+    class App extends React.Component {
+      render() {
+        const children = [];
+        for (let i = 0; i < 1200; i++) {
+          children.push(<Child key={i} />);
+        }
+        return children;
+      }
+    }
+
+    const container = document.createElement('div');
+    ReactDOM.render(<App />, container);
+
+    ReactDOM.unstable_batchedUpdates(() => {
+      subscribers.forEach(s => {
+        s.setState({value: 'update'});
+      });
+    });
+  });
 });
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index c4f3c8aeec..91b7916876 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -1474,6 +1474,8 @@ function scheduleWork(fiber: Fiber, expirationTime: ExpirationTime) {
     requestWork(root, rootExpirationTime);
   }
   if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
+    // Reset this back to zero so subsequent updates don't throw.
+    nestedUpdateCount = 0;
     invariant(
       false,
       'Maximum update depth exceeded. This can happen when a ' +
@@ -1544,6 +1546,7 @@ let currentSchedulerTime: ExpirationTime = currentRendererTime;
 // Use these to prevent an infinite loop of nested updates
 const NESTED_UPDATE_LIMIT = 1000;
 let nestedUpdateCount: number = 0;
+let lastCommittedRootDuringThisBatch: FiberRoot | null = null;
 
 const timeHeuristicForUnitOfWork = 1;
 
@@ -1798,19 +1801,6 @@ function findHighestPriorityRoot() {
     }
   }
 
-  // If the next root is the same as the previous root, this is a nested
-  // update. To prevent an infinite loop, increment the nested update count.
-  const previousFlushedRoot = nextFlushedRoot;
-  if (
-    previousFlushedRoot !== null &&
-    previousFlushedRoot === highestPriorityRoot &&
-    highestPriorityWork === Sync
-  ) {
-    nestedUpdateCount++;
-  } else {
-    // Reset whenever we switch roots.
-    nestedUpdateCount = 0;
-  }
   nextFlushedRoot = highestPriorityRoot;
   nextFlushedExpirationTime = highestPriorityWork;
 }
@@ -1911,6 +1901,7 @@ function flushRoot(root: FiberRoot, expirationTime: ExpirationTime) {
 
 function finishRendering() {
   nestedUpdateCount = 0;
+  lastCommittedRootDuringThisBatch = null;
 
   if (completedBatches !== null) {
     const batches = completedBatches;
@@ -2046,6 +2037,17 @@ function completeRoot(
   // Commit the root.
   root.finishedWork = null;
 
+  // Check if this is a nested update (a sync update scheduled during the
+  // commit phase).
+  if (root === lastCommittedRootDuringThisBatch) {
+    // If the next root is the same as the previous root, this is a nested
+    // update. To prevent an infinite loop, increment the nested update count.
+    nestedUpdateCount++;
+  } else {
+    // Reset whenever we switch roots.
+    lastCommittedRootDuringThisBatch = root;
+    nestedUpdateCount = 0;
+  }
   commitRoot(root, finishedWork);
 }
 

From ddc91af7957f3cca6910a95cef71076897ebdb53 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Fri, 6 Jul 2018 15:50:31 -0700
Subject: [PATCH 207/277] Decrease nested update limit from 1000 to 50 (#13163)

An infinite update loop can occur when an update is scheduled inside a
lifecycle method, which causes a re-render, which schedules another
update, and so on. Before the Fiber rewrite, this scenario resulted in a
stack overflow.

Because Fiber does not use the JavaScript stack, we maintain our own
counter to track the number of nested, synchronous updates. We throw an
error if the limit is exceeded.

The nested update limit is currently 1000. I chose this number
arbitrarily, certain that there was no valid reason for a component to
schedule so many synchronous re-renders.

I think we can go much lower. This commit decreases the limit to 50. I
believe this is still comfortably above the reasonable number of
synchronous re-renders a component may perform.

This will make it easier for developers to debug infinite update bugs
when they occur.
---
 packages/react-reconciler/src/ReactFiberScheduler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 91b7916876..f18d833438 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -1544,7 +1544,7 @@ let currentRendererTime: ExpirationTime = msToExpirationTime(
 let currentSchedulerTime: ExpirationTime = currentRendererTime;
 
 // Use these to prevent an infinite loop of nested updates
-const NESTED_UPDATE_LIMIT = 1000;
+const NESTED_UPDATE_LIMIT = 50;
 let nestedUpdateCount: number = 0;
 let lastCommittedRootDuringThisBatch: FiberRoot | null = null;
 

From ebbd2214326ca6a5f24f46ea7eaffc6cfabbbe1c Mon Sep 17 00:00:00 2001
From: Brandon Dail <aweary@users.noreply.github.com>
Date: Fri, 6 Jul 2018 16:04:45 -0700
Subject: [PATCH 208/277] Configure react-test-renderer as a secondary (#13164)

---
 .../react-art/src/__tests__/ReactART-test.js  | 15 ++++++++-------
 .../src/ReactTestHostConfig.js                |  2 +-
 .../ReactTestRenderer-test.internal.js        | 19 +++++++++++++++++++
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/packages/react-art/src/__tests__/ReactART-test.js b/packages/react-art/src/__tests__/ReactART-test.js
index d2ce830aa8..7e783b5582 100644
--- a/packages/react-art/src/__tests__/ReactART-test.js
+++ b/packages/react-art/src/__tests__/ReactART-test.js
@@ -28,6 +28,10 @@ const Circle = require('react-art/Circle');
 const Rectangle = require('react-art/Rectangle');
 const Wedge = require('react-art/Wedge');
 
+// Isolate the noop renderer
+jest.resetModules();
+const ReactNoop = require('react-noop-renderer');
+
 let Group;
 let Shape;
 let Surface;
@@ -354,7 +358,7 @@ describe('ReactART', () => {
     const CurrentRendererContext = React.createContext(null);
 
     function Yield(props) {
-      testRenderer.unstable_yield(props.value);
+      ReactNoop.yield(props.value);
       return null;
     }
 
@@ -372,19 +376,16 @@ describe('ReactART', () => {
 
     // Using test renderer instead of the DOM renderer here because async
     // testing APIs for the DOM renderer don't exist.
-    const testRenderer = ReactTestRenderer.create(
+    ReactNoop.render(
       <CurrentRendererContext.Provider value="Test">
         <Yield value="A" />
         <Yield value="B" />
         <LogCurrentRenderer />
         <Yield value="C" />
       </CurrentRendererContext.Provider>,
-      {
-        unstable_isAsync: true,
-      },
     );
 
-    testRenderer.unstable_flushThrough(['A']);
+    ReactNoop.flushThrough(['A']);
 
     ReactDOM.render(
       <Surface>
@@ -399,7 +400,7 @@ describe('ReactART', () => {
     expect(ops).toEqual([null, 'ART']);
 
     ops = [];
-    expect(testRenderer.unstable_flushAll()).toEqual(['B', 'C']);
+    expect(ReactNoop.flush()).toEqual(['B', 'C']);
 
     expect(ops).toEqual(['Test']);
   });
diff --git a/packages/react-test-renderer/src/ReactTestHostConfig.js b/packages/react-test-renderer/src/ReactTestHostConfig.js
index 7c7bf958ab..e42a8c4bae 100644
--- a/packages/react-test-renderer/src/ReactTestHostConfig.js
+++ b/packages/react-test-renderer/src/ReactTestHostConfig.js
@@ -180,7 +180,7 @@ export function createTextInstance(
   };
 }
 
-export const isPrimaryRenderer = true;
+export const isPrimaryRenderer = false;
 // This approach enables `now` to be mocked by tests,
 // Even after the reconciler has initialized and read host config values.
 export const now = () => TestRendererScheduling.nowImplementation();
diff --git a/packages/react-test-renderer/src/__tests__/ReactTestRenderer-test.internal.js b/packages/react-test-renderer/src/__tests__/ReactTestRenderer-test.internal.js
index 1f463f9172..1ea2bdaeb6 100644
--- a/packages/react-test-renderer/src/__tests__/ReactTestRenderer-test.internal.js
+++ b/packages/react-test-renderer/src/__tests__/ReactTestRenderer-test.internal.js
@@ -16,6 +16,10 @@ const React = require('react');
 const ReactTestRenderer = require('react-test-renderer');
 const prettyFormat = require('pretty-format');
 
+// Isolate noop renderer
+jest.resetModules();
+const ReactNoop = require('react-noop-renderer');
+
 // Kind of hacky, but we nullify all the instances to test the tree structure
 // with jasmine's deep equality function, and test the instances separate. We
 // also delete children props because testing them is more annoying and not
@@ -1000,4 +1004,19 @@ describe('ReactTestRenderer', () => {
       }),
     );
   });
+
+  it('can concurrently render context with a "primary" renderer', () => {
+    const Context = React.createContext(null);
+    const Indirection = React.Fragment;
+    const App = () => (
+      <Context.Provider>
+        <Indirection>
+          <Context.Consumer>{() => null}</Context.Consumer>
+        </Indirection>
+      </Context.Provider>
+    );
+    ReactNoop.render(<App />);
+    ReactNoop.flush();
+    ReactTestRenderer.create(<App />);
+  });
 });

From 566259567773a0af56e6c19da615e6802d73f834 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Sat, 7 Jul 2018 01:09:41 +0100
Subject: [PATCH 209/277] Refactor stack handling (no functional changes)
 (#13165)

* Refactor ReactDebugCurrentFiber to use named exports

This makes the difference between it and ReactFiberCurrentFrame a bit clearer.

ReactDebugCurrentFiber is Fiber's own implementation.
ReactFiberCurrentFrame is the thing that holds a reference to the current implementation and delegates to it.

* Unify ReactFiberComponentTreeHook and ReactDebugCurrentFiber

Conceptually they're very related.

ReactFiberComponentTreeHook contains implementation details of reading Fiber's stack (both in DEV and PROD).
ReactDebugCurrentFiber contained a reference to the current fiber, and used the above utility.

It was confusing when to use which one. Colocating them makes it clearer what you could do with each method.

In the future, the plan is to stop using these methods explicitly in most places, and instead delegate to a warning system that includes stacks automatically. This change makes future refactorings simpler by colocating related logic.

* Rename methods to better reflect their meanings

Clarify which are DEV or PROD-only.
Clarify which can return null.

I believe the "work in progress only" was a mistake. I introduced it because I wasn't sure what guarantees we have around .return. But we know for sure that following a .return chain gives us an accurate stack even if we get into WIP trees because we don't have reparenting. So it's fine to relax that naming.

* Rename ReactDebugCurrentFiber -> ReactCurrentFiber

It's not completely DEV-only anymore.
Individual methods already specify whether they work in DEV or PROD in their names.
---
 .../src/client/ReactDOMFiberComponent.js      |  39 ++++---
 .../src/client/ReactDOMFiberInput.js          |  19 ++--
 .../src/client/ReactDOMFiberSelect.js         |  14 ++-
 .../src/client/ReactDOMFiberTextarea.js       |   5 +-
 .../src/client/validateDOMNesting.js          |   5 +-
 .../src/ReactNativeRenderer.js                |   6 +-
 .../src/ReactCapturedValue.js                 |   4 +-
 .../react-reconciler/src/ReactChildFiber.js   |  24 ++---
 .../react-reconciler/src/ReactCurrentFiber.js | 101 ++++++++++++++++++
 .../src/ReactDebugCurrentFiber.js             |  71 ------------
 .../src/ReactFiberBeginWork.js                |  26 +++--
 .../src/ReactFiberCommitWork.js               |  12 +--
 .../react-reconciler/src/ReactFiberContext.js |  10 +-
 .../src/ReactFiberReconciler.js               |   8 +-
 .../src/ReactFiberScheduler.js                |  21 ++--
 .../src/ReactStrictModeWarnings.js            |   7 +-
 .../shared/ReactFiberComponentTreeHook.js     |  54 ----------
 17 files changed, 201 insertions(+), 225 deletions(-)
 create mode 100644 packages/react-reconciler/src/ReactCurrentFiber.js
 delete mode 100644 packages/react-reconciler/src/ReactDebugCurrentFiber.js
 delete mode 100644 packages/shared/ReactFiberComponentTreeHook.js

diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js
index c7ec03ed12..2839a92fb4 100644
--- a/packages/react-dom/src/client/ReactDOMFiberComponent.js
+++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js
@@ -8,7 +8,10 @@
  */
 
 // TODO: direct imports like some-package/src/* are bad. Fix me.
-import ReactDebugCurrentFiber from 'react-reconciler/src/ReactDebugCurrentFiber';
+import {
+  getCurrentFiberOwnerNameInDevOrNull,
+  getCurrentFiberStackInDevOrNull,
+} from 'react-reconciler/src/ReactCurrentFiber';
 import {registrationNameModules} from 'events/EventPluginRegistry';
 import warning from 'shared/warning';
 
@@ -45,10 +48,6 @@ import {validateProperties as validateARIAProperties} from '../shared/ReactDOMIn
 import {validateProperties as validateInputProperties} from '../shared/ReactDOMNullInputValuePropHook';
 import {validateProperties as validateUnknownProperties} from '../shared/ReactDOMUnknownPropertyHook';
 
-const {
-  getCurrentFiberOwnerName,
-  getCurrentFiberStackAddendum,
-} = ReactDebugCurrentFiber;
 let didWarnInvalidHydration = false;
 let didWarnShadyDOM = false;
 
@@ -62,7 +61,7 @@ const HTML = '__html';
 
 const {html: HTML_NAMESPACE} = Namespaces;
 
-let getStack = () => '';
+let getStackInDevOrNull = () => '';
 
 let warnedUnknownTags;
 let suppressHydrationWarning;
@@ -77,7 +76,7 @@ let normalizeMarkupForTextOrAttribute;
 let normalizeHTML;
 
 if (__DEV__) {
-  getStack = getCurrentFiberStackAddendum;
+  getStackInDevOrNull = getCurrentFiberStackInDevOrNull;
 
   warnedUnknownTags = {
     // Chrome is the only major browser not shipping <time>. But as of July
@@ -181,7 +180,7 @@ if (__DEV__) {
         registrationName,
         registrationName,
         registrationName,
-        getCurrentFiberStackAddendum(),
+        getCurrentFiberStackInDevOrNull(),
       );
     } else {
       warning(
@@ -189,7 +188,7 @@ if (__DEV__) {
         'Expected `%s` listener to be a function, instead got a value of `%s` type.%s',
         registrationName,
         typeof listener,
-        getCurrentFiberStackAddendum(),
+        getCurrentFiberStackInDevOrNull(),
       );
     }
   };
@@ -267,7 +266,11 @@ function setInitialDOMProperties(
         }
       }
       // Relies on `updateStylesByID` not mutating `styleUpdates`.
-      CSSPropertyOperations.setValueForStyles(domElement, nextProp, getStack);
+      CSSPropertyOperations.setValueForStyles(
+        domElement,
+        nextProp,
+        getStackInDevOrNull,
+      );
     } else if (propKey === DANGEROUSLY_SET_INNER_HTML) {
       const nextHtml = nextProp ? nextProp[HTML] : undefined;
       if (nextHtml != null) {
@@ -323,7 +326,11 @@ function updateDOMProperties(
     const propKey = updatePayload[i];
     const propValue = updatePayload[i + 1];
     if (propKey === STYLE) {
-      CSSPropertyOperations.setValueForStyles(domElement, propValue, getStack);
+      CSSPropertyOperations.setValueForStyles(
+        domElement,
+        propValue,
+        getStackInDevOrNull,
+      );
     } else if (propKey === DANGEROUSLY_SET_INNER_HTML) {
       setInnerHTML(domElement, propValue);
     } else if (propKey === CHILDREN) {
@@ -442,7 +449,7 @@ export function setInitialProperties(
         false,
         '%s is using shady DOM. Using shady DOM with React can ' +
           'cause things to break subtly.',
-        getCurrentFiberOwnerName() || 'A component',
+        getCurrentFiberOwnerNameInDevOrNull() || 'A component',
       );
       didWarnShadyDOM = true;
     }
@@ -516,7 +523,7 @@ export function setInitialProperties(
       props = rawProps;
   }
 
-  assertValidProps(tag, props, getStack);
+  assertValidProps(tag, props, getStackInDevOrNull);
 
   setInitialDOMProperties(
     tag,
@@ -604,7 +611,7 @@ export function diffProperties(
       break;
   }
 
-  assertValidProps(tag, nextProps, getStack);
+  assertValidProps(tag, nextProps, getStackInDevOrNull);
 
   let propKey;
   let styleName;
@@ -834,7 +841,7 @@ export function diffHydratedProperties(
         false,
         '%s is using shady DOM. Using shady DOM with React can ' +
           'cause things to break subtly.',
-        getCurrentFiberOwnerName() || 'A component',
+        getCurrentFiberOwnerNameInDevOrNull() || 'A component',
       );
       didWarnShadyDOM = true;
     }
@@ -895,7 +902,7 @@ export function diffHydratedProperties(
       break;
   }
 
-  assertValidProps(tag, rawProps, getStack);
+  assertValidProps(tag, rawProps, getStackInDevOrNull);
 
   if (__DEV__) {
     extraAttributeNames = new Set();
diff --git a/packages/react-dom/src/client/ReactDOMFiberInput.js b/packages/react-dom/src/client/ReactDOMFiberInput.js
index 07b4752182..82603a64ca 100644
--- a/packages/react-dom/src/client/ReactDOMFiberInput.js
+++ b/packages/react-dom/src/client/ReactDOMFiberInput.js
@@ -8,7 +8,10 @@
  */
 
 // TODO: direct imports like some-package/src/* are bad. Fix me.
-import ReactDebugCurrentFiber from 'react-reconciler/src/ReactDebugCurrentFiber';
+import {
+  getCurrentFiberOwnerNameInDevOrNull,
+  getCurrentFiberStackInDevOrNull,
+} from 'react-reconciler/src/ReactCurrentFiber';
 import invariant from 'shared/invariant';
 import warning from 'shared/warning';
 
@@ -25,10 +28,6 @@ type InputWithWrapperState = HTMLInputElement & {
   },
 };
 
-const {
-  getCurrentFiberOwnerName,
-  getCurrentFiberStackAddendum,
-} = ReactDebugCurrentFiber;
 let didWarnValueDefaultValue = false;
 let didWarnCheckedDefaultChecked = false;
 let didWarnControlledToUncontrolled = false;
@@ -75,7 +74,7 @@ export function initWrapperState(element: Element, props: Object) {
     ReactControlledValuePropTypes.checkPropTypes(
       'input',
       props,
-      getCurrentFiberStackAddendum,
+      getCurrentFiberStackInDevOrNull,
     );
 
     if (
@@ -91,7 +90,7 @@ export function initWrapperState(element: Element, props: Object) {
           'both). Decide between using a controlled or uncontrolled input ' +
           'element and remove one of these props. More info: ' +
           'https://fb.me/react-controlled-components',
-        getCurrentFiberOwnerName() || 'A component',
+        getCurrentFiberOwnerNameInDevOrNull() || 'A component',
         props.type,
       );
       didWarnCheckedDefaultChecked = true;
@@ -109,7 +108,7 @@ export function initWrapperState(element: Element, props: Object) {
           'both). Decide between using a controlled or uncontrolled input ' +
           'element and remove one of these props. More info: ' +
           'https://fb.me/react-controlled-components',
-        getCurrentFiberOwnerName() || 'A component',
+        getCurrentFiberOwnerNameInDevOrNull() || 'A component',
         props.type,
       );
       didWarnValueDefaultValue = true;
@@ -154,7 +153,7 @@ export function updateWrapper(element: Element, props: Object) {
           'Decide between using a controlled or uncontrolled input ' +
           'element for the lifetime of the component. More info: https://fb.me/react-controlled-components%s',
         props.type,
-        getCurrentFiberStackAddendum(),
+        getCurrentFiberStackInDevOrNull(),
       );
       didWarnUncontrolledToControlled = true;
     }
@@ -170,7 +169,7 @@ export function updateWrapper(element: Element, props: Object) {
           'Decide between using a controlled or uncontrolled input ' +
           'element for the lifetime of the component. More info: https://fb.me/react-controlled-components%s',
         props.type,
-        getCurrentFiberStackAddendum(),
+        getCurrentFiberStackInDevOrNull(),
       );
       didWarnControlledToUncontrolled = true;
     }
diff --git a/packages/react-dom/src/client/ReactDOMFiberSelect.js b/packages/react-dom/src/client/ReactDOMFiberSelect.js
index 21c7e62ece..1f03a93a05 100644
--- a/packages/react-dom/src/client/ReactDOMFiberSelect.js
+++ b/packages/react-dom/src/client/ReactDOMFiberSelect.js
@@ -8,16 +8,14 @@
  */
 
 // TODO: direct imports like some-package/src/* are bad. Fix me.
-import ReactDebugCurrentFiber from 'react-reconciler/src/ReactDebugCurrentFiber';
+import {
+  getCurrentFiberOwnerNameInDevOrNull,
+  getCurrentFiberStackInDevOrNull,
+} from 'react-reconciler/src/ReactCurrentFiber';
 import warning from 'shared/warning';
 
 import ReactControlledValuePropTypes from '../shared/ReactControlledValuePropTypes';
 
-const {
-  getCurrentFiberOwnerName,
-  getCurrentFiberStackAddendum,
-} = ReactDebugCurrentFiber;
-
 let didWarnValueDefaultValue;
 
 if (__DEV__) {
@@ -32,7 +30,7 @@ type SelectWithWrapperState = HTMLSelectElement & {
 };
 
 function getDeclarationErrorAddendum() {
-  const ownerName = getCurrentFiberOwnerName();
+  const ownerName = getCurrentFiberOwnerNameInDevOrNull();
   if (ownerName) {
     return '\n\nCheck the render method of `' + ownerName + '`.';
   }
@@ -48,7 +46,7 @@ function checkSelectPropTypes(props) {
   ReactControlledValuePropTypes.checkPropTypes(
     'select',
     props,
-    getCurrentFiberStackAddendum,
+    getCurrentFiberStackInDevOrNull,
   );
 
   for (let i = 0; i < valuePropNames.length; i++) {
diff --git a/packages/react-dom/src/client/ReactDOMFiberTextarea.js b/packages/react-dom/src/client/ReactDOMFiberTextarea.js
index 4ff024895e..6ffe3db6d3 100644
--- a/packages/react-dom/src/client/ReactDOMFiberTextarea.js
+++ b/packages/react-dom/src/client/ReactDOMFiberTextarea.js
@@ -10,11 +10,10 @@
 import invariant from 'shared/invariant';
 import warning from 'shared/warning';
 // TODO: direct imports like some-package/src/* are bad. Fix me.
-import ReactDebugCurrentFiber from 'react-reconciler/src/ReactDebugCurrentFiber';
+import {getCurrentFiberStackInDevOrNull} from 'react-reconciler/src/ReactCurrentFiber';
 
 import ReactControlledValuePropTypes from '../shared/ReactControlledValuePropTypes';
 
-const {getCurrentFiberStackAddendum} = ReactDebugCurrentFiber;
 let didWarnValDefaultVal = false;
 
 type TextAreaWithWrapperState = HTMLTextAreaElement & {
@@ -68,7 +67,7 @@ export function initWrapperState(element: Element, props: Object) {
     ReactControlledValuePropTypes.checkPropTypes(
       'textarea',
       props,
-      getCurrentFiberStackAddendum,
+      getCurrentFiberStackInDevOrNull,
     );
     if (
       props.value !== undefined &&
diff --git a/packages/react-dom/src/client/validateDOMNesting.js b/packages/react-dom/src/client/validateDOMNesting.js
index 3d3e17cd25..ea7e5f12dd 100644
--- a/packages/react-dom/src/client/validateDOMNesting.js
+++ b/packages/react-dom/src/client/validateDOMNesting.js
@@ -7,9 +7,8 @@
 
 import warning from 'shared/warning';
 // TODO: direct imports like some-package/src/* are bad. Fix me.
-import ReactDebugCurrentFiber from 'react-reconciler/src/ReactDebugCurrentFiber';
+import {getCurrentFiberStackInDevOrNull} from 'react-reconciler/src/ReactCurrentFiber';
 
-const {getCurrentFiberStackAddendum} = ReactDebugCurrentFiber;
 let validateDOMNesting = () => {};
 
 if (__DEV__) {
@@ -427,7 +426,7 @@ if (__DEV__) {
     }
 
     const ancestorTag = invalidParentOrAncestor.tag;
-    const addendum = getCurrentFiberStackAddendum();
+    const addendum = getCurrentFiberStackInDevOrNull();
 
     const warnKey =
       !!invalidParent + '|' + childTag + '|' + ancestorTag + '|' + addendum;
diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js
index 9ff1749c50..5f044f5f2a 100644
--- a/packages/react-native-renderer/src/ReactNativeRenderer.js
+++ b/packages/react-native-renderer/src/ReactNativeRenderer.js
@@ -13,14 +13,14 @@ import type {ReactNodeList} from 'shared/ReactTypes';
 import './ReactNativeInjection';
 
 import * as ReactNativeFiberRenderer from 'react-reconciler/inline.native';
+// TODO: direct imports like some-package/src/* are bad. Fix me.
+import {getStackByFiberInDevAndProd} from 'react-reconciler/src/ReactCurrentFiber';
 import * as ReactPortal from 'shared/ReactPortal';
 import * as ReactGenericBatching from 'events/ReactGenericBatching';
 import ReactVersion from 'shared/ReactVersion';
 // Module provided by RN:
 import UIManager from 'UIManager';
 
-import {getStackAddendumByWorkInProgressFiber} from 'shared/ReactFiberComponentTreeHook';
-
 import NativeMethodsMixin from './NativeMethodsMixin';
 import ReactNativeComponent from './ReactNativeComponent';
 import * as ReactNativeComponentTree from './ReactNativeComponentTree';
@@ -80,7 +80,7 @@ function computeComponentStackForErrorReporting(reactTag: number): string {
   if (!fiber) {
     return '';
   }
-  return getStackAddendumByWorkInProgressFiber(fiber);
+  return getStackByFiberInDevAndProd(fiber);
 }
 
 const roots = new Map();
diff --git a/packages/react-reconciler/src/ReactCapturedValue.js b/packages/react-reconciler/src/ReactCapturedValue.js
index 1f6543b246..4fa8d72082 100644
--- a/packages/react-reconciler/src/ReactCapturedValue.js
+++ b/packages/react-reconciler/src/ReactCapturedValue.js
@@ -9,7 +9,7 @@
 
 import type {Fiber} from './ReactFiber';
 
-import {getStackAddendumByWorkInProgressFiber} from 'shared/ReactFiberComponentTreeHook';
+import {getStackByFiberInDevAndProd} from './ReactCurrentFiber';
 
 export type CapturedValue<T> = {
   value: T,
@@ -36,6 +36,6 @@ export function createCapturedValue<T>(
   return {
     value,
     source,
-    stack: getStackAddendumByWorkInProgressFiber(source),
+    stack: getStackByFiberInDevAndProd(source),
   };
 }
diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js
index 19bdfbd059..64922d94fd 100644
--- a/packages/react-reconciler/src/ReactChildFiber.js
+++ b/packages/react-reconciler/src/ReactChildFiber.js
@@ -27,7 +27,6 @@ import {
   HostPortal,
   Fragment,
 } from 'shared/ReactTypeOfWork';
-import {getStackAddendumByWorkInProgressFiber} from 'shared/ReactFiberComponentTreeHook';
 import invariant from 'shared/invariant';
 import warning from 'shared/warning';
 
@@ -39,11 +38,12 @@ import {
   createFiberFromPortal,
 } from './ReactFiber';
 import {emptyRefsObject} from './ReactFiberClassComponent';
-import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
+import {
+  getCurrentFiberStackInDevOrNull,
+  getStackByFiberInDevAndProd,
+} from './ReactCurrentFiber';
 import {StrictMode} from './ReactTypeOfMode';
 
-const {getCurrentFiberStackAddendum} = ReactDebugCurrentFiber;
-
 let didWarnAboutMaps;
 let didWarnAboutStringRefInStrictMode;
 let ownerHasKeyUseWarning;
@@ -80,7 +80,7 @@ if (__DEV__) {
       'Each child in an array or iterator should have a unique ' +
       '"key" prop. See https://fb.me/react-warning-keys for ' +
       'more information.' +
-      (getCurrentFiberStackAddendum() || '');
+      (getCurrentFiberStackInDevOrNull() || '');
     if (ownerHasKeyUseWarning[currentComponentErrorInfo]) {
       return;
     }
@@ -91,7 +91,7 @@ if (__DEV__) {
       '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(),
+      getCurrentFiberStackInDevOrNull(),
     );
   };
 }
@@ -122,7 +122,7 @@ function coerceRef(
               '\n\nLearn more about using refs safely here:' +
               '\nhttps://fb.me/react-strict-mode-string-ref',
             mixedRef,
-            getStackAddendumByWorkInProgressFiber(returnFiber),
+            getStackByFiberInDevAndProd(returnFiber),
           );
           didWarnAboutStringRefInStrictMode[componentName] = true;
         }
@@ -197,7 +197,7 @@ function throwOnInvalidObjectType(returnFiber: Fiber, newChild: Object) {
       addendum =
         ' If you meant to render a collection of children, use an array ' +
         'instead.' +
-        (getCurrentFiberStackAddendum() || '');
+        (getCurrentFiberStackInDevOrNull() || '');
     }
     invariant(
       false,
@@ -215,7 +215,7 @@ function warnOnFunctionType() {
     'Functions are not valid as a React child. This may happen if ' +
     'you return a Component instead of <Component /> from render. ' +
     'Or maybe you meant to call this function rather than return it.' +
-    (getCurrentFiberStackAddendum() || '');
+    (getCurrentFiberStackInDevOrNull() || '');
 
   if (ownerHasFunctionTypeWarning[currentComponentErrorInfo]) {
     return;
@@ -227,7 +227,7 @@ function warnOnFunctionType() {
     'Functions are not valid as a React child. This may happen if ' +
       'you return a Component instead of <Component /> from render. ' +
       'Or maybe you meant to call this function rather than return it.%s',
-    getCurrentFiberStackAddendum() || '',
+    getCurrentFiberStackInDevOrNull() || '',
   );
 }
 
@@ -719,7 +719,7 @@ function ChildReconciler(shouldTrackSideEffects) {
               'duplicated and/or omitted — the behavior is unsupported and ' +
               'could change in a future version.%s',
             key,
-            getCurrentFiberStackAddendum(),
+            getCurrentFiberStackInDevOrNull(),
           );
           break;
         default:
@@ -912,7 +912,7 @@ function ChildReconciler(shouldTrackSideEffects) {
           'Using Maps as children is unsupported and will likely yield ' +
             'unexpected results. Convert it to a sequence/iterable of keyed ' +
             'ReactElements instead.%s',
-          getCurrentFiberStackAddendum(),
+          getCurrentFiberStackInDevOrNull(),
         );
         didWarnAboutMaps = true;
       }
diff --git a/packages/react-reconciler/src/ReactCurrentFiber.js b/packages/react-reconciler/src/ReactCurrentFiber.js
new file mode 100644
index 0000000000..22d6a557ed
--- /dev/null
+++ b/packages/react-reconciler/src/ReactCurrentFiber.js
@@ -0,0 +1,101 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
+import {
+  IndeterminateComponent,
+  FunctionalComponent,
+  ClassComponent,
+  HostComponent,
+} from 'shared/ReactTypeOfWork';
+import describeComponentFrame from 'shared/describeComponentFrame';
+import getComponentName from 'shared/getComponentName';
+
+import type {Fiber} from './ReactFiber';
+
+type LifeCyclePhase = 'render' | 'getChildContext';
+
+function describeFiber(fiber: Fiber): string {
+  switch (fiber.tag) {
+    case IndeterminateComponent:
+    case FunctionalComponent:
+    case ClassComponent:
+    case HostComponent:
+      const owner = fiber._debugOwner;
+      const source = fiber._debugSource;
+      const name = getComponentName(fiber);
+      let ownerName = null;
+      if (owner) {
+        ownerName = getComponentName(owner);
+      }
+      return describeComponentFrame(name, source, ownerName);
+    default:
+      return '';
+  }
+}
+
+export function getStackByFiberInDevAndProd(workInProgress: Fiber): string {
+  let info = '';
+  let node = workInProgress;
+  do {
+    info += describeFiber(node);
+    node = node.return;
+  } while (node);
+  return info;
+}
+
+export let current: Fiber | null = null;
+export let phase: LifeCyclePhase | null = null;
+
+export function getCurrentFiberOwnerNameInDevOrNull(): string | null {
+  if (__DEV__) {
+    if (current === null) {
+      return null;
+    }
+    const owner = current._debugOwner;
+    if (owner !== null && typeof owner !== 'undefined') {
+      return getComponentName(owner);
+    }
+  }
+  return null;
+}
+
+export function getCurrentFiberStackInDevOrNull(): string | null {
+  if (__DEV__) {
+    if (current === null) {
+      return null;
+    }
+    // Safe because if current fiber exists, we are reconciling,
+    // and it is guaranteed to be the work-in-progress version.
+    return getStackByFiberInDevAndProd(current);
+  }
+  return null;
+}
+
+export function resetCurrentFiber() {
+  if (__DEV__) {
+    ReactDebugCurrentFrame.getCurrentStack = null;
+    current = null;
+    phase = null;
+  }
+}
+
+export function setCurrentFiber(fiber: Fiber) {
+  if (__DEV__) {
+    ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackInDevOrNull;
+    current = fiber;
+    phase = null;
+  }
+}
+
+export function setCurrentPhase(lifeCyclePhase: LifeCyclePhase | null) {
+  if (__DEV__) {
+    phase = lifeCyclePhase;
+  }
+}
diff --git a/packages/react-reconciler/src/ReactDebugCurrentFiber.js b/packages/react-reconciler/src/ReactDebugCurrentFiber.js
deleted file mode 100644
index 7b0f6b5cf8..0000000000
--- a/packages/react-reconciler/src/ReactDebugCurrentFiber.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow
- */
-
-import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
-import {getStackAddendumByWorkInProgressFiber} from 'shared/ReactFiberComponentTreeHook';
-import getComponentName from 'shared/getComponentName';
-
-import type {Fiber} from './ReactFiber';
-
-type LifeCyclePhase = 'render' | 'getChildContext';
-
-function getCurrentFiberOwnerName(): string | null {
-  if (__DEV__) {
-    const fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
-    }
-    const owner = fiber._debugOwner;
-    if (owner !== null && typeof owner !== 'undefined') {
-      return getComponentName(owner);
-    }
-  }
-  return null;
-}
-
-function getCurrentFiberStackAddendum(): string | null {
-  if (__DEV__) {
-    const fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
-    }
-    // Safe because if current fiber exists, we are reconciling,
-    // and it is guaranteed to be the work-in-progress version.
-    return getStackAddendumByWorkInProgressFiber(fiber);
-  }
-  return null;
-}
-
-function resetCurrentFiber() {
-  ReactDebugCurrentFrame.getCurrentStack = null;
-  ReactDebugCurrentFiber.current = null;
-  ReactDebugCurrentFiber.phase = null;
-}
-
-function setCurrentFiber(fiber: Fiber) {
-  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
-  ReactDebugCurrentFiber.current = fiber;
-  ReactDebugCurrentFiber.phase = null;
-}
-
-function setCurrentPhase(phase: LifeCyclePhase | null) {
-  ReactDebugCurrentFiber.phase = phase;
-}
-
-const ReactDebugCurrentFiber = {
-  current: (null: Fiber | null),
-  phase: (null: LifeCyclePhase | null),
-  resetCurrentFiber,
-  setCurrentFiber,
-  setCurrentPhase,
-  getCurrentFiberOwnerName,
-  getCurrentFiberStackAddendum,
-};
-
-export default ReactDebugCurrentFiber;
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 9c95166258..2057dba048 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -50,7 +50,7 @@ import invariant from 'shared/invariant';
 import getComponentName from 'shared/getComponentName';
 import ReactStrictModeWarnings from './ReactStrictModeWarnings';
 import warning from 'shared/warning';
-import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
+import * as ReactCurrentFiber from './ReactCurrentFiber';
 import {cancelWorkTimer} from './ReactDebugFiberPerf';
 
 import {applyDerivedStateFromProps} from './ReactFiberClassComponent';
@@ -98,8 +98,6 @@ import {
 } from './ReactFiberClassComponent';
 import MAX_SIGNED_31_BIT_INT from './maxSigned31BitInt';
 
-const {getCurrentFiberStackAddendum} = ReactDebugCurrentFiber;
-
 let didWarnAboutBadClass;
 let didWarnAboutGetDerivedStateOnFunctionalComponent;
 let didWarnAboutStatelessRefs;
@@ -170,9 +168,9 @@ function updateForwardRef(current, workInProgress) {
   let nextChildren;
   if (__DEV__) {
     ReactCurrentOwner.current = workInProgress;
-    ReactDebugCurrentFiber.setCurrentPhase('render');
+    ReactCurrentFiber.setCurrentPhase('render');
     nextChildren = render(nextProps, ref);
-    ReactDebugCurrentFiber.setCurrentPhase(null);
+    ReactCurrentFiber.setCurrentPhase(null);
   } else {
     nextChildren = render(nextProps, ref);
   }
@@ -258,9 +256,9 @@ function updateFunctionalComponent(current, workInProgress) {
 
   if (__DEV__) {
     ReactCurrentOwner.current = workInProgress;
-    ReactDebugCurrentFiber.setCurrentPhase('render');
+    ReactCurrentFiber.setCurrentPhase('render');
     nextChildren = fn(nextProps, context);
-    ReactDebugCurrentFiber.setCurrentPhase(null);
+    ReactCurrentFiber.setCurrentPhase(null);
   } else {
     nextChildren = fn(nextProps, context);
   }
@@ -359,7 +357,7 @@ function finishClassComponent(
     }
   } else {
     if (__DEV__) {
-      ReactDebugCurrentFiber.setCurrentPhase('render');
+      ReactCurrentFiber.setCurrentPhase('render');
       nextChildren = instance.render();
       if (
         debugRenderPhaseSideEffects ||
@@ -368,7 +366,7 @@ function finishClassComponent(
       ) {
         instance.render();
       }
-      ReactDebugCurrentFiber.setCurrentPhase(null);
+      ReactCurrentFiber.setCurrentPhase(null);
     } else {
       nextChildren = instance.render();
     }
@@ -660,7 +658,7 @@ function mountIndeterminateComponent(
       }
       if (workInProgress.ref !== null) {
         let info = '';
-        const ownerName = ReactDebugCurrentFiber.getCurrentFiberOwnerName();
+        const ownerName = ReactCurrentFiber.getCurrentFiberOwnerNameInDevOrNull();
         if (ownerName) {
           info += '\n\nCheck the render method of `' + ownerName + '`.';
         }
@@ -677,7 +675,7 @@ function mountIndeterminateComponent(
             'Stateless function components cannot be given refs. ' +
               'Attempts to access this ref will fail.%s%s',
             info,
-            ReactDebugCurrentFiber.getCurrentFiberStackAddendum(),
+            ReactCurrentFiber.getCurrentFiberStackInDevOrNull(),
           );
         }
       }
@@ -935,7 +933,7 @@ function updateContextProvider(current, workInProgress, renderExpirationTime) {
         newProps,
         'prop',
         'Context.Provider',
-        getCurrentFiberStackAddendum,
+        ReactCurrentFiber.getCurrentFiberStackInDevOrNull,
       );
     }
   }
@@ -1069,9 +1067,9 @@ function updateContextConsumer(current, workInProgress, renderExpirationTime) {
   let newChildren;
   if (__DEV__) {
     ReactCurrentOwner.current = workInProgress;
-    ReactDebugCurrentFiber.setCurrentPhase('render');
+    ReactCurrentFiber.setCurrentPhase('render');
     newChildren = render(newValue);
-    ReactDebugCurrentFiber.setCurrentPhase(null);
+    ReactCurrentFiber.setCurrentPhase(null);
   } else {
     newChildren = render(newValue);
   }
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index 9eb54495a9..34ce416fbe 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -20,7 +20,6 @@ import type {ExpirationTime} from './ReactFiberExpirationTime';
 import type {CapturedValue, CapturedError} from './ReactCapturedValue';
 
 import {enableProfilerTimer, enableSuspense} from 'shared/ReactFeatureFlags';
-import {getCommitTime} from './ReactProfilerTimer';
 import {
   ClassComponent,
   HostRoot,
@@ -38,16 +37,17 @@ import {
   Snapshot,
   Update,
 } from 'shared/ReactTypeOfSideEffect';
-import {commitUpdateQueue} from './ReactUpdateQueue';
+import getComponentName from 'shared/getComponentName';
 import invariant from 'shared/invariant';
 import warning from 'shared/warning';
 
 import {Sync} from './ReactFiberExpirationTime';
 import {onCommitUnmount} from './ReactFiberDevToolsHook';
 import {startPhaseTimer, stopPhaseTimer} from './ReactDebugFiberPerf';
-import getComponentName from 'shared/getComponentName';
-import {getStackAddendumByWorkInProgressFiber} from 'shared/ReactFiberComponentTreeHook';
+import {getStackByFiberInDevAndProd} from './ReactCurrentFiber';
 import {logCapturedError} from './ReactFiberErrorLogger';
+import {getCommitTime} from './ReactProfilerTimer';
+import {commitUpdateQueue} from './ReactUpdateQueue';
 import {
   getPublicInstance,
   supportsMutation,
@@ -89,7 +89,7 @@ export function logError(boundary: Fiber, errorInfo: CapturedValue<mixed>) {
   const source = errorInfo.source;
   let stack = errorInfo.stack;
   if (stack === null && source !== null) {
-    stack = getStackAddendumByWorkInProgressFiber(source);
+    stack = getStackByFiberInDevAndProd(source);
   }
 
   const capturedError: CapturedError = {
@@ -373,7 +373,7 @@ function commitAttachRef(finishedWork: Fiber) {
             'Unexpected ref object provided for %s. ' +
               'Use either a ref-setter function or React.createRef().%s',
             getComponentName(finishedWork),
-            getStackAddendumByWorkInProgressFiber(finishedWork),
+            getStackByFiberInDevAndProd(finishedWork),
           );
         }
       }
diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js
index 1a1a30f35e..a27515fec8 100644
--- a/packages/react-reconciler/src/ReactFiberContext.js
+++ b/packages/react-reconciler/src/ReactFiberContext.js
@@ -17,7 +17,7 @@ import invariant from 'shared/invariant';
 import warning from 'shared/warning';
 import checkPropTypes from 'prop-types/checkPropTypes';
 
-import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
+import * as ReactCurrentFiber from './ReactCurrentFiber';
 import {startPhaseTimer, stopPhaseTimer} from './ReactDebugFiberPerf';
 import {createCursor, push, pop} from './ReactFiberStack';
 
@@ -96,7 +96,7 @@ function getMaskedContext(
       context,
       'context',
       name,
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum,
+      ReactCurrentFiber.getCurrentFiberStackInDevOrNull,
     );
   }
 
@@ -177,13 +177,13 @@ function processChildContext(fiber: Fiber, parentContext: Object): Object {
 
   let childContext;
   if (__DEV__) {
-    ReactDebugCurrentFiber.setCurrentPhase('getChildContext');
+    ReactCurrentFiber.setCurrentPhase('getChildContext');
   }
   startPhaseTimer(fiber, 'getChildContext');
   childContext = instance.getChildContext();
   stopPhaseTimer();
   if (__DEV__) {
-    ReactDebugCurrentFiber.setCurrentPhase(null);
+    ReactCurrentFiber.setCurrentPhase(null);
   }
   for (let contextKey in childContext) {
     invariant(
@@ -205,7 +205,7 @@ function processChildContext(fiber: Fiber, parentContext: Object): Object {
       // context from the parent component instance. The stack will be missing
       // because it's outside of the reconciliation, and so the pointer has not
       // been set. This is rare and doesn't matter. We'll also remove that API.
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum,
+      ReactCurrentFiber.getCurrentFiberStackInDevOrNull,
     );
   }
 
diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js
index 245b1654e2..3f8554fb5a 100644
--- a/packages/react-reconciler/src/ReactFiberReconciler.js
+++ b/packages/react-reconciler/src/ReactFiberReconciler.js
@@ -55,7 +55,7 @@ import {
 } from './ReactFiberScheduler';
 import {createUpdate, enqueueUpdate} from './ReactUpdateQueue';
 import ReactFiberInstrumentation from './ReactFiberInstrumentation';
-import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
+import * as ReactCurrentFiber from './ReactCurrentFiber';
 
 type OpaqueRoot = FiberRoot;
 
@@ -104,8 +104,8 @@ function scheduleRootUpdate(
 ) {
   if (__DEV__) {
     if (
-      ReactDebugCurrentFiber.phase === 'render' &&
-      ReactDebugCurrentFiber.current !== null &&
+      ReactCurrentFiber.phase === 'render' &&
+      ReactCurrentFiber.current !== null &&
       !didWarnAboutNestedUpdates
     ) {
       didWarnAboutNestedUpdates = true;
@@ -115,7 +115,7 @@ function scheduleRootUpdate(
           'triggering nested component updates from render is not allowed. ' +
           'If necessary, trigger nested updates in componentDidUpdate.\n\n' +
           'Check the render method of %s.',
-        getComponentName(ReactDebugCurrentFiber.current) || 'Unknown',
+        getComponentName(ReactCurrentFiber.current) || 'Unknown',
       );
     }
   }
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index f18d833438..e5f1c86ba1 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -12,7 +12,6 @@ import type {FiberRoot, Batch} from './ReactFiberRoot';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 
 import ReactErrorUtils from 'shared/ReactErrorUtils';
-import {getStackAddendumByWorkInProgressFiber} from 'shared/ReactFiberComponentTreeHook';
 import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
 import ReactStrictModeWarnings from './ReactStrictModeWarnings';
 import {
@@ -56,7 +55,7 @@ import {
 } from './ReactFiberHostConfig';
 
 import ReactFiberInstrumentation from './ReactFiberInstrumentation';
-import ReactDebugCurrentFiber from './ReactDebugCurrentFiber';
+import * as ReactCurrentFiber from './ReactCurrentFiber';
 import {
   now,
   scheduleDeferredCallback,
@@ -185,13 +184,13 @@ if (__DEV__) {
         'is a no-op, but it indicates a memory leak in your application. To ' +
         'fix, cancel all subscriptions and asynchronous tasks in the ' +
         'componentWillUnmount method.%s',
-      getStackAddendumByWorkInProgressFiber(fiber),
+      ReactCurrentFiber.getStackByFiberInDevAndProd(fiber),
     );
     didWarnStateUpdateForUnmountedComponent[componentName] = true;
   };
 
   warnAboutInvalidUpdates = function(instance: React$Component<any>) {
-    switch (ReactDebugCurrentFiber.phase) {
+    switch (ReactCurrentFiber.phase) {
       case 'getChildContext':
         if (didWarnSetStateChildContext) {
           return;
@@ -363,7 +362,7 @@ function resetStack() {
 function commitAllHostEffects() {
   while (nextEffect !== null) {
     if (__DEV__) {
-      ReactDebugCurrentFiber.setCurrentFiber(nextEffect);
+      ReactCurrentFiber.setCurrentFiber(nextEffect);
     }
     recordEffect();
 
@@ -422,7 +421,7 @@ function commitAllHostEffects() {
   }
 
   if (__DEV__) {
-    ReactDebugCurrentFiber.resetCurrentFiber();
+    ReactCurrentFiber.resetCurrentFiber();
   }
 }
 
@@ -778,7 +777,7 @@ function completeUnitOfWork(workInProgress: Fiber): Fiber | null {
     // progress.
     const current = workInProgress.alternate;
     if (__DEV__) {
-      ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
+      ReactCurrentFiber.setCurrentFiber(workInProgress);
     }
 
     const returnFiber = workInProgress.return;
@@ -794,7 +793,7 @@ function completeUnitOfWork(workInProgress: Fiber): Fiber | null {
       stopWorkTimer(workInProgress);
       resetExpirationTime(workInProgress, nextRenderExpirationTime);
       if (__DEV__) {
-        ReactDebugCurrentFiber.resetCurrentFiber();
+        ReactCurrentFiber.resetCurrentFiber();
       }
 
       if (next !== null) {
@@ -873,7 +872,7 @@ function completeUnitOfWork(workInProgress: Fiber): Fiber | null {
       }
 
       if (__DEV__) {
-        ReactDebugCurrentFiber.resetCurrentFiber();
+        ReactCurrentFiber.resetCurrentFiber();
       }
 
       if (next !== null) {
@@ -929,7 +928,7 @@ function performUnitOfWork(workInProgress: Fiber): Fiber | null {
   // See if beginning this work spawns more work.
   startWorkTimer(workInProgress);
   if (__DEV__) {
-    ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
+    ReactCurrentFiber.setCurrentFiber(workInProgress);
   }
 
   if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
@@ -957,7 +956,7 @@ function performUnitOfWork(workInProgress: Fiber): Fiber | null {
   }
 
   if (__DEV__) {
-    ReactDebugCurrentFiber.resetCurrentFiber();
+    ReactCurrentFiber.resetCurrentFiber();
     if (isReplayingFailedUnitOfWork) {
       // Currently replaying a failed unit of work. This should be unreachable,
       // because the render phase is meant to be idempotent, and it should
diff --git a/packages/react-reconciler/src/ReactStrictModeWarnings.js b/packages/react-reconciler/src/ReactStrictModeWarnings.js
index 365f4bf4d6..cd29d2de93 100644
--- a/packages/react-reconciler/src/ReactStrictModeWarnings.js
+++ b/packages/react-reconciler/src/ReactStrictModeWarnings.js
@@ -9,8 +9,9 @@
 
 import type {Fiber} from './ReactFiber';
 
+import {getStackByFiberInDevAndProd} from './ReactCurrentFiber';
+
 import getComponentName from 'shared/getComponentName';
-import {getStackAddendumByWorkInProgressFiber} from 'shared/ReactFiberComponentTreeHook';
 import {StrictMode} from './ReactTypeOfMode';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
 import warning from 'shared/warning';
@@ -94,7 +95,7 @@ if (__DEV__) {
         });
 
         if (lifecyclesWarningMesages.length > 0) {
-          const strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
+          const strictRootComponentStack = getStackByFiberInDevAndProd(
             strictRoot,
           );
 
@@ -341,7 +342,7 @@ if (__DEV__) {
         });
 
         const sortedNames = setToSortedString(uniqueNames);
-        const strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
+        const strictRootComponentStack = getStackByFiberInDevAndProd(
           strictRoot,
         );
 
diff --git a/packages/shared/ReactFiberComponentTreeHook.js b/packages/shared/ReactFiberComponentTreeHook.js
deleted file mode 100644
index 8926ce3426..0000000000
--- a/packages/shared/ReactFiberComponentTreeHook.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (c) 2016-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow
- */
-
-import type {Fiber} from 'react-reconciler/src/ReactFiber';
-
-import {
-  IndeterminateComponent,
-  FunctionalComponent,
-  ClassComponent,
-  HostComponent,
-} from './ReactTypeOfWork';
-import describeComponentFrame from './describeComponentFrame';
-import getComponentName from './getComponentName';
-
-function describeFiber(fiber: Fiber): string {
-  switch (fiber.tag) {
-    case IndeterminateComponent:
-    case FunctionalComponent:
-    case ClassComponent:
-    case HostComponent:
-      const owner = fiber._debugOwner;
-      const source = fiber._debugSource;
-      const name = getComponentName(fiber);
-      let ownerName = null;
-      if (owner) {
-        ownerName = getComponentName(owner);
-      }
-      return describeComponentFrame(name, source, ownerName);
-    default:
-      return '';
-  }
-}
-
-// This function can only be called with a work-in-progress fiber and
-// only during begin or complete phase. Do not call it under any other
-// circumstances.
-export function getStackAddendumByWorkInProgressFiber(
-  workInProgress: Fiber,
-): string {
-  let info = '';
-  let node = workInProgress;
-  do {
-    info += describeFiber(node);
-    // Otherwise this return pointer might point to the wrong tree:
-    node = node.return;
-  } while (node);
-  return info;
-}

From 095dd5049c7810841024078f4bbea7e4d7766acc Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Sat, 7 Jul 2018 08:11:30 -0700
Subject: [PATCH 210/277] Add DEV warning if forwardRef function doesn't use
 the ref param (#13168)

* Add DEV warning if forwardRef function doesn't use the ref param
* Fixed a forwardRef arity warning in another test
---
 .../ReactTestRendererTraversal-test.js        |  2 +-
 .../react/src/__tests__/forwardRef-test.js    | 22 +++++++++++++++++--
 packages/react/src/forwardRef.js              | 18 ++++++++++-----
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js b/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js
index 3ea71880ea..a3c88f2bf9 100644
--- a/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactTestRendererTraversal-test.js
@@ -201,7 +201,7 @@ describe('ReactTestRendererTraversal', () => {
   });
 
   it('can have special nodes as roots', () => {
-    const FR = React.forwardRef(props => <section {...props} />);
+    const FR = React.forwardRef((props, ref) => <section {...props} />);
     expect(
       ReactTestRenderer.create(
         <FR>
diff --git a/packages/react/src/__tests__/forwardRef-test.js b/packages/react/src/__tests__/forwardRef-test.js
index aa1cd160d5..b14408bd28 100644
--- a/packages/react/src/__tests__/forwardRef-test.js
+++ b/packages/react/src/__tests__/forwardRef-test.js
@@ -136,12 +136,12 @@ describe('forwardRef', () => {
   });
 
   it('should warn if the render function provided has propTypes or defaultProps attributes', () => {
-    function renderWithPropTypes() {
+    function renderWithPropTypes(props, ref) {
       return null;
     }
     renderWithPropTypes.propTypes = {};
 
-    function renderWithDefaultProps() {
+    function renderWithDefaultProps(props, ref) {
       return null;
     }
     renderWithDefaultProps.defaultProps = {};
@@ -155,4 +155,22 @@ describe('forwardRef', () => {
         'Did you accidentally pass a React component?',
     );
   });
+
+  it('should warn if the render function provided does not use the forwarded ref parameter', () => {
+    function arityOfZero() {
+      return null;
+    }
+
+    const arityOfOne = props => null;
+
+    expect(() => React.forwardRef(arityOfZero)).toWarnDev(
+      'forwardRef render functions accept two parameters: props and ref. ' +
+        'Did you forget to use the ref parameter?',
+    );
+
+    expect(() => React.forwardRef(arityOfOne)).toWarnDev(
+      'forwardRef render functions accept two parameters: props and ref. ' +
+        'Did you forget to use the ref parameter?',
+    );
+  });
 });
diff --git a/packages/react/src/forwardRef.js b/packages/react/src/forwardRef.js
index 419af668a3..0f4cf3ef1f 100644
--- a/packages/react/src/forwardRef.js
+++ b/packages/react/src/forwardRef.js
@@ -13,11 +13,19 @@ export default function forwardRef<Props, ElementType: React$ElementType>(
   render: (props: Props, ref: React$ElementRef<ElementType>) => React$Node,
 ) {
   if (__DEV__) {
-    warning(
-      typeof render === 'function',
-      'forwardRef requires a render function but was given %s.',
-      render === null ? 'null' : typeof render,
-    );
+    if (typeof render !== 'function') {
+      warning(
+        false,
+        'forwardRef requires a render function but was given %s.',
+        render === null ? 'null' : typeof render,
+      );
+    } else {
+      warning(
+        render.length === 2,
+        'forwardRef render functions accept two parameters: props and ref. ' +
+          'Did you forget to use the ref parameter?',
+      );
+    }
 
     if (render != null) {
       warning(

From 96d38d178ae3956e0eecbde789e3fcf3e487cfea Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 9 Jul 2018 13:56:24 +0100
Subject: [PATCH 211/277] Fix concatenation of null to a warning message
 (#13166)

---
 .../src/client/ReactDOMFiberComponent.js      | 20 +++++++-------
 .../src/client/ReactDOMFiberInput.js          |  8 +++---
 .../src/client/ReactDOMFiberSelect.js         |  4 +--
 .../src/client/ReactDOMFiberTextarea.js       |  4 +--
 .../src/client/validateDOMNesting.js          |  4 +--
 .../src/shared/ReactDOMInvalidARIAHook.js     | 15 ++++-------
 .../shared/ReactDOMNullInputValuePropHook.js  |  9 ++-----
 .../src/shared/ReactDOMUnknownPropertyHook.js | 27 ++++++++-----------
 .../react-reconciler/src/ReactChildFiber.js   | 16 +++++------
 .../react-reconciler/src/ReactCurrentFiber.js |  8 +++---
 .../src/ReactFiberBeginWork.js                |  4 +--
 .../react-reconciler/src/ReactFiberContext.js |  4 +--
 packages/react/src/ReactDebugCurrentFrame.js  |  8 +++---
 packages/react/src/ReactElementValidator.js   |  4 +--
 14 files changed, 60 insertions(+), 75 deletions(-)

diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js
index 2839a92fb4..c21e3cc568 100644
--- a/packages/react-dom/src/client/ReactDOMFiberComponent.js
+++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js
@@ -10,7 +10,7 @@
 // TODO: direct imports like some-package/src/* are bad. Fix me.
 import {
   getCurrentFiberOwnerNameInDevOrNull,
-  getCurrentFiberStackInDevOrNull,
+  getCurrentFiberStackInDev,
 } from 'react-reconciler/src/ReactCurrentFiber';
 import {registrationNameModules} from 'events/EventPluginRegistry';
 import warning from 'shared/warning';
@@ -61,7 +61,7 @@ const HTML = '__html';
 
 const {html: HTML_NAMESPACE} = Namespaces;
 
-let getStackInDevOrNull = () => '';
+let getStackInDev = () => '';
 
 let warnedUnknownTags;
 let suppressHydrationWarning;
@@ -76,7 +76,7 @@ let normalizeMarkupForTextOrAttribute;
 let normalizeHTML;
 
 if (__DEV__) {
-  getStackInDevOrNull = getCurrentFiberStackInDevOrNull;
+  getStackInDev = getCurrentFiberStackInDev;
 
   warnedUnknownTags = {
     // Chrome is the only major browser not shipping <time>. But as of July
@@ -180,7 +180,7 @@ if (__DEV__) {
         registrationName,
         registrationName,
         registrationName,
-        getCurrentFiberStackInDevOrNull(),
+        getCurrentFiberStackInDev(),
       );
     } else {
       warning(
@@ -188,7 +188,7 @@ if (__DEV__) {
         'Expected `%s` listener to be a function, instead got a value of `%s` type.%s',
         registrationName,
         typeof listener,
-        getCurrentFiberStackInDevOrNull(),
+        getCurrentFiberStackInDev(),
       );
     }
   };
@@ -269,7 +269,7 @@ function setInitialDOMProperties(
       CSSPropertyOperations.setValueForStyles(
         domElement,
         nextProp,
-        getStackInDevOrNull,
+        getStackInDev,
       );
     } else if (propKey === DANGEROUSLY_SET_INNER_HTML) {
       const nextHtml = nextProp ? nextProp[HTML] : undefined;
@@ -329,7 +329,7 @@ function updateDOMProperties(
       CSSPropertyOperations.setValueForStyles(
         domElement,
         propValue,
-        getStackInDevOrNull,
+        getStackInDev,
       );
     } else if (propKey === DANGEROUSLY_SET_INNER_HTML) {
       setInnerHTML(domElement, propValue);
@@ -523,7 +523,7 @@ export function setInitialProperties(
       props = rawProps;
   }
 
-  assertValidProps(tag, props, getStackInDevOrNull);
+  assertValidProps(tag, props, getStackInDev);
 
   setInitialDOMProperties(
     tag,
@@ -611,7 +611,7 @@ export function diffProperties(
       break;
   }
 
-  assertValidProps(tag, nextProps, getStackInDevOrNull);
+  assertValidProps(tag, nextProps, getStackInDev);
 
   let propKey;
   let styleName;
@@ -902,7 +902,7 @@ export function diffHydratedProperties(
       break;
   }
 
-  assertValidProps(tag, rawProps, getStackInDevOrNull);
+  assertValidProps(tag, rawProps, getStackInDev);
 
   if (__DEV__) {
     extraAttributeNames = new Set();
diff --git a/packages/react-dom/src/client/ReactDOMFiberInput.js b/packages/react-dom/src/client/ReactDOMFiberInput.js
index 82603a64ca..7aaa773078 100644
--- a/packages/react-dom/src/client/ReactDOMFiberInput.js
+++ b/packages/react-dom/src/client/ReactDOMFiberInput.js
@@ -10,7 +10,7 @@
 // TODO: direct imports like some-package/src/* are bad. Fix me.
 import {
   getCurrentFiberOwnerNameInDevOrNull,
-  getCurrentFiberStackInDevOrNull,
+  getCurrentFiberStackInDev,
 } from 'react-reconciler/src/ReactCurrentFiber';
 import invariant from 'shared/invariant';
 import warning from 'shared/warning';
@@ -74,7 +74,7 @@ export function initWrapperState(element: Element, props: Object) {
     ReactControlledValuePropTypes.checkPropTypes(
       'input',
       props,
-      getCurrentFiberStackInDevOrNull,
+      getCurrentFiberStackInDev,
     );
 
     if (
@@ -153,7 +153,7 @@ export function updateWrapper(element: Element, props: Object) {
           'Decide between using a controlled or uncontrolled input ' +
           'element for the lifetime of the component. More info: https://fb.me/react-controlled-components%s',
         props.type,
-        getCurrentFiberStackInDevOrNull(),
+        getCurrentFiberStackInDev(),
       );
       didWarnUncontrolledToControlled = true;
     }
@@ -169,7 +169,7 @@ export function updateWrapper(element: Element, props: Object) {
           'Decide between using a controlled or uncontrolled input ' +
           'element for the lifetime of the component. More info: https://fb.me/react-controlled-components%s',
         props.type,
-        getCurrentFiberStackInDevOrNull(),
+        getCurrentFiberStackInDev(),
       );
       didWarnControlledToUncontrolled = true;
     }
diff --git a/packages/react-dom/src/client/ReactDOMFiberSelect.js b/packages/react-dom/src/client/ReactDOMFiberSelect.js
index 1f03a93a05..1ea9ccb084 100644
--- a/packages/react-dom/src/client/ReactDOMFiberSelect.js
+++ b/packages/react-dom/src/client/ReactDOMFiberSelect.js
@@ -10,7 +10,7 @@
 // TODO: direct imports like some-package/src/* are bad. Fix me.
 import {
   getCurrentFiberOwnerNameInDevOrNull,
-  getCurrentFiberStackInDevOrNull,
+  getCurrentFiberStackInDev,
 } from 'react-reconciler/src/ReactCurrentFiber';
 import warning from 'shared/warning';
 
@@ -46,7 +46,7 @@ function checkSelectPropTypes(props) {
   ReactControlledValuePropTypes.checkPropTypes(
     'select',
     props,
-    getCurrentFiberStackInDevOrNull,
+    getCurrentFiberStackInDev,
   );
 
   for (let i = 0; i < valuePropNames.length; i++) {
diff --git a/packages/react-dom/src/client/ReactDOMFiberTextarea.js b/packages/react-dom/src/client/ReactDOMFiberTextarea.js
index 6ffe3db6d3..3b6648b244 100644
--- a/packages/react-dom/src/client/ReactDOMFiberTextarea.js
+++ b/packages/react-dom/src/client/ReactDOMFiberTextarea.js
@@ -10,7 +10,7 @@
 import invariant from 'shared/invariant';
 import warning from 'shared/warning';
 // TODO: direct imports like some-package/src/* are bad. Fix me.
-import {getCurrentFiberStackInDevOrNull} from 'react-reconciler/src/ReactCurrentFiber';
+import {getCurrentFiberStackInDev} from 'react-reconciler/src/ReactCurrentFiber';
 
 import ReactControlledValuePropTypes from '../shared/ReactControlledValuePropTypes';
 
@@ -67,7 +67,7 @@ export function initWrapperState(element: Element, props: Object) {
     ReactControlledValuePropTypes.checkPropTypes(
       'textarea',
       props,
-      getCurrentFiberStackInDevOrNull,
+      getCurrentFiberStackInDev,
     );
     if (
       props.value !== undefined &&
diff --git a/packages/react-dom/src/client/validateDOMNesting.js b/packages/react-dom/src/client/validateDOMNesting.js
index ea7e5f12dd..7738cae42f 100644
--- a/packages/react-dom/src/client/validateDOMNesting.js
+++ b/packages/react-dom/src/client/validateDOMNesting.js
@@ -7,7 +7,7 @@
 
 import warning from 'shared/warning';
 // TODO: direct imports like some-package/src/* are bad. Fix me.
-import {getCurrentFiberStackInDevOrNull} from 'react-reconciler/src/ReactCurrentFiber';
+import {getCurrentFiberStackInDev} from 'react-reconciler/src/ReactCurrentFiber';
 
 let validateDOMNesting = () => {};
 
@@ -426,7 +426,7 @@ if (__DEV__) {
     }
 
     const ancestorTag = invalidParentOrAncestor.tag;
-    const addendum = getCurrentFiberStackInDevOrNull();
+    const addendum = getCurrentFiberStackInDev();
 
     const warnKey =
       !!invalidParent + '|' + childTag + '|' + ancestorTag + '|' + addendum;
diff --git a/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js b/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js
index def8ce5a26..ebd5b9c35e 100644
--- a/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js
+++ b/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js
@@ -18,11 +18,6 @@ const rARIACamel = new RegExp('^(aria)[A-Z][' + ATTRIBUTE_NAME_CHAR + ']*$');
 
 const hasOwnProperty = Object.prototype.hasOwnProperty;
 
-function getStackAddendum() {
-  const stack = ReactDebugCurrentFrame.getStackAddendum();
-  return stack != null ? stack : '';
-}
-
 function validateProperty(tagName, name) {
   if (hasOwnProperty.call(warnedProperties, name) && warnedProperties[name]) {
     return true;
@@ -41,7 +36,7 @@ function validateProperty(tagName, name) {
         false,
         'Invalid ARIA attribute `%s`. ARIA attributes follow the pattern aria-* and must be lowercase.%s',
         name,
-        getStackAddendum(),
+        ReactDebugCurrentFrame.getStackAddendum(),
       );
       warnedProperties[name] = true;
       return true;
@@ -53,7 +48,7 @@ function validateProperty(tagName, name) {
         'Invalid ARIA attribute `%s`. Did you mean `%s`?%s',
         name,
         correctName,
-        getStackAddendum(),
+        ReactDebugCurrentFrame.getStackAddendum(),
       );
       warnedProperties[name] = true;
       return true;
@@ -79,7 +74,7 @@ function validateProperty(tagName, name) {
         'Unknown ARIA attribute `%s`. Did you mean `%s`?%s',
         name,
         standardName,
-        getStackAddendum(),
+        ReactDebugCurrentFrame.getStackAddendum(),
       );
       warnedProperties[name] = true;
       return true;
@@ -110,7 +105,7 @@ function warnInvalidARIAProps(type, props) {
         'For details, see https://fb.me/invalid-aria-prop%s',
       unknownPropString,
       type,
-      getStackAddendum(),
+      ReactDebugCurrentFrame.getStackAddendum(),
     );
   } else if (invalidProps.length > 1) {
     warning(
@@ -119,7 +114,7 @@ function warnInvalidARIAProps(type, props) {
         'For details, see https://fb.me/invalid-aria-prop%s',
       unknownPropString,
       type,
-      getStackAddendum(),
+      ReactDebugCurrentFrame.getStackAddendum(),
     );
   }
 }
diff --git a/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js b/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js
index b8e5aeb231..a7702f7408 100644
--- a/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js
+++ b/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js
@@ -10,11 +10,6 @@ import warning from 'shared/warning';
 
 let didWarnValueNull = false;
 
-function getStackAddendum() {
-  const stack = ReactDebugCurrentFrame.getStackAddendum();
-  return stack != null ? stack : '';
-}
-
 export function validateProperties(type, props) {
   if (type !== 'input' && type !== 'textarea' && type !== 'select') {
     return;
@@ -29,7 +24,7 @@ export function validateProperties(type, props) {
           'Consider using an empty array when `multiple` is set to `true` ' +
           'to clear the component or `undefined` for uncontrolled components.%s',
         type,
-        getStackAddendum(),
+        ReactDebugCurrentFrame.getStackAddendum(),
       );
     } else {
       warning(
@@ -38,7 +33,7 @@ export function validateProperties(type, props) {
           'Consider using an empty string to clear the component or `undefined` ' +
           'for uncontrolled components.%s',
         type,
-        getStackAddendum(),
+        ReactDebugCurrentFrame.getStackAddendum(),
       );
     }
   }
diff --git a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js
index 80607b6b65..652fbb1c02 100644
--- a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js
+++ b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js
@@ -21,11 +21,6 @@ import {
 import isCustomComponent from './isCustomComponent';
 import possibleStandardNames from './possibleStandardNames';
 
-function getStackAddendum() {
-  const stack = ReactDebugCurrentFrame.getStackAddendum();
-  return stack != null ? stack : '';
-}
-
 let validateProperty = () => {};
 
 if (__DEV__) {
@@ -69,7 +64,7 @@ if (__DEV__) {
           'Invalid event handler property `%s`. Did you mean `%s`?%s',
           name,
           registrationName,
-          getStackAddendum(),
+          ReactDebugCurrentFrame.getStackAddendum(),
         );
         warnedProperties[name] = true;
         return true;
@@ -79,7 +74,7 @@ if (__DEV__) {
           false,
           'Unknown event handler property `%s`. It will be ignored.%s',
           name,
-          getStackAddendum(),
+          ReactDebugCurrentFrame.getStackAddendum(),
         );
         warnedProperties[name] = true;
         return true;
@@ -94,7 +89,7 @@ if (__DEV__) {
           'Invalid event handler property `%s`. ' +
             'React events use the camelCase naming convention, for example `onClick`.%s',
           name,
-          getStackAddendum(),
+          ReactDebugCurrentFrame.getStackAddendum(),
         );
       }
       warnedProperties[name] = true;
@@ -137,7 +132,7 @@ if (__DEV__) {
         'Received a `%s` for a string attribute `is`. If this is expected, cast ' +
           'the value to a string.%s',
         typeof value,
-        getStackAddendum(),
+        ReactDebugCurrentFrame.getStackAddendum(),
       );
       warnedProperties[name] = true;
       return true;
@@ -149,7 +144,7 @@ if (__DEV__) {
         'Received NaN for the `%s` attribute. If this is expected, cast ' +
           'the value to a string.%s',
         name,
-        getStackAddendum(),
+        ReactDebugCurrentFrame.getStackAddendum(),
       );
       warnedProperties[name] = true;
       return true;
@@ -167,7 +162,7 @@ if (__DEV__) {
           'Invalid DOM property `%s`. Did you mean `%s`?%s',
           name,
           standardName,
-          getStackAddendum(),
+          ReactDebugCurrentFrame.getStackAddendum(),
         );
         warnedProperties[name] = true;
         return true;
@@ -184,7 +179,7 @@ if (__DEV__) {
           'it from the DOM element.%s',
         name,
         lowerCasedName,
-        getStackAddendum(),
+        ReactDebugCurrentFrame.getStackAddendum(),
       );
       warnedProperties[name] = true;
       return true;
@@ -205,7 +200,7 @@ if (__DEV__) {
           name,
           value,
           name,
-          getStackAddendum(),
+          ReactDebugCurrentFrame.getStackAddendum(),
         );
       } else {
         warning(
@@ -222,7 +217,7 @@ if (__DEV__) {
           name,
           name,
           name,
-          getStackAddendum(),
+          ReactDebugCurrentFrame.getStackAddendum(),
         );
       }
       warnedProperties[name] = true;
@@ -265,7 +260,7 @@ const warnUnknownProperties = function(type, props, canUseEventSystem) {
         'For details, see https://fb.me/react-attribute-behavior%s',
       unknownPropString,
       type,
-      getStackAddendum(),
+      ReactDebugCurrentFrame.getStackAddendum(),
     );
   } else if (unknownProps.length > 1) {
     warning(
@@ -275,7 +270,7 @@ const warnUnknownProperties = function(type, props, canUseEventSystem) {
         'For details, see https://fb.me/react-attribute-behavior%s',
       unknownPropString,
       type,
-      getStackAddendum(),
+      ReactDebugCurrentFrame.getStackAddendum(),
     );
   }
 };
diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js
index 64922d94fd..302918abb1 100644
--- a/packages/react-reconciler/src/ReactChildFiber.js
+++ b/packages/react-reconciler/src/ReactChildFiber.js
@@ -39,7 +39,7 @@ import {
 } from './ReactFiber';
 import {emptyRefsObject} from './ReactFiberClassComponent';
 import {
-  getCurrentFiberStackInDevOrNull,
+  getCurrentFiberStackInDev,
   getStackByFiberInDevAndProd,
 } from './ReactCurrentFiber';
 import {StrictMode} from './ReactTypeOfMode';
@@ -80,7 +80,7 @@ if (__DEV__) {
       'Each child in an array or iterator should have a unique ' +
       '"key" prop. See https://fb.me/react-warning-keys for ' +
       'more information.' +
-      (getCurrentFiberStackInDevOrNull() || '');
+      getCurrentFiberStackInDev();
     if (ownerHasKeyUseWarning[currentComponentErrorInfo]) {
       return;
     }
@@ -91,7 +91,7 @@ if (__DEV__) {
       'Each child in an array or iterator should have a unique ' +
         '"key" prop. See https://fb.me/react-warning-keys for ' +
         'more information.%s',
-      getCurrentFiberStackInDevOrNull(),
+      getCurrentFiberStackInDev(),
     );
   };
 }
@@ -197,7 +197,7 @@ function throwOnInvalidObjectType(returnFiber: Fiber, newChild: Object) {
       addendum =
         ' If you meant to render a collection of children, use an array ' +
         'instead.' +
-        (getCurrentFiberStackInDevOrNull() || '');
+        getCurrentFiberStackInDev();
     }
     invariant(
       false,
@@ -215,7 +215,7 @@ function warnOnFunctionType() {
     'Functions are not valid as a React child. This may happen if ' +
     'you return a Component instead of <Component /> from render. ' +
     'Or maybe you meant to call this function rather than return it.' +
-    (getCurrentFiberStackInDevOrNull() || '');
+    getCurrentFiberStackInDev();
 
   if (ownerHasFunctionTypeWarning[currentComponentErrorInfo]) {
     return;
@@ -227,7 +227,7 @@ function warnOnFunctionType() {
     'Functions are not valid as a React child. This may happen if ' +
       'you return a Component instead of <Component /> from render. ' +
       'Or maybe you meant to call this function rather than return it.%s',
-    getCurrentFiberStackInDevOrNull() || '',
+    getCurrentFiberStackInDev(),
   );
 }
 
@@ -719,7 +719,7 @@ function ChildReconciler(shouldTrackSideEffects) {
               'duplicated and/or omitted — the behavior is unsupported and ' +
               'could change in a future version.%s',
             key,
-            getCurrentFiberStackInDevOrNull(),
+            getCurrentFiberStackInDev(),
           );
           break;
         default:
@@ -912,7 +912,7 @@ function ChildReconciler(shouldTrackSideEffects) {
           'Using Maps as children is unsupported and will likely yield ' +
             'unexpected results. Convert it to a sequence/iterable of keyed ' +
             'ReactElements instead.%s',
-          getCurrentFiberStackInDevOrNull(),
+          getCurrentFiberStackInDev(),
         );
         didWarnAboutMaps = true;
       }
diff --git a/packages/react-reconciler/src/ReactCurrentFiber.js b/packages/react-reconciler/src/ReactCurrentFiber.js
index 22d6a557ed..d321e350d4 100644
--- a/packages/react-reconciler/src/ReactCurrentFiber.js
+++ b/packages/react-reconciler/src/ReactCurrentFiber.js
@@ -66,16 +66,16 @@ export function getCurrentFiberOwnerNameInDevOrNull(): string | null {
   return null;
 }
 
-export function getCurrentFiberStackInDevOrNull(): string | null {
+export function getCurrentFiberStackInDev(): string {
   if (__DEV__) {
     if (current === null) {
-      return null;
+      return '';
     }
     // Safe because if current fiber exists, we are reconciling,
     // and it is guaranteed to be the work-in-progress version.
     return getStackByFiberInDevAndProd(current);
   }
-  return null;
+  return '';
 }
 
 export function resetCurrentFiber() {
@@ -88,7 +88,7 @@ export function resetCurrentFiber() {
 
 export function setCurrentFiber(fiber: Fiber) {
   if (__DEV__) {
-    ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackInDevOrNull;
+    ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackInDev;
     current = fiber;
     phase = null;
   }
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 2057dba048..ba3a02b3d2 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -675,7 +675,7 @@ function mountIndeterminateComponent(
             'Stateless function components cannot be given refs. ' +
               'Attempts to access this ref will fail.%s%s',
             info,
-            ReactCurrentFiber.getCurrentFiberStackInDevOrNull(),
+            ReactCurrentFiber.getCurrentFiberStackInDev(),
           );
         }
       }
@@ -933,7 +933,7 @@ function updateContextProvider(current, workInProgress, renderExpirationTime) {
         newProps,
         'prop',
         'Context.Provider',
-        ReactCurrentFiber.getCurrentFiberStackInDevOrNull,
+        ReactCurrentFiber.getCurrentFiberStackInDev,
       );
     }
   }
diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js
index a27515fec8..f5831396e1 100644
--- a/packages/react-reconciler/src/ReactFiberContext.js
+++ b/packages/react-reconciler/src/ReactFiberContext.js
@@ -96,7 +96,7 @@ function getMaskedContext(
       context,
       'context',
       name,
-      ReactCurrentFiber.getCurrentFiberStackInDevOrNull,
+      ReactCurrentFiber.getCurrentFiberStackInDev,
     );
   }
 
@@ -205,7 +205,7 @@ function processChildContext(fiber: Fiber, parentContext: Object): Object {
       // context from the parent component instance. The stack will be missing
       // because it's outside of the reconciliation, and so the pointer has not
       // been set. This is rare and doesn't matter. We'll also remove that API.
-      ReactCurrentFiber.getCurrentFiberStackInDevOrNull,
+      ReactCurrentFiber.getCurrentFiberStackInDev,
     );
   }
 
diff --git a/packages/react/src/ReactDebugCurrentFrame.js b/packages/react/src/ReactDebugCurrentFrame.js
index f8bdff0df4..1327fbf34d 100644
--- a/packages/react/src/ReactDebugCurrentFrame.js
+++ b/packages/react/src/ReactDebugCurrentFrame.js
@@ -11,14 +11,14 @@ const ReactDebugCurrentFrame = {};
 
 if (__DEV__) {
   // Component that is being worked on
-  ReactDebugCurrentFrame.getCurrentStack = (null: null | (() => string | null));
+  ReactDebugCurrentFrame.getCurrentStack = (null: null | (() => string));
 
-  ReactDebugCurrentFrame.getStackAddendum = function(): string | null {
+  ReactDebugCurrentFrame.getStackAddendum = function(): string {
     const impl = ReactDebugCurrentFrame.getCurrentStack;
     if (impl) {
-      return impl();
+      return impl() || '';
     }
-    return null;
+    return '';
   };
 }
 
diff --git a/packages/react/src/ReactElementValidator.js b/packages/react/src/ReactElementValidator.js
index f0ea9601b8..cd833260d5 100644
--- a/packages/react/src/ReactElementValidator.js
+++ b/packages/react/src/ReactElementValidator.js
@@ -74,7 +74,7 @@ if (__DEV__) {
         owner && getComponentName(owner),
       );
     }
-    stack += ReactDebugCurrentFrame.getStackAddendum() || '';
+    stack += ReactDebugCurrentFrame.getStackAddendum();
     return stack;
   };
 }
@@ -324,7 +324,7 @@ export function createElementWithValidation(type, props, children) {
       info += getDeclarationErrorAddendum();
     }
 
-    info += getStackAddendum() || '';
+    info += getStackAddendum();
 
     let typeString;
     if (type === null) {

From 377e1a049e03cbbf78a63ecadf31c3460602fe06 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 9 Jul 2018 14:41:48 +0100
Subject: [PATCH 212/277] Add a test for SSR stack traces (#13180)

---
 .../__tests__/ReactServerRendering-test.js    | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/packages/react-dom/src/__tests__/ReactServerRendering-test.js b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
index a07a842b33..6524b06671 100644
--- a/packages/react-dom/src/__tests__/ReactServerRendering-test.js
+++ b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
@@ -664,4 +664,60 @@ describe('ReactDOMServer', () => {
       require('react-dom');
     }).not.toThrow();
   });
+
+  it('includes a useful stack in warnings', () => {
+    function A() {
+      return null;
+    }
+
+    function B() {
+      return (
+        <font>
+          <C>
+            <span ariaTypo="no" />
+          </C>
+        </font>
+      );
+    }
+
+    class C extends React.Component {
+      render() {
+        return <b>{this.props.children}</b>;
+      }
+    }
+
+    function Child() {
+      return [<A key="1" />, <B key="2" />, <span ariaTypo2="no" />];
+    }
+
+    function App() {
+      return (
+        <div>
+          <section />
+          <span>
+            <Child />
+          </span>
+        </div>
+      );
+    }
+
+    expect(() => ReactDOMServer.renderToString(<App />)).toWarnDev([
+      'Invalid ARIA attribute `ariaTypo`. ARIA attributes follow the pattern aria-* and must be lowercase.\n' +
+        '    in span (at **)\n' +
+        '    in b (at **)\n' +
+        '    in C (at **)\n' +
+        '    in font (at **)\n' +
+        '    in B (at **)\n' +
+        '    in Child (at **)\n' +
+        '    in span (at **)\n' +
+        '    in div (at **)\n' +
+        '    in App (at **)',
+      'Invalid ARIA attribute `ariaTypo2`. ARIA attributes follow the pattern aria-* and must be lowercase.\n' +
+        '    in span (at **)\n' +
+        '    in Child (at **)\n' +
+        '    in span (at **)\n' +
+        '    in div (at **)\n' +
+        '    in App (at **)',
+    ]);
+  });
 });

From 1f32d3c6dcc51f6a540997ab884a300b3f2ac5d4 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Mon, 9 Jul 2018 09:05:13 -0700
Subject: [PATCH 213/277] Test renderer flushAll method verifies an array of
 expected yields (#13174)

---
 .../src/ReactTestRendererScheduling.js        | 75 ++++++++++---------
 .../__tests__/ReactTestRendererAsync-test.js  | 50 +++++++++++--
 .../__tests__/ReactProfiler-test.internal.js  | 19 ++---
 3 files changed, 89 insertions(+), 55 deletions(-)

diff --git a/packages/react-test-renderer/src/ReactTestRendererScheduling.js b/packages/react-test-renderer/src/ReactTestRendererScheduling.js
index cc446fe6b1..5cb66088fb 100644
--- a/packages/react-test-renderer/src/ReactTestRendererScheduling.js
+++ b/packages/react-test-renderer/src/ReactTestRendererScheduling.js
@@ -12,7 +12,7 @@ import type {Deadline} from 'react-reconciler/src/ReactFiberScheduler';
 // Current virtual time
 export let nowImplementation = () => 0;
 export let scheduledCallback: ((deadline: Deadline) => mixed) | null = null;
-export let yieldedValues: Array<mixed> | null = null;
+export let yieldedValues: Array<mixed> = [];
 
 export function scheduleDeferredCallback(
   callback: (deadline: Deadline) => mixed,
@@ -31,8 +31,39 @@ export function setNowImplementation(implementation: () => number): void {
   nowImplementation = implementation;
 }
 
-export function flushAll(): Array<mixed> {
-  yieldedValues = null;
+function verifyExpectedValues(expectedValues: Array<mixed>): void {
+  for (let i = 0; i < expectedValues.length; i++) {
+    const expectedValue = `"${(expectedValues[i]: any)}"`;
+    const yieldedValue =
+      i < yieldedValues.length ? `"${(yieldedValues[i]: any)}"` : 'nothing';
+    if (yieldedValue !== expectedValue) {
+      const error = new Error(
+        `Flush expected to yield ${(expectedValue: any)}, but ${(yieldedValue: any)} was yielded`,
+      );
+      // Attach expected and yielded arrays,
+      // So the caller could pretty print the diff (if desired).
+      (error: any).expectedValues = expectedValues;
+      (error: any).actualValues = yieldedValues;
+      throw error;
+    }
+  }
+
+  if (expectedValues.length !== yieldedValues.length) {
+    const error = new Error(
+      `Flush expected to yield ${expectedValues.length} values, but yielded ${
+        yieldedValues.length
+      }`,
+    );
+    // Attach expected and yielded arrays,
+    // So the caller could pretty print the diff (if desired).
+    (error: any).expectedValues = expectedValues;
+    (error: any).actualValues = yieldedValues;
+    throw error;
+  }
+}
+
+export function flushAll(expectedValues: Array<mixed>): Array<mixed> {
+  yieldedValues = [];
   while (scheduledCallback !== null) {
     const cb = scheduledCallback;
     scheduledCallback = null;
@@ -47,25 +78,19 @@ export function flushAll(): Array<mixed> {
       didTimeout: false,
     });
   }
-  if (yieldedValues === null) {
-    // Always return an array.
-    return [];
-  }
+  verifyExpectedValues(expectedValues);
   return yieldedValues;
 }
 
 export function flushThrough(expectedValues: Array<mixed>): Array<mixed> {
   let didStop = false;
-  yieldedValues = null;
+  yieldedValues = [];
   while (scheduledCallback !== null && !didStop) {
     const cb = scheduledCallback;
     scheduledCallback = null;
     cb({
       timeRemaining() {
-        if (
-          yieldedValues !== null &&
-          yieldedValues.length >= expectedValues.length
-        ) {
+        if (yieldedValues.length >= expectedValues.length) {
           // We at least as many values as expected. Stop rendering.
           didStop = true;
           return 0;
@@ -79,34 +104,12 @@ export function flushThrough(expectedValues: Array<mixed>): Array<mixed> {
       didTimeout: false,
     });
   }
-  if (yieldedValues === null) {
-    // Always return an array.
-    yieldedValues = [];
-  }
-  for (let i = 0; i < expectedValues.length; i++) {
-    const expectedValue = `"${(expectedValues[i]: any)}"`;
-    const yieldedValue =
-      i < yieldedValues.length ? `"${(yieldedValues[i]: any)}"` : 'nothing';
-    if (yieldedValue !== expectedValue) {
-      const error = new Error(
-        `flushThrough expected to yield ${(expectedValue: any)}, but ${(yieldedValue: any)} was yielded`,
-      );
-      // Attach expected and yielded arrays,
-      // So the caller could pretty print the diff (if desired).
-      (error: any).expectedValues = expectedValues;
-      (error: any).actualValues = yieldedValues;
-      throw error;
-    }
-  }
+  verifyExpectedValues(expectedValues);
   return yieldedValues;
 }
 
 export function yieldValue(value: mixed): void {
-  if (yieldedValues === null) {
-    yieldedValues = [value];
-  } else {
-    yieldedValues.push(value);
-  }
+  yieldedValues.push(value);
 }
 
 export function withCleanYields(fn: Function) {
diff --git a/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js b/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js
index e44bf0cb17..abc72c0e0f 100644
--- a/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js
@@ -32,7 +32,7 @@ describe('ReactTestRendererAsync', () => {
     expect(renderer.toJSON()).toEqual(null);
 
     // Flush initial mount.
-    renderer.unstable_flushAll();
+    renderer.unstable_flushAll([]);
     expect(renderer.toJSON()).toEqual('Hi');
 
     // Update
@@ -40,7 +40,7 @@ describe('ReactTestRendererAsync', () => {
     // Not yet updated.
     expect(renderer.toJSON()).toEqual('Hi');
     // Flush update.
-    renderer.unstable_flushAll();
+    renderer.unstable_flushAll([]);
     expect(renderer.toJSON()).toEqual('Bye');
   });
 
@@ -62,11 +62,11 @@ describe('ReactTestRendererAsync', () => {
       unstable_isAsync: true,
     });
 
-    expect(renderer.unstable_flushAll()).toEqual(['A:1', 'B:1', 'C:1']);
+    renderer.unstable_flushAll(['A:1', 'B:1', 'C:1']);
     expect(renderer.toJSON()).toEqual(['A:1', 'B:1', 'C:1']);
 
     renderer.update(<Parent step={2} />);
-    expect(renderer.unstable_flushAll()).toEqual(['A:2', 'B:2', 'C:2']);
+    renderer.unstable_flushAll(['A:2', 'B:2', 'C:2']);
     expect(renderer.toJSON()).toEqual(['A:2', 'B:2', 'C:2']);
   });
 
@@ -97,7 +97,7 @@ describe('ReactTestRendererAsync', () => {
     expect(renderer.toJSON()).toEqual(null);
 
     // Flush the remaining work
-    expect(renderer.unstable_flushAll()).toEqual(['C:1']);
+    renderer.unstable_flushAll(['C:1']);
     expect(renderer.toJSON()).toEqual(['A:1', 'B:1', 'C:1']);
   });
 
@@ -159,7 +159,41 @@ describe('ReactTestRendererAsync', () => {
     );
 
     expect(() => renderer.unstable_flushThrough(['foo', 'baz'])).toThrow(
-      'flushThrough expected to yield "baz", but "bar" was yielded',
+      'Flush expected to yield "baz", but "bar" was yielded',
+    );
+  });
+
+  it('should error if flushAll params dont match yielded values', () => {
+    const Yield = ({id}) => {
+      renderer.unstable_yield(id);
+      return id;
+    };
+
+    const renderer = ReactTestRenderer.create(
+      <div>
+        <Yield id="foo" />
+        <Yield id="bar" />
+        <Yield id="baz" />
+      </div>,
+      {
+        unstable_isAsync: true,
+      },
+    );
+
+    expect(() => renderer.unstable_flushAll([])).toThrow(
+      'Flush expected to yield 0 values, but yielded 3',
+    );
+
+    renderer.update(
+      <div>
+        <Yield id="foo" />
+        <Yield id="bar" />
+        <Yield id="baz" />
+      </div>,
+    );
+
+    expect(() => renderer.unstable_flushAll(['foo', 'baz'])).toThrow(
+      'Flush expected to yield "baz", but "bar" was yielded',
     );
   });
 
@@ -179,7 +213,7 @@ describe('ReactTestRendererAsync', () => {
     );
 
     expect(() => renderer.unstable_flushThrough(['foo', 'bar'])).toThrow(
-      'flushThrough expected to yield "bar", but nothing was yielded',
+      'Flush expected to yield "bar", but nothing was yielded',
     );
   });
 
@@ -189,7 +223,7 @@ describe('ReactTestRendererAsync', () => {
     });
 
     expect(() => renderer.unstable_flushThrough(['foo'])).toThrow(
-      'flushThrough expected to yield "foo", but nothing was yielded',
+      'Flush expected to yield "foo", but nothing was yielded',
     );
   });
 });
diff --git a/packages/react/src/__tests__/ReactProfiler-test.internal.js b/packages/react/src/__tests__/ReactProfiler-test.internal.js
index 48e9d1e6d5..74f491a01f 100644
--- a/packages/react/src/__tests__/ReactProfiler-test.internal.js
+++ b/packages/react/src/__tests__/ReactProfiler-test.internal.js
@@ -178,7 +178,7 @@ describe('Profiler', () => {
       // Times are logged until a render is committed.
       renderer.unstable_flushThrough(['first']);
       expect(callback).toHaveBeenCalledTimes(0);
-      expect(renderer.unstable_flushAll()).toEqual(['last']);
+      renderer.unstable_flushAll(['last']);
       expect(callback).toHaveBeenCalledTimes(1);
     });
 
@@ -532,7 +532,7 @@ describe('Profiler', () => {
         expect(callback).toHaveBeenCalledTimes(0);
 
         // Resume render for remaining children.
-        expect(renderer.unstable_flushAll()).toEqual(['Yield:3']);
+        renderer.unstable_flushAll(['Yield:3']);
 
         // Verify that logged times include both durations above.
         expect(callback).toHaveBeenCalledTimes(1);
@@ -576,7 +576,7 @@ describe('Profiler', () => {
 
         // Flush the remaninig work,
         // Which should take an additional 10ms of simulated time.
-        expect(renderer.unstable_flushAll()).toEqual(['Yield:10', 'Yield:17']);
+        renderer.unstable_flushAll(['Yield:10', 'Yield:17']);
         expect(callback).toHaveBeenCalledTimes(2);
 
         const [innerCall, outerCall] = callback.mock.calls;
@@ -647,7 +647,7 @@ describe('Profiler', () => {
         callback.mockReset();
 
         // Verify no more unexpected callbacks from low priority work
-        expect(renderer.unstable_flushAll()).toEqual([]);
+        renderer.unstable_flushAll([]);
         expect(callback).toHaveBeenCalledTimes(0);
       });
 
@@ -672,7 +672,7 @@ describe('Profiler', () => {
 
         // Render everything initially.
         // This should take 21 seconds of actual and base time.
-        expect(renderer.unstable_flushAll()).toEqual(['Yield:6', 'Yield:15']);
+        renderer.unstable_flushAll(['Yield:6', 'Yield:15']);
         expect(callback).toHaveBeenCalledTimes(1);
         let call = callback.mock.calls[0];
         expect(call[2]).toBe(21); // actual time
@@ -733,7 +733,7 @@ describe('Profiler', () => {
         expect(call[5]).toBe(275); // commit time
 
         // Verify no more unexpected callbacks from low priority work
-        expect(renderer.unstable_flushAll()).toEqual([]);
+        renderer.unstable_flushAll([]);
         expect(callback).toHaveBeenCalledTimes(1);
       });
 
@@ -780,7 +780,7 @@ describe('Profiler', () => {
         // Render everything initially.
         // This simulates a total of 14ms of actual render time.
         // The base render time is also 14ms for the initial render.
-        expect(renderer.unstable_flushAll()).toEqual([
+        renderer.unstable_flushAll([
           'FirstComponent:1',
           'Yield:4',
           'SecondComponent:2',
@@ -836,10 +836,7 @@ describe('Profiler', () => {
         // The tree contains 42ms of base render time at this point,
         // Reflecting the most recent (longer) render durations.
         // TODO: This actual time should decrease by 10ms once the scheduler supports resuming.
-        expect(renderer.unstable_flushAll()).toEqual([
-          'FirstComponent:10',
-          'Yield:4',
-        ]);
+        renderer.unstable_flushAll(['FirstComponent:10', 'Yield:4']);
         expect(callback).toHaveBeenCalledTimes(1);
         call = callback.mock.calls[0];
         expect(call[2]).toBe(14); // actual time

From e79366d5497e669af462b705303bee7edef02585 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Tue, 10 Jul 2018 14:00:06 -0700
Subject: [PATCH 214/277] Link create-subscription doc to GH issue with de-opt
 explanation (#13187)

---
 packages/create-subscription/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/create-subscription/README.md b/packages/create-subscription/README.md
index caca7a3a2e..3fa90d1e69 100644
--- a/packages/create-subscription/README.md
+++ b/packages/create-subscription/README.md
@@ -15,7 +15,7 @@ Other cases have **better long-term solutions**:
 
 The main motivation for `create-subscription` is to provide a way for library authors to ensure compatibility with React's upcoming asynchronous rendering mode. `create-subscription` guarantees correctness in async mode, accounting for the subtle bugs and edge cases that a library author might otherwise miss.
 
-However, it achieves correctness by sometimes de-opting to synchronous mode, obviating the benefits of async rendering. This is an inherent limitation of storing state outside of React's managed state queue and rendering in response to a change event.
+However, [it achieves correctness by sometimes de-opting to synchronous mode](https://github.com/facebook/react/issues/13186#issuecomment-403959161), obviating the benefits of async rendering. This is an inherent limitation of storing state outside of React's managed state queue and rendering in response to a change event.
 
 The effect of de-opting to sync mode is that the main thread may periodically be blocked (in the case of CPU-bound work), and placeholders may appear earlier than desired (in the case of IO-bound work).
 

From afd46490d0b384ddf3f67f9a8fc857e32cdecfe3 Mon Sep 17 00:00:00 2001
From: dongyuwei <newdongyuwei@gmail.com>
Date: Wed, 11 Jul 2018 18:46:44 +0800
Subject: [PATCH 215/277] update devEngines to include nodejs 10.x (#13190)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 01d3bbd9a5..b484024e86 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "yargs": "^6.3.0"
   },
   "devEngines": {
-    "node": "8.x || 9.x"
+    "node": "8.x || 9.x || 10.x"
   },
   "jest": {
     "testRegex": "/scripts/jest/dont-run-jest-directly\\.js$"

From d64d1ddb570a4fb7d748f4c500ac083886c2f0ec Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Wed, 11 Jul 2018 10:18:49 -0700
Subject: [PATCH 216/277] Deprecate ReactTestUtils.mockComponent() (#13193)

Deprecate ReactTestUtils.mockComponent()
---
 packages/react-dom/src/__tests__/ReactTestUtils-test.js | 7 ++++++-
 packages/react-dom/src/test-utils/ReactTestUtils.js     | 7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/react-dom/src/__tests__/ReactTestUtils-test.js b/packages/react-dom/src/__tests__/ReactTestUtils-test.js
index 83437133b6..4db78d8c11 100644
--- a/packages/react-dom/src/__tests__/ReactTestUtils-test.js
+++ b/packages/react-dom/src/__tests__/ReactTestUtils-test.js
@@ -53,7 +53,12 @@ describe('ReactTestUtils', () => {
     MockedComponent.prototype.render = jest.fn();
 
     // Patch it up so it returns its children.
-    ReactTestUtils.mockComponent(MockedComponent);
+    expect(() =>
+      ReactTestUtils.mockComponent(MockedComponent),
+    ).toLowPriorityWarnDev(
+      'ReactTestUtils.mockComponent() is deprecated. ' +
+        'Use shallow rendering or jest.mock() instead.',
+    );
 
     const container = document.createElement('div');
     ReactDOM.render(<MockedComponent>Hello</MockedComponent>, container);
diff --git a/packages/react-dom/src/test-utils/ReactTestUtils.js b/packages/react-dom/src/test-utils/ReactTestUtils.js
index cc0c5a89f7..aba82ddc97 100644
--- a/packages/react-dom/src/test-utils/ReactTestUtils.js
+++ b/packages/react-dom/src/test-utils/ReactTestUtils.js
@@ -17,6 +17,7 @@ import {
 } from 'shared/ReactTypeOfWork';
 import SyntheticEvent from 'events/SyntheticEvent';
 import invariant from 'shared/invariant';
+import lowPriorityWarning from 'shared/lowPriorityWarning';
 
 import * as DOMTopLevelEventTypes from '../events/DOMTopLevelEventTypes';
 
@@ -309,6 +310,12 @@ const ReactTestUtils = {
    * @return {object} the ReactTestUtils object (for chaining)
    */
   mockComponent: function(module, mockTagName) {
+    lowPriorityWarning(
+      false,
+      'ReactTestUtils.mockComponent() is deprecated. ' +
+        'Use shallow rendering or jest.mock() instead.',
+    );
+
     mockTagName = mockTagName || module.mockTagName || 'div';
 
     module.prototype.render.mockImplementation(function() {

From 6ebc8f3c07d8aadea127532fd33637cb091a9e66 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 11 Jul 2018 19:43:54 +0100
Subject: [PATCH 217/277] Add support for re-entrant SSR stacks (#13181)

* Add failing tests

* Fix re-entrancy in ReactDOMServer
---
 .../react-dom/src/__tests__/ReactDOM-test.js  |  75 +++++++++++-
 .../__tests__/ReactServerRendering-test.js    |  57 +++++++++
 .../src/server/ReactPartialRenderer.js        | 115 ++++++++++++------
 3 files changed, 205 insertions(+), 42 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOM-test.js b/packages/react-dom/src/__tests__/ReactDOM-test.js
index 97842417dc..b37f4dd35f 100644
--- a/packages/react-dom/src/__tests__/ReactDOM-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOM-test.js
@@ -9,11 +9,20 @@
 
 'use strict';
 
-let React = require('react');
-let ReactDOM = require('react-dom');
-const ReactTestUtils = require('react-dom/test-utils');
+let React;
+let ReactDOM;
+let ReactDOMServer;
+let ReactTestUtils;
 
 describe('ReactDOM', () => {
+  beforeEach(() => {
+    jest.resetModules();
+    React = require('react');
+    ReactDOM = require('react-dom');
+    ReactDOMServer = require('react-dom/server');
+    ReactTestUtils = require('react-dom/test-utils');
+  });
+
   // TODO: uncomment this test once we can run in phantom, which
   // supports real submit events.
   /*
@@ -446,4 +455,64 @@ describe('ReactDOM', () => {
       global.requestAnimationFrame = previousRAF;
     }
   });
+
+  it('reports stacks with re-entrant renderToString() calls on the client', () => {
+    function Child2(props) {
+      return <span ariaTypo3="no">{props.children}</span>;
+    }
+
+    function App2() {
+      return (
+        <Child2>
+          {ReactDOMServer.renderToString(<blink ariaTypo2="no" />)}
+        </Child2>
+      );
+    }
+
+    function Child() {
+      return (
+        <span ariaTypo4="no">{ReactDOMServer.renderToString(<App2 />)}</span>
+      );
+    }
+
+    function ServerEntry() {
+      return ReactDOMServer.renderToString(<Child />);
+    }
+
+    function App() {
+      return (
+        <div>
+          <span ariaTypo="no" />
+          <ServerEntry />
+          <font ariaTypo5="no" />
+        </div>
+      );
+    }
+
+    const container = document.createElement('div');
+    expect(() => ReactDOM.render(<App />, container)).toWarnDev([
+      // ReactDOM(App > div > span)
+      'Invalid ARIA attribute `ariaTypo`. ARIA attributes follow the pattern aria-* and must be lowercase.\n' +
+        '    in span (at **)\n' +
+        '    in div (at **)\n' +
+        '    in App (at **)',
+      // ReactDOM(App > div > ServerEntry) >>> ReactDOMServer(Child) >>> ReactDOMServer(App2) >>> ReactDOMServer(blink)
+      'Invalid ARIA attribute `ariaTypo2`. ARIA attributes follow the pattern aria-* and must be lowercase.\n' +
+        '    in blink (at **)',
+      // ReactDOM(App > div > ServerEntry) >>> ReactDOMServer(Child) >>> ReactDOMServer(App2 > Child2 > span)
+      'Invalid ARIA attribute `ariaTypo3`. ARIA attributes follow the pattern aria-* and must be lowercase.\n' +
+        '    in span (at **)\n' +
+        '    in Child2 (at **)\n' +
+        '    in App2 (at **)',
+      // ReactDOM(App > div > ServerEntry) >>> ReactDOMServer(Child > span)
+      'Invalid ARIA attribute `ariaTypo4`. ARIA attributes follow the pattern aria-* and must be lowercase.\n' +
+        '    in span (at **)\n' +
+        '    in Child (at **)',
+      // ReactDOM(App > div > font)
+      'Invalid ARIA attribute `ariaTypo5`. ARIA attributes follow the pattern aria-* and must be lowercase.\n' +
+        '    in font (at **)\n' +
+        '    in div (at **)\n' +
+        '    in App (at **)',
+    ]);
+  });
 });
diff --git a/packages/react-dom/src/__tests__/ReactServerRendering-test.js b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
index 6524b06671..a859e0c8f1 100644
--- a/packages/react-dom/src/__tests__/ReactServerRendering-test.js
+++ b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
@@ -720,4 +720,61 @@ describe('ReactDOMServer', () => {
         '    in App (at **)',
     ]);
   });
+
+  it('reports stacks with re-entrant renderToString() calls', () => {
+    function Child2(props) {
+      return <span ariaTypo3="no">{props.children}</span>;
+    }
+
+    function App2() {
+      return (
+        <Child2>
+          {ReactDOMServer.renderToString(<blink ariaTypo2="no" />)}
+        </Child2>
+      );
+    }
+
+    function Child() {
+      return (
+        <span ariaTypo4="no">{ReactDOMServer.renderToString(<App2 />)}</span>
+      );
+    }
+
+    function App() {
+      return (
+        <div>
+          <span ariaTypo="no" />
+          <Child />
+          <font ariaTypo5="no" />
+        </div>
+      );
+    }
+
+    expect(() => ReactDOMServer.renderToString(<App />)).toWarnDev([
+      // ReactDOMServer(App > div > span)
+      'Invalid ARIA attribute `ariaTypo`. ARIA attributes follow the pattern aria-* and must be lowercase.\n' +
+        '    in span (at **)\n' +
+        '    in div (at **)\n' +
+        '    in App (at **)',
+      // ReactDOMServer(App > div > Child) >>> ReactDOMServer(App2) >>> ReactDOMServer(blink)
+      'Invalid ARIA attribute `ariaTypo2`. ARIA attributes follow the pattern aria-* and must be lowercase.\n' +
+        '    in blink (at **)',
+      // ReactDOMServer(App > div > Child) >>> ReactDOMServer(App2 > Child2 > span)
+      'Invalid ARIA attribute `ariaTypo3`. ARIA attributes follow the pattern aria-* and must be lowercase.\n' +
+        '    in span (at **)\n' +
+        '    in Child2 (at **)\n' +
+        '    in App2 (at **)',
+      // ReactDOMServer(App > div > Child > span)
+      'Invalid ARIA attribute `ariaTypo4`. ARIA attributes follow the pattern aria-* and must be lowercase.\n' +
+        '    in span (at **)\n' +
+        '    in Child (at **)\n' +
+        '    in div (at **)\n' +
+        '    in App (at **)',
+      // ReactDOMServer(App > div > font)
+      'Invalid ARIA attribute `ariaTypo5`. ARIA attributes follow the pattern aria-* and must be lowercase.\n' +
+        '    in font (at **)\n' +
+        '    in div (at **)\n' +
+        '    in App (at **)',
+    ]);
+  });
 });
diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index f3c20cde34..e2fec2d9a2 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -61,16 +61,20 @@ type FlatReactChildren = Array<null | ReactNode>;
 type toArrayType = (children: mixed) => FlatReactChildren;
 const toArray = ((React.Children.toArray: any): toArrayType);
 
-let currentDebugStack;
-let currentDebugElementStack;
+// This is only used in DEV.
+// Each entry is `this.stack` from a currently executing renderer instance.
+// (There may be more than one because ReactDOMServer is reentrant).
+// Each stack is an array of frames which may contain nested stacks of elements.
+let currentDebugStacks = [];
 
-let getStackAddendum = () => '';
+let prevGetCurrentStackImpl = null;
+let getCurrentServerStackImpl = () => '';
 let describeStackFrame = element => '';
 
 let validatePropertiesInDevelopment = (type, props) => {};
-let setCurrentDebugStack = (stack: Array<Frame>) => {};
+let pushCurrentDebugStack = (stack: Array<Frame>) => {};
 let pushElementToDebugStack = (element: ReactElement) => {};
-let resetCurrentDebugStack = () => {};
+let popCurrentDebugStack = () => {};
 
 if (__DEV__) {
   validatePropertiesInDevelopment = function(type, props) {
@@ -87,34 +91,55 @@ if (__DEV__) {
     return describeComponentFrame(name, source, ownerName);
   };
 
-  currentDebugStack = null;
-  currentDebugElementStack = null;
-  setCurrentDebugStack = function(stack: Array<Frame>) {
-    const frame: Frame = stack[stack.length - 1];
-    currentDebugElementStack = ((frame: any): FrameDev).debugElementStack;
-    // We are about to enter a new composite stack, reset the array.
-    currentDebugElementStack.length = 0;
-    currentDebugStack = stack;
-    ReactDebugCurrentFrame.getCurrentStack = getStackAddendum;
-  };
-  pushElementToDebugStack = function(element: ReactElement) {
-    if (currentDebugElementStack !== null) {
-      currentDebugElementStack.push(element);
+  pushCurrentDebugStack = function(stack: Array<Frame>) {
+    currentDebugStacks.push(stack);
+
+    if (currentDebugStacks.length === 1) {
+      // We are entering a server renderer.
+      // Remember the previous (e.g. client) global stack implementation.
+      prevGetCurrentStackImpl = ReactDebugCurrentFrame.getCurrentStack;
+      ReactDebugCurrentFrame.getCurrentStack = getCurrentServerStackImpl;
     }
   };
-  resetCurrentDebugStack = function() {
-    currentDebugElementStack = null;
-    currentDebugStack = null;
-    ReactDebugCurrentFrame.getCurrentStack = null;
+
+  pushElementToDebugStack = function(element: ReactElement) {
+    // For the innermost executing ReactDOMServer call,
+    const stack = currentDebugStacks[currentDebugStacks.length - 1];
+    // Take the innermost executing frame (e.g. <Foo>),
+    const frame: Frame = stack[stack.length - 1];
+    // and record that it has one more element associated with it.
+    ((frame: any): FrameDev).debugElementStack.push(element);
+    // We only need this because we tail-optimize single-element
+    // children and directly handle them in an inner loop instead of
+    // creating separate frames for them.
   };
-  getStackAddendum = function(): null | string {
-    if (currentDebugStack === null) {
+
+  popCurrentDebugStack = function() {
+    currentDebugStacks.pop();
+
+    if (currentDebugStacks.length === 0) {
+      // We are exiting the server renderer.
+      // Restore the previous (e.g. client) global stack implementation.
+      ReactDebugCurrentFrame.getCurrentStack = prevGetCurrentStackImpl;
+      prevGetCurrentStackImpl = null;
+    }
+  };
+
+  getCurrentServerStackImpl = function(): string {
+    if (currentDebugStacks.length === 0) {
+      // Nothing is currently rendering.
       return '';
     }
+    // ReactDOMServer is reentrant so there may be multiple calls at the same time.
+    // Take the frames from the innermost call which is the last in the array.
+    let frames = currentDebugStacks[currentDebugStacks.length - 1];
     let stack = '';
-    let debugStack = currentDebugStack;
-    for (let i = debugStack.length - 1; i >= 0; i--) {
-      const frame: Frame = debugStack[i];
+    // Go through every frame in the stack from the innermost one.
+    for (let i = frames.length - 1; i >= 0; i--) {
+      const frame: Frame = frames[i];
+      // Every frame might have more than one debug element stack entry associated with it.
+      // This is because single-child nesting doesn't create materialized frames.
+      // Instead it would push them through `pushElementToDebugStack()`.
       let debugElementStack = ((frame: any): FrameDev).debugElementStack;
       for (let ii = debugElementStack.length - 1; ii >= 0; ii--) {
         stack += describeStackFrame(debugElementStack[ii]);
@@ -180,7 +205,7 @@ function createMarkupForStyles(styles): string | null {
     const styleValue = styles[styleName];
     if (__DEV__) {
       if (!isCustomProperty) {
-        warnValidStyle(styleName, styleValue, getStackAddendum);
+        warnValidStyle(styleName, styleValue, getCurrentServerStackImpl);
       }
     }
     if (styleValue != null) {
@@ -305,7 +330,13 @@ function maskContext(type, context) {
 
 function checkContextTypes(typeSpecs, values, location: string) {
   if (__DEV__) {
-    checkPropTypes(typeSpecs, values, location, 'Component', getStackAddendum);
+    checkPropTypes(
+      typeSpecs,
+      values,
+      location,
+      'Component',
+      getCurrentServerStackImpl,
+    );
   }
 }
 
@@ -774,12 +805,18 @@ class ReactDOMServerRenderer {
       }
       const child = frame.children[frame.childIndex++];
       if (__DEV__) {
-        setCurrentDebugStack(this.stack);
-      }
-      out += this.render(child, frame.context, frame.domNamespace);
-      if (__DEV__) {
-        // TODO: Handle reentrant server render calls. This doesn't.
-        resetCurrentDebugStack();
+        pushCurrentDebugStack(this.stack);
+        // We're starting work on this frame, so reset its inner stack.
+        ((frame: any): FrameDev).debugElementStack.length = 0;
+        try {
+          // Be careful! Make sure this matches the PROD path below.
+          out += this.render(child, frame.context, frame.domNamespace);
+        } finally {
+          popCurrentDebugStack();
+        }
+      } else {
+        // Be careful! Make sure this matches the DEV path above.
+        out += this.render(child, frame.context, frame.domNamespace);
       }
     }
     return out;
@@ -1005,7 +1042,7 @@ class ReactDOMServerRenderer {
         ReactControlledValuePropTypes.checkPropTypes(
           'input',
           props,
-          getStackAddendum,
+          getCurrentServerStackImpl,
         );
 
         if (
@@ -1063,7 +1100,7 @@ class ReactDOMServerRenderer {
         ReactControlledValuePropTypes.checkPropTypes(
           'textarea',
           props,
-          getStackAddendum,
+          getCurrentServerStackImpl,
         );
         if (
           props.value !== undefined &&
@@ -1124,7 +1161,7 @@ class ReactDOMServerRenderer {
         ReactControlledValuePropTypes.checkPropTypes(
           'select',
           props,
-          getStackAddendum,
+          getCurrentServerStackImpl,
         );
 
         for (let i = 0; i < valuePropNames.length; i++) {
@@ -1215,7 +1252,7 @@ class ReactDOMServerRenderer {
       validatePropertiesInDevelopment(tag, props);
     }
 
-    assertValidProps(tag, props, getStackAddendum);
+    assertValidProps(tag, props, getCurrentServerStackImpl);
 
     let out = createOpenTagMarkup(
       element.type,

From 7b99ceabec08b8df79596d7dd1f5dd282010e959 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Wed, 11 Jul 2018 11:56:44 -0700
Subject: [PATCH 218/277] Deprecate test utils mock component follow up
 (#13194)

* De-duplicate the mockComponent deprecation warning

* Added fb.me link to mockComponent
---
 .../src/__tests__/ReactTestUtils-test.js         |  6 +++++-
 .../react-dom/src/test-utils/ReactTestUtils.js   | 16 +++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactTestUtils-test.js b/packages/react-dom/src/__tests__/ReactTestUtils-test.js
index 4db78d8c11..34bb16cb37 100644
--- a/packages/react-dom/src/__tests__/ReactTestUtils-test.js
+++ b/packages/react-dom/src/__tests__/ReactTestUtils-test.js
@@ -57,9 +57,13 @@ describe('ReactTestUtils', () => {
       ReactTestUtils.mockComponent(MockedComponent),
     ).toLowPriorityWarnDev(
       'ReactTestUtils.mockComponent() is deprecated. ' +
-        'Use shallow rendering or jest.mock() instead.',
+        'Use shallow rendering or jest.mock() instead.\n\n' +
+        'See https://fb.me/test-utils-mock-component for more information.',
     );
 
+    // De-duplication check
+    ReactTestUtils.mockComponent(MockedComponent);
+
     const container = document.createElement('div');
     ReactDOM.render(<MockedComponent>Hello</MockedComponent>, container);
     expect(container.textContent).toBe('Hello');
diff --git a/packages/react-dom/src/test-utils/ReactTestUtils.js b/packages/react-dom/src/test-utils/ReactTestUtils.js
index aba82ddc97..1e5c81e468 100644
--- a/packages/react-dom/src/test-utils/ReactTestUtils.js
+++ b/packages/react-dom/src/test-utils/ReactTestUtils.js
@@ -33,6 +33,8 @@ const {
 
 function Event(suffix) {}
 
+let hasWarnedAboutDeprecatedMockComponent = false;
+
 /**
  * @class ReactTestUtils
  */
@@ -310,11 +312,15 @@ const ReactTestUtils = {
    * @return {object} the ReactTestUtils object (for chaining)
    */
   mockComponent: function(module, mockTagName) {
-    lowPriorityWarning(
-      false,
-      'ReactTestUtils.mockComponent() is deprecated. ' +
-        'Use shallow rendering or jest.mock() instead.',
-    );
+    if (!hasWarnedAboutDeprecatedMockComponent) {
+      hasWarnedAboutDeprecatedMockComponent = true;
+      lowPriorityWarning(
+        false,
+        'ReactTestUtils.mockComponent() is deprecated. ' +
+          'Use shallow rendering or jest.mock() instead.\n\n' +
+          'See https://fb.me/test-utils-mock-component for more information.',
+      );
+    }
 
     mockTagName = mockTagName || module.mockTagName || 'div';
 

From f89f25f4718c83b54b0e35c78a2608987db27f8a Mon Sep 17 00:00:00 2001
From: Moti Zilberman <motiz88@gmail.com>
Date: Wed, 11 Jul 2018 22:27:46 +0100
Subject: [PATCH 219/277] Correct type of `ref` in forwardRef render() (#13100)

`React$ElementRef<T>` is the type of the ref _instance_ for a component of type T, whereas `React$Ref<T>` is the type of the ref _prop_ for a component of type T, which seems to be the intended type here.
---
 packages/react/src/forwardRef.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/src/forwardRef.js b/packages/react/src/forwardRef.js
index 0f4cf3ef1f..ec78565211 100644
--- a/packages/react/src/forwardRef.js
+++ b/packages/react/src/forwardRef.js
@@ -10,7 +10,7 @@ import {REACT_FORWARD_REF_TYPE} from 'shared/ReactSymbols';
 import warning from 'shared/warning';
 
 export default function forwardRef<Props, ElementType: React$ElementType>(
-  render: (props: Props, ref: React$ElementRef<ElementType>) => React$Node,
+  render: (props: Props, ref: React$Ref<ElementType>) => React$Node,
 ) {
   if (__DEV__) {
     if (typeof render !== 'function') {

From 9ca37f843194e7a91b7c7250025edaba370f479c Mon Sep 17 00:00:00 2001
From: Sen Yang <jasonslyvia@gmail.com>
Date: Thu, 12 Jul 2018 05:31:48 +0800
Subject: [PATCH 220/277] docs: update comments (#13043)

---
 packages/create-subscription/src/createSubscription.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/create-subscription/src/createSubscription.js b/packages/create-subscription/src/createSubscription.js
index dec0cc57ce..16c5998139 100644
--- a/packages/create-subscription/src/createSubscription.js
+++ b/packages/create-subscription/src/createSubscription.js
@@ -21,7 +21,7 @@ export function createSubscription<Property, Value>(
     getCurrentValue: (source: Property) => Value | void,
 
     // Setup a subscription for the subscribable value in props, and return an unsubscribe function.
-    // Return false to indicate the property cannot be unsubscribed from (e.g. native Promises).
+    // Return empty function if the property cannot be unsubscribed from (e.g. native Promises).
     // Due to the variety of change event types, subscribers should provide their own handlers.
     // Those handlers should not attempt to update state though;
     // They should call the callback() instead when a subscription changes.

From 32f6f258bad524ec3886901a5b132887f8dd7553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Spie=C3=9F?= <hello@philippspiess.com>
Date: Thu, 12 Jul 2018 13:11:35 +0200
Subject: [PATCH 221/277] Remove event simulation of onChange events (#13176)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove event simulation of onChange events

It’s time to get rid of even more `ReactTestUtils.Simulate`s. In this PR
we remove the event simulation from all onChange tests. To do this, we
have to get a setter to the untracked value/checked props.

All remaining `ReactTestUtils.Simulate` calls are either testing
ReactTestUtils or assert that they do/don't throw.

* Use input instead of change event for all but checkbox, radio, and select
---
 .../src/__tests__/ReactDOMInput-test.js       | 335 ++++++++----------
 .../src/__tests__/ReactDOMSelect-test.js      |  15 +-
 .../ReactDOMServerIntegrationForms-test.js    | 108 ++++--
 .../src/__tests__/ReactDOMTextarea-test.js    |  22 +-
 4 files changed, 257 insertions(+), 223 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index feed5963eb..480287cfc0 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -15,8 +15,9 @@ describe('ReactDOMInput', () => {
   let React;
   let ReactDOM;
   let ReactDOMServer;
-  let ReactTestUtils;
   let setUntrackedValue;
+  let setUntrackedChecked;
+  let container;
 
   function dispatchEventOnNode(node, type) {
     node.dispatchEvent(new Event(type, {bubbles: true, cancelable: true}));
@@ -29,15 +30,24 @@ describe('ReactDOMInput', () => {
       HTMLInputElement.prototype,
       'value',
     ).set;
+    setUntrackedChecked = Object.getOwnPropertyDescriptor(
+      HTMLInputElement.prototype,
+      'checked',
+    ).set;
 
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMServer = require('react-dom/server');
-    ReactTestUtils = require('react-dom/test-utils');
+
+    container = document.createElement('div');
+    document.body.appendChild(container);
+  });
+
+  afterEach(() => {
+    document.body.removeChild(container);
   });
 
   it('should properly control a value even if no event listener exists', () => {
-    const container = document.createElement('div');
     let node;
 
     expect(() => {
@@ -46,19 +56,13 @@ describe('ReactDOMInput', () => {
       'Failed prop type: You provided a `value` prop to a form field without an `onChange` handler.',
     );
 
-    document.body.appendChild(container);
+    setUntrackedValue.call(node, 'giraffe');
 
-    try {
-      setUntrackedValue.call(node, 'giraffe');
+    // This must use the native event dispatching. If we simulate, we will
+    // bypass the lazy event attachment system so we won't actually test this.
+    dispatchEventOnNode(node, 'input');
 
-      // This must use the native event dispatching. If we simulate, we will
-      // bypass the lazy event attachment system so we won't actually test this.
-      dispatchEventOnNode(node, 'change');
-
-      expect(node.value).toBe('lion');
-    } finally {
-      document.body.removeChild(container);
-    }
+    expect(node.value).toBe('lion');
   });
 
   it('should control a value in reentrant events', () => {
@@ -72,7 +76,7 @@ describe('ReactDOMInput', () => {
         // Calling focus here will blur the text box which causes a native
         // change event. Ideally we shouldn't have to fire this ourselves.
         // Don't remove unless you've verified the fix in #8240 is still covered.
-        dispatchEventOnNode(this.a, 'change');
+        dispatchEventOnNode(this.a, 'input');
         this.b.focus();
       }
       blur(currentValue) {
@@ -97,25 +101,19 @@ describe('ReactDOMInput', () => {
       }
     }
 
-    const container = document.createElement('div');
     const instance = ReactDOM.render(<ControlledInputs />, container);
 
-    // We need it to be in the body to test native event dispatching.
-    document.body.appendChild(container);
-
     // Focus the field so we can later blur it.
     // Don't remove unless you've verified the fix in #8240 is still covered.
     instance.a.focus();
     setUntrackedValue.call(instance.a, 'giraffe');
     // This must use the native event dispatching. If we simulate, we will
     // bypass the lazy event attachment system so we won't actually test this.
-    dispatchEventOnNode(instance.a, 'change');
+    dispatchEventOnNode(instance.a, 'input');
     dispatchEventOnNode(instance.a, 'blur');
 
     expect(instance.a.value).toBe('giraffe');
     expect(instance.switchedFocus).toBe(true);
-
-    document.body.removeChild(container);
   });
 
   it('should control values in reentrant events with different targets', () => {
@@ -150,12 +148,8 @@ describe('ReactDOMInput', () => {
       }
     }
 
-    const container = document.createElement('div');
     const instance = ReactDOM.render(<ControlledInputs />, container);
 
-    // We need it to be in the body to test native event dispatching.
-    document.body.appendChild(container);
-
     setUntrackedValue.call(instance.a, 'giraffe');
     // This must use the native event dispatching. If we simulate, we will
     // bypass the lazy event attachment system so we won't actually test this.
@@ -163,18 +157,16 @@ describe('ReactDOMInput', () => {
 
     expect(instance.a.value).toBe('lion');
     expect(instance.b.checked).toBe(true);
-
-    document.body.removeChild(container);
   });
 
   describe('switching text inputs between numeric and string numbers', () => {
     it('does change the number 2 to "2.0" with no change handler', () => {
       const stub = <input type="text" value={2} onChange={jest.fn()} />;
-      const node = ReactTestUtils.renderIntoDocument(stub);
+      const node = ReactDOM.render(stub, container);
 
-      node.value = '2.0';
+      setUntrackedValue.call(node, '2.0');
 
-      ReactTestUtils.Simulate.change(node);
+      dispatchEventOnNode(node, 'input');
 
       expect(node.getAttribute('value')).toBe('2');
       expect(node.value).toBe('2');
@@ -182,11 +174,11 @@ describe('ReactDOMInput', () => {
 
     it('does change the string "2" to "2.0" with no change handler', () => {
       const stub = <input type="text" value={'2'} onChange={jest.fn()} />;
-      const node = ReactTestUtils.renderIntoDocument(stub);
+      const node = ReactDOM.render(stub, container);
 
-      node.value = '2.0';
+      setUntrackedValue.call(node, '2.0');
 
-      ReactTestUtils.Simulate.change(node);
+      dispatchEventOnNode(node, 'input');
 
       expect(node.getAttribute('value')).toBe('2');
       expect(node.value).toBe('2');
@@ -207,12 +199,12 @@ describe('ReactDOMInput', () => {
         }
       }
 
-      const stub = ReactTestUtils.renderIntoDocument(<Stub />);
+      const stub = ReactDOM.render(<Stub />, container);
       const node = ReactDOM.findDOMNode(stub);
 
-      node.value = '2.0';
+      setUntrackedValue.call(node, '2.0');
 
-      ReactTestUtils.Simulate.change(node);
+      dispatchEventOnNode(node, 'input');
 
       expect(node.getAttribute('value')).toBe('2.0');
       expect(node.value).toBe('2.0');
@@ -231,7 +223,7 @@ describe('ReactDOMInput', () => {
 
     let stub;
     expect(() => {
-      stub = ReactTestUtils.renderIntoDocument(<Stub />);
+      stub = ReactDOM.render(<Stub />, container);
     }).toWarnDev(
       'You provided a `value` prop to a form field ' +
         'without an `onChange` handler.',
@@ -252,7 +244,7 @@ describe('ReactDOMInput', () => {
       }
     }
 
-    const stub = ReactTestUtils.renderIntoDocument(<Stub />);
+    const stub = ReactDOM.render(<Stub />, container);
     const node = ReactDOM.findDOMNode(stub);
     stub.setState({value: 0});
 
@@ -260,7 +252,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('updates the value on radio buttons from "" to 0', function() {
-    const container = document.createElement('div');
     ReactDOM.render(
       <input type="radio" value="" onChange={function() {}} />,
       container,
@@ -274,7 +265,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('updates the value on checkboxes from "" to 0', function() {
-    const container = document.createElement('div');
     ReactDOM.render(
       <input type="checkbox" value="" onChange={function() {}} />,
       container,
@@ -300,7 +290,7 @@ describe('ReactDOMInput', () => {
     let stub;
 
     expect(() => {
-      stub = ReactTestUtils.renderIntoDocument(<Stub />);
+      stub = ReactDOM.render(<Stub />, container);
     }).toWarnDev(
       'You provided a `value` prop to a form field ' +
         'without an `onChange` handler.',
@@ -313,7 +303,7 @@ describe('ReactDOMInput', () => {
 
   it('should display `defaultValue` of number 0', () => {
     let stub = <input type="text" defaultValue={0} />;
-    const node = ReactTestUtils.renderIntoDocument(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(node.getAttribute('value')).toBe('0');
     expect(node.value).toBe('0');
@@ -326,7 +316,7 @@ describe('ReactDOMInput', () => {
       }
     }
 
-    const component = ReactTestUtils.renderIntoDocument(<Test />);
+    const component = ReactDOM.render(<Test />, container);
     const node = ReactDOM.findDOMNode(component);
 
     Object.defineProperty(node, 'defaultValue', {
@@ -345,21 +335,19 @@ describe('ReactDOMInput', () => {
 
   it('should display "true" for `defaultValue` of `true`', () => {
     let stub = <input type="text" defaultValue={true} />;
-    const node = ReactTestUtils.renderIntoDocument(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(node.value).toBe('true');
   });
 
   it('should display "false" for `defaultValue` of `false`', () => {
     let stub = <input type="text" defaultValue={false} />;
-    const node = ReactTestUtils.renderIntoDocument(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(node.value).toBe('false');
   });
 
   it('should update `defaultValue` for uncontrolled input', () => {
-    const container = document.createElement('div');
-
     const node = ReactDOM.render(
       <input type="text" defaultValue="0" />,
       container,
@@ -374,8 +362,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should update `defaultValue` for uncontrolled date/time input', () => {
-    const container = document.createElement('div');
-
     const node = ReactDOM.render(
       <input type="date" defaultValue="1980-01-01" />,
       container,
@@ -392,7 +378,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should take `defaultValue` when changing to uncontrolled input', () => {
-    const container = document.createElement('div');
     const node = ReactDOM.render(
       <input type="text" value="0" readOnly="true" />,
       container,
@@ -427,7 +412,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should render name attribute if it is supplied', () => {
-    const container = document.createElement('div');
     const node = ReactDOM.render(<input type="text" name="name" />, container);
     expect(node.name).toBe('name');
     expect(container.firstChild.getAttribute('name')).toBe('name');
@@ -442,7 +426,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should not render name attribute if it is not supplied', () => {
-    const container = document.createElement('div');
     ReactDOM.render(<input type="text" />, container);
     expect(container.firstChild.getAttribute('name')).toBe(null);
   });
@@ -463,20 +446,19 @@ describe('ReactDOMInput', () => {
     };
 
     const stub = <input type="text" defaultValue={objToString} />;
-    const node = ReactTestUtils.renderIntoDocument(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(node.value).toBe('foobar');
   });
 
   it('should display `value` of number 0', () => {
     const stub = <input type="text" value={0} />;
-    const node = ReactTestUtils.renderIntoDocument(stub);
+    const node = ReactDOM.render(stub, container);
 
     expect(node.value).toBe('0');
   });
 
   it('should allow setting `value` to `true`', () => {
-    const container = document.createElement('div');
     let stub = <input type="text" value="yolo" onChange={emptyFunction} />;
     const node = ReactDOM.render(stub, container);
 
@@ -490,7 +472,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should allow setting `value` to `false`', () => {
-    const container = document.createElement('div');
     let stub = <input type="text" value="yolo" onChange={emptyFunction} />;
     const node = ReactDOM.render(stub, container);
 
@@ -504,7 +485,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should allow setting `value` to `objToString`', () => {
-    const container = document.createElement('div');
     let stub = <input type="text" value="foo" onChange={emptyFunction} />;
     const node = ReactDOM.render(stub, container);
 
@@ -523,7 +503,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should not incur unnecessary DOM mutations', () => {
-    const container = document.createElement('div');
     ReactDOM.render(<input value="a" onChange={() => {}} />, container);
 
     const node = container.firstChild;
@@ -546,7 +525,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should not incur unnecessary DOM mutations for numeric type conversion', () => {
-    const container = document.createElement('div');
     ReactDOM.render(<input value="0" onChange={() => {}} />, container);
 
     const node = container.firstChild;
@@ -566,7 +544,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should not incur unnecessary DOM mutations for the boolean type conversion', () => {
-    const container = document.createElement('div');
     ReactDOM.render(<input value="true" onChange={() => {}} />, container);
 
     const node = container.firstChild;
@@ -587,34 +564,32 @@ describe('ReactDOMInput', () => {
 
   it('should properly control a value of number `0`', () => {
     const stub = <input type="text" value={0} onChange={emptyFunction} />;
-    const node = ReactTestUtils.renderIntoDocument(stub);
+    const node = ReactDOM.render(stub, container);
 
-    node.value = 'giraffe';
-    ReactTestUtils.Simulate.change(node);
+    setUntrackedValue.call(node, 'giraffe');
+    dispatchEventOnNode(node, 'input');
     expect(node.value).toBe('0');
   });
 
   it('should properly control 0.0 for a text input', () => {
     const stub = <input type="text" value={0} onChange={emptyFunction} />;
-    const node = ReactTestUtils.renderIntoDocument(stub);
+    const node = ReactDOM.render(stub, container);
 
-    node.value = '0.0';
-    ReactTestUtils.Simulate.change(node, {target: {value: '0.0'}});
+    setUntrackedValue.call(node, '0.0');
+    dispatchEventOnNode(node, 'input');
     expect(node.value).toBe('0');
   });
 
   it('should properly control 0.0 for a number input', () => {
     const stub = <input type="number" value={0} onChange={emptyFunction} />;
-    const node = ReactTestUtils.renderIntoDocument(stub);
+    const node = ReactDOM.render(stub, container);
 
-    node.value = '0.0';
-    ReactTestUtils.Simulate.change(node, {target: {value: '0.0'}});
+    setUntrackedValue.call(node, '0.0');
+    dispatchEventOnNode(node, 'input');
     expect(node.value).toBe('0.0');
   });
 
   it('should properly transition from an empty value to 0', function() {
-    const container = document.createElement('div');
-
     ReactDOM.render(<input type="text" value="" />, container);
     ReactDOM.render(<input type="text" value={0} />, container);
 
@@ -625,8 +600,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should properly transition from 0 to an empty value', function() {
-    const container = document.createElement('div');
-
     ReactDOM.render(<input type="text" value={0} />, container);
     ReactDOM.render(<input type="text" value="" />, container);
 
@@ -637,8 +610,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should properly transition a text input from 0 to an empty 0.0', function() {
-    const container = document.createElement('div');
-
     ReactDOM.render(<input type="text" value={0} />, container);
     ReactDOM.render(<input type="text" value="0.0" />, container);
 
@@ -649,8 +620,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should properly transition a number input from "" to 0', function() {
-    const container = document.createElement('div');
-
     ReactDOM.render(<input type="number" value="" />, container);
     ReactDOM.render(<input type="number" value={0} />, container);
 
@@ -661,8 +630,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should properly transition a number input from "" to "0"', function() {
-    const container = document.createElement('div');
-
     ReactDOM.render(<input type="number" value="" />, container);
     ReactDOM.render(<input type="number" value="0" />, container);
 
@@ -679,21 +646,18 @@ describe('ReactDOMInput', () => {
       handled = true;
     };
     const stub = <input type="text" value={0} onChange={handler} />;
-    const container = document.createElement('div');
     const node = ReactDOM.render(stub, container);
 
     setUntrackedValue.call(node, 'giraffe');
 
-    ReactTestUtils.SimulateNative.input(node, {
-      path: [node, container],
-    });
+    dispatchEventOnNode(node, 'input');
 
     expect(handled).toBe(true);
   });
 
   it('should not set a value for submit buttons unnecessarily', () => {
     const stub = <input type="submit" />;
-    const node = ReactTestUtils.renderIntoDocument(stub);
+    const node = ReactDOM.render(stub, container);
 
     // The value shouldn't be '', or else the button will have no text; it
     // should have the default "Submit" or "Submit Query" label. Most browsers
@@ -733,7 +697,7 @@ describe('ReactDOMInput', () => {
       }
     }
 
-    const stub = ReactTestUtils.renderIntoDocument(<RadioGroup />);
+    const stub = ReactDOM.render(<RadioGroup />, container);
     const aNode = stub.refs.a;
     const bNode = stub.refs.b;
     const cNode = stub.refs.c;
@@ -746,11 +710,8 @@ describe('ReactDOMInput', () => {
     expect(cNode.checked).toBe(true);
     expect(cNode.hasAttribute('checked')).toBe(true);
 
-    bNode.checked = true;
-    // This next line isn't necessary in a proper browser environment, but
-    // jsdom doesn't uncheck the others in a group (which makes this whole test
-    // a little less effective)
-    aNode.checked = false;
+    setUntrackedChecked.call(bNode, true);
+    expect(aNode.checked).toBe(false);
     expect(cNode.checked).toBe(true);
 
     // The original 'checked' attribute should be unchanged
@@ -759,7 +720,7 @@ describe('ReactDOMInput', () => {
     expect(cNode.hasAttribute('checked')).toBe(true);
 
     // Now let's run the actual ReactDOMInput change event handler
-    ReactTestUtils.Simulate.change(bNode);
+    dispatchEventOnNode(bNode, 'click');
 
     // The original state should have been restored
     expect(aNode.checked).toBe(true);
@@ -797,16 +758,16 @@ describe('ReactDOMInput', () => {
       }
     }
 
-    const stub = ReactTestUtils.renderIntoDocument(<App />);
+    const stub = ReactDOM.render(<App />, container);
     const buttonNode = ReactDOM.findDOMNode(stub).childNodes[0];
     const firstRadioNode = ReactDOM.findDOMNode(stub).childNodes[1];
     expect(firstRadioNode.checked).toBe(false);
-    ReactTestUtils.Simulate.click(buttonNode);
+    dispatchEventOnNode(buttonNode, 'click');
     expect(firstRadioNode.checked).toBe(true);
   });
 
   it('should control radio buttons if the tree updates during render', () => {
-    const sharedParent = document.createElement('div');
+    const sharedParent = container;
     const container1 = document.createElement('div');
     const container2 = document.createElement('div');
 
@@ -815,6 +776,15 @@ describe('ReactDOMInput', () => {
     let aNode;
     let bNode;
     class ComponentA extends React.Component {
+      state = {changed: false};
+      handleChange = () => {
+        this.setState({
+          changed: true,
+        });
+      };
+      componentDidUpdate() {
+        sharedParent.appendChild(container2);
+      }
       componentDidMount() {
         ReactDOM.render(<ComponentB />, container2);
       }
@@ -825,8 +795,8 @@ describe('ReactDOMInput', () => {
               ref={n => (aNode = n)}
               type="radio"
               name="fruit"
-              checked={true}
-              onChange={emptyFunction}
+              checked={false}
+              onChange={this.handleChange}
             />
             A
           </div>
@@ -835,15 +805,6 @@ describe('ReactDOMInput', () => {
     }
 
     class ComponentB extends React.Component {
-      state = {changed: false};
-      handleChange = () => {
-        this.setState({
-          changed: true,
-        });
-      };
-      componentDidUpdate() {
-        sharedParent.appendChild(container2);
-      }
       render() {
         return (
           <div>
@@ -851,8 +812,8 @@ describe('ReactDOMInput', () => {
               ref={n => (bNode = n)}
               type="radio"
               name="fruit"
-              checked={false}
-              onChange={this.handleChange}
+              checked={true}
+              onChange={emptyFunction}
             />
             B
           </div>
@@ -862,31 +823,34 @@ describe('ReactDOMInput', () => {
 
     ReactDOM.render(<ComponentA />, container1);
 
-    expect(aNode.checked).toBe(true);
-    expect(bNode.checked).toBe(false);
+    expect(aNode.checked).toBe(false);
+    expect(bNode.checked).toBe(true);
 
-    bNode.checked = true;
+    setUntrackedChecked.call(aNode, true);
     // This next line isn't necessary in a proper browser environment, but
-    // jsdom doesn't uncheck the others in a group (which makes this whole test
-    // a little less effective)
-    aNode.checked = false;
+    // jsdom doesn't uncheck the others in a group (because they are not yet
+    // sharing a parent), which makes this whole test a little less effective.
+    setUntrackedChecked.call(bNode, false);
 
     // Now let's run the actual ReactDOMInput change event handler
-    ReactTestUtils.Simulate.change(bNode);
+    dispatchEventOnNode(aNode, 'click');
 
     // The original state should have been restored
-    expect(aNode.checked).toBe(true);
-    expect(bNode.checked).toBe(false);
+    expect(aNode.checked).toBe(false);
+    expect(bNode.checked).toBe(true);
   });
 
   it('should warn with value and no onChange handler and readOnly specified', () => {
-    ReactTestUtils.renderIntoDocument(
+    ReactDOM.render(
       <input type="text" value="zoink" readOnly={true} />,
+      container,
     );
+    ReactDOM.unmountComponentAtNode(container);
 
     expect(() =>
-      ReactTestUtils.renderIntoDocument(
+      ReactDOM.render(
         <input type="text" value="zoink" readOnly={false} />,
+        container,
       ),
     ).toWarnDev(
       'Warning: Failed prop type: You provided a `value` prop to a form ' +
@@ -898,24 +862,29 @@ describe('ReactDOMInput', () => {
   });
 
   it('should have a this value of undefined if bind is not used', () => {
+    expect.assertions(1);
     const unboundInputOnChange = function() {
       expect(this).toBe(undefined);
     };
 
-    let instance = <input type="text" onChange={unboundInputOnChange} />;
-    instance = ReactTestUtils.renderIntoDocument(instance);
+    const stub = <input type="text" onChange={unboundInputOnChange} />;
+    const node = ReactDOM.render(stub, container);
 
-    ReactTestUtils.Simulate.change(instance);
+    setUntrackedValue.call(node, 'giraffe');
+    dispatchEventOnNode(node, 'input');
   });
 
   it('should warn with checked and no onChange handler with readOnly specified', () => {
-    ReactTestUtils.renderIntoDocument(
+    ReactDOM.render(
       <input type="checkbox" checked="false" readOnly={true} />,
+      container,
     );
+    ReactDOM.unmountComponentAtNode(container);
 
     expect(() =>
-      ReactTestUtils.renderIntoDocument(
+      ReactDOM.render(
         <input type="checkbox" checked="false" readOnly={false} />,
+        container,
       ),
     ).toWarnDev(
       'Failed prop type: You provided a `checked` prop to a form field without an `onChange` handler. ' +
@@ -925,7 +894,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should update defaultValue to empty string', () => {
-    const container = document.createElement('div');
     ReactDOM.render(<input type="text" defaultValue={'foo'} />, container);
     ReactDOM.render(<input type="text" defaultValue={''} />, container);
     expect(container.firstChild.defaultValue).toBe('');
@@ -933,25 +901,27 @@ describe('ReactDOMInput', () => {
 
   it('should warn if value is null', () => {
     expect(() =>
-      ReactTestUtils.renderIntoDocument(<input type="text" value={null} />),
+      ReactDOM.render(<input type="text" value={null} />, container),
     ).toWarnDev(
       '`value` prop on `input` should not be null. ' +
         'Consider using an empty string to clear the component or `undefined` ' +
         'for uncontrolled components.',
     );
+    ReactDOM.unmountComponentAtNode(container);
 
-    ReactTestUtils.renderIntoDocument(<input type="text" value={null} />);
+    ReactDOM.render(<input type="text" value={null} />, container);
   });
 
   it('should warn if checked and defaultChecked props are specified', () => {
     expect(() =>
-      ReactTestUtils.renderIntoDocument(
+      ReactDOM.render(
         <input
           type="radio"
           checked={true}
           defaultChecked={true}
           readOnly={true}
         />,
+        container,
       ),
     ).toWarnDev(
       'A component contains an input of type radio with both checked and defaultChecked props. ' +
@@ -961,21 +931,24 @@ describe('ReactDOMInput', () => {
         'element and remove one of these props. More info: ' +
         'https://fb.me/react-controlled-components',
     );
+    ReactDOM.unmountComponentAtNode(container);
 
-    ReactTestUtils.renderIntoDocument(
+    ReactDOM.render(
       <input
         type="radio"
         checked={true}
         defaultChecked={true}
         readOnly={true}
       />,
+      container,
     );
   });
 
   it('should warn if value and defaultValue props are specified', () => {
     expect(() =>
-      ReactTestUtils.renderIntoDocument(
+      ReactDOM.render(
         <input type="text" value="foo" defaultValue="bar" readOnly={true} />,
+        container,
       ),
     ).toWarnDev(
       'A component contains an input of type text with both value and defaultValue props. ' +
@@ -985,9 +958,11 @@ describe('ReactDOMInput', () => {
         'element and remove one of these props. More info: ' +
         'https://fb.me/react-controlled-components',
     );
+    ReactDOM.unmountComponentAtNode(container);
 
-    ReactTestUtils.renderIntoDocument(
+    ReactDOM.render(
       <input type="text" value="foo" defaultValue="bar" readOnly={true} />,
+      container,
     );
   });
 
@@ -995,7 +970,6 @@ describe('ReactDOMInput', () => {
     const stub = (
       <input type="text" value="controlled" onChange={emptyFunction} />
     );
-    const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() => ReactDOM.render(<input type="text" />, container)).toWarnDev(
       'Warning: A component is changing a controlled input of type text to be uncontrolled. ' +
@@ -1010,7 +984,6 @@ describe('ReactDOMInput', () => {
     const stub = (
       <input type="text" value="controlled" onChange={emptyFunction} />
     );
-    const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
       ReactDOM.render(<input type="text" value={null} />, container),
@@ -1029,7 +1002,6 @@ describe('ReactDOMInput', () => {
     const stub = (
       <input type="text" value="controlled" onChange={emptyFunction} />
     );
-    const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
       ReactDOM.render(
@@ -1047,7 +1019,6 @@ describe('ReactDOMInput', () => {
 
   it('should warn if uncontrolled input (value is undefined) switches to controlled', () => {
     const stub = <input type="text" />;
-    const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
       ReactDOM.render(<input type="text" value="controlled" />, container),
@@ -1062,7 +1033,6 @@ describe('ReactDOMInput', () => {
 
   it('should warn if uncontrolled input (value is null) switches to controlled', () => {
     const stub = <input type="text" value={null} />;
-    const container = document.createElement('div');
     expect(() => ReactDOM.render(stub, container)).toWarnDev(
       '`value` prop on `input` should not be null. ' +
         'Consider using an empty string to clear the component or `undefined` for uncontrolled components.',
@@ -1082,7 +1052,6 @@ describe('ReactDOMInput', () => {
     const stub = (
       <input type="checkbox" checked={true} onChange={emptyFunction} />
     );
-    const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
       ReactDOM.render(<input type="checkbox" />, container),
@@ -1099,7 +1068,6 @@ describe('ReactDOMInput', () => {
     const stub = (
       <input type="checkbox" checked={true} onChange={emptyFunction} />
     );
-    const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
       ReactDOM.render(<input type="checkbox" checked={null} />, container),
@@ -1116,7 +1084,6 @@ describe('ReactDOMInput', () => {
     const stub = (
       <input type="checkbox" checked={true} onChange={emptyFunction} />
     );
-    const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
       ReactDOM.render(
@@ -1134,7 +1101,6 @@ describe('ReactDOMInput', () => {
 
   it('should warn if uncontrolled checkbox (checked is undefined) switches to controlled', () => {
     const stub = <input type="checkbox" />;
-    const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
       ReactDOM.render(<input type="checkbox" checked={true} />, container),
@@ -1149,7 +1115,6 @@ describe('ReactDOMInput', () => {
 
   it('should warn if uncontrolled checkbox (checked is null) switches to controlled', () => {
     const stub = <input type="checkbox" checked={null} />;
-    const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
       ReactDOM.render(<input type="checkbox" checked={true} />, container),
@@ -1164,7 +1129,6 @@ describe('ReactDOMInput', () => {
 
   it('should warn if controlled radio switches to uncontrolled (checked is undefined)', () => {
     const stub = <input type="radio" checked={true} onChange={emptyFunction} />;
-    const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() => ReactDOM.render(<input type="radio" />, container)).toWarnDev(
       'Warning: A component is changing a controlled input of type radio to be uncontrolled. ' +
@@ -1177,7 +1141,6 @@ describe('ReactDOMInput', () => {
 
   it('should warn if controlled radio switches to uncontrolled (checked is null)', () => {
     const stub = <input type="radio" checked={true} onChange={emptyFunction} />;
-    const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
       ReactDOM.render(<input type="radio" checked={null} />, container),
@@ -1192,7 +1155,6 @@ describe('ReactDOMInput', () => {
 
   it('should warn if controlled radio switches to uncontrolled with defaultChecked', () => {
     const stub = <input type="radio" checked={true} onChange={emptyFunction} />;
-    const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
       ReactDOM.render(<input type="radio" defaultChecked={true} />, container),
@@ -1207,7 +1169,6 @@ describe('ReactDOMInput', () => {
 
   it('should warn if uncontrolled radio (checked is undefined) switches to controlled', () => {
     const stub = <input type="radio" />;
-    const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
       ReactDOM.render(<input type="radio" checked={true} />, container),
@@ -1222,7 +1183,6 @@ describe('ReactDOMInput', () => {
 
   it('should warn if uncontrolled radio (checked is null) switches to controlled', () => {
     const stub = <input type="radio" checked={null} />;
-    const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
       ReactDOM.render(<input type="radio" checked={true} />, container),
@@ -1236,7 +1196,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should not warn if radio value changes but never becomes controlled', () => {
-    const container = document.createElement('div');
     ReactDOM.render(<input type="radio" value="value" />, container);
     ReactDOM.render(<input type="radio" />, container);
     ReactDOM.render(
@@ -1251,7 +1210,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should not warn if radio value changes but never becomes uncontrolled', () => {
-    const container = document.createElement('div');
     ReactDOM.render(
       <input type="radio" checked={false} onChange={() => null} />,
       container,
@@ -1269,7 +1227,6 @@ describe('ReactDOMInput', () => {
   });
 
   it('should warn if radio checked false changes to become uncontrolled', () => {
-    const container = document.createElement('div');
     ReactDOM.render(
       <input
         type="radio"
@@ -1314,7 +1271,7 @@ describe('ReactDOMInput', () => {
       return el;
     });
 
-    ReactTestUtils.renderIntoDocument(
+    ReactDOM.render(
       <input
         value="0"
         onChange={() => {}}
@@ -1323,6 +1280,7 @@ describe('ReactDOMInput', () => {
         max="100"
         step="1"
       />,
+      container,
     );
     expect(log).toEqual([
       'set attribute type',
@@ -1336,9 +1294,7 @@ describe('ReactDOMInput', () => {
   });
 
   it('sets value properly with type coming later in props', () => {
-    const input = ReactTestUtils.renderIntoDocument(
-      <input value="hi" type="radio" />,
-    );
+    const input = ReactDOM.render(<input value="hi" type="radio" />, container);
     expect(input.value).toBe('hi');
   });
 
@@ -1352,7 +1308,7 @@ describe('ReactDOMInput', () => {
       }
     }
 
-    const input = ReactTestUtils.renderIntoDocument(<Input />);
+    const input = ReactDOM.render(<Input />, container);
     const node = ReactDOM.findDOMNode(input);
 
     // If the value is set before the type, a validation warning will raise and
@@ -1388,9 +1344,7 @@ describe('ReactDOMInput', () => {
       return el;
     });
 
-    ReactTestUtils.renderIntoDocument(
-      <input type="date" defaultValue="1980-01-01" />,
-    );
+    ReactDOM.render(<input type="date" defaultValue="1980-01-01" />, container);
     expect(log).toEqual([
       'node.setAttribute("type", "date")',
       'node.value = "1980-01-01"',
@@ -1419,61 +1373,68 @@ describe('ReactDOMInput', () => {
 
     it('always sets the attribute when values change on text inputs', function() {
       const Input = getTestInput();
-      const stub = ReactTestUtils.renderIntoDocument(<Input type="text" />);
+      const stub = ReactDOM.render(<Input type="text" />, container);
       const node = ReactDOM.findDOMNode(stub);
 
-      ReactTestUtils.Simulate.change(node, {target: {value: '2'}});
+      setUntrackedValue.call(node, '2');
+      dispatchEventOnNode(node, 'input');
 
       expect(node.getAttribute('value')).toBe('2');
     });
 
     it('does not set the value attribute on number inputs if focused', () => {
       const Input = getTestInput();
-      const stub = ReactTestUtils.renderIntoDocument(
+      const stub = ReactDOM.render(
         <Input type="number" value="1" />,
+        container,
       );
       const node = ReactDOM.findDOMNode(stub);
 
       node.focus();
 
-      ReactTestUtils.Simulate.change(node, {target: {value: '2'}});
+      setUntrackedValue.call(node, '2');
+      dispatchEventOnNode(node, 'input');
 
       expect(node.getAttribute('value')).toBe('1');
     });
 
     it('sets the value attribute on number inputs on blur', () => {
       const Input = getTestInput();
-      const stub = ReactTestUtils.renderIntoDocument(
+      const stub = ReactDOM.render(
         <Input type="number" value="1" />,
+        container,
       );
       const node = ReactDOM.findDOMNode(stub);
 
-      ReactTestUtils.Simulate.change(node, {target: {value: '2'}});
-      ReactTestUtils.SimulateNative.blur(node);
+      setUntrackedValue.call(node, '2');
+      dispatchEventOnNode(node, 'input');
+      dispatchEventOnNode(node, 'blur');
 
       expect(node.getAttribute('value')).toBe('2');
     });
 
     it('an uncontrolled number input will not update the value attribute on blur', () => {
-      const node = ReactTestUtils.renderIntoDocument(
+      const node = ReactDOM.render(
         <input type="number" defaultValue="1" />,
+        container,
       );
 
-      node.value = 4;
+      setUntrackedValue.call(node, 4);
 
-      ReactTestUtils.SimulateNative.blur(node);
+      dispatchEventOnNode(node, 'blur');
 
       expect(node.getAttribute('value')).toBe('1');
     });
 
     it('an uncontrolled text input will not update the value attribute on blur', () => {
-      const node = ReactTestUtils.renderIntoDocument(
+      const node = ReactDOM.render(
         <input type="text" defaultValue="1" />,
+        container,
       );
 
-      node.value = 4;
+      setUntrackedValue.call(node, 4);
 
-      ReactTestUtils.SimulateNative.blur(node);
+      dispatchEventOnNode(node, 'blur');
 
       expect(node.getAttribute('value')).toBe('1');
     });
@@ -1483,7 +1444,12 @@ describe('ReactDOMInput', () => {
     let input;
 
     function renderInputWithStringThenWithUndefined() {
+      let setValueToUndefined;
       class Input extends React.Component {
+        constructor() {
+          super();
+          setValueToUndefined = () => this.setState({value: undefined});
+        }
         state = {value: 'first'};
         render() {
           return (
@@ -1495,10 +1461,11 @@ describe('ReactDOMInput', () => {
         }
       }
 
-      const stub = ReactTestUtils.renderIntoDocument(<Input />);
+      const stub = ReactDOM.render(<Input />, container);
       input = ReactDOM.findDOMNode(stub);
-      ReactTestUtils.Simulate.change(input, {target: {value: 'latest'}});
-      ReactTestUtils.Simulate.change(input, {target: {value: undefined}});
+      setUntrackedValue.call(input, 'latest');
+      dispatchEventOnNode(input, 'input');
+      setValueToUndefined();
     }
 
     it('reverts the value attribute to the initial value', () => {
@@ -1522,7 +1489,12 @@ describe('ReactDOMInput', () => {
     let input;
 
     function renderInputWithStringThenWithNull() {
+      let setValueToNull;
       class Input extends React.Component {
+        constructor() {
+          super();
+          setValueToNull = () => this.setState({value: null});
+        }
         state = {value: 'first'};
         render() {
           return (
@@ -1534,10 +1506,11 @@ describe('ReactDOMInput', () => {
         }
       }
 
-      const stub = ReactTestUtils.renderIntoDocument(<Input />);
+      const stub = ReactDOM.render(<Input />, container);
       input = ReactDOM.findDOMNode(stub);
-      ReactTestUtils.Simulate.change(input, {target: {value: 'latest'}});
-      ReactTestUtils.Simulate.change(input, {target: {value: null}});
+      setUntrackedValue.call(input, 'latest');
+      dispatchEventOnNode(input, 'input');
+      setValueToNull();
     }
 
     it('reverts the value attribute to the initial value', () => {
@@ -1565,7 +1538,6 @@ describe('ReactDOMInput', () => {
 
   describe('When given a Symbol value', function() {
     it('treats initial Symbol value as an empty string', function() {
-      const container = document.createElement('div');
       expect(() =>
         ReactDOM.render(
           <input value={Symbol('foobar')} onChange={() => {}} />,
@@ -1579,7 +1551,6 @@ describe('ReactDOMInput', () => {
     });
 
     it('treats updated Symbol value as an empty string', function() {
-      const container = document.createElement('div');
       ReactDOM.render(<input value="foo" onChange={() => {}} />, container);
       expect(() =>
         ReactDOM.render(
@@ -1594,7 +1565,6 @@ describe('ReactDOMInput', () => {
     });
 
     it('treats initial Symbol defaultValue as an empty string', function() {
-      const container = document.createElement('div');
       ReactDOM.render(<input defaultValue={Symbol('foobar')} />, container);
       const node = container.firstChild;
 
@@ -1604,7 +1574,6 @@ describe('ReactDOMInput', () => {
     });
 
     it('treats updated Symbol defaultValue as an empty string', function() {
-      const container = document.createElement('div');
       ReactDOM.render(<input defaultValue="foo" />, container);
       ReactDOM.render(<input defaultValue={Symbol('foobar')} />, container);
       const node = container.firstChild;
@@ -1617,7 +1586,6 @@ describe('ReactDOMInput', () => {
 
   describe('When given a function value', function() {
     it('treats initial function value as an empty string', function() {
-      const container = document.createElement('div');
       expect(() =>
         ReactDOM.render(
           <input value={() => {}} onChange={() => {}} />,
@@ -1631,7 +1599,6 @@ describe('ReactDOMInput', () => {
     });
 
     it('treats updated function value as an empty string', function() {
-      const container = document.createElement('div');
       ReactDOM.render(<input value="foo" onChange={() => {}} />, container);
       expect(() =>
         ReactDOM.render(
@@ -1646,7 +1613,6 @@ describe('ReactDOMInput', () => {
     });
 
     it('treats initial function defaultValue as an empty string', function() {
-      const container = document.createElement('div');
       ReactDOM.render(<input defaultValue={() => {}} />, container);
       const node = container.firstChild;
 
@@ -1656,7 +1622,6 @@ describe('ReactDOMInput', () => {
     });
 
     it('treats updated function defaultValue as an empty string', function() {
-      const container = document.createElement('div');
       ReactDOM.render(<input defaultValue="foo" />, container);
       ReactDOM.render(<input defaultValue={() => {}} />, container);
       const node = container.firstChild;
@@ -1673,7 +1638,6 @@ describe('ReactDOMInput', () => {
     // value in order to "dettach" it from defaultValue. This had the unfortunate
     // side-effect of assigning value="on" to radio and checkboxes
     it('does not add "on" in absence of value on a checkbox', function() {
-      const container = document.createElement('div');
       ReactDOM.render(
         <input type="checkbox" defaultChecked={true} />,
         container,
@@ -1685,7 +1649,6 @@ describe('ReactDOMInput', () => {
     });
 
     it('does not add "on" in absence of value on a radio', function() {
-      const container = document.createElement('div');
       ReactDOM.render(<input type="radio" defaultChecked={true} />, container);
       const node = container.firstChild;
 
diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index f2df03a5b0..dad8ff395f 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -615,11 +615,20 @@ describe('ReactDOMSelect', () => {
         <option value="gorilla">A gorilla!</option>
       </select>
     );
-    const node = ReactTestUtils.renderIntoDocument(stub);
+    const container = document.createElement('div');
+    document.body.appendChild(container);
 
-    ReactTestUtils.Simulate.change(node);
+    try {
+      const node = ReactDOM.render(stub, container);
 
-    expect(node.value).toBe('giraffe');
+      node.dispatchEvent(
+        new Event('change', {bubbles: true, cancelable: false}),
+      );
+
+      expect(node.value).toBe('giraffe');
+    } finally {
+      document.body.removeChild(container);
+    }
   });
 
   it('should warn if value and defaultValue props are specified', () => {
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js
index 8ae403c0f9..bc1db8d569 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js
@@ -14,14 +14,12 @@ const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegratio
 let React;
 let ReactDOM;
 let ReactDOMServer;
-let ReactTestUtils;
 
 function initModules() {
   // Reset warning cache.
   jest.resetModuleRegistry();
   React = require('react');
   ReactDOM = require('react-dom');
-  ReactTestUtils = require('react-dom/test-utils');
   ReactDOMServer = require('react-dom/server');
 
   // Make them available to the helpers.
@@ -519,35 +517,63 @@ describe('ReactDOMServerIntegration', () => {
 
       describe('user interaction with controlled inputs', function() {
         itClientRenders('a controlled text input', async render => {
+          const setUntrackedValue = Object.getOwnPropertyDescriptor(
+            HTMLInputElement.prototype,
+            'value',
+          ).set;
+
           let changeCount = 0;
           const e = await render(
             <ControlledInput onChange={() => changeCount++} />,
           );
-          expect(changeCount).toBe(0);
-          expect(e.value).toBe('Hello');
+          const container = e.parentNode;
+          document.body.appendChild(container);
 
-          // simulate a user typing.
-          e.value = 'Goodbye';
-          ReactTestUtils.Simulate.change(e);
+          try {
+            expect(changeCount).toBe(0);
+            expect(e.value).toBe('Hello');
 
-          expect(changeCount).toBe(1);
-          expect(e.value).toBe('Goodbye');
+            // simulate a user typing.
+            setUntrackedValue.call(e, 'Goodbye');
+            e.dispatchEvent(
+              new Event('input', {bubbles: true, cancelable: false}),
+            );
+
+            expect(changeCount).toBe(1);
+            expect(e.value).toBe('Goodbye');
+          } finally {
+            document.body.removeChild(container);
+          }
         });
 
         itClientRenders('a controlled textarea', async render => {
+          const setUntrackedValue = Object.getOwnPropertyDescriptor(
+            HTMLTextAreaElement.prototype,
+            'value',
+          ).set;
+
           let changeCount = 0;
           const e = await render(
             <ControlledTextArea onChange={() => changeCount++} />,
           );
-          expect(changeCount).toBe(0);
-          expect(e.value).toBe('Hello');
+          const container = e.parentNode;
+          document.body.appendChild(container);
 
-          // simulate a user typing.
-          e.value = 'Goodbye';
-          ReactTestUtils.Simulate.change(e);
+          try {
+            expect(changeCount).toBe(0);
+            expect(e.value).toBe('Hello');
 
-          expect(changeCount).toBe(1);
-          expect(e.value).toBe('Goodbye');
+            // simulate a user typing.
+            setUntrackedValue.call(e, 'Goodbye');
+            e.dispatchEvent(
+              new Event('input', {bubbles: true, cancelable: false}),
+            );
+
+            expect(changeCount).toBe(1);
+            expect(e.value).toBe('Goodbye');
+          } finally {
+            document.body.removeChild(container);
+          }
         });
 
         itClientRenders('a controlled checkbox', async render => {
@@ -555,31 +581,53 @@ describe('ReactDOMServerIntegration', () => {
           const e = await render(
             <ControlledCheckbox onChange={() => changeCount++} />,
           );
-          expect(changeCount).toBe(0);
-          expect(e.checked).toBe(true);
+          const container = e.parentNode;
+          document.body.appendChild(container);
 
-          // simulate a user typing.
-          e.checked = false;
-          ReactTestUtils.Simulate.change(e);
+          try {
+            expect(changeCount).toBe(0);
+            expect(e.checked).toBe(true);
 
-          expect(changeCount).toBe(1);
-          expect(e.checked).toBe(false);
+            // simulate a user clicking.
+            e.dispatchEvent(
+              new Event('click', {bubbles: true, cancelable: true}),
+            );
+
+            expect(changeCount).toBe(1);
+            expect(e.checked).toBe(false);
+          } finally {
+            document.body.removeChild(container);
+          }
         });
 
         itClientRenders('a controlled select', async render => {
+          const setUntrackedValue = Object.getOwnPropertyDescriptor(
+            HTMLSelectElement.prototype,
+            'value',
+          ).set;
+
           let changeCount = 0;
           const e = await render(
             <ControlledSelect onChange={() => changeCount++} />,
           );
-          expect(changeCount).toBe(0);
-          expect(e.value).toBe('Hello');
+          const container = e.parentNode;
+          document.body.appendChild(container);
 
-          // simulate a user typing.
-          e.value = 'Goodbye';
-          ReactTestUtils.Simulate.change(e);
+          try {
+            expect(changeCount).toBe(0);
+            expect(e.value).toBe('Hello');
 
-          expect(changeCount).toBe(1);
-          expect(e.value).toBe('Goodbye');
+            // simulate a user typing.
+            setUntrackedValue.call(e, 'Goodbye');
+            e.dispatchEvent(
+              new Event('change', {bubbles: true, cancelable: false}),
+            );
+
+            expect(changeCount).toBe(1);
+            expect(e.value).toBe('Goodbye');
+          } finally {
+            document.body.removeChild(container);
+          }
         });
       });
 
diff --git a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
index aa5714ded3..73522ace5d 100644
--- a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
@@ -237,11 +237,25 @@ describe('ReactDOMTextarea', () => {
 
   it('should properly control a value of number `0`', () => {
     const stub = <textarea value={0} onChange={emptyFunction} />;
-    const node = renderTextarea(stub);
+    const setUntrackedValue = Object.getOwnPropertyDescriptor(
+      HTMLTextAreaElement.prototype,
+      'value',
+    ).set;
 
-    node.value = 'giraffe';
-    ReactTestUtils.Simulate.change(node);
-    expect(node.value).toBe('0');
+    const container = document.createElement('div');
+    document.body.appendChild(container);
+
+    try {
+      const node = renderTextarea(stub, container);
+
+      setUntrackedValue.call(node, 'giraffe');
+      node.dispatchEvent(
+        new Event('input', {bubbles: true, cancelable: false}),
+      );
+      expect(node.value).toBe('0');
+    } finally {
+      document.body.removeChild(container);
+    }
   });
 
   it('should treat children like `defaultValue`', () => {

From e6076ecf48f5e492e894a5bc3f609b0478388b80 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 12 Jul 2018 15:32:06 +0100
Subject: [PATCH 222/277] Remove ad-hoc forks of getComponentName() and fix it
 (#13197)

* Fix getComponentName() for types with nested $$typeof

* Temporarily remove Profiler ID from messages

* Change getComponentName() signature to take just type

It doesn't actually need the whole Fiber.

* Remove getComponentName() forks in isomorphic and SSR

* Remove unnecessary .type access where we already have a type

* Remove unused type
---
 packages/react-dom/src/client/ReactDOM.js     |  2 +-
 .../src/server/ReactPartialRenderer.js        |  7 +---
 .../react-native-renderer/src/ReactFabric.js  |  2 +-
 .../src/ReactNativeFiberInspector.js          |  2 +-
 .../src/ReactNativeRenderer.js                |  2 +-
 .../react-reconciler/src/ReactChildFiber.js   |  2 +-
 .../react-reconciler/src/ReactCurrentFiber.js |  6 +--
 .../src/ReactDebugFiberPerf.js                |  8 ++--
 packages/react-reconciler/src/ReactFiber.js   |  2 +-
 .../src/ReactFiberBeginWork.js                |  4 +-
 .../src/ReactFiberClassComponent.js           | 25 ++++++------
 .../src/ReactFiberCommitWork.js               |  8 ++--
 .../react-reconciler/src/ReactFiberContext.js | 11 ++---
 .../src/ReactFiberReconciler.js               |  2 +-
 .../src/ReactFiberScheduler.js                |  2 +-
 .../src/ReactFiberTreeReflection.js           |  2 +-
 .../src/ReactProfilerTimer.js                 |  2 +-
 .../src/ReactStrictModeWarnings.js            | 10 ++---
 ...ReactIncrementalPerf-test.internal.js.snap |  2 +-
 .../src/ReactShallowRenderer.js               |  2 +-
 packages/react/src/ReactElementValidator.js   | 33 ++-------------
 packages/shared/getComponentName.js           | 40 ++++++++++++-------
 22 files changed, 80 insertions(+), 96 deletions(-)

diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js
index 363617fc7e..5ff4085f4f 100644
--- a/packages/react-dom/src/client/ReactDOM.js
+++ b/packages/react-dom/src/client/ReactDOM.js
@@ -595,7 +595,7 @@ const ReactDOM: Object = {
             'never access something that requires stale data from the previous ' +
             'render, such as refs. Move this logic to componentDidMount and ' +
             'componentDidUpdate instead.',
-          getComponentName(owner) || 'A component',
+          getComponentName(owner.type) || 'A component',
         );
         owner.stateNode._warnedAboutRefsInRender = true;
       }
diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index e2fec2d9a2..601131bf81 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -16,6 +16,7 @@ import type {
 
 import React from 'react';
 import invariant from 'shared/invariant';
+import getComponentName from 'shared/getComponentName';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
 import warning from 'shared/warning';
 import checkPropTypes from 'prop-types/checkPropTypes';
@@ -166,12 +167,6 @@ const newlineEatingTags = {
   textarea: true,
 };
 
-function getComponentName(type) {
-  return typeof type === 'string'
-    ? type
-    : typeof type === 'function' ? type.displayName || type.name : null;
-}
-
 // We accept any tag to be rendered but since this gets injected into arbitrary
 // HTML, we want to make sure that it's a safe tag.
 // http://www.w3.org/TR/REC-xml/#NT-Name
diff --git a/packages/react-native-renderer/src/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js
index 63cc05480b..8a34ac063f 100644
--- a/packages/react-native-renderer/src/ReactFabric.js
+++ b/packages/react-native-renderer/src/ReactFabric.js
@@ -40,7 +40,7 @@ function findNodeHandle(componentOrHandle: any): ?number {
           'never access something that requires stale data from the previous ' +
           'render, such as refs. Move this logic to componentDidMount and ' +
           'componentDidUpdate instead.',
-        getComponentName(owner) || 'A component',
+        getComponentName(owner.type) || 'A component',
       );
 
       owner.stateNode._warnedAboutRefsInRender = true;
diff --git a/packages/react-native-renderer/src/ReactNativeFiberInspector.js b/packages/react-native-renderer/src/ReactNativeFiberInspector.js
index 766e05760e..17620f3887 100644
--- a/packages/react-native-renderer/src/ReactNativeFiberInspector.js
+++ b/packages/react-native-renderer/src/ReactNativeFiberInspector.js
@@ -79,7 +79,7 @@ if (__DEV__) {
 
   const createHierarchy = function(fiberHierarchy) {
     return fiberHierarchy.map(fiber => ({
-      name: getComponentName(fiber),
+      name: getComponentName(fiber.type),
       getInspectorData: findNodeHandle => ({
         measure: callback =>
           UIManager.measure(getHostNode(fiber, findNodeHandle), callback),
diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js
index 5f044f5f2a..cced457703 100644
--- a/packages/react-native-renderer/src/ReactNativeRenderer.js
+++ b/packages/react-native-renderer/src/ReactNativeRenderer.js
@@ -43,7 +43,7 @@ function findNodeHandle(componentOrHandle: any): ?number {
           'never access something that requires stale data from the previous ' +
           'render, such as refs. Move this logic to componentDidMount and ' +
           'componentDidUpdate instead.',
-        getComponentName(owner) || 'A component',
+        getComponentName(owner.type) || 'A component',
       );
 
       owner.stateNode._warnedAboutRefsInRender = true;
diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js
index 302918abb1..34cad7de9e 100644
--- a/packages/react-reconciler/src/ReactChildFiber.js
+++ b/packages/react-reconciler/src/ReactChildFiber.js
@@ -111,7 +111,7 @@ function coerceRef(
   ) {
     if (__DEV__) {
       if (returnFiber.mode & StrictMode) {
-        const componentName = getComponentName(returnFiber) || 'Component';
+        const componentName = getComponentName(returnFiber.type) || 'Component';
         if (!didWarnAboutStringRefInStrictMode[componentName]) {
           warning(
             false,
diff --git a/packages/react-reconciler/src/ReactCurrentFiber.js b/packages/react-reconciler/src/ReactCurrentFiber.js
index d321e350d4..45cfc2150e 100644
--- a/packages/react-reconciler/src/ReactCurrentFiber.js
+++ b/packages/react-reconciler/src/ReactCurrentFiber.js
@@ -29,10 +29,10 @@ function describeFiber(fiber: Fiber): string {
     case HostComponent:
       const owner = fiber._debugOwner;
       const source = fiber._debugSource;
-      const name = getComponentName(fiber);
+      const name = getComponentName(fiber.type);
       let ownerName = null;
       if (owner) {
-        ownerName = getComponentName(owner);
+        ownerName = getComponentName(owner.type);
       }
       return describeComponentFrame(name, source, ownerName);
     default:
@@ -60,7 +60,7 @@ export function getCurrentFiberOwnerNameInDevOrNull(): string | null {
     }
     const owner = current._debugOwner;
     if (owner !== null && typeof owner !== 'undefined') {
-      return getComponentName(owner);
+      return getComponentName(owner.type);
     }
   }
   return null;
diff --git a/packages/react-reconciler/src/ReactDebugFiberPerf.js b/packages/react-reconciler/src/ReactDebugFiberPerf.js
index 7c2226f9a8..f8d8fc3bb7 100644
--- a/packages/react-reconciler/src/ReactDebugFiberPerf.js
+++ b/packages/react-reconciler/src/ReactDebugFiberPerf.js
@@ -121,7 +121,7 @@ const beginFiberMark = (
   fiber: Fiber,
   phase: MeasurementPhase | null,
 ): boolean => {
-  const componentName = getComponentName(fiber) || 'Unknown';
+  const componentName = getComponentName(fiber.type) || 'Unknown';
   const debugID = ((fiber._debugID: any): number);
   const isMounted = fiber.alternate !== null;
   const label = getFiberLabel(componentName, isMounted, phase);
@@ -140,7 +140,7 @@ const beginFiberMark = (
 };
 
 const clearFiberMark = (fiber: Fiber, phase: MeasurementPhase | null) => {
-  const componentName = getComponentName(fiber) || 'Unknown';
+  const componentName = getComponentName(fiber.type) || 'Unknown';
   const debugID = ((fiber._debugID: any): number);
   const isMounted = fiber.alternate !== null;
   const label = getFiberLabel(componentName, isMounted, phase);
@@ -153,7 +153,7 @@ const endFiberMark = (
   phase: MeasurementPhase | null,
   warning: string | null,
 ) => {
-  const componentName = getComponentName(fiber) || 'Unknown';
+  const componentName = getComponentName(fiber.type) || 'Unknown';
   const debugID = ((fiber._debugID: any): number);
   const isMounted = fiber.alternate !== null;
   const label = getFiberLabel(componentName, isMounted, phase);
@@ -378,7 +378,7 @@ export function stopWorkLoopTimer(
       if (interruptedBy.tag === HostRoot) {
         warning = 'A top-level update interrupted the previous render';
       } else {
-        const componentName = getComponentName(interruptedBy) || 'Unknown';
+        const componentName = getComponentName(interruptedBy.type) || 'Unknown';
         warning = `An update to ${componentName} interrupted the previous render`;
       }
     } else if (commitCountInCurrentWorkLoop > 1) {
diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js
index 0b40046856..e0b325f67e 100644
--- a/packages/react-reconciler/src/ReactFiber.js
+++ b/packages/react-reconciler/src/ReactFiber.js
@@ -444,7 +444,7 @@ function getFiberTagFromObjectType(type, owner): TypeOfWork {
             "it's defined in, or you might have mixed up default and " +
             'named imports.';
         }
-        const ownerName = owner ? getComponentName(owner) : null;
+        const ownerName = owner ? getComponentName(owner.type) : null;
         if (ownerName) {
           info += '\n\nCheck the render method of `' + ownerName + '`.';
         }
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index ba3a02b3d2..d22c27be9c 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -581,7 +581,7 @@ function mountIndeterminateComponent(
 
   if (__DEV__) {
     if (fn.prototype && typeof fn.prototype.render === 'function') {
-      const componentName = getComponentName(workInProgress) || 'Unknown';
+      const componentName = getComponentName(fn) || 'Unknown';
 
       if (!didWarnAboutBadClass[componentName]) {
         warning(
@@ -681,7 +681,7 @@ function mountIndeterminateComponent(
       }
 
       if (typeof fn.getDerivedStateFromProps === 'function') {
-        const componentName = getComponentName(workInProgress) || 'Unknown';
+        const componentName = getComponentName(fn) || 'Unknown';
 
         if (!didWarnAboutGetDerivedStateOnFunctionalComponent[componentName]) {
           warning(
diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js
index a0ae9fb782..2464b3545d 100644
--- a/packages/react-reconciler/src/ReactFiberClassComponent.js
+++ b/packages/react-reconciler/src/ReactFiberClassComponent.js
@@ -92,9 +92,9 @@ if (__DEV__) {
     }
   };
 
-  warnOnUndefinedDerivedState = function(workInProgress, partialState) {
+  warnOnUndefinedDerivedState = function(type, partialState) {
     if (partialState === undefined) {
-      const componentName = getComponentName(workInProgress) || 'Component';
+      const componentName = getComponentName(type) || 'Component';
       if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
         didWarnAboutUndefinedDerivedState.add(componentName);
         warning(
@@ -150,7 +150,7 @@ export function applyDerivedStateFromProps(
   const partialState = getDerivedStateFromProps(nextProps, prevState);
 
   if (__DEV__) {
-    warnOnUndefinedDerivedState(workInProgress, partialState);
+    warnOnUndefinedDerivedState(workInProgress.type, partialState);
   }
   // Merge the partial state and the previous state.
   const memoizedState =
@@ -249,7 +249,7 @@ function checkShouldComponentUpdate(
         shouldUpdate !== undefined,
         '%s.shouldComponentUpdate(): Returned undefined instead of a ' +
           'boolean value. Make sure to return true or false.',
-        getComponentName(workInProgress) || 'Component',
+        getComponentName(ctor) || 'Component',
       );
     }
 
@@ -269,7 +269,7 @@ function checkClassInstance(workInProgress: Fiber) {
   const instance = workInProgress.stateNode;
   const type = workInProgress.type;
   if (__DEV__) {
-    const name = getComponentName(workInProgress) || 'Component';
+    const name = getComponentName(type) || 'Component';
     const renderPresent = instance.render;
 
     if (!renderPresent) {
@@ -345,7 +345,7 @@ function checkClassInstance(workInProgress: Fiber) {
         '%s has a method called shouldComponentUpdate(). ' +
           'shouldComponentUpdate should not be used when extending React.PureComponent. ' +
           'Please extend React.Component if shouldComponentUpdate is used.',
-        getComponentName(workInProgress) || 'A pure component',
+        getComponentName(type) || 'A pure component',
       );
     }
     const noComponentDidUnmount =
@@ -411,7 +411,7 @@ function checkClassInstance(workInProgress: Fiber) {
         false,
         '%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). ' +
           'This component defines getSnapshotBeforeUpdate() only.',
-        getComponentName(workInProgress),
+        getComponentName(type),
       );
     }
 
@@ -496,7 +496,7 @@ function constructClassInstance(
 
   if (__DEV__) {
     if (typeof ctor.getDerivedStateFromProps === 'function' && state === null) {
-      const componentName = getComponentName(workInProgress) || 'Component';
+      const componentName = getComponentName(ctor) || 'Component';
       if (!didWarnAboutUninitializedState.has(componentName)) {
         didWarnAboutUninitializedState.add(componentName);
         warning(
@@ -550,7 +550,7 @@ function constructClassInstance(
         foundWillReceivePropsName !== null ||
         foundWillUpdateName !== null
       ) {
-        const componentName = getComponentName(workInProgress) || 'Component';
+        const componentName = getComponentName(ctor) || 'Component';
         const newApiName =
           typeof ctor.getDerivedStateFromProps === 'function'
             ? 'getDerivedStateFromProps()'
@@ -605,7 +605,7 @@ function callComponentWillMount(workInProgress, instance) {
         '%s.componentWillMount(): Assigning directly to this.state is ' +
           "deprecated (except inside a component's " +
           'constructor). Use setState instead.',
-        getComponentName(workInProgress) || 'Component',
+        getComponentName(workInProgress.type) || 'Component',
       );
     }
     classComponentUpdater.enqueueReplaceState(instance, instance.state, null);
@@ -630,7 +630,8 @@ function callComponentWillReceiveProps(
 
   if (instance.state !== oldState) {
     if (__DEV__) {
-      const componentName = getComponentName(workInProgress) || 'Component';
+      const componentName =
+        getComponentName(workInProgress.type) || 'Component';
       if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
         didWarnAboutStateAssignmentForComponent.add(componentName);
         warning(
@@ -699,7 +700,7 @@ function mountClassInstance(
     instance.state = workInProgress.memoizedState;
   }
 
-  const getDerivedStateFromProps = workInProgress.type.getDerivedStateFromProps;
+  const getDerivedStateFromProps = ctor.getDerivedStateFromProps;
   if (typeof getDerivedStateFromProps === 'function') {
     applyDerivedStateFromProps(workInProgress, getDerivedStateFromProps, props);
     instance.state = workInProgress.memoizedState;
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index 34ce416fbe..53a3774ab4 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -93,7 +93,7 @@ export function logError(boundary: Fiber, errorInfo: CapturedValue<mixed>) {
   }
 
   const capturedError: CapturedError = {
-    componentName: source !== null ? getComponentName(source) : null,
+    componentName: source !== null ? getComponentName(source.type) : null,
     componentStack: stack !== null ? stack : '',
     error: errorInfo.value,
     errorBoundary: null,
@@ -104,7 +104,7 @@ export function logError(boundary: Fiber, errorInfo: CapturedValue<mixed>) {
 
   if (boundary !== null && boundary.tag === ClassComponent) {
     capturedError.errorBoundary = boundary.stateNode;
-    capturedError.errorBoundaryName = getComponentName(boundary);
+    capturedError.errorBoundaryName = getComponentName(boundary.type);
     capturedError.errorBoundaryFound = true;
     capturedError.willRetry = true;
   }
@@ -203,7 +203,7 @@ function commitBeforeMutationLifeCycles(
                 false,
                 '%s.getSnapshotBeforeUpdate(): A snapshot value (or null) ' +
                   'must be returned. You have returned undefined.',
-                getComponentName(finishedWork),
+                getComponentName(finishedWork.type),
               );
             }
           }
@@ -372,7 +372,7 @@ function commitAttachRef(finishedWork: Fiber) {
             false,
             'Unexpected ref object provided for %s. ' +
               'Use either a ref-setter function or React.createRef().%s',
-            getComponentName(finishedWork),
+            getComponentName(finishedWork.type),
             getStackByFiberInDevAndProd(finishedWork),
           );
         }
diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js
index f5831396e1..78d7cb316f 100644
--- a/packages/react-reconciler/src/ReactFiberContext.js
+++ b/packages/react-reconciler/src/ReactFiberContext.js
@@ -90,7 +90,7 @@ function getMaskedContext(
   }
 
   if (__DEV__) {
-    const name = getComponentName(workInProgress) || 'Unknown';
+    const name = getComponentName(type) || 'Unknown';
     checkPropTypes(
       contextTypes,
       context,
@@ -152,13 +152,14 @@ function pushTopLevelContextObject(
 
 function processChildContext(fiber: Fiber, parentContext: Object): Object {
   const instance = fiber.stateNode;
-  const childContextTypes = fiber.type.childContextTypes;
+  const type = fiber.type;
+  const childContextTypes = type.childContextTypes;
 
   // TODO (bvaughn) Replace this behavior with an invariant() in the future.
   // It has only been added in Fiber to match the (unintentional) behavior in Stack.
   if (typeof instance.getChildContext !== 'function') {
     if (__DEV__) {
-      const componentName = getComponentName(fiber) || 'Unknown';
+      const componentName = getComponentName(type) || 'Unknown';
 
       if (!warnedAboutMissingGetChildContext[componentName]) {
         warnedAboutMissingGetChildContext[componentName] = true;
@@ -189,12 +190,12 @@ function processChildContext(fiber: Fiber, parentContext: Object): Object {
     invariant(
       contextKey in childContextTypes,
       '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || 'Unknown',
+      getComponentName(type) || 'Unknown',
       contextKey,
     );
   }
   if (__DEV__) {
-    const name = getComponentName(fiber) || 'Unknown';
+    const name = getComponentName(type) || 'Unknown';
     checkPropTypes(
       childContextTypes,
       childContext,
diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js
index 3f8554fb5a..6e9fc37e42 100644
--- a/packages/react-reconciler/src/ReactFiberReconciler.js
+++ b/packages/react-reconciler/src/ReactFiberReconciler.js
@@ -115,7 +115,7 @@ function scheduleRootUpdate(
           'triggering nested component updates from render is not allowed. ' +
           'If necessary, trigger nested updates in componentDidUpdate.\n\n' +
           'Check the render method of %s.',
-        getComponentName(ReactCurrentFiber.current) || 'Unknown',
+        getComponentName(ReactCurrentFiber.current.type) || 'Unknown',
       );
     }
   }
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index e5f1c86ba1..f2d915b30f 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -174,7 +174,7 @@ if (__DEV__) {
   warnAboutUpdateOnUnmounted = function(fiber: Fiber) {
     // We show the whole stack but dedupe on the top component's name because
     // the problematic code almost always lies inside that component.
-    const componentName = getComponentName(fiber) || 'ReactClass';
+    const componentName = getComponentName(fiber.type) || 'ReactClass';
     if (didWarnStateUpdateForUnmountedComponent[componentName]) {
       return;
     }
diff --git a/packages/react-reconciler/src/ReactFiberTreeReflection.js b/packages/react-reconciler/src/ReactFiberTreeReflection.js
index 394a4b3871..9de1fc6930 100644
--- a/packages/react-reconciler/src/ReactFiberTreeReflection.js
+++ b/packages/react-reconciler/src/ReactFiberTreeReflection.js
@@ -74,7 +74,7 @@ export function isMounted(component: React$Component<any, any>): boolean {
           'never access something that requires stale data from the previous ' +
           'render, such as refs. Move this logic to componentDidMount and ' +
           'componentDidUpdate instead.',
-        getComponentName(ownerFiber) || 'A component',
+        getComponentName(ownerFiber.type) || 'A component',
       );
       instance._warnedAboutRefsInRender = true;
     }
diff --git a/packages/react-reconciler/src/ReactProfilerTimer.js b/packages/react-reconciler/src/ReactProfilerTimer.js
index 7f707141d9..c8982baf42 100644
--- a/packages/react-reconciler/src/ReactProfilerTimer.js
+++ b/packages/react-reconciler/src/ReactProfilerTimer.js
@@ -109,7 +109,7 @@ function recordElapsedActualRenderTime(fiber: Fiber): void {
     warning(
       fiber === fiberStack.pop(),
       'Unexpected Fiber (%s) popped.',
-      getComponentName(fiber),
+      getComponentName(fiber.type),
     );
   }
 
diff --git a/packages/react-reconciler/src/ReactStrictModeWarnings.js b/packages/react-reconciler/src/ReactStrictModeWarnings.js
index cd29d2de93..83c354af0b 100644
--- a/packages/react-reconciler/src/ReactStrictModeWarnings.js
+++ b/packages/react-reconciler/src/ReactStrictModeWarnings.js
@@ -79,7 +79,7 @@ if (__DEV__) {
           if (lifecycleWarnings.length > 0) {
             const componentNames = new Set();
             lifecycleWarnings.forEach(fiber => {
-              componentNames.add(getComponentName(fiber) || 'Component');
+              componentNames.add(getComponentName(fiber.type) || 'Component');
               didWarnAboutUnsafeLifecycles.add(fiber.type);
             });
 
@@ -133,7 +133,7 @@ if (__DEV__) {
     if (pendingComponentWillMountWarnings.length > 0) {
       const uniqueNames = new Set();
       pendingComponentWillMountWarnings.forEach(fiber => {
-        uniqueNames.add(getComponentName(fiber) || 'Component');
+        uniqueNames.add(getComponentName(fiber.type) || 'Component');
         didWarnAboutDeprecatedLifecycles.add(fiber.type);
       });
 
@@ -156,7 +156,7 @@ if (__DEV__) {
     if (pendingComponentWillReceivePropsWarnings.length > 0) {
       const uniqueNames = new Set();
       pendingComponentWillReceivePropsWarnings.forEach(fiber => {
-        uniqueNames.add(getComponentName(fiber) || 'Component');
+        uniqueNames.add(getComponentName(fiber.type) || 'Component');
         didWarnAboutDeprecatedLifecycles.add(fiber.type);
       });
 
@@ -178,7 +178,7 @@ if (__DEV__) {
     if (pendingComponentWillUpdateWarnings.length > 0) {
       const uniqueNames = new Set();
       pendingComponentWillUpdateWarnings.forEach(fiber => {
-        uniqueNames.add(getComponentName(fiber) || 'Component');
+        uniqueNames.add(getComponentName(fiber.type) || 'Component');
         didWarnAboutDeprecatedLifecycles.add(fiber.type);
       });
 
@@ -337,7 +337,7 @@ if (__DEV__) {
       (fiberArray: FiberArray, strictRoot) => {
         const uniqueNames = new Set();
         fiberArray.forEach(fiber => {
-          uniqueNames.add(getComponentName(fiber) || 'Component');
+          uniqueNames.add(getComponentName(fiber.type) || 'Component');
           didWarnAboutLegacyContext.add(fiber.type);
         });
 
diff --git a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
index a6b1b1caf1..f6c7cb67b6 100644
--- a/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
+++ b/packages/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
@@ -96,7 +96,7 @@ exports[`ReactDebugFiberPerf does not include AsyncMode, StrictMode, or Profiler
 
 // Mount
 ⚛ (React Tree Reconciliation: Completed Root)
-  ⚛ Profiler(test) [mount]
+  ⚛ Profiler [mount]
     ⚛ Parent [mount]
       ⚛ Child [mount]
 
diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js
index ceaf1e748a..dd1e8f750d 100644
--- a/packages/react-test-renderer/src/ReactShallowRenderer.js
+++ b/packages/react-test-renderer/src/ReactShallowRenderer.js
@@ -349,7 +349,7 @@ function getStackAddendum() {
     stack += describeComponentFrame(
       name,
       currentlyValidatingElement._source,
-      owner && getComponentName(owner),
+      owner && getComponentName(owner.type),
     );
   }
   return stack;
diff --git a/packages/react/src/ReactElementValidator.js b/packages/react/src/ReactElementValidator.js
index cd833260d5..727c189b3b 100644
--- a/packages/react/src/ReactElementValidator.js
+++ b/packages/react/src/ReactElementValidator.js
@@ -31,7 +31,6 @@ import ReactDebugCurrentFrame from './ReactDebugCurrentFrame';
 let currentlyValidatingElement;
 let propTypesMisspellWarningShown;
 
-let getDisplayName = () => {};
 let getStackAddendum = () => {};
 
 if (__DEV__) {
@@ -39,39 +38,15 @@ if (__DEV__) {
 
   propTypesMisspellWarningShown = false;
 
-  getDisplayName = function(element): string {
-    if (element == null) {
-      return '#empty';
-    } else if (typeof element === 'string' || typeof element === 'number') {
-      return '#text';
-    } else if (typeof element.type === 'string') {
-      return element.type;
-    }
-
-    const type = element.type;
-    if (type === REACT_FRAGMENT_TYPE) {
-      return 'React.Fragment';
-    } else if (
-      typeof type === 'object' &&
-      type !== null &&
-      type.$$typeof === REACT_FORWARD_REF_TYPE
-    ) {
-      const functionName = type.render.displayName || type.render.name || '';
-      return functionName !== '' ? `ForwardRef(${functionName})` : 'ForwardRef';
-    } else {
-      return type.displayName || type.name || 'Unknown';
-    }
-  };
-
   getStackAddendum = function(): string {
     let stack = '';
     if (currentlyValidatingElement) {
-      const name = getDisplayName(currentlyValidatingElement);
+      const name = getComponentName(currentlyValidatingElement.type);
       const owner = currentlyValidatingElement._owner;
       stack += describeComponentFrame(
         name,
         currentlyValidatingElement._source,
-        owner && getComponentName(owner),
+        owner && getComponentName(owner.type),
       );
     }
     stack += ReactDebugCurrentFrame.getStackAddendum();
@@ -81,7 +56,7 @@ if (__DEV__) {
 
 function getDeclarationErrorAddendum() {
   if (ReactCurrentOwner.current) {
-    const name = getComponentName(ReactCurrentOwner.current);
+    const name = getComponentName(ReactCurrentOwner.current.type);
     if (name) {
       return '\n\nCheck the render method of `' + name + '`.';
     }
@@ -159,7 +134,7 @@ function validateExplicitKey(element, parentType) {
   ) {
     // Give the component that originally created this child.
     childOwner = ` It was passed a child from ${getComponentName(
-      element._owner,
+      element._owner.type,
     )}.`;
   }
 
diff --git a/packages/shared/getComponentName.js b/packages/shared/getComponentName.js
index f51f6862b3..1149b04f46 100644
--- a/packages/shared/getComponentName.js
+++ b/packages/shared/getComponentName.js
@@ -7,8 +7,7 @@
  * @flow
  */
 
-import type {Fiber} from 'react-reconciler/src/ReactFiber';
-
+import warning from 'shared/warning';
 import {
   REACT_ASYNC_MODE_TYPE,
   REACT_CONTEXT_TYPE,
@@ -21,10 +20,22 @@ import {
   REACT_PLACEHOLDER_TYPE,
 } from 'shared/ReactSymbols';
 
-function getComponentName(fiber: Fiber): string | null {
-  const {type} = fiber;
+function getComponentName(type: mixed): string | null {
+  if (type == null) {
+    // Host root, text node or just invalid type.
+    return null;
+  }
+  if (__DEV__) {
+    if (typeof (type: any).tag === 'number') {
+      warning(
+        false,
+        'Received an unexpected object in getComponentName(). ' +
+          'This is likely a bug in React. Please file an issue.',
+      );
+    }
+  }
   if (typeof type === 'function') {
-    return type.displayName || type.name;
+    return type.displayName || type.name || null;
   }
   if (typeof type === 'string') {
     return type;
@@ -32,25 +43,26 @@ function getComponentName(fiber: Fiber): string | null {
   switch (type) {
     case REACT_ASYNC_MODE_TYPE:
       return 'AsyncMode';
-    case REACT_CONTEXT_TYPE:
-      return 'Context.Consumer';
     case REACT_FRAGMENT_TYPE:
-      return 'ReactFragment';
+      return 'Fragment';
     case REACT_PORTAL_TYPE:
-      return 'ReactPortal';
+      return 'Portal';
     case REACT_PROFILER_TYPE:
-      return `Profiler(${fiber.pendingProps.id})`;
-    case REACT_PROVIDER_TYPE:
-      return 'Context.Provider';
+      return `Profiler`;
     case REACT_STRICT_MODE_TYPE:
       return 'StrictMode';
     case REACT_PLACEHOLDER_TYPE:
       return 'Placeholder';
   }
-  if (typeof type === 'object' && type !== null) {
+  if (typeof type === 'object') {
     switch (type.$$typeof) {
+      case REACT_CONTEXT_TYPE:
+        return 'Context.Consumer';
+      case REACT_PROVIDER_TYPE:
+        return 'Context.Provider';
       case REACT_FORWARD_REF_TYPE:
-        const functionName = type.render.displayName || type.render.name || '';
+        const renderFn = (type.render: any);
+        const functionName = renderFn.displayName || renderFn.name || '';
         return functionName !== ''
           ? `ForwardRef(${functionName})`
           : 'ForwardRef';

From 1c89cb62fdd686a00351dfabc689571081edbd1a Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 12 Jul 2018 16:18:24 +0100
Subject: [PATCH 223/277] Use ReactDebugCurrentFrame.getStackAddendum() in
 element validator (#13198)

Instead of wrapping ReactDebugCurrentFrame.getStackAddendum() call into a custom wrapper inside ReactElementValidator, "teach" the main ReactDebugCurrentFrame.getStackAddendum() to take currently validating element into account.
---
 packages/react/src/ReactDebugCurrentFrame.js | 34 +++++++++++--
 packages/react/src/ReactElementValidator.js  | 53 ++++++++------------
 2 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/packages/react/src/ReactDebugCurrentFrame.js b/packages/react/src/ReactDebugCurrentFrame.js
index 1327fbf34d..f69020fd5e 100644
--- a/packages/react/src/ReactDebugCurrentFrame.js
+++ b/packages/react/src/ReactDebugCurrentFrame.js
@@ -7,18 +7,46 @@
  * @flow
  */
 
+import type {ReactElement} from 'shared/ReactElementType';
+
+import describeComponentFrame from 'shared/describeComponentFrame';
+import getComponentName from 'shared/getComponentName';
+
 const ReactDebugCurrentFrame = {};
 
+let currentlyValidatingElement = (null: null | ReactElement);
+
+export function setCurrentlyValidatingElement(element: null | ReactElement) {
+  if (__DEV__) {
+    currentlyValidatingElement = element;
+  }
+}
+
 if (__DEV__) {
-  // Component that is being worked on
+  // Stack implementation injected by the current renderer.
   ReactDebugCurrentFrame.getCurrentStack = (null: null | (() => string));
 
   ReactDebugCurrentFrame.getStackAddendum = function(): string {
+    let stack = '';
+
+    // Add an extra top frame while an element is being validated
+    if (currentlyValidatingElement) {
+      const name = getComponentName(currentlyValidatingElement.type);
+      const owner = currentlyValidatingElement._owner;
+      stack += describeComponentFrame(
+        name,
+        currentlyValidatingElement._source,
+        owner && getComponentName(owner.type),
+      );
+    }
+
+    // Delegate to the injected renderer-specific implementation
     const impl = ReactDebugCurrentFrame.getCurrentStack;
     if (impl) {
-      return impl() || '';
+      stack += impl() || '';
     }
-    return '';
+
+    return stack;
   };
 }
 
diff --git a/packages/react/src/ReactElementValidator.js b/packages/react/src/ReactElementValidator.js
index 727c189b3b..9648e072be 100644
--- a/packages/react/src/ReactElementValidator.js
+++ b/packages/react/src/ReactElementValidator.js
@@ -13,7 +13,6 @@
  */
 
 import lowPriorityWarning from 'shared/lowPriorityWarning';
-import describeComponentFrame from 'shared/describeComponentFrame';
 import isValidElementType from 'shared/isValidElementType';
 import getComponentName from 'shared/getComponentName';
 import {
@@ -26,32 +25,14 @@ import warning from 'shared/warning';
 
 import ReactCurrentOwner from './ReactCurrentOwner';
 import {isValidElement, createElement, cloneElement} from './ReactElement';
-import ReactDebugCurrentFrame from './ReactDebugCurrentFrame';
+import ReactDebugCurrentFrame, {
+  setCurrentlyValidatingElement,
+} from './ReactDebugCurrentFrame';
 
-let currentlyValidatingElement;
 let propTypesMisspellWarningShown;
 
-let getStackAddendum = () => {};
-
 if (__DEV__) {
-  currentlyValidatingElement = null;
-
   propTypesMisspellWarningShown = false;
-
-  getStackAddendum = function(): string {
-    let stack = '';
-    if (currentlyValidatingElement) {
-      const name = getComponentName(currentlyValidatingElement.type);
-      const owner = currentlyValidatingElement._owner;
-      stack += describeComponentFrame(
-        name,
-        currentlyValidatingElement._source,
-        owner && getComponentName(owner.type),
-      );
-    }
-    stack += ReactDebugCurrentFrame.getStackAddendum();
-    return stack;
-  };
 }
 
 function getDeclarationErrorAddendum() {
@@ -138,7 +119,7 @@ function validateExplicitKey(element, parentType) {
     )}.`;
   }
 
-  currentlyValidatingElement = element;
+  setCurrentlyValidatingElement(element);
   if (__DEV__) {
     warning(
       false,
@@ -146,10 +127,10 @@ function validateExplicitKey(element, parentType) {
         '%s%s See https://fb.me/react-warning-keys for more information.%s',
       currentComponentErrorInfo,
       childOwner,
-      getStackAddendum(),
+      ReactDebugCurrentFrame.getStackAddendum(),
     );
   }
-  currentlyValidatingElement = null;
+  setCurrentlyValidatingElement(null);
 }
 
 /**
@@ -221,9 +202,15 @@ function validatePropTypes(element) {
     return;
   }
   if (propTypes) {
-    currentlyValidatingElement = element;
-    checkPropTypes(propTypes, element.props, 'prop', name, getStackAddendum);
-    currentlyValidatingElement = null;
+    setCurrentlyValidatingElement(element);
+    checkPropTypes(
+      propTypes,
+      element.props,
+      'prop',
+      name,
+      ReactDebugCurrentFrame.getStackAddendum,
+    );
+    setCurrentlyValidatingElement(null);
   } else if (type.PropTypes !== undefined && !propTypesMisspellWarningShown) {
     propTypesMisspellWarningShown = true;
     warning(
@@ -246,7 +233,7 @@ function validatePropTypes(element) {
  * @param {ReactElement} fragment
  */
 function validateFragmentProps(fragment) {
-  currentlyValidatingElement = fragment;
+  setCurrentlyValidatingElement(fragment);
 
   const keys = Object.keys(fragment.props);
   for (let i = 0; i < keys.length; i++) {
@@ -257,7 +244,7 @@ function validateFragmentProps(fragment) {
         'Invalid prop `%s` supplied to `React.Fragment`. ' +
           'React.Fragment can only have `key` and `children` props.%s',
         key,
-        getStackAddendum(),
+        ReactDebugCurrentFrame.getStackAddendum(),
       );
       break;
     }
@@ -267,11 +254,11 @@ function validateFragmentProps(fragment) {
     warning(
       false,
       'Invalid attribute `ref` supplied to `React.Fragment`.%s',
-      getStackAddendum(),
+      ReactDebugCurrentFrame.getStackAddendum(),
     );
   }
 
-  currentlyValidatingElement = null;
+  setCurrentlyValidatingElement(null);
 }
 
 export function createElementWithValidation(type, props, children) {
@@ -299,7 +286,7 @@ export function createElementWithValidation(type, props, children) {
       info += getDeclarationErrorAddendum();
     }
 
-    info += getStackAddendum();
+    info += ReactDebugCurrentFrame.getStackAddendum();
 
     let typeString;
     if (type === null) {

From 58f3b29d91a1bcd5c81d25ae8b3f760cbea612ae Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Thu, 12 Jul 2018 08:35:21 -0700
Subject: [PATCH 224/277] Added SSR/hydration tests for modes, forwardRef, and
 Profiler (#13195)

* Added more SSR tests for modes, profiler, and forward-ref
---
 ...ctDOMServerIntegrationSpecialTypes-test.js | 68 ++++++++++++++++++
 .../ReactServerRenderingHydration.js          | 72 +++++++++++++++++++
 2 files changed, 140 insertions(+)
 create mode 100644 packages/react-dom/src/__tests__/ReactDOMServerIntegrationSpecialTypes-test.js

diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationSpecialTypes-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationSpecialTypes-test.js
new file mode 100644
index 0000000000..c5f26b1b2b
--- /dev/null
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationSpecialTypes-test.js
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react-core
+ */
+
+'use strict';
+
+const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
+
+let React;
+let ReactDOM;
+let ReactDOMServer;
+
+function initModules() {
+  // Reset warning cache.
+  jest.resetModuleRegistry();
+  React = require('react');
+  ReactDOM = require('react-dom');
+  ReactDOMServer = require('react-dom/server');
+
+  // Make them available to the helpers.
+  return {
+    ReactDOM,
+    ReactDOMServer,
+  };
+}
+
+const {resetModules, itRenders} = ReactDOMServerIntegrationUtils(initModules);
+
+describe('ReactDOMServerIntegration', () => {
+  beforeEach(() => {
+    resetModules();
+  });
+
+  itRenders('a forwardedRef component and its children', async render => {
+    const FunctionComponent = ({label, forwardedRef}) => (
+      <div ref={forwardedRef}>{label}</div>
+    );
+    const WrappedFunctionComponent = React.forwardRef((props, ref) => (
+      <FunctionComponent {...props} forwardedRef={ref} />
+    ));
+
+    const ref = React.createRef();
+    const element = await render(
+      <WrappedFunctionComponent ref={ref} label="Test" />,
+    );
+    const parent = element.parentNode;
+    const div = parent.childNodes[0];
+    expect(div.tagName).toBe('DIV');
+    expect(div.textContent).toBe('Test');
+  });
+
+  itRenders('a Profiler component and its children', async render => {
+    const element = await render(
+      <React.unstable_Profiler id="profiler" onRender={jest.fn()}>
+        <div>Test</div>
+      </React.unstable_Profiler>,
+    );
+    const parent = element.parentNode;
+    const div = parent.childNodes[0];
+    expect(div.tagName).toBe('DIV');
+    expect(div.textContent).toBe('Test');
+  });
+});
diff --git a/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js b/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
index 1faf45872b..6767fc47de 100644
--- a/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
+++ b/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
@@ -263,4 +263,76 @@ describe('ReactDOMServerHydration', () => {
         'Render them conditionally so that they only appear on the client render.',
     );
   });
+
+  it('should be able to render and hydrate Mode components', () => {
+    class ComponentWithWarning extends React.Component {
+      componentWillMount() {
+        // Expected warning
+      }
+      render() {
+        return 'Hi';
+      }
+    }
+
+    const markup = (
+      <React.StrictMode>
+        <ComponentWithWarning />
+      </React.StrictMode>
+    );
+
+    const element = document.createElement('div');
+    element.innerHTML = ReactDOMServer.renderToString(markup);
+    expect(element.textContent).toBe('Hi');
+
+    expect(() => ReactDOM.hydrate(markup, element)).toWarnDev(
+      'Please update the following components to use componentDidMount instead: ComponentWithWarning',
+    );
+    expect(element.textContent).toBe('Hi');
+  });
+
+  it('should be able to render and hydrate forwardRef components', () => {
+    const FunctionComponent = ({label, forwardedRef}) => (
+      <div ref={forwardedRef}>{label}</div>
+    );
+    const WrappedFunctionComponent = React.forwardRef((props, ref) => (
+      <FunctionComponent {...props} forwardedRef={ref} />
+    ));
+
+    const ref = React.createRef();
+    const markup = <WrappedFunctionComponent ref={ref} label="Hi" />;
+
+    const element = document.createElement('div');
+    element.innerHTML = ReactDOMServer.renderToString(markup);
+    expect(element.textContent).toBe('Hi');
+    expect(ref.current).toBe(null);
+
+    ReactDOM.hydrate(markup, element);
+    expect(element.textContent).toBe('Hi');
+    expect(ref.current.tagName).toBe('DIV');
+  });
+
+  it('should be able to render and hydrate Profiler components', () => {
+    const callback = jest.fn();
+    const markup = (
+      <React.unstable_Profiler id="profiler" onRender={callback}>
+        <div>Hi</div>
+      </React.unstable_Profiler>
+    );
+
+    const element = document.createElement('div');
+    element.innerHTML = ReactDOMServer.renderToString(markup);
+    expect(element.textContent).toBe('Hi');
+    expect(callback).not.toHaveBeenCalled();
+
+    ReactDOM.hydrate(markup, element);
+    expect(element.textContent).toBe('Hi');
+    if (__DEV__) {
+      expect(callback).toHaveBeenCalledTimes(1);
+      const [id, phase] = callback.mock.calls[0];
+      expect(id).toBe('profiler');
+      expect(phase).toBe('mount');
+    } else {
+      expect(callback).toHaveBeenCalledTimes(0);
+    }
+  });
 });

From 659a29cecf74301532354261369e9048aac6e20f Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 13 Jul 2018 02:45:37 +0100
Subject: [PATCH 225/277] Reorganize how shared internals are accessed (#13201)

* Reorganize how shared internals are accessed

* Update forks.js
---
 packages/react-dom/src/client/ReactDOM.js     |  4 ++-
 .../src/server/ReactPartialRenderer.js        |  5 +++-
 .../src/shared/ReactDOMInvalidARIAHook.js     |  4 ++-
 .../shared/ReactDOMNullInputValuePropHook.js  |  4 ++-
 .../src/shared/ReactDOMUnknownPropertyHook.js |  6 +++-
 .../react-native-renderer/src/ReactFabric.js  |  3 +-
 .../src/ReactNativeRenderer.js                |  3 +-
 .../react-reconciler/src/ReactCurrentFiber.js |  4 ++-
 .../src/ReactFiberBeginWork.js                |  4 ++-
 .../src/ReactFiberScheduler.js                |  3 +-
 .../src/ReactFiberTreeReflection.js           |  4 ++-
 packages/react/src/React.js                   | 20 ++-----------
 packages/react/src/ReactSharedInternals.js    | 28 +++++++++++++++++++
 packages/shared/ReactGlobalSharedState.js     | 15 ----------
 packages/shared/ReactSharedInternals.js       | 13 +++++++++
 scripts/jest/setupHostConfigs.js              |  6 ++++
 scripts/rollup/forks.js                       |  9 ++++++
 17 files changed, 91 insertions(+), 44 deletions(-)
 create mode 100644 packages/react/src/ReactSharedInternals.js
 delete mode 100644 packages/shared/ReactGlobalSharedState.js
 create mode 100644 packages/shared/ReactSharedInternals.js

diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js
index 5ff4085f4f..b5e60ecf1c 100644
--- a/packages/react-dom/src/client/ReactDOM.js
+++ b/packages/react-dom/src/client/ReactDOM.js
@@ -29,7 +29,7 @@ import * as EventPluginRegistry from 'events/EventPluginRegistry';
 import * as EventPropagators from 'events/EventPropagators';
 import * as ReactInstanceMap from 'shared/ReactInstanceMap';
 import ReactVersion from 'shared/ReactVersion';
-import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'shared/invariant';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
@@ -46,6 +46,8 @@ import {
 } from '../shared/HTMLNodeType';
 import {ROOT_ATTRIBUTE_NAME} from '../shared/DOMProperty';
 
+const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
+
 let topLevelUpdateWarnings;
 let warnOnInvalidCallback;
 let didWarnAboutUnstableCreatePortal = false;
diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index 601131bf81..83e3b805a2 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -21,7 +21,7 @@ import lowPriorityWarning from 'shared/lowPriorityWarning';
 import warning from 'shared/warning';
 import checkPropTypes from 'prop-types/checkPropTypes';
 import describeComponentFrame from 'shared/describeComponentFrame';
-import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import {warnAboutDeprecatedLifecycles} from 'shared/ReactFeatureFlags';
 import {
   REACT_FORWARD_REF_TYPE,
@@ -68,6 +68,7 @@ const toArray = ((React.Children.toArray: any): toArrayType);
 // Each stack is an array of frames which may contain nested stacks of elements.
 let currentDebugStacks = [];
 
+let ReactDebugCurrentFrame;
 let prevGetCurrentStackImpl = null;
 let getCurrentServerStackImpl = () => '';
 let describeStackFrame = element => '';
@@ -78,6 +79,8 @@ let pushElementToDebugStack = (element: ReactElement) => {};
 let popCurrentDebugStack = () => {};
 
 if (__DEV__) {
+  ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+
   validatePropertiesInDevelopment = function(type, props) {
     validateARIAProperties(type, props);
     validateInputProperties(type, props);
diff --git a/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js b/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js
index ebd5b9c35e..bcc5c4b758 100644
--- a/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js
+++ b/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js
@@ -6,12 +6,14 @@
  */
 
 import warning from 'shared/warning';
-import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 
 import {ATTRIBUTE_NAME_CHAR} from './DOMProperty';
 import isCustomComponent from './isCustomComponent';
 import validAriaProperties from './validAriaProperties';
 
+const ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+
 const warnedProperties = {};
 const rARIA = new RegExp('^(aria)-[' + ATTRIBUTE_NAME_CHAR + ']*$');
 const rARIACamel = new RegExp('^(aria)[A-Z][' + ATTRIBUTE_NAME_CHAR + ']*$');
diff --git a/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js b/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js
index a7702f7408..71a14f8123 100644
--- a/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js
+++ b/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js
@@ -5,9 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import warning from 'shared/warning';
 
+let ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+
 let didWarnValueNull = false;
 
 export function validateProperties(type, props) {
diff --git a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js
index 652fbb1c02..891682fbb7 100644
--- a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js
+++ b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js
@@ -9,7 +9,7 @@ import {
   registrationNameModules,
   possibleRegistrationNames,
 } from 'events/EventPluginRegistry';
-import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import warning from 'shared/warning';
 
 import {
@@ -21,9 +21,13 @@ import {
 import isCustomComponent from './isCustomComponent';
 import possibleStandardNames from './possibleStandardNames';
 
+let ReactDebugCurrentFrame = null;
+
 let validateProperty = () => {};
 
 if (__DEV__) {
+  ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+
   const warnedProperties = {};
   const hasOwnProperty = Object.prototype.hasOwnProperty;
   const EVENT_NAME_REGEX = /^on./;
diff --git a/packages/react-native-renderer/src/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js
index 8a34ac063f..2ceb95e360 100644
--- a/packages/react-native-renderer/src/ReactFabric.js
+++ b/packages/react-native-renderer/src/ReactFabric.js
@@ -23,10 +23,11 @@ import ReactNativeComponent from './ReactNativeComponent';
 import * as ReactFabricComponentTree from './ReactFabricComponentTree';
 import {getInspectorDataForViewTag} from './ReactNativeFiberInspector';
 
-import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import getComponentName from 'shared/getComponentName';
 import warning from 'shared/warning';
 
+const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
 const findHostInstance = ReactFabricRenderer.findHostInstance;
 
 function findNodeHandle(componentOrHandle: any): ?number {
diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js
index cced457703..af8f94d3f0 100644
--- a/packages/react-native-renderer/src/ReactNativeRenderer.js
+++ b/packages/react-native-renderer/src/ReactNativeRenderer.js
@@ -26,10 +26,11 @@ import ReactNativeComponent from './ReactNativeComponent';
 import * as ReactNativeComponentTree from './ReactNativeComponentTree';
 import {getInspectorDataForViewTag} from './ReactNativeFiberInspector';
 
-import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import getComponentName from 'shared/getComponentName';
 import warning from 'shared/warning';
 
+const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
 const findHostInstance = ReactNativeFiberRenderer.findHostInstance;
 
 function findNodeHandle(componentOrHandle: any): ?number {
diff --git a/packages/react-reconciler/src/ReactCurrentFiber.js b/packages/react-reconciler/src/ReactCurrentFiber.js
index 45cfc2150e..0a47c6ba90 100644
--- a/packages/react-reconciler/src/ReactCurrentFiber.js
+++ b/packages/react-reconciler/src/ReactCurrentFiber.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import {
   IndeterminateComponent,
   FunctionalComponent,
@@ -17,6 +17,8 @@ import {
 import describeComponentFrame from 'shared/describeComponentFrame';
 import getComponentName from 'shared/getComponentName';
 
+const ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+
 import type {Fiber} from './ReactFiber';
 
 type LifeCyclePhase = 'render' | 'getChildContext';
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index d22c27be9c..0f7d0c3b18 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -38,7 +38,7 @@ import {
   Update,
   Ref,
 } from 'shared/ReactTypeOfSideEffect';
-import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import {
   enableGetDerivedStateFromCatch,
   enableSuspense,
@@ -98,6 +98,8 @@ import {
 } from './ReactFiberClassComponent';
 import MAX_SIGNED_31_BIT_INT from './maxSigned31BitInt';
 
+const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
+
 let didWarnAboutBadClass;
 let didWarnAboutGetDerivedStateOnFunctionalComponent;
 let didWarnAboutStatelessRefs;
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index f2d915b30f..e2b0653d6a 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -12,7 +12,7 @@ import type {FiberRoot, Batch} from './ReactFiberRoot';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 
 import ReactErrorUtils from 'shared/ReactErrorUtils';
-import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import ReactStrictModeWarnings from './ReactStrictModeWarnings';
 import {
   NoEffect,
@@ -155,6 +155,7 @@ export type Thenable = {
   then(resolve: () => mixed, reject?: () => mixed): mixed,
 };
 
+const {ReactCurrentOwner} = ReactSharedInternals;
 const {
   invokeGuardedCallback,
   hasCaughtError,
diff --git a/packages/react-reconciler/src/ReactFiberTreeReflection.js b/packages/react-reconciler/src/ReactFiberTreeReflection.js
index 9de1fc6930..7ee0ff5cc3 100644
--- a/packages/react-reconciler/src/ReactFiberTreeReflection.js
+++ b/packages/react-reconciler/src/ReactFiberTreeReflection.js
@@ -13,7 +13,7 @@ import invariant from 'shared/invariant';
 import warning from 'shared/warning';
 
 import * as ReactInstanceMap from 'shared/ReactInstanceMap';
-import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import getComponentName from 'shared/getComponentName';
 import {
   ClassComponent,
@@ -24,6 +24,8 @@ import {
 } from 'shared/ReactTypeOfWork';
 import {NoEffect, Placement} from 'shared/ReactTypeOfSideEffect';
 
+const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
+
 const MOUNTING = 1;
 const MOUNTED = 2;
 const UNMOUNTED = 3;
diff --git a/packages/react/src/React.js b/packages/react/src/React.js
index 01df1b4ed6..15e10114dc 100644
--- a/packages/react/src/React.js
+++ b/packages/react/src/React.js
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import assign from 'object-assign';
 import ReactVersion from 'shared/ReactVersion';
 import {
   REACT_ASYNC_MODE_TYPE,
@@ -19,7 +18,6 @@ import {enableSuspense} from 'shared/ReactFeatureFlags';
 import {Component, PureComponent} from './ReactBaseClasses';
 import {createRef} from './ReactCreateRef';
 import {forEach, map, count, toArray, only} from './ReactChildren';
-import ReactCurrentOwner from './ReactCurrentOwner';
 import {
   createElement,
   createFactory,
@@ -33,7 +31,7 @@ import {
   createFactoryWithValidation,
   cloneElementWithValidation,
 } from './ReactElementValidator';
-import ReactDebugCurrentFrame from './ReactDebugCurrentFrame';
+import ReactSharedInternals from './ReactSharedInternals';
 
 const React = {
   Children: {
@@ -63,25 +61,11 @@ const React = {
 
   version: ReactVersion,
 
-  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
-    ReactCurrentOwner,
-    // Used by renderers to avoid bundling object-assign twice in UMD bundles:
-    assign,
-  },
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: ReactSharedInternals,
 };
 
 if (enableSuspense) {
   React.Placeholder = REACT_PLACEHOLDER_TYPE;
 }
 
-if (__DEV__) {
-  Object.assign(React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, {
-    // These should not be included in production.
-    ReactDebugCurrentFrame,
-    // Shim for React DOM 16.0.0 which still destructured (but not used) this.
-    // TODO: remove in React 17.0.
-    ReactComponentTreeHook: {},
-  });
-}
-
 export default React;
diff --git a/packages/react/src/ReactSharedInternals.js b/packages/react/src/ReactSharedInternals.js
new file mode 100644
index 0000000000..8b179aff84
--- /dev/null
+++ b/packages/react/src/ReactSharedInternals.js
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import assign from 'object-assign';
+import ReactCurrentOwner from './ReactCurrentOwner';
+import ReactDebugCurrentFrame from './ReactDebugCurrentFrame';
+
+const ReactSharedInternals = {
+  ReactCurrentOwner,
+  // Used by renderers to avoid bundling object-assign twice in UMD bundles:
+  assign,
+};
+
+if (__DEV__) {
+  Object.assign(ReactSharedInternals, {
+    // These should not be included in production.
+    ReactDebugCurrentFrame,
+    // Shim for React DOM 16.0.0 which still destructured (but not used) this.
+    // TODO: remove in React 17.0.
+    ReactComponentTreeHook: {},
+  });
+}
+
+export default ReactSharedInternals;
diff --git a/packages/shared/ReactGlobalSharedState.js b/packages/shared/ReactGlobalSharedState.js
deleted file mode 100644
index b911e90801..0000000000
--- a/packages/shared/ReactGlobalSharedState.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import React from 'react';
-
-const ReactInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-
-export const ReactCurrentOwner = ReactInternals.ReactCurrentOwner;
-export const ReactDebugCurrentFrame = __DEV__
-  ? ReactInternals.ReactDebugCurrentFrame
-  : null;
diff --git a/packages/shared/ReactSharedInternals.js b/packages/shared/ReactSharedInternals.js
new file mode 100644
index 0000000000..7dbaa7de16
--- /dev/null
+++ b/packages/shared/ReactSharedInternals.js
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React from 'react';
+
+const ReactSharedInternals =
+  React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+
+export default ReactSharedInternals;
diff --git a/scripts/jest/setupHostConfigs.js b/scripts/jest/setupHostConfigs.js
index b018f42d92..888fade848 100644
--- a/scripts/jest/setupHostConfigs.js
+++ b/scripts/jest/setupHostConfigs.js
@@ -56,3 +56,9 @@ inlinedHostConfigs.forEach(rendererInfo => {
     return renderer;
   });
 });
+
+// Make it possible to import this module inside
+// the React package itself.
+jest.mock('shared/ReactSharedInternals', () =>
+  require.requireActual('react/src/ReactSharedInternals')
+);
diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js
index 682a4cd767..74d4df6c36 100644
--- a/scripts/rollup/forks.js
+++ b/scripts/rollup/forks.js
@@ -38,6 +38,15 @@ const forks = Object.freeze({
     return 'shared/forks/object-assign.umd.js';
   },
 
+  // Without this fork, importing `shared/ReactSharedInternals` inside
+  // the `react` package itself would not work due to a cyclical dependency.
+  'shared/ReactSharedInternals': (bundleType, entry) => {
+    if (entry === 'react') {
+      return 'react/src/ReactSharedInternals';
+    }
+    return null;
+  },
+
   // We have a few forks for different environments.
   'shared/ReactFeatureFlags': (bundleType, entry) => {
     switch (entry) {

From 43ffae2d1750ee32409e140e41ea562ff46d2516 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Fri, 13 Jul 2018 11:24:03 -0700
Subject: [PATCH 226/277] Suspending inside a constructor outside of strict
 mode (#13200)

* Suspending inside a constructor outside of strict mode

Outside of strict mode, suspended components commit in an incomplete
state, then are synchronously deleted in a subsequent commit. If a
component suspends inside the constructor, it mounts without
an instance.

This breaks at least one invariant: during deletion, we assume that
every mounted component has an instance, and check the instance for
the existence of `componentWillUnmount`.

Rather than add a redundant check to the deletion of every class
component, components that suspend inside their constructor and outside
of strict mode are turned into empty functional components before they
are mounted. This is a bit weird, but it's an edge case, and the empty
component will be synchronously unmounted regardless.

* Do not fire lifecycles of a suspended component

In non-strict mode, suspended components commit, but their lifecycles
should not fire.
---
 .../src/ReactFiberUnwindWork.js               |  21 ++++
 .../__tests__/ReactSuspense-test.internal.js  | 116 ++++++++++++++++++
 packages/shared/ReactTypeOfSideEffect.js      |   3 +
 3 files changed, 140 insertions(+)

diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index 192d083c17..432c30d442 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -30,6 +30,7 @@ import {
   NoEffect,
   ShouldCapture,
   Update as UpdateEffect,
+  LifecycleEffectMask,
 } from 'shared/ReactTypeOfSideEffect';
 import {
   enableGetDerivedStateFromCatch,
@@ -71,6 +72,10 @@ import {
 import {findEarliestOutstandingPriorityLevel} from './ReactFiberPendingPriority';
 import {reconcileChildrenAtExpirationTime} from './ReactFiberBeginWork';
 
+function NoopComponent() {
+  return null;
+}
+
 function createRootErrorUpdate(
   fiber: Fiber,
   errorInfo: CapturedValue<mixed>,
@@ -246,6 +251,22 @@ function throwException(
               sourceFiber.tag = FunctionalComponent;
             }
 
+            if (sourceFiber.tag === ClassComponent) {
+              // We're going to commit this fiber even though it didn't
+              // complete. But we shouldn't call any lifecycle methods or
+              // callbacks. Remove all lifecycle effect tags.
+              sourceFiber.effectTag &= ~LifecycleEffectMask;
+              if (sourceFiber.alternate === null) {
+                // We're about to mount a class component that doesn't have an
+                // instance. Turn this into a dummy functional component instead,
+                // to prevent type errors. This is a bit weird but it's an edge
+                // case and we're about to synchronously delete this
+                // component, anyway.
+                sourceFiber.tag = FunctionalComponent;
+                sourceFiber.type = NoopComponent;
+              }
+            }
+
             // Exit without suspending.
             return;
           }
diff --git a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
index 12b4ce001b..14678d160e 100644
--- a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
@@ -1282,6 +1282,122 @@ describe('ReactSuspense', () => {
         span('C'),
       ]);
     });
+
+    it('suspends inside constructor', async () => {
+      class AsyncTextInConstructor extends React.Component {
+        constructor(props) {
+          super(props);
+          const text = props.text;
+          try {
+            TextResource.read(cache, [props.text, props.ms]);
+            this.state = {text};
+          } catch (promise) {
+            if (typeof promise.then === 'function') {
+              ReactNoop.yield(`Suspend! [${text}]`);
+            } else {
+              ReactNoop.yield(`Error! [${text}]`);
+            }
+            throw promise;
+          }
+        }
+        render() {
+          ReactNoop.yield(this.state.text);
+          return <span prop={this.state.text} />;
+        }
+      }
+
+      ReactNoop.renderLegacySyncRoot(
+        <Placeholder fallback={<Text text="Loading..." />}>
+          <AsyncTextInConstructor ms={100} text="Hi" />
+        </Placeholder>,
+      );
+
+      expect(ReactNoop.getChildren()).toEqual([span('Loading...')]);
+    });
+  });
+
+  it('does not call lifecycles of a suspended component', async () => {
+    class TextWithLifecycle extends React.Component {
+      componentDidMount() {
+        ReactNoop.yield(`Mount [${this.props.text}]`);
+      }
+      componentDidUpdate() {
+        ReactNoop.yield(`Update [${this.props.text}]`);
+      }
+      componentWillUnmount() {
+        ReactNoop.yield(`Unmount [${this.props.text}]`);
+      }
+      render() {
+        return <Text {...this.props} />;
+      }
+    }
+
+    class AsyncTextWithLifecycle extends React.Component {
+      componentDidMount() {
+        ReactNoop.yield(`Mount [${this.props.text}]`);
+      }
+      componentDidUpdate() {
+        ReactNoop.yield(`Update [${this.props.text}]`);
+      }
+      componentWillUnmount() {
+        ReactNoop.yield(`Unmount [${this.props.text}]`);
+      }
+      render() {
+        const text = this.props.text;
+        const ms = this.props.ms;
+        try {
+          TextResource.read(cache, [text, ms]);
+          ReactNoop.yield(text);
+          return <span prop={text} />;
+        } catch (promise) {
+          if (typeof promise.then === 'function') {
+            ReactNoop.yield(`Suspend! [${text}]`);
+          } else {
+            ReactNoop.yield(`Error! [${text}]`);
+          }
+          throw promise;
+        }
+      }
+    }
+
+    function App() {
+      return (
+        <Placeholder
+          delayMs={1000}
+          fallback={<TextWithLifecycle text="Loading..." />}>
+          <TextWithLifecycle text="A" />
+          <AsyncTextWithLifecycle ms={100} text="B" />
+          <TextWithLifecycle text="C" />
+        </Placeholder>
+      );
+    }
+
+    ReactNoop.renderLegacySyncRoot(<App />, () =>
+      ReactNoop.yield('Commit root'),
+    );
+    expect(ReactNoop.clearYields()).toEqual([
+      'A',
+      'Suspend! [B]',
+      'C',
+
+      'Mount [A]',
+      // B's lifecycle should not fire because it suspended
+      // 'Mount [B]',
+      'Mount [C]',
+      'Commit root',
+
+      // In a subsequent commit, render a placeholder
+      'Loading...',
+
+      // A, B, and C are unmounted, but we skip calling B's componentWillUnmount
+      'Unmount [A]',
+      'Unmount [C]',
+
+      // Force delete all the existing children when switching to the
+      // placeholder. This should be a mount, not an update.
+      'Mount [Loading...]',
+    ]);
+    expect(ReactNoop.getChildren()).toEqual([span('Loading...')]);
   });
 });
 
diff --git a/packages/shared/ReactTypeOfSideEffect.js b/packages/shared/ReactTypeOfSideEffect.js
index 27d6aa6090..2a5732c385 100644
--- a/packages/shared/ReactTypeOfSideEffect.js
+++ b/packages/shared/ReactTypeOfSideEffect.js
@@ -24,6 +24,9 @@ export const DidCapture = /*            */ 0b00001000000;
 export const Ref = /*                   */ 0b00010000000;
 export const Snapshot = /*              */ 0b00100000000;
 
+// Update & Callback & Ref & Snapshot
+export const LifecycleEffectMask = /*   */ 0b00110100100;
+
 // Union of all host effects
 export const HostEffectMask = /*        */ 0b00111111111;
 

From 467d1391016dd2df8e1946aa33c6d6e1219c9dbb Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 16 Jul 2018 20:20:18 +0100
Subject: [PATCH 227/277] Enforce presence or absence of component stack in
 tests (#13215)

* Enforce presence or absence of stack in tests

* Rename expectNoStack to withoutStack

* Fix lint

* Add some tests for toWarnDev()
---
 .../createSubscription-test.internal.js       |   8 +-
 .../ReactComponentLifeCycle-test.internal.js  |  29 ++--
 .../__tests__/ReactComponentLifeCycle-test.js |  29 +++-
 .../__tests__/ReactCompositeComponent-test.js |  11 ++
 .../ReactCompositeComponentState-test.js      |   2 +
 .../react-dom/src/__tests__/ReactDOM-test.js  |   1 +
 .../src/__tests__/ReactDOMComponent-test.js   |  40 ++++-
 .../__tests__/ReactDOMComponentTree-test.js   |   2 +
 .../src/__tests__/ReactDOMFiber-test.js       |   4 +
 .../src/__tests__/ReactDOMInput-test.js       |   2 +
 .../src/__tests__/ReactDOMRoot-test.js        |  11 +-
 .../src/__tests__/ReactDOMSelect-test.js      |   2 +
 ...eactDOMServerIntegrationAttributes-test.js |   4 +-
 .../ReactDOMServerIntegrationElements-test.js |   7 +-
 .../ReactDOMServerLifecycles-test.internal.js |   2 +
 .../ReactDOMServerLifecycles-test.js          |   3 +
 .../src/__tests__/ReactDOMTextarea-test.js    |   7 +
 .../src/__tests__/ReactMount-test.js          |   7 +
 .../__tests__/ReactMountDestruction-test.js   |   2 +
 .../src/__tests__/ReactRenderDocument-test.js |  15 +-
 .../__tests__/ReactServerRendering-test.js    |  23 +--
 .../ReactServerRenderingHydration.js          |  11 +-
 .../__tests__/ReactStatelessComponent-test.js |   2 +
 .../src/__tests__/ReactTestUtils-test.js      |   1 +
 .../src/__tests__/ReactUpdates-test.js        |   1 +
 .../src/__tests__/validateDOMNesting-test.js  |   8 +-
 .../events/__tests__/SyntheticEvent-test.js   |   8 +
 .../ReactIncremental-test.internal.js         |   1 +
 ...tIncrementalErrorHandling-test.internal.js |   1 +
 .../ReactIncrementalPerf-test.internal.js     |  16 +-
 ...eactIncrementalReflection-test.internal.js |   3 +
 ...eactIncrementalScheduling-test.internal.js |   1 +
 .../ReactIncrementalUpdates-test.internal.js  |   2 +
 .../ReactNewContext-test.internal.js          |   1 +
 .../react/src/__tests__/ReactChildren-test.js |   1 +
 .../ReactCoffeeScriptClass-test.coffee        |  29 ++--
 .../__tests__/ReactContextValidator-test.js   |  19 ++-
 .../react/src/__tests__/ReactES6Class-test.js |  42 ++++--
 .../react/src/__tests__/ReactElement-test.js  |   3 +
 .../ReactElementValidator-test.internal.js    |  49 ++++---
 .../ReactJSXElementValidator-test.js          |   9 +-
 .../src/__tests__/ReactPureComponent-test.js  |   2 +
 .../__tests__/ReactTypeScriptClass-test.ts    |  40 +++--
 ...eateReactClassIntegration-test.internal.js |   3 +
 .../createReactClassIntegration-test.js       |  17 ++-
 .../react/src/__tests__/forwardRef-test.js    |   8 +
 .../__tests__/ReactDOMFrameScheduling-test.js |   1 +
 .../src/__tests__/SimpleCacheProvider-test.js |  34 +++--
 .../jest/matchers/__tests__/toWarnDev-test.js | 137 ++++++++++++++++++
 scripts/jest/matchers/toWarnDev.js            |  59 +++++++-
 scripts/jest/typescript/jest.d.ts             |   4 +-
 51 files changed, 584 insertions(+), 140 deletions(-)
 create mode 100644 scripts/jest/matchers/__tests__/toWarnDev-test.js

diff --git a/packages/create-subscription/src/__tests__/createSubscription-test.internal.js b/packages/create-subscription/src/__tests__/createSubscription-test.internal.js
index d96f57ba51..bbeb7892f2 100644
--- a/packages/create-subscription/src/__tests__/createSubscription-test.internal.js
+++ b/packages/create-subscription/src/__tests__/createSubscription-test.internal.js
@@ -450,7 +450,9 @@ describe('createSubscription', () => {
           },
           () => null,
         );
-      }).toWarnDev('Subscription must specify a getCurrentValue function');
+      }).toWarnDev('Subscription must specify a getCurrentValue function', {
+        withoutStack: true,
+      });
     });
 
     it('should warn for invalid missing subscribe', () => {
@@ -461,7 +463,9 @@ describe('createSubscription', () => {
           },
           () => null,
         );
-      }).toWarnDev('Subscription must specify a subscribe function');
+      }).toWarnDev('Subscription must specify a subscribe function', {
+        withoutStack: true,
+      });
     });
 
     it('should warn if subscribe does not return an unsubscribe method', () => {
diff --git a/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.internal.js b/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.internal.js
index 651463bf1c..8ee9782d82 100644
--- a/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.internal.js
+++ b/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.internal.js
@@ -43,19 +43,22 @@ describe('ReactComponentLifeCycle', () => {
     const container = document.createElement('div');
     expect(() =>
       ReactDOM.render(<MyComponent x={1} />, container),
-    ).toLowPriorityWarnDev([
-      'componentWillMount is deprecated and will be removed in the next major version. ' +
-        'Use componentDidMount instead. As a temporary workaround, ' +
-        'you can rename to UNSAFE_componentWillMount.' +
-        '\n\nPlease update the following components: MyComponent',
-      'componentWillReceiveProps is deprecated and will be removed in the next major version. ' +
-        'Use static getDerivedStateFromProps instead.' +
-        '\n\nPlease update the following components: MyComponent',
-      'componentWillUpdate is deprecated and will be removed in the next major version. ' +
-        'Use componentDidUpdate instead. As a temporary workaround, ' +
-        'you can rename to UNSAFE_componentWillUpdate.' +
-        '\n\nPlease update the following components: MyComponent',
-    ]);
+    ).toLowPriorityWarnDev(
+      [
+        'componentWillMount is deprecated and will be removed in the next major version. ' +
+          'Use componentDidMount instead. As a temporary workaround, ' +
+          'you can rename to UNSAFE_componentWillMount.' +
+          '\n\nPlease update the following components: MyComponent',
+        'componentWillReceiveProps is deprecated and will be removed in the next major version. ' +
+          'Use static getDerivedStateFromProps instead.' +
+          '\n\nPlease update the following components: MyComponent',
+        'componentWillUpdate is deprecated and will be removed in the next major version. ' +
+          'Use componentDidUpdate instead. As a temporary workaround, ' +
+          'you can rename to UNSAFE_componentWillUpdate.' +
+          '\n\nPlease update the following components: MyComponent',
+      ],
+      {withoutStack: true},
+    );
 
     // Dedupe check (update and instantiate new
     ReactDOM.render(<MyComponent x={2} />, container);
diff --git a/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js b/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js
index 25577ee5af..bace77fda7 100644
--- a/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js
+++ b/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js
@@ -218,6 +218,7 @@ describe('ReactComponentLifeCycle', () => {
         'This is a no-op, but it might indicate a bug in your application. ' +
         'Instead, assign to `this.state` directly or define a `state = {};` ' +
         'class property with the desired state in the StatefulComponent component.',
+      {withoutStack: true},
     );
 
     // Check deduplication; (no extra warnings should be logged).
@@ -248,7 +249,9 @@ describe('ReactComponentLifeCycle', () => {
     expect(() => {
       const instance = ReactTestUtils.renderIntoDocument(element);
       expect(instance._isMounted()).toBeTruthy();
-    }).toWarnDev('Component is accessing isMounted inside its render()');
+    }).toWarnDev('Component is accessing isMounted inside its render()', {
+      withoutStack: true,
+    });
   });
 
   it('should correctly determine if a null component is mounted', () => {
@@ -275,7 +278,9 @@ describe('ReactComponentLifeCycle', () => {
     expect(() => {
       const instance = ReactTestUtils.renderIntoDocument(element);
       expect(instance._isMounted()).toBeTruthy();
-    }).toWarnDev('Component is accessing isMounted inside its render()');
+    }).toWarnDev('Component is accessing isMounted inside its render()', {
+      withoutStack: true,
+    });
   });
 
   it('isMounted should return false when unmounted', () => {
@@ -313,7 +318,9 @@ describe('ReactComponentLifeCycle', () => {
 
     expect(() => {
       ReactTestUtils.renderIntoDocument(<Component />);
-    }).toWarnDev('Component is accessing findDOMNode inside its render()');
+    }).toWarnDev('Component is accessing findDOMNode inside its render()', {
+      withoutStack: true,
+    });
   });
 
   it('should carry through each of the phases of setup', () => {
@@ -379,6 +386,7 @@ describe('ReactComponentLifeCycle', () => {
       instance = ReactDOM.render(<LifeCycleComponent />, container);
     }).toWarnDev(
       'LifeCycleComponent is accessing isMounted inside its render() function',
+      {withoutStack: true},
     );
 
     // getInitialState
@@ -674,6 +682,7 @@ describe('ReactComponentLifeCycle', () => {
     const container = document.createElement('div');
     expect(() => ReactDOM.render(<Component />, container)).toWarnDev(
       'Unsafe legacy lifecycles will not be called for components using new component APIs.',
+      {withoutStack: true},
     );
   });
 
@@ -701,6 +710,7 @@ describe('ReactComponentLifeCycle', () => {
     const container = document.createElement('div');
     expect(() => ReactDOM.render(<Component value={1} />, container)).toWarnDev(
       'Unsafe legacy lifecycles will not be called for components using new component APIs.',
+      {withoutStack: true},
     );
     ReactDOM.render(<Component value={2} />, container);
   });
@@ -728,6 +738,7 @@ describe('ReactComponentLifeCycle', () => {
     const container = document.createElement('div');
     expect(() => ReactDOM.render(<Component value={1} />, container)).toWarnDev(
       'Unsafe legacy lifecycles will not be called for components using new component APIs.',
+      {withoutStack: true},
     );
     ReactDOM.render(<Component value={2} />, container);
   });
@@ -756,6 +767,7 @@ describe('ReactComponentLifeCycle', () => {
         '  componentWillUpdate\n\n' +
         'The above lifecycles should be removed. Learn more about this warning here:\n' +
         'https://fb.me/react-async-component-lifecycle-hooks',
+      {withoutStack: true},
     );
 
     class WillMount extends React.Component {
@@ -775,6 +787,7 @@ describe('ReactComponentLifeCycle', () => {
         '  UNSAFE_componentWillMount\n\n' +
         'The above lifecycles should be removed. Learn more about this warning here:\n' +
         'https://fb.me/react-async-component-lifecycle-hooks',
+      {withoutStack: true},
     );
 
     class WillMountAndUpdate extends React.Component {
@@ -796,6 +809,7 @@ describe('ReactComponentLifeCycle', () => {
         '  UNSAFE_componentWillUpdate\n\n' +
         'The above lifecycles should be removed. Learn more about this warning here:\n' +
         'https://fb.me/react-async-component-lifecycle-hooks',
+      {withoutStack: true},
     );
 
     class WillReceiveProps extends React.Component {
@@ -815,6 +829,7 @@ describe('ReactComponentLifeCycle', () => {
         '  componentWillReceiveProps\n\n' +
         'The above lifecycles should be removed. Learn more about this warning here:\n' +
         'https://fb.me/react-async-component-lifecycle-hooks',
+      {withoutStack: true},
     );
   });
 
@@ -841,6 +856,7 @@ describe('ReactComponentLifeCycle', () => {
         '  componentWillUpdate\n\n' +
         'The above lifecycles should be removed. Learn more about this warning here:\n' +
         'https://fb.me/react-async-component-lifecycle-hooks',
+      {withoutStack: true},
     );
 
     class WillMount extends React.Component {
@@ -859,6 +875,7 @@ describe('ReactComponentLifeCycle', () => {
         '  UNSAFE_componentWillMount\n\n' +
         'The above lifecycles should be removed. Learn more about this warning here:\n' +
         'https://fb.me/react-async-component-lifecycle-hooks',
+      {withoutStack: true},
     );
 
     class WillMountAndUpdate extends React.Component {
@@ -879,6 +896,7 @@ describe('ReactComponentLifeCycle', () => {
         '  UNSAFE_componentWillUpdate\n\n' +
         'The above lifecycles should be removed. Learn more about this warning here:\n' +
         'https://fb.me/react-async-component-lifecycle-hooks',
+      {withoutStack: true},
     );
 
     class WillReceiveProps extends React.Component {
@@ -897,6 +915,7 @@ describe('ReactComponentLifeCycle', () => {
         '  componentWillReceiveProps\n\n' +
         'The above lifecycles should be removed. Learn more about this warning here:\n' +
         'https://fb.me/react-async-component-lifecycle-hooks',
+      {withoutStack: true},
     );
   });
 
@@ -964,6 +983,7 @@ describe('ReactComponentLifeCycle', () => {
     expect(() => ReactDOM.render(<MyComponent />, div)).toWarnDev(
       'MyComponent.getDerivedStateFromProps(): A valid state object (or null) must ' +
         'be returned. You have returned undefined.',
+      {withoutStack: true},
     );
 
     // De-duped
@@ -984,6 +1004,7 @@ describe('ReactComponentLifeCycle', () => {
     expect(() => ReactDOM.render(<MyComponent />, div)).toWarnDev(
       'MyComponent: Did not properly initialize state during construction. ' +
         'Expected state to be an object, but it was undefined.',
+      {withoutStack: true},
     );
 
     // De-duped
@@ -1209,6 +1230,7 @@ describe('ReactComponentLifeCycle', () => {
     expect(() => ReactDOM.render(<MyComponent value="bar" />, div)).toWarnDev(
       'MyComponent.getSnapshotBeforeUpdate(): A snapshot value (or null) must ' +
         'be returned. You have returned undefined.',
+      {withoutStack: true},
     );
 
     // De-duped
@@ -1229,6 +1251,7 @@ describe('ReactComponentLifeCycle', () => {
     expect(() => ReactDOM.render(<MyComponent />, div)).toWarnDev(
       'MyComponent: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). ' +
         'This component defines getSnapshotBeforeUpdate() only.',
+      {withoutStack: true},
     );
 
     // De-duped
diff --git a/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js b/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js
index 182564111f..c0b30b032e 100644
--- a/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js
@@ -163,6 +163,7 @@ describe('ReactCompositeComponent', () => {
       'render(): Calling ReactDOM.render() to hydrate server-rendered markup ' +
         'will stop working in React v17. Replace the ReactDOM.render() call ' +
         'with ReactDOM.hydrate() if you want React to attach to the server HTML.',
+      {withoutStack: true},
     );
 
     // New explicit API
@@ -279,6 +280,7 @@ describe('ReactCompositeComponent', () => {
         'This is a no-op, but it might indicate a bug in your application. ' +
         'Instead, assign to `this.state` directly or define a `state = {};` ' +
         'class property with the desired state in the MyComponent component.',
+      {withoutStack: true},
     );
 
     // No additional warning should be recorded
@@ -303,6 +305,7 @@ describe('ReactCompositeComponent', () => {
         'This is a no-op, but it might indicate a bug in your application. ' +
         'Instead, assign to `this.state` directly or define a `state = {};` ' +
         'class property with the desired state in the MyComponent component.',
+      {withoutStack: true},
     );
 
     // No additional warning should be recorded
@@ -466,6 +469,7 @@ describe('ReactCompositeComponent', () => {
         "`render` or another component's constructor). Render methods should " +
         'be a pure function of props and state; constructor side-effects are ' +
         'an anti-pattern, but can be moved to `componentWillMount`.',
+      {withoutStack: true},
     );
 
     // The setState call is queued and then executed as a second pass. This
@@ -513,6 +517,7 @@ describe('ReactCompositeComponent', () => {
       instance = ReactDOM.render(<Component />, container);
     }).toWarnDev(
       'Warning: setState(...): Cannot call setState() inside getChildContext()',
+      {withoutStack: true},
     );
 
     expect(renderPasses).toBe(2);
@@ -589,6 +594,7 @@ describe('ReactCompositeComponent', () => {
     expect(() => instance.setState({bogus: true})).toWarnDev(
       'Warning: Component.shouldComponentUpdate(): Returned undefined instead of a ' +
         'boolean value. Make sure to return true or false.',
+      {withoutStack: true},
     );
   });
 
@@ -605,6 +611,7 @@ describe('ReactCompositeComponent', () => {
       'Warning: Component has a method called ' +
         'componentDidUnmount(). But there is no such lifecycle method. ' +
         'Did you mean componentWillUnmount()?',
+      {withoutStack: true},
     );
   });
 
@@ -623,6 +630,7 @@ describe('ReactCompositeComponent', () => {
         'If you meant to update the state in response to changing props, ' +
         'use componentWillReceiveProps(). If you meant to fetch data or ' +
         'run side-effects or mutations after React has updated the UI, use componentDidUpdate().',
+      {withoutStack: true},
     );
   });
 
@@ -641,6 +649,7 @@ describe('ReactCompositeComponent', () => {
     expect(() => ReactTestUtils.renderIntoDocument(<Component />)).toWarnDev(
       'Warning: Setting defaultProps as an instance property on Component is not supported ' +
         'and will be ignored. Instead, define defaultProps as a static property on Component.',
+      {withoutStack: true},
     );
   });
 
@@ -1131,6 +1140,7 @@ describe('ReactCompositeComponent', () => {
         'triggering nested component updates from render is not allowed. If ' +
         'necessary, trigger nested updates in componentDidUpdate.\n\nCheck the ' +
         'render method of Outer.',
+      {withoutStack: true},
     );
   });
 
@@ -1422,6 +1432,7 @@ describe('ReactCompositeComponent', () => {
     expect(() => ReactDOM.render(<Foo idx="qwe" />, container)).toWarnDev(
       'Foo(...): When calling super() in `Foo`, make sure to pass ' +
         "up the same props that your component's constructor was passed.",
+      {withoutStack: true},
     );
   });
 
diff --git a/packages/react-dom/src/__tests__/ReactCompositeComponentState-test.js b/packages/react-dom/src/__tests__/ReactCompositeComponentState-test.js
index 65a02827a7..8402abe9bd 100644
--- a/packages/react-dom/src/__tests__/ReactCompositeComponentState-test.js
+++ b/packages/react-dom/src/__tests__/ReactCompositeComponentState-test.js
@@ -410,6 +410,7 @@ describe('ReactCompositeComponent-state', () => {
       'Warning: Test.componentWillReceiveProps(): Assigning directly to ' +
         "this.state is deprecated (except inside a component's constructor). " +
         'Use setState instead.',
+      {withoutStack: true},
     );
 
     expect(ops).toEqual([
@@ -451,6 +452,7 @@ describe('ReactCompositeComponent-state', () => {
       'Warning: Test.componentWillMount(): Assigning directly to ' +
         "this.state is deprecated (except inside a component's constructor). " +
         'Use setState instead.',
+      {withoutStack: true},
     );
 
     expect(ops).toEqual([
diff --git a/packages/react-dom/src/__tests__/ReactDOM-test.js b/packages/react-dom/src/__tests__/ReactDOM-test.js
index b37f4dd35f..08aff5b582 100644
--- a/packages/react-dom/src/__tests__/ReactDOM-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOM-test.js
@@ -450,6 +450,7 @@ describe('ReactDOM', () => {
       jest.resetModules();
       expect(() => require('react-dom')).toWarnDev(
         "This browser doesn't support requestAnimationFrame.",
+        {withoutStack: true},
       );
     } finally {
       global.requestAnimationFrame = previousRAF;
diff --git a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
index 441545fc0a..08a83ace2e 100644
--- a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
@@ -567,6 +567,7 @@ describe('ReactDOMComponent', () => {
         }
       }).toWarnDev(
         'Warning: Invalid attribute name: `blah" onclick="beevil" noise="hi`',
+        {withoutStack: true}, // TODO: add a stack
       );
     });
 
@@ -586,6 +587,7 @@ describe('ReactDOMComponent', () => {
         }
       }).toWarnDev(
         'Warning: Invalid attribute name: `blah" onclick="beevil" noise="hi`',
+        {withoutStack: true}, // TODO: add a stack
       );
     });
 
@@ -1004,6 +1006,7 @@ describe('ReactDOMComponent', () => {
         '<BR /> is using incorrect casing. ' +
           'Use PascalCase for React components, ' +
           'or lowercase for HTML elements.',
+        {withoutStack: true}, // TODO: add a stack
       );
       expect(returnedValue).not.toContain('</BR>');
     });
@@ -1020,6 +1023,7 @@ describe('ReactDOMComponent', () => {
         '<IMG /> is using incorrect casing. ' +
           'Use PascalCase for React components, ' +
           'or lowercase for HTML elements.',
+        {withoutStack: true}, // TODO: add a stack
       );
     });
 
@@ -1029,6 +1033,7 @@ describe('ReactDOMComponent', () => {
       ).toWarnDev(
         'The `aria` attribute is reserved for future use in React. ' +
           'Pass individual `aria-` attributes instead.',
+        {withoutStack: true}, // TODO: add a stack
       );
     });
 
@@ -1051,10 +1056,12 @@ describe('ReactDOMComponent', () => {
 
         expect(() => ReactTestUtils.renderIntoDocument(<bar />)).toWarnDev(
           'The tag <bar> is unrecognized in this browser',
+          {withoutStack: true}, // TODO: add a stack
         );
         // Test deduplication
         expect(() => ReactTestUtils.renderIntoDocument(<foo />)).toWarnDev(
           'The tag <foo> is unrecognized in this browser',
+          {withoutStack: true}, // TODO: add a stack
         );
         ReactTestUtils.renderIntoDocument(<foo />);
         // This is a funny case.
@@ -1066,12 +1073,15 @@ describe('ReactDOMComponent', () => {
         // Corner case. Make sure out deduplication logic doesn't break with weird tag.
         expect(() =>
           ReactTestUtils.renderIntoDocument(<hasOwnProperty />),
-        ).toWarnDev([
-          '<hasOwnProperty /> is using incorrect casing. ' +
-            'Use PascalCase for React components, ' +
-            'or lowercase for HTML elements.',
-          'The tag <hasOwnProperty> is unrecognized in this browser',
-        ]);
+        ).toWarnDev(
+          [
+            '<hasOwnProperty /> is using incorrect casing. ' +
+              'Use PascalCase for React components, ' +
+              'or lowercase for HTML elements.',
+            'The tag <hasOwnProperty> is unrecognized in this browser',
+          ],
+          {withoutStack: true}, // TODO: add a stack
+        );
       } finally {
         Object.prototype.toString = realToString; // eslint-disable-line no-extend-native
       }
@@ -1130,6 +1140,7 @@ describe('ReactDOMComponent', () => {
         expect(() => ReactDOM.render(<ShadyComponent />, node)).toWarnDev(
           'ShadyComponent is using shady DOM. Using shady DOM with React can ' +
             'cause things to break subtly.',
+          {withoutStack: true}, // TODO: add a stack
         );
         mountComponent({is: 'custom-shady-div2'});
       } finally {
@@ -1150,6 +1161,7 @@ describe('ReactDOMComponent', () => {
         expect(() => mountComponent({is: 'custom-shady-div'})).toWarnDev(
           'A component is using shady DOM. Using shady DOM with React can ' +
             'cause things to break subtly.',
+          {withoutStack: true}, // TODO: add a stack
         );
 
         // No additional warnings are expected
@@ -1197,13 +1209,17 @@ describe('ReactDOMComponent', () => {
     it('should validate against use of innerHTML', () => {
       expect(() =>
         mountComponent({innerHTML: '<span>Hi Jim!</span>'}),
-      ).toWarnDev('Directly setting property `innerHTML` is not permitted. ');
+      ).toWarnDev('Directly setting property `innerHTML` is not permitted. ', {
+        withoutStack: true, // TODO: add a stack
+      });
     });
 
     it('should validate against use of innerHTML without case sensitivity', () => {
       expect(() =>
         mountComponent({innerhtml: '<span>Hi Jim!</span>'}),
-      ).toWarnDev('Directly setting property `innerHTML` is not permitted. ');
+      ).toWarnDev('Directly setting property `innerHTML` is not permitted. ', {
+        withoutStack: true, // TODO: add a stack
+      });
     });
 
     it('should validate use of dangerouslySetInnerHTML', () => {
@@ -1796,11 +1812,13 @@ describe('ReactDOMComponent', () => {
         ReactTestUtils.renderIntoDocument(<div onFocusIn={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
+        {withoutStack: true}, // TODO: add a stack
       );
       expect(() =>
         ReactTestUtils.renderIntoDocument(<div onFocusOut={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
+        {withoutStack: true}, // TODO: add a stack
       );
     });
 
@@ -1810,11 +1828,13 @@ describe('ReactDOMComponent', () => {
         ReactTestUtils.renderIntoDocument(<div onfocusin={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
+        {withoutStack: true}, // TODO: add a stack
       );
       expect(() =>
         ReactTestUtils.renderIntoDocument(<div onfocusout={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
+        {withoutStack: true}, // TODO: add a stack
       );
     });
 
@@ -1824,11 +1844,13 @@ describe('ReactDOMComponent', () => {
         ReactDOMServer.renderToString(<div onFocusIn={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
+        {withoutStack: true}, // TODO: add a stack
       );
       expect(() =>
         ReactDOMServer.renderToString(<div onFocusOut={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
+        {withoutStack: true}, // TODO: add a stack
       );
     });
 
@@ -1838,11 +1860,13 @@ describe('ReactDOMComponent', () => {
         ReactDOMServer.renderToString(<div onfocusin={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
+        {withoutStack: true}, // TODO: add a stack
       );
       expect(() =>
         ReactDOMServer.renderToString(<div onfocusout={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
+        {withoutStack: true}, // TODO: add a stack
       );
     });
 
diff --git a/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js b/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js
index dc48fcba59..9732ffa6f7 100644
--- a/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js
@@ -195,6 +195,7 @@ describe('ReactDOMComponentTree', () => {
         'was rendered by React and is not a top-level container. You may ' +
         'have accidentally passed in a React root node instead of its ' +
         'container.',
+      {withoutStack: true},
     );
   });
 
@@ -211,6 +212,7 @@ describe('ReactDOMComponentTree', () => {
         '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.',
+      {withoutStack: true},
     );
   });
 });
diff --git a/packages/react-dom/src/__tests__/ReactDOMFiber-test.js b/packages/react-dom/src/__tests__/ReactDOMFiber-test.js
index 530232becb..c47653fba4 100644
--- a/packages/react-dom/src/__tests__/ReactDOMFiber-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMFiber-test.js
@@ -256,6 +256,7 @@ describe('ReactDOMFiber', () => {
         'and will be removed in React 17+. Update your code to use ' +
         'ReactDOM.createPortal() instead. It has the exact same API, ' +
         'but without the "unstable_" prefix.',
+      {withoutStack: true},
     );
     expect(portalContainer.innerHTML).toBe('<div>portal</div>');
     expect(container.innerHTML).toBe('<div></div>');
@@ -1100,6 +1101,7 @@ describe('ReactDOMFiber', () => {
           'removed without using React. This is not supported and will ' +
           'cause errors. Instead, call ReactDOM.unmountComponentAtNode ' +
           'to empty a container.',
+        {withoutStack: true},
       );
     }).toThrowError();
   });
@@ -1117,6 +1119,7 @@ describe('ReactDOMFiber', () => {
         'removed without using React. This is not supported and will ' +
         'cause errors. Instead, call ReactDOM.unmountComponentAtNode ' +
         'to empty a container.',
+      {withoutStack: true},
     );
   });
 
@@ -1133,6 +1136,7 @@ describe('ReactDOMFiber', () => {
         'removed without using React. This is not supported and will ' +
         'cause errors. Instead, call ReactDOM.unmountComponentAtNode ' +
         'to empty a container.',
+      {withoutStack: true},
     );
   });
 
diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index 480287cfc0..aaa2083934 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -930,6 +930,7 @@ describe('ReactDOMInput', () => {
         'both). Decide between using a controlled or uncontrolled input ' +
         'element and remove one of these props. More info: ' +
         'https://fb.me/react-controlled-components',
+      {withoutStack: true}, // TODO: add a stack
     );
     ReactDOM.unmountComponentAtNode(container);
 
@@ -957,6 +958,7 @@ describe('ReactDOMInput', () => {
         'both). Decide between using a controlled or uncontrolled input ' +
         'element and remove one of these props. More info: ' +
         'https://fb.me/react-controlled-components',
+      {withoutStack: true}, // TODO: add a stack
     );
     ReactDOM.unmountComponentAtNode(container);
 
diff --git a/packages/react-dom/src/__tests__/ReactDOMRoot-test.js b/packages/react-dom/src/__tests__/ReactDOMRoot-test.js
index 2255d1cb04..deded72130 100644
--- a/packages/react-dom/src/__tests__/ReactDOMRoot-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMRoot-test.js
@@ -143,7 +143,9 @@ describe('ReactDOMRoot', () => {
         <span />
       </div>,
     );
-    expect(jest.runAllTimers).toWarnDev('Extra attributes');
+    expect(jest.runAllTimers).toWarnDev('Extra attributes', {
+      withoutStack: true,
+    });
   });
 
   it('does not clear existing children', async () => {
@@ -358,9 +360,10 @@ describe('ReactDOMRoot', () => {
     const root = ReactDOM.unstable_createRoot(container);
     const batch = root.createBatch();
     const InvalidType = undefined;
-    expect(() => batch.render(<InvalidType />)).toWarnDev([
-      'React.createElement: type is invalid',
-    ]);
+    expect(() => batch.render(<InvalidType />)).toWarnDev(
+      ['React.createElement: type is invalid'],
+      {withoutStack: true},
+    );
     expect(() => batch.commit()).toThrow('Element type is invalid');
   });
 });
diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index dad8ff395f..8ed6f32d0f 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -576,6 +576,7 @@ describe('ReactDOMSelect', () => {
     ).toWarnDev(
       'Use the `defaultValue` or `value` props on <select> instead of ' +
         'setting `selected` on <option>.',
+      {withoutStack: true}, // TODO: add a stack
     );
 
     ReactTestUtils.renderIntoDocument(
@@ -646,6 +647,7 @@ describe('ReactDOMSelect', () => {
         'both). Decide between using a controlled or uncontrolled select ' +
         'element and remove one of these props. More info: ' +
         'https://fb.me/react-controlled-components',
+      {withoutStack: true}, // TODO: add a stack
     );
 
     ReactTestUtils.renderIntoDocument(
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationAttributes-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationAttributes-test.js
index 2838ad660a..0211f483f5 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationAttributes-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationAttributes-test.js
@@ -598,7 +598,9 @@ describe('ReactDOMServerIntegration', () => {
         // so that it gets deduplicated later, and doesn't fail the test.
         expect(() => {
           ReactDOM.render(<nonstandard />, document.createElement('div'));
-        }).toWarnDev('The tag <nonstandard> is unrecognized in this browser.');
+        }).toWarnDev('The tag <nonstandard> is unrecognized in this browser.', {
+          withoutStack: true, // TODO: add a stack
+        });
 
         const e = await render(<nonstandard foo="bar" />);
         expect(e.getAttribute('foo')).toBe('bar');
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationElements-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationElements-test.js
index f50253904d..087b66474c 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationElements-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationElements-test.js
@@ -142,7 +142,9 @@ describe('ReactDOMServerIntegration', () => {
         // so that it gets deduplicated later, and doesn't fail the test.
         expect(() => {
           ReactDOM.render(<nonstandard />, document.createElement('div'));
-        }).toWarnDev('The tag <nonstandard> is unrecognized in this browser.');
+        }).toWarnDev('The tag <nonstandard> is unrecognized in this browser.', {
+          withoutStack: true, // TODO: add a stack
+        });
 
         const e = await render(<nonstandard>Text</nonstandard>);
         expect(e.tagName).toBe('NONSTANDARD');
@@ -885,6 +887,7 @@ describe('ReactDOMServerIntegration', () => {
               'components) but got: object. You likely forgot to export your ' +
               "component from the file it's defined in, or you might have mixed up " +
               'default and named imports.',
+            {withoutStack: true},
           );
           await render(EmptyComponent);
         },
@@ -906,6 +909,7 @@ describe('ReactDOMServerIntegration', () => {
             'Warning: React.createElement: type is invalid -- expected a string ' +
               '(for built-in components) or a class/function (for composite ' +
               'components) but got: null.',
+            {withoutStack: true},
           );
           await render(NullComponent);
         },
@@ -925,6 +929,7 @@ describe('ReactDOMServerIntegration', () => {
               'components) but got: undefined. You likely forgot to export your ' +
               "component from the file it's defined in, or you might have mixed up " +
               'default and named imports.',
+            {withoutStack: true},
           );
 
           await render(UndefinedComponent);
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.internal.js b/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.internal.js
index bbd502e2ab..f3c499627e 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.internal.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.internal.js
@@ -44,6 +44,7 @@ describe('ReactDOMServerLifecycles', () => {
       ReactDOMServer.renderToString(<Component />),
     ).toLowPriorityWarnDev(
       'Component: componentWillMount() is deprecated and will be removed in the next major version.',
+      {withoutStack: true},
     );
   });
 
@@ -62,6 +63,7 @@ describe('ReactDOMServerLifecycles', () => {
     ).toLowPriorityWarnDev(
       'Warning: Component: componentWillMount() is deprecated and will be removed ' +
         'in the next major version.',
+      {withoutStack: true},
     );
 
     // De-duped
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.js b/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.js
index 53a384b5cd..b0a4a29593 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.js
@@ -183,6 +183,7 @@ describe('ReactDOMServerLifecycles', () => {
     expect(() => ReactDOMServer.renderToString(<Component />)).toWarnDev(
       'Component.getDerivedStateFromProps(): A valid state object (or null) must ' +
         'be returned. You have returned undefined.',
+      {withoutStack: true},
     );
 
     // De-duped
@@ -202,6 +203,7 @@ describe('ReactDOMServerLifecycles', () => {
     expect(() => ReactDOMServer.renderToString(<Component />)).toWarnDev(
       'Component: Did not properly initialize state during construction. ' +
         'Expected state to be an object, but it was undefined.',
+      {withoutStack: true},
     );
 
     // De-duped
@@ -258,6 +260,7 @@ describe('ReactDOMServerLifecycles', () => {
         'usually means you called setState() outside componentWillMount() on ' +
         'the server. This is a no-op.\n\n' +
         'Please check the code for the Outer component.',
+      {withoutStack: true},
     );
   });
 });
diff --git a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
index 73522ace5d..619d59380f 100644
--- a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
@@ -267,6 +267,7 @@ describe('ReactDOMTextarea', () => {
       node = renderTextarea(stub, container);
     }).toWarnDev(
       'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',
+      {withoutStack: true}, // TODO: add a stack
     );
 
     expect(node.value).toBe('giraffe');
@@ -319,6 +320,7 @@ describe('ReactDOMTextarea', () => {
       node = renderTextarea(<textarea>{17}</textarea>);
     }).toWarnDev(
       'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',
+      {withoutStack: true}, // TODO: add a stack
     );
     expect(node.value).toBe('17');
   });
@@ -329,6 +331,7 @@ describe('ReactDOMTextarea', () => {
       node = renderTextarea(<textarea>{false}</textarea>);
     }).toWarnDev(
       'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',
+      {withoutStack: true}, // TODO: add a stack
     );
     expect(node.value).toBe('false');
   });
@@ -344,6 +347,7 @@ describe('ReactDOMTextarea', () => {
       node = renderTextarea(<textarea>{obj}</textarea>);
     }).toWarnDev(
       'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',
+      {withoutStack: true}, // TODO: add a stack
     );
     expect(node.value).toBe('sharkswithlasers');
   });
@@ -359,6 +363,7 @@ describe('ReactDOMTextarea', () => {
         ),
       ).toWarnDev(
         'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',
+        {withoutStack: true}, // TODO: add a stack
       );
     }).toThrow();
 
@@ -373,6 +378,7 @@ describe('ReactDOMTextarea', () => {
           )),
       ).toWarnDev(
         'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',
+        {withoutStack: true}, // TODO: add a stack
       );
     }).not.toThrow();
 
@@ -409,6 +415,7 @@ describe('ReactDOMTextarea', () => {
         'both). Decide between using a controlled or uncontrolled textarea ' +
         'and remove one of these props. More info: ' +
         'https://fb.me/react-controlled-components',
+      {withoutStack: true}, // TODO: add a stack
     );
 
     // No additional warnings are expected
diff --git a/packages/react-dom/src/__tests__/ReactMount-test.js b/packages/react-dom/src/__tests__/ReactMount-test.js
index 375e85b95b..897dadef9e 100644
--- a/packages/react-dom/src/__tests__/ReactMount-test.js
+++ b/packages/react-dom/src/__tests__/ReactMount-test.js
@@ -63,6 +63,7 @@ describe('ReactMount', () => {
       'Functions are not valid as a React child. ' +
         'This may happen if you return a Component instead of <Component /> from render. ' +
         'Or maybe you meant to call this function rather than return it.',
+      {withoutStack: true},
     );
   });
 
@@ -126,6 +127,7 @@ describe('ReactMount', () => {
 
     expect(() => ReactDOM.hydrate(<div />, container)).toWarnDev(
       'Did not expect server HTML to contain the text node " " in <container>.',
+      {withoutStack: true},
     );
   });
 
@@ -135,6 +137,7 @@ describe('ReactMount', () => {
 
     expect(() => ReactDOM.hydrate(<div />, container)).toWarnDev(
       'Did not expect server HTML to contain the text node " " in <container>.',
+      {withoutStack: true},
     );
   });
 
@@ -153,6 +156,7 @@ describe('ReactMount', () => {
       ReactDOM.render(<div />, iFrame.contentDocument.body),
     ).toWarnDev(
       'Rendering components directly into document.body is discouraged',
+      {withoutStack: true},
     );
   });
 
@@ -171,6 +175,7 @@ describe('ReactMount', () => {
     ).toWarnDev(
       'Server: "This markup contains an nbsp entity:   server text" ' +
         'Client: "This markup contains an nbsp entity:   client text"',
+      {withoutStack: true},
     );
   });
 
@@ -197,6 +202,7 @@ describe('ReactMount', () => {
         '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.',
+      {withoutStack: true},
     );
   });
 
@@ -222,6 +228,7 @@ describe('ReactMount', () => {
     expect(() => ReactDOMOther.unmountComponentAtNode(container)).toWarnDev(
       "Warning: unmountComponentAtNode(): The node you're attempting to unmount " +
         'was rendered by another copy of React.',
+      {withoutStack: true},
     );
 
     // Don't throw a warning if the correct React copy unmounts the node
diff --git a/packages/react-dom/src/__tests__/ReactMountDestruction-test.js b/packages/react-dom/src/__tests__/ReactMountDestruction-test.js
index 24a32a56a1..dec9414e4a 100644
--- a/packages/react-dom/src/__tests__/ReactMountDestruction-test.js
+++ b/packages/react-dom/src/__tests__/ReactMountDestruction-test.js
@@ -55,6 +55,7 @@ describe('ReactMount', () => {
         'unmount was rendered by React and is not a top-level container. You ' +
         'may have accidentally passed in a React root node instead of its ' +
         'container.',
+      {withoutStack: true},
     );
   });
 
@@ -77,6 +78,7 @@ describe('ReactMount', () => {
         'unmount was rendered by React and is not a top-level container. ' +
         'Instead, have the parent component update its state and rerender in ' +
         'order to remove this component.',
+      {withoutStack: true},
     );
   });
 });
diff --git a/packages/react-dom/src/__tests__/ReactRenderDocument-test.js b/packages/react-dom/src/__tests__/ReactRenderDocument-test.js
index c9b8cb89f3..3e6837557f 100644
--- a/packages/react-dom/src/__tests__/ReactRenderDocument-test.js
+++ b/packages/react-dom/src/__tests__/ReactRenderDocument-test.js
@@ -39,6 +39,7 @@ describe('rendering React components at document', () => {
         'render(): Calling ReactDOM.render() to hydrate server-rendered markup ' +
           'will stop working in React v17. Replace the ReactDOM.render() call ' +
           'with ReactDOM.hydrate() if you want React to attach to the server HTML.',
+        {withoutStack: true},
       );
     }
 
@@ -200,8 +201,11 @@ describe('rendering React components at document', () => {
           'render(): Calling ReactDOM.render() to hydrate server-rendered markup ' +
             'will stop working in React v17. Replace the ReactDOM.render() call ' +
             'with ReactDOM.hydrate() if you want React to attach to the server HTML.',
+          {withoutStack: true},
         );
-      }).toWarnDev('Warning: Text content did not match.');
+      }).toWarnDev('Warning: Text content did not match.', {
+        withoutStack: true,
+      });
     });
 
     it('should throw on full document render w/ no markup', () => {
@@ -369,6 +373,7 @@ describe('rendering React components at document', () => {
       container.textContent = 'potato';
       expect(() => ReactDOM.hydrate(<div>parsnip</div>, container)).toWarnDev(
         'Expected server HTML to contain a matching <div> in <div>.',
+        {withoutStack: true},
       );
       expect(container.textContent).toBe('parsnip');
     });
@@ -394,7 +399,9 @@ describe('rendering React components at document', () => {
 
       expect(() =>
         ReactDOM.hydrate(<Component text="Hello world" />, testDocument),
-      ).toWarnDev('Warning: Text content did not match.');
+      ).toWarnDev('Warning: Text content did not match.', {
+        withoutStack: true,
+      });
       expect(testDocument.body.innerHTML).toBe('Hello world');
     });
 
@@ -417,7 +424,9 @@ describe('rendering React components at document', () => {
       // getTestDocument() has an extra <meta> that we didn't render.
       expect(() =>
         ReactDOM.hydrate(<Component text="Hello world" />, testDocument),
-      ).toWarnDev('Did not expect server HTML to contain a <meta> in <head>.');
+      ).toWarnDev('Did not expect server HTML to contain a <meta> in <head>.', {
+        withoutStack: true,
+      });
       expect(testDocument.body.innerHTML).toBe('Hello world');
     });
 
diff --git a/packages/react-dom/src/__tests__/ReactServerRendering-test.js b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
index a859e0c8f1..e3b05d7328 100644
--- a/packages/react-dom/src/__tests__/ReactServerRendering-test.js
+++ b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
@@ -519,6 +519,7 @@ describe('ReactDOMServer', () => {
       'Warning: setState(...): Can only update a mounting component.' +
         ' This usually means you called setState() outside componentWillMount() on the server.' +
         ' This is a no-op.\n\nPlease check the code for the Foo component.',
+      {withoutStack: true},
     );
 
     const markup = ReactDOMServer.renderToStaticMarkup(<Foo />);
@@ -546,6 +547,7 @@ describe('ReactDOMServer', () => {
       'Warning: forceUpdate(...): Can only update a mounting component. ' +
         'This usually means you called forceUpdate() outside componentWillMount() on the server. ' +
         'This is a no-op.\n\nPlease check the code for the Baz component.',
+      {withoutStack: true},
     );
     const markup = ReactDOMServer.renderToStaticMarkup(<Baz />);
     expect(markup).toBe('<div></div>');
@@ -599,15 +601,18 @@ describe('ReactDOMServer', () => {
           </svg>
         </div>,
       ),
-    ).toWarnDev([
-      'Warning: <inPUT /> is using incorrect casing. ' +
-        'Use PascalCase for React components, ' +
-        'or lowercase for HTML elements.',
-      // linearGradient doesn't warn
-      'Warning: <iFrame /> is using incorrect casing. ' +
-        'Use PascalCase for React components, ' +
-        'or lowercase for HTML elements.',
-    ]);
+    ).toWarnDev(
+      [
+        'Warning: <inPUT /> is using incorrect casing. ' +
+          'Use PascalCase for React components, ' +
+          'or lowercase for HTML elements.',
+        // linearGradient doesn't warn
+        'Warning: <iFrame /> is using incorrect casing. ' +
+          'Use PascalCase for React components, ' +
+          'or lowercase for HTML elements.',
+      ],
+      {withoutStack: true},
+    );
   });
 
   it('should warn about contentEditable and children', () => {
diff --git a/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js b/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
index 6767fc47de..9f15eab857 100644
--- a/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
+++ b/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
@@ -83,6 +83,7 @@ describe('ReactDOMServerHydration', () => {
         'render(): Calling ReactDOM.render() to hydrate server-rendered markup ' +
           'will stop working in React v17. Replace the ReactDOM.render() call ' +
           'with ReactDOM.hydrate() if you want React to attach to the server HTML.',
+        {withoutStack: true},
       );
       expect(mountCount).toEqual(3);
       expect(element.innerHTML).toBe(lastMarkup);
@@ -101,7 +102,9 @@ describe('ReactDOMServerHydration', () => {
       element.innerHTML = lastMarkup;
       expect(() => {
         instance = ReactDOM.render(<TestComponent name="y" />, element);
-      }).toWarnDev('Text content did not match. Server: "x" Client: "y"');
+      }).toWarnDev('Text content did not match. Server: "x" Client: "y"', {
+        withoutStack: true,
+      });
       expect(mountCount).toEqual(4);
       expect(element.innerHTML.length > 0).toBe(true);
       expect(element.innerHTML).not.toEqual(lastMarkup);
@@ -184,7 +187,9 @@ describe('ReactDOMServerHydration', () => {
       element.innerHTML = lastMarkup;
       expect(() => {
         instance = ReactDOM.hydrate(<TestComponent name="y" />, element);
-      }).toWarnDev('Text content did not match. Server: "x" Client: "y"');
+      }).toWarnDev('Text content did not match. Server: "x" Client: "y"', {
+        withoutStack: true,
+      });
       expect(mountCount).toEqual(4);
       expect(element.innerHTML.length > 0).toBe(true);
       expect(element.innerHTML).not.toEqual(lastMarkup);
@@ -247,6 +252,7 @@ describe('ReactDOMServerHydration', () => {
       ReactDOM.hydrate(<button autoFocus={false}>client</button>, element),
     ).toWarnDev(
       'Warning: Text content did not match. Server: "server" Client: "client"',
+      {withoutStack: true},
     );
 
     expect(element.firstChild.focus).not.toHaveBeenCalled();
@@ -286,6 +292,7 @@ describe('ReactDOMServerHydration', () => {
 
     expect(() => ReactDOM.hydrate(markup, element)).toWarnDev(
       'Please update the following components to use componentDidMount instead: ComponentWithWarning',
+      {withoutStack: true},
     );
     expect(element.textContent).toBe('Hi');
   });
diff --git a/packages/react-dom/src/__tests__/ReactStatelessComponent-test.js b/packages/react-dom/src/__tests__/ReactStatelessComponent-test.js
index aa13b58de8..c5b8cbc7e2 100644
--- a/packages/react-dom/src/__tests__/ReactStatelessComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactStatelessComponent-test.js
@@ -111,6 +111,7 @@ describe('ReactStatelessComponent', () => {
     ).toWarnDev(
       'StatelessComponentWithChildContext: Stateless ' +
         'functional components do not support getDerivedStateFromProps.',
+      {withoutStack: true},
     );
   });
 
@@ -133,6 +134,7 @@ describe('ReactStatelessComponent', () => {
     ).toWarnDev(
       'StatelessComponentWithChildContext(...): childContextTypes cannot ' +
         'be defined on a functional component.',
+      {withoutStack: true},
     );
   });
 
diff --git a/packages/react-dom/src/__tests__/ReactTestUtils-test.js b/packages/react-dom/src/__tests__/ReactTestUtils-test.js
index 34bb16cb37..148befdb23 100644
--- a/packages/react-dom/src/__tests__/ReactTestUtils-test.js
+++ b/packages/react-dom/src/__tests__/ReactTestUtils-test.js
@@ -59,6 +59,7 @@ describe('ReactTestUtils', () => {
       'ReactTestUtils.mockComponent() is deprecated. ' +
         'Use shallow rendering or jest.mock() instead.\n\n' +
         'See https://fb.me/test-utils-mock-component for more information.',
+      {withoutStack: true},
     );
 
     // De-duplication check
diff --git a/packages/react-dom/src/__tests__/ReactUpdates-test.js b/packages/react-dom/src/__tests__/ReactUpdates-test.js
index b29af8f52f..184f289535 100644
--- a/packages/react-dom/src/__tests__/ReactUpdates-test.js
+++ b/packages/react-dom/src/__tests__/ReactUpdates-test.js
@@ -1226,6 +1226,7 @@ describe('ReactUpdates', () => {
     const container = document.createElement('div');
     expect(() => ReactDOM.render(<Foo />, container)).toWarnDev(
       'Cannot update during an existing state transition',
+      {withoutStack: true},
     );
     expect(ops).toEqual(['base: 0, memoized: 0', 'base: 1, memoized: 1']);
   });
diff --git a/packages/react-dom/src/__tests__/validateDOMNesting-test.js b/packages/react-dom/src/__tests__/validateDOMNesting-test.js
index f2c092cc48..94ea338f59 100644
--- a/packages/react-dom/src/__tests__/validateDOMNesting-test.js
+++ b/packages/react-dom/src/__tests__/validateDOMNesting-test.js
@@ -12,7 +12,7 @@
 const React = require('react');
 const ReactDOM = require('react-dom');
 
-function expectWarnings(tags, warnings = []) {
+function expectWarnings(tags, warnings = [], withoutStack = 0) {
   tags = [...tags];
   warnings = [...warnings];
 
@@ -28,7 +28,9 @@ function expectWarnings(tags, warnings = []) {
     element = <Tag>{element}</Tag>;
   }
 
-  expect(() => ReactDOM.render(element, container)).toWarnDev(warnings);
+  expect(() => ReactDOM.render(element, container)).toWarnDev(warnings, {
+    withoutStack,
+  });
 }
 
 describe('validateDOMNesting', () => {
@@ -39,6 +41,7 @@ describe('validateDOMNesting', () => {
       [
         'render(): Rendering components directly into document.body is discouraged',
       ],
+      1,
     );
     expectWarnings(['div', 'a', 'object', 'a']);
     expectWarnings(['div', 'p', 'button', 'p']);
@@ -106,6 +109,7 @@ describe('validateDOMNesting', () => {
         'validateDOMNesting(...): <body> cannot appear as a child of <body>.\n' +
           '    in body (at **)',
       ],
+      1,
     );
     expectWarnings(
       ['svg', 'foreignObject', 'body', 'p'],
diff --git a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js
index 6ba906593c..6d98060e9e 100644
--- a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js
+++ b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js
@@ -153,12 +153,15 @@ describe('SyntheticEvent', () => {
     // once for each property accessed
     expect(() => expect(syntheticEvent.type).toBe(null)).toWarnDev(
       getExpectedWarning('type'),
+      {withoutStack: true},
     );
     expect(() => expect(syntheticEvent.nativeEvent).toBe(null)).toWarnDev(
       getExpectedWarning('nativeEvent'),
+      {withoutStack: true},
     );
     expect(() => expect(syntheticEvent.target).toBe(null)).toWarnDev(
       getExpectedWarning('target'),
+      {withoutStack: true},
     );
 
     expect(expectedCount).toBe(1);
@@ -188,6 +191,7 @@ describe('SyntheticEvent', () => {
         'released/nullified synthetic event. This is effectively a no-op. If you must ' +
         'keep the original synthetic event around, use event.persist(). ' +
         'See https://fb.me/react-event-pooling for more information.',
+      {withoutStack: true},
     );
     expect(expectedCount).toBe(1);
   });
@@ -213,6 +217,7 @@ describe('SyntheticEvent', () => {
         'released/nullified synthetic event. This is a no-op function. If you must ' +
         'keep the original synthetic event around, use event.persist(). ' +
         'See https://fb.me/react-event-pooling for more information.',
+      {withoutStack: true},
     );
     expect(expectedCount).toBe(1);
   });
@@ -239,6 +244,7 @@ describe('SyntheticEvent', () => {
         'released/nullified synthetic event. This is a no-op function. If you must ' +
         'keep the original synthetic event around, use event.persist(). ' +
         'See https://fb.me/react-event-pooling for more information.',
+      {withoutStack: true},
     );
     expect(expectedCount).toBe(1);
   });
@@ -260,6 +266,7 @@ describe('SyntheticEvent', () => {
         'released/nullified synthetic event. This is set to null. If you must ' +
         'keep the original synthetic event around, use event.persist(). ' +
         'See https://fb.me/react-event-pooling for more information.',
+      {withoutStack: true},
     );
   });
 
@@ -277,6 +284,7 @@ describe('SyntheticEvent', () => {
             "you're seeing this, you're adding a new property in the synthetic " +
             'event object. The property is never released. ' +
             'See https://fb.me/react-event-pooling for more information.',
+          {withoutStack: true},
         );
       } else {
         e.foo = 'bar';
diff --git a/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
index b4674fd75f..0ffd7079d7 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncremental-test.internal.js
@@ -2403,6 +2403,7 @@ describe('ReactIncremental', () => {
     expect(ReactNoop.flush).toWarnDev(
       'componentWillReceiveProps: Please update the following components ' +
         'to use static getDerivedStateFromProps instead: MyComponent',
+      {withoutStack: true},
     );
 
     expect(ops).toEqual([
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
index 00dd06e660..8e1945f283 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
@@ -1100,6 +1100,7 @@ describe('ReactIncrementalErrorHandling', () => {
     const InvalidType = undefined;
     expect(() => ReactNoop.render(<InvalidType />)).toWarnDev(
       'Warning: React.createElement: type is invalid -- expected a string',
+      {withoutStack: true},
     );
     expect(ReactNoop.flush).toThrowError(
       'Element type is invalid: expected a string (for built-in components) or ' +
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
index ef4631a81d..d5d335a169 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
@@ -314,12 +314,15 @@ describe('ReactDebugFiberPerf', () => {
       </Parent>,
     );
     addComment('Should not print a warning');
-    expect(ReactNoop.flush).toWarnDev([
-      'componentWillMount: Please update the following components ' +
-        'to use componentDidMount instead: NotCascading' +
-        '\n\ncomponentWillReceiveProps: Please update the following components ' +
-        'to use static getDerivedStateFromProps instead: NotCascading',
-    ]);
+    expect(ReactNoop.flush).toWarnDev(
+      [
+        'componentWillMount: Please update the following components ' +
+          'to use componentDidMount instead: NotCascading' +
+          '\n\ncomponentWillReceiveProps: Please update the following components ' +
+          'to use static getDerivedStateFromProps instead: NotCascading',
+      ],
+      {withoutStack: true},
+    );
     ReactNoop.render(
       <Parent>
         <NotCascading />
@@ -360,6 +363,7 @@ describe('ReactDebugFiberPerf', () => {
         'to use static getDerivedStateFromProps instead: AllLifecycles' +
         '\n\ncomponentWillUpdate: Please update the following components ' +
         'to use componentDidUpdate instead: AllLifecycles',
+      {withoutStack: true},
     );
     ReactNoop.render(<AllLifecycles />);
     addComment('Update');
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalReflection-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalReflection-test.internal.js
index 64decb120a..250b816900 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalReflection-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalReflection-test.internal.js
@@ -65,6 +65,7 @@ describe('ReactIncrementalReflection', () => {
     expect(ReactNoop.flush).toWarnDev(
       'componentWillMount: Please update the following components ' +
         'to use componentDidMount instead: Component',
+      {withoutStack: true},
     );
 
     expect(ops).toEqual(['componentDidMount', true]);
@@ -106,6 +107,7 @@ describe('ReactIncrementalReflection', () => {
     expect(ReactNoop.flush).toWarnDev(
       'componentWillMount: Please update the following components ' +
         'to use componentDidMount instead: Component',
+      {withoutStack: true},
     );
 
     expect(ops).toEqual(['Component']);
@@ -198,6 +200,7 @@ describe('ReactIncrementalReflection', () => {
         'to use componentDidMount instead: Component' +
         '\n\ncomponentWillUpdate: Please update the following components ' +
         'to use componentDidUpdate instead: Component',
+      {withoutStack: true},
     );
 
     const hostSpan = classInstance.span;
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalScheduling-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalScheduling-test.internal.js
index 85b9763353..8d9bd41cc2 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalScheduling-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalScheduling-test.internal.js
@@ -353,6 +353,7 @@ describe('ReactIncrementalScheduling', () => {
     expect(ReactNoop.flush).toWarnDev(
       'componentWillReceiveProps: Please update the following components ' +
         'to use static getDerivedStateFromProps instead: Foo',
+      {withoutStack: true},
     );
 
     ReactNoop.render(<Foo step={2} />);
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalUpdates-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalUpdates-test.internal.js
index ddf917d7e8..f33100e3cb 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalUpdates-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalUpdates-test.internal.js
@@ -345,6 +345,7 @@ describe('ReactIncrementalUpdates', () => {
     expect(ReactNoop.flush).toWarnDev(
       'componentWillReceiveProps: Please update the following components ' +
         'to use static getDerivedStateFromProps instead: Foo',
+      {withoutStack: true},
     );
 
     ops = [];
@@ -385,6 +386,7 @@ describe('ReactIncrementalUpdates', () => {
         'from inside an update function. Update functions should be pure, ' +
         'with zero side-effects. Consider using componentDidUpdate or a ' +
         'callback.',
+      {withoutStack: true},
     );
     expect(ops).toEqual([
       // Initial render
diff --git a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
index 95355e2a18..44ae40bc12 100644
--- a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
@@ -720,6 +720,7 @@ describe('ReactNewContext', () => {
       expect(console.error.calls.argsFor(0)[0]).toContain(
         'calculateChangedBits: Expected the return value to be a 31-bit ' +
           'integer. Instead received: 4294967295',
+        {withoutStack: true}, // TODO: add a stack
       );
     }
   });
diff --git a/packages/react/src/__tests__/ReactChildren-test.js b/packages/react/src/__tests__/ReactChildren-test.js
index 841875fce3..83aff2be3a 100644
--- a/packages/react/src/__tests__/ReactChildren-test.js
+++ b/packages/react/src/__tests__/ReactChildren-test.js
@@ -928,6 +928,7 @@ describe('ReactChildren', () => {
         'Warning: ' +
           'Each child in an array or iterator should have a unique "key" prop.' +
           ' See https://fb.me/react-warning-keys for more information.',
+        {withoutStack: true}, // There's nothing on the stack
       );
     });
   });
diff --git a/packages/react/src/__tests__/ReactCoffeeScriptClass-test.coffee b/packages/react/src/__tests__/ReactCoffeeScriptClass-test.coffee
index a137a5488b..ed49ba0072 100644
--- a/packages/react/src/__tests__/ReactCoffeeScriptClass-test.coffee
+++ b/packages/react/src/__tests__/ReactCoffeeScriptClass-test.coffee
@@ -55,7 +55,7 @@ describe 'ReactCoffeeScriptClass', ->
       # A failed component renders twice in DEV
       'No `render` method found on the returned component instance',
       'No `render` method found on the returned component instance',
-    ])
+    ], {withoutStack: true})
     undefined
 
   it 'renders a simple stateless component with prop', ->
@@ -126,7 +126,7 @@ describe 'ReactCoffeeScriptClass', ->
         {}
     expect(->
       ReactDOM.render(React.createElement(Foo, foo: 'foo'), container)
-    ).toWarnDev 'Foo: getDerivedStateFromProps() is defined as an instance method and will be ignored. Instead, declare it as a static method.',
+    ).toWarnDev 'Foo: getDerivedStateFromProps() is defined as an instance method and will be ignored. Instead, declare it as a static method.', {withoutStack: true}
     undefined
 
   it 'warns if getDerivedStateFromCatch is not static', ->
@@ -137,7 +137,7 @@ describe 'ReactCoffeeScriptClass', ->
         {}
     expect(->
       ReactDOM.render(React.createElement(Foo, foo: 'foo'), container)
-    ).toWarnDev 'Foo: getDerivedStateFromCatch() is defined as an instance method and will be ignored. Instead, declare it as a static method.',
+    ).toWarnDev 'Foo: getDerivedStateFromCatch() is defined as an instance method and will be ignored. Instead, declare it as a static method.', {withoutStack: true}
     undefined
 
   it 'warns if getSnapshotBeforeUpdate is static', ->
@@ -148,7 +148,7 @@ describe 'ReactCoffeeScriptClass', ->
       {}
     expect(->
       ReactDOM.render(React.createElement(Foo, foo: 'foo'), container)
-    ).toWarnDev 'Foo: getSnapshotBeforeUpdate() is defined as a static method and will be ignored. Instead, declare it as an instance method.',
+    ).toWarnDev 'Foo: getSnapshotBeforeUpdate() is defined as a static method and will be ignored. Instead, declare it as an instance method.', {withoutStack: true}
     undefined
 
   it 'warns if state not initialized before static getDerivedStateFromProps', ->
@@ -163,7 +163,7 @@ describe 'ReactCoffeeScriptClass', ->
       }
     expect(->
       ReactDOM.render(React.createElement(Foo, foo: 'foo'), container)
-    ).toWarnDev 'Foo: Did not properly initialize state during construction. Expected state to be an object, but it was undefined.'
+    ).toWarnDev 'Foo: Did not properly initialize state during construction. Expected state to be an object, but it was undefined.', {withoutStack: true}
     undefined
 
   it 'updates initial state with values returned by static getDerivedStateFromProps', ->
@@ -262,7 +262,7 @@ describe 'ReactCoffeeScriptClass', ->
 
       expect(->
         test React.createElement(Foo), 'SPAN', ''
-      ).toWarnDev('Foo.state: must be set to an object or null')
+      ).toWarnDev('Foo.state: must be set to an object or null', {withoutStack: true})
     undefined
 
   it 'should render with null in the initial state property', ->
@@ -408,7 +408,7 @@ describe 'ReactCoffeeScriptClass', ->
       'getDefaultProps was defined on Foo, a plain JavaScript class.',
       'propTypes was defined as an instance property on Foo.',
       'contextTypes was defined as an instance property on Foo.',
-    ])
+    ], {withoutStack: true})
     expect(getInitialStateWasCalled).toBe false
     expect(getDefaultPropsWasCalled).toBe false
     undefined
@@ -444,7 +444,8 @@ describe 'ReactCoffeeScriptClass', ->
     ).toWarnDev(
       '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.'
+       question because the function is expected to return a value.',
+       {withoutStack: true}
     )
     undefined
 
@@ -461,7 +462,8 @@ describe 'ReactCoffeeScriptClass', ->
       test React.createElement(NamedComponent), 'SPAN', 'foo'
     ).toWarnDev(
       'Warning: NamedComponent has a method called componentWillRecieveProps().
-       Did you mean componentWillReceiveProps()?'
+       Did you mean componentWillReceiveProps()?',
+       {withoutStack: true}
     )
     undefined
 
@@ -478,7 +480,8 @@ describe 'ReactCoffeeScriptClass', ->
       test React.createElement(NamedComponent), 'SPAN', 'foo'
     ).toWarnDev(
       'Warning: NamedComponent has a method called UNSAFE_componentWillRecieveProps().
-       Did you mean UNSAFE_componentWillReceiveProps()?'
+       Did you mean UNSAFE_componentWillReceiveProps()?',
+       {withoutStack: true}
     )
     undefined
 
@@ -488,12 +491,14 @@ describe 'ReactCoffeeScriptClass', ->
     expect(->
       expect(-> instance.replaceState {}).toThrow()
     ).toLowPriorityWarnDev(
-      'replaceState(...) is deprecated in plain JavaScript React classes'
+      'replaceState(...) is deprecated in plain JavaScript React classes',
+      {withoutStack: true}
     )
     expect(->
       expect(-> instance.isMounted()).toThrow()
     ).toLowPriorityWarnDev(
-      'isMounted(...) is deprecated in plain JavaScript React classes'
+      'isMounted(...) is deprecated in plain JavaScript React classes',
+      {withoutStack: true}
     )
     undefined
 
diff --git a/packages/react/src/__tests__/ReactContextValidator-test.js b/packages/react/src/__tests__/ReactContextValidator-test.js
index b4f500d930..976027770c 100644
--- a/packages/react/src/__tests__/ReactContextValidator-test.js
+++ b/packages/react/src/__tests__/ReactContextValidator-test.js
@@ -271,6 +271,7 @@ describe('ReactContextValidator', () => {
       'Warning: ComponentA.childContextTypes is specified but there is no ' +
         'getChildContext() method on the instance. You can either define ' +
         'getChildContext() on ComponentA or remove childContextTypes from it.',
+      {withoutStack: true},
     );
 
     // Warnings should be deduped by component type
@@ -280,6 +281,7 @@ describe('ReactContextValidator', () => {
       'Warning: ComponentB.childContextTypes is specified but there is no ' +
         'getChildContext() method on the instance. You can either define ' +
         'getChildContext() on ComponentB or remove childContextTypes from it.',
+      {withoutStack: true},
     );
   });
 
@@ -323,13 +325,16 @@ describe('ReactContextValidator', () => {
 
     expect(() =>
       ReactTestUtils.renderIntoDocument(<ParentContextProvider />),
-    ).toWarnDev([
-      'Warning: MiddleMissingContext.childContextTypes is specified but there is no getChildContext() method on the ' +
-        'instance. You can either define getChildContext() on MiddleMissingContext or remove childContextTypes from ' +
-        'it.',
-      'Warning: Failed context type: The context `bar` is marked as required in `ChildContextConsumer`, but its ' +
-        'value is `undefined`.',
-    ]);
+    ).toWarnDev(
+      [
+        'Warning: MiddleMissingContext.childContextTypes is specified but there is no ' +
+          'getChildContext() method on the instance. You can either define getChildContext() ' +
+          'on MiddleMissingContext or remove childContextTypes from it.',
+        'Warning: Failed context type: The context `bar` is marked as required ' +
+          'in `ChildContextConsumer`, but its value is `undefined`.',
+      ],
+      {withoutStack: 1},
+    );
     expect(childContext.bar).toBeUndefined();
     expect(childContext.foo).toBe('FOO');
   });
diff --git a/packages/react/src/__tests__/ReactES6Class-test.js b/packages/react/src/__tests__/ReactES6Class-test.js
index 8284f53e44..39da681bd6 100644
--- a/packages/react/src/__tests__/ReactES6Class-test.js
+++ b/packages/react/src/__tests__/ReactES6Class-test.js
@@ -59,13 +59,16 @@ describe('ReactES6Class', () => {
     class Foo extends React.Component {}
     expect(() =>
       expect(() => ReactDOM.render(<Foo />, container)).toThrow(),
-    ).toWarnDev([
-      // A failed component renders twice in DEV
-      'Warning: Foo(...): No `render` method found on the returned component ' +
-        'instance: you may have forgotten to define `render`.',
-      'Warning: Foo(...): No `render` method found on the returned component ' +
-        'instance: you may have forgotten to define `render`.',
-    ]);
+    ).toWarnDev(
+      [
+        // A failed component renders twice in DEV
+        'Warning: Foo(...): No `render` method found on the returned component ' +
+          'instance: you may have forgotten to define `render`.',
+        'Warning: Foo(...): No `render` method found on the returned component ' +
+          'instance: you may have forgotten to define `render`.',
+      ],
+      {withoutStack: true},
+    );
   });
 
   it('renders a simple stateless component with prop', () => {
@@ -140,6 +143,7 @@ describe('ReactES6Class', () => {
     expect(() => ReactDOM.render(<Foo foo="foo" />, container)).toWarnDev(
       'Foo: getDerivedStateFromProps() is defined as an instance method ' +
         'and will be ignored. Instead, declare it as a static method.',
+      {withoutStack: true},
     );
   });
 
@@ -155,6 +159,7 @@ describe('ReactES6Class', () => {
     expect(() => ReactDOM.render(<Foo foo="foo" />, container)).toWarnDev(
       'Foo: getDerivedStateFromCatch() is defined as an instance method ' +
         'and will be ignored. Instead, declare it as a static method.',
+      {withoutStack: true},
     );
   });
 
@@ -168,6 +173,7 @@ describe('ReactES6Class', () => {
     expect(() => ReactDOM.render(<Foo foo="foo" />, container)).toWarnDev(
       'Foo: getSnapshotBeforeUpdate() is defined as a static method ' +
         'and will be ignored. Instead, declare it as an instance method.',
+      {withoutStack: true},
     );
   });
 
@@ -186,6 +192,7 @@ describe('ReactES6Class', () => {
     expect(() => ReactDOM.render(<Foo foo="foo" />, container)).toWarnDev(
       'Foo: Did not properly initialize state during construction. ' +
         'Expected state to be an object, but it was undefined.',
+      {withoutStack: true},
     );
   });
 
@@ -291,6 +298,7 @@ describe('ReactES6Class', () => {
       }
       expect(() => test(<Foo />, 'SPAN', '')).toWarnDev(
         'Foo.state: must be set to an object or null',
+        {withoutStack: true},
       );
     });
   });
@@ -440,12 +448,15 @@ describe('ReactES6Class', () => {
       }
     }
 
-    expect(() => test(<Foo />, 'SPAN', 'foo')).toWarnDev([
-      'getInitialState was defined on Foo, a plain JavaScript class.',
-      'getDefaultProps was defined on Foo, a plain JavaScript class.',
-      'propTypes was defined as an instance property on Foo.',
-      'contextTypes was defined as an instance property on Foo.',
-    ]);
+    expect(() => test(<Foo />, 'SPAN', 'foo')).toWarnDev(
+      [
+        'getInitialState was defined on Foo, a plain JavaScript class.',
+        'getDefaultProps was defined on Foo, a plain JavaScript class.',
+        'propTypes was defined as an instance property on Foo.',
+        'contextTypes was defined as an instance property on Foo.',
+      ],
+      {withoutStack: true},
+    );
     expect(getInitialStateWasCalled).toBe(false);
     expect(getDefaultPropsWasCalled).toBe(false);
   });
@@ -478,6 +489,7 @@ describe('ReactES6Class', () => {
         '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.',
+      {withoutStack: true},
     );
   });
 
@@ -495,6 +507,7 @@ describe('ReactES6Class', () => {
       'Warning: ' +
         'NamedComponent has a method called componentWillRecieveProps(). Did ' +
         'you mean componentWillReceiveProps()?',
+      {withoutStack: true},
     );
   });
 
@@ -512,6 +525,7 @@ describe('ReactES6Class', () => {
       'Warning: ' +
         'NamedComponent has a method called UNSAFE_componentWillRecieveProps(). ' +
         'Did you mean UNSAFE_componentWillReceiveProps()?',
+      {withoutStack: true},
     );
   });
 
@@ -521,11 +535,13 @@ describe('ReactES6Class', () => {
       expect(() => instance.replaceState({})).toThrow(),
     ).toLowPriorityWarnDev(
       'replaceState(...) is deprecated in plain JavaScript React classes',
+      {withoutStack: true},
     );
     expect(() =>
       expect(() => instance.isMounted()).toThrow(),
     ).toLowPriorityWarnDev(
       'isMounted(...) is deprecated in plain JavaScript React classes',
+      {withoutStack: true},
     );
   });
 
diff --git a/packages/react/src/__tests__/ReactElement-test.js b/packages/react/src/__tests__/ReactElement-test.js
index 5790767e5b..5a30cbe8b0 100644
--- a/packages/react/src/__tests__/ReactElement-test.js
+++ b/packages/react/src/__tests__/ReactElement-test.js
@@ -80,6 +80,7 @@ describe('ReactElement', () => {
         '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)',
+      {withoutStack: true},
     );
   });
 
@@ -90,6 +91,7 @@ describe('ReactElement', () => {
         '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)',
+      {withoutStack: true},
     );
   });
 
@@ -114,6 +116,7 @@ describe('ReactElement', () => {
         '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)',
+      {withoutStack: true},
     );
   });
 
diff --git a/packages/react/src/__tests__/ReactElementValidator-test.internal.js b/packages/react/src/__tests__/ReactElementValidator-test.internal.js
index 8fca997707..cb9a9eaa04 100644
--- a/packages/react/src/__tests__/ReactElementValidator-test.internal.js
+++ b/packages/react/src/__tests__/ReactElementValidator-test.internal.js
@@ -235,27 +235,30 @@ describe('ReactElementValidator', () => {
       React.createElement(true);
       React.createElement({x: 17});
       React.createElement({});
-    }).toWarnDev([
-      'Warning: React.createElement: type is invalid -- expected a string ' +
-        '(for built-in components) or a class/function (for composite ' +
-        'components) but got: undefined. You likely forgot to export your ' +
-        "component from the file it's defined in, or you might have mixed up " +
-        'default and named imports.',
-      'Warning: React.createElement: type is invalid -- expected a string ' +
-        '(for built-in components) or a class/function (for composite ' +
-        'components) but got: null.',
-      'Warning: React.createElement: type is invalid -- expected a string ' +
-        '(for built-in components) or a class/function (for composite ' +
-        'components) but got: boolean.',
-      'Warning: React.createElement: type is invalid -- expected a string ' +
-        '(for built-in components) or a class/function (for composite ' +
-        'components) but got: object.',
-      'Warning: React.createElement: type is invalid -- expected a string ' +
-        '(for built-in components) or a class/function (for composite ' +
-        'components) but got: object. You likely forgot to export your ' +
-        "component from the file it's defined in, or you might have mixed up " +
-        'default and named imports.',
-    ]);
+    }).toWarnDev(
+      [
+        'Warning: React.createElement: type is invalid -- expected a string ' +
+          '(for built-in components) or a class/function (for composite ' +
+          'components) but got: undefined. You likely forgot to export your ' +
+          "component from the file it's defined in, or you might have mixed up " +
+          'default and named imports.',
+        'Warning: React.createElement: type is invalid -- expected a string ' +
+          '(for built-in components) or a class/function (for composite ' +
+          'components) but got: null.',
+        'Warning: React.createElement: type is invalid -- expected a string ' +
+          '(for built-in components) or a class/function (for composite ' +
+          'components) but got: boolean.',
+        'Warning: React.createElement: type is invalid -- expected a string ' +
+          '(for built-in components) or a class/function (for composite ' +
+          'components) but got: object.',
+        'Warning: React.createElement: type is invalid -- expected a string ' +
+          '(for built-in components) or a class/function (for composite ' +
+          'components) but got: object. You likely forgot to export your ' +
+          "component from the file it's defined in, or you might have mixed up " +
+          'default and named imports.',
+      ],
+      {withoutStack: true},
+    );
 
     // Should not log any additional warnings
     React.createElement('div');
@@ -372,6 +375,7 @@ describe('ReactElementValidator', () => {
         'returned a function. You may have forgotten to pass an argument to ' +
         'the type checker creator (arrayOf, instanceOf, objectOf, oneOf, ' +
         'oneOfType, and shape all require an argument).',
+      {withoutStack: true},
     );
   });
 
@@ -392,6 +396,7 @@ describe('ReactElementValidator', () => {
     }).toWarnDev(
       'Warning: Component MisspelledPropTypesComponent declared `PropTypes` ' +
         'instead of `propTypes`. Did you misspell the property assignment?',
+      {withoutStack: true},
     );
   });
 
@@ -404,6 +409,7 @@ describe('ReactElementValidator', () => {
     expect(() => TestFactory.type).toLowPriorityWarnDev(
       'Warning: Factory.type is deprecated. Access the class directly before ' +
         'passing it to createFactory.',
+      {withoutStack: true},
     );
 
     // Warn once, not again
@@ -471,6 +477,7 @@ describe('ReactElementValidator', () => {
         'components) but got: undefined. You likely forgot to export your ' +
         "component from the file it's defined in, or you might have mixed up " +
         'default and named imports.\n\nCheck your code at **.',
+      {withoutStack: true},
     );
   });
 });
diff --git a/packages/react/src/__tests__/ReactJSXElementValidator-test.js b/packages/react/src/__tests__/ReactJSXElementValidator-test.js
index 741d978de7..010a03d24a 100644
--- a/packages/react/src/__tests__/ReactJSXElementValidator-test.js
+++ b/packages/react/src/__tests__/ReactJSXElementValidator-test.js
@@ -221,18 +221,21 @@ describe('ReactJSXElementValidator', () => {
         "component from the file it's defined in, or you might have mixed up " +
         'default and named imports.' +
         '\n\nCheck your code at **.',
+      {withoutStack: true},
     );
     expect(() => void <Null />).toWarnDev(
       'Warning: React.createElement: type is invalid -- expected a string ' +
         '(for built-in components) or a class/function (for composite ' +
         'components) but got: null.' +
         '\n\nCheck your code at **.',
+      {withoutStack: true},
     );
     expect(() => void <True />).toWarnDev(
       'Warning: React.createElement: type is invalid -- expected a string ' +
         '(for built-in components) or a class/function (for composite ' +
         'components) but got: boolean.' +
         '\n\nCheck your code at **.',
+      {withoutStack: true},
     );
     // No error expected
     void <Div />;
@@ -334,6 +337,7 @@ describe('ReactJSXElementValidator', () => {
     ).toWarnDev(
       'getDefaultProps is only used on classic React.createClass definitions.' +
         ' Use a static property named `defaultProps` instead.',
+      {withoutStack: true},
     );
   });
 
@@ -353,6 +357,7 @@ describe('ReactJSXElementValidator', () => {
     ).toWarnDev(
       'Warning: Component MisspelledPropTypesComponent declared `PropTypes` ' +
         'instead of `propTypes`. Did you misspell the property assignment?',
+      {withoutStack: true},
     );
   });
 
@@ -406,6 +411,8 @@ describe('ReactJSXElementValidator', () => {
           <span key="b">3</span>
         </React.Fragment>,
       ),
-    ).toWarnDev('Encountered two children with the same key, `a`.');
+    ).toWarnDev('Encountered two children with the same key, `a`.', {
+      withoutStack: true,
+    });
   });
 });
diff --git a/packages/react/src/__tests__/ReactPureComponent-test.js b/packages/react/src/__tests__/ReactPureComponent-test.js
index 776f7a2cc1..607aa57808 100644
--- a/packages/react/src/__tests__/ReactPureComponent-test.js
+++ b/packages/react/src/__tests__/ReactPureComponent-test.js
@@ -79,6 +79,7 @@ describe('ReactPureComponent', () => {
         'Component has a method called shouldComponentUpdate(). ' +
         'shouldComponentUpdate should not be used when extending React.PureComponent. ' +
         'Please extend React.Component if shouldComponentUpdate is used.',
+      {withoutStack: true},
     );
     ReactDOM.render(<Component />, container);
     expect(renders).toBe(2);
@@ -113,6 +114,7 @@ describe('ReactPureComponent', () => {
         'PureComponent has a method called shouldComponentUpdate(). ' +
         'shouldComponentUpdate should not be used when extending React.PureComponent. ' +
         'Please extend React.Component if shouldComponentUpdate is used.',
+      {withoutStack: true},
     );
   });
 });
diff --git a/packages/react/src/__tests__/ReactTypeScriptClass-test.ts b/packages/react/src/__tests__/ReactTypeScriptClass-test.ts
index 930b13c414..443259373f 100644
--- a/packages/react/src/__tests__/ReactTypeScriptClass-test.ts
+++ b/packages/react/src/__tests__/ReactTypeScriptClass-test.ts
@@ -331,7 +331,7 @@ describe('ReactTypeScriptClass', function() {
         'component instance: you may have forgotten to define `render`.',
       'Warning: Empty(...): No `render` method found on the returned ' +
         'component instance: you may have forgotten to define `render`.',
-    ]);
+    ], {withoutStack: true});
   });
 
   it('renders a simple stateless component with prop', function() {
@@ -391,7 +391,8 @@ describe('ReactTypeScriptClass', function() {
       ReactDOM.render(React.createElement(Foo, {foo: 'foo'}), container);
     }).toWarnDev(
       'Foo: getDerivedStateFromProps() is defined as an instance method ' +
-        'and will be ignored. Instead, declare it as a static method.'
+        'and will be ignored. Instead, declare it as a static method.',
+        {withoutStack: true}
     );
   });
 
@@ -408,7 +409,8 @@ describe('ReactTypeScriptClass', function() {
       ReactDOM.render(React.createElement(Foo, {foo: 'foo'}), container);
     }).toWarnDev(
       'Foo: getDerivedStateFromCatch() is defined as an instance method ' +
-        'and will be ignored. Instead, declare it as a static method.'
+        'and will be ignored. Instead, declare it as a static method.',
+        {withoutStack: true}
     );
   });
 
@@ -424,7 +426,8 @@ describe('ReactTypeScriptClass', function() {
       ReactDOM.render(React.createElement(Foo, {foo: 'foo'}), container);
     }).toWarnDev(
       'Foo: getSnapshotBeforeUpdate() is defined as a static method ' +
-        'and will be ignored. Instead, declare it as an instance method.'
+        'and will be ignored. Instead, declare it as an instance method.',
+        {withoutStack: true}
     );
   });
 
@@ -446,7 +449,8 @@ describe('ReactTypeScriptClass', function() {
       ReactDOM.render(React.createElement(Foo, {foo: 'foo'}), container);
     }).toWarnDev(
       'Foo: Did not properly initialize state during construction. ' +
-        'Expected state to be an object, but it was undefined.'
+        'Expected state to be an object, but it was undefined.',
+        {withoutStack: true}
     );
   });
 
@@ -503,13 +507,16 @@ describe('ReactTypeScriptClass', function() {
 
   it('should warn with non-object in the initial state property', function() {
     expect(() => test(React.createElement(ArrayState), 'SPAN', '')).toWarnDev(
-      'ArrayState.state: must be set to an object or null'
+      'ArrayState.state: must be set to an object or null',
+      {withoutStack: true}
     );
     expect(() => test(React.createElement(StringState), 'SPAN', '')).toWarnDev(
-      'StringState.state: must be set to an object or null'
+      'StringState.state: must be set to an object or null',
+      {withoutStack: true}
     );
     expect(() => test(React.createElement(NumberState), 'SPAN', '')).toWarnDev(
-      'NumberState.state: must be set to an object or null'
+      'NumberState.state: must be set to an object or null',
+      {withoutStack: true}
     );
   });
 
@@ -585,7 +592,7 @@ describe('ReactTypeScriptClass', function() {
           'a plain JavaScript class.',
         'propTypes was defined as an instance property on ClassicProperties.',
         'contextTypes was defined as an instance property on ClassicProperties.',
-      ]);
+      ], {withoutStack: true});
       expect(getInitialStateWasCalled).toBe(false);
       expect(getDefaultPropsWasCalled).toBe(false);
     }
@@ -616,7 +623,8 @@ describe('ReactTypeScriptClass', function() {
       'Warning: ' +
         'MisspelledComponent1 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.'
+        'because the function is expected to return a value.',
+        {withoutStack: true}
     );
   });
 
@@ -626,7 +634,8 @@ describe('ReactTypeScriptClass', function() {
     ).toWarnDev(
       'Warning: ' +
         'MisspelledComponent2 has a method called componentWillRecieveProps(). ' +
-        'Did you mean componentWillReceiveProps()?'
+        'Did you mean componentWillReceiveProps()?',
+        {withoutStack: true}
     );
   });
 
@@ -636,7 +645,8 @@ describe('ReactTypeScriptClass', function() {
     ).toWarnDev(
       'Warning: ' +
         'MisspelledComponent3 has a method called UNSAFE_componentWillRecieveProps(). ' +
-        'Did you mean UNSAFE_componentWillReceiveProps()?'
+        'Did you mean UNSAFE_componentWillReceiveProps()?',
+        {withoutStack: true}
     );
   });
 
@@ -649,12 +659,14 @@ describe('ReactTypeScriptClass', function() {
     expect(() =>
       expect(() => instance.replaceState({})).toThrow()
     ).toLowPriorityWarnDev(
-      'replaceState(...) is deprecated in plain JavaScript React classes'
+      'replaceState(...) is deprecated in plain JavaScript React classes',
+      {withoutStack: true}
     );
     expect(() =>
       expect(() => instance.isMounted()).toThrow()
     ).toLowPriorityWarnDev(
-      'isMounted(...) is deprecated in plain JavaScript React classes'
+      'isMounted(...) is deprecated in plain JavaScript React classes',
+      {withoutStack: true}
     );
   });
 
diff --git a/packages/react/src/__tests__/createReactClassIntegration-test.internal.js b/packages/react/src/__tests__/createReactClassIntegration-test.internal.js
index d79a194996..f87a50e942 100644
--- a/packages/react/src/__tests__/createReactClassIntegration-test.internal.js
+++ b/packages/react/src/__tests__/createReactClassIntegration-test.internal.js
@@ -91,6 +91,7 @@ describe('create-react-class-integration', () => {
       'Warning: MyComponent: isMounted is deprecated. Instead, make sure to ' +
         'clean up subscriptions and pending requests in componentWillUnmount ' +
         'to prevent memory leaks.',
+      {withoutStack: true},
     );
 
     // Dedupe
@@ -149,6 +150,7 @@ describe('create-react-class-integration', () => {
           'Use componentDidMount instead. As a temporary workaround, ' +
           'you can rename to UNSAFE_componentWillMount.' +
           '\n\nPlease update the following components: MyNativeComponent',
+        {withoutStack: true},
       );
     });
 
@@ -164,6 +166,7 @@ describe('create-react-class-integration', () => {
         'componentWillReceiveProps is deprecated and will be removed in the next major version. ' +
           'Use static getDerivedStateFromProps instead.' +
           '\n\nPlease update the following components: MyNativeComponent',
+        {withoutStack: true},
       );
     });
   });
diff --git a/packages/react/src/__tests__/createReactClassIntegration-test.js b/packages/react/src/__tests__/createReactClassIntegration-test.js
index d0d2babaf3..255b7602cb 100644
--- a/packages/react/src/__tests__/createReactClassIntegration-test.js
+++ b/packages/react/src/__tests__/createReactClassIntegration-test.js
@@ -66,6 +66,7 @@ describe('create-react-class-integration', () => {
     ).toWarnDev(
       'Warning: Component: prop type `prop` is invalid; ' +
         'it must be a function, usually from React.PropTypes.',
+      {withoutStack: true},
     );
   });
 
@@ -83,6 +84,7 @@ describe('create-react-class-integration', () => {
     ).toWarnDev(
       'Warning: Component: context type `prop` is invalid; ' +
         'it must be a function, usually from React.PropTypes.',
+      {withoutStack: true},
     );
   });
 
@@ -100,6 +102,7 @@ describe('create-react-class-integration', () => {
     ).toWarnDev(
       'Warning: Component: child context type `prop` is invalid; ' +
         'it must be a function, usually from React.PropTypes.',
+      {withoutStack: true},
     );
   });
 
@@ -117,6 +120,7 @@ describe('create-react-class-integration', () => {
       '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.',
+      {withoutStack: true},
     );
 
     expect(() =>
@@ -133,6 +137,7 @@ describe('create-react-class-integration', () => {
       '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.',
+      {withoutStack: true},
     );
   });
 
@@ -149,6 +154,7 @@ describe('create-react-class-integration', () => {
     ).toWarnDev(
       'Warning: A component has a method called componentWillRecieveProps(). Did you ' +
         'mean componentWillReceiveProps()?',
+      {withoutStack: true},
     );
   });
 
@@ -165,6 +171,7 @@ describe('create-react-class-integration', () => {
     ).toWarnDev(
       'Warning: A component has a method called UNSAFE_componentWillRecieveProps(). ' +
         'Did you mean UNSAFE_componentWillReceiveProps()?',
+      {withoutStack: true},
     );
   });
 
@@ -357,6 +364,7 @@ describe('create-react-class-integration', () => {
     expect(() => expect(() => Component()).toThrow()).toWarnDev(
       'Warning: Something is calling a React component directly. Use a ' +
         'factory or JSX instead. See: https://fb.me/react-legacyfactory',
+      {withoutStack: true},
     );
   });
 
@@ -447,6 +455,7 @@ describe('create-react-class-integration', () => {
     ).toWarnDev(
       'Component: getDerivedStateFromProps() is defined as an instance method ' +
         'and will be ignored. Instead, declare it as a static method.',
+      {withoutStack: true},
     );
   });
 
@@ -464,6 +473,7 @@ describe('create-react-class-integration', () => {
     ).toWarnDev(
       'Component: getDerivedStateFromCatch() is defined as an instance method ' +
         'and will be ignored. Instead, declare it as a static method.',
+      {withoutStack: true},
     );
   });
 
@@ -483,6 +493,7 @@ describe('create-react-class-integration', () => {
     ).toWarnDev(
       'Component: getSnapshotBeforeUpdate() is defined as a static method ' +
         'and will be ignored. Instead, declare it as an instance method.',
+      {withoutStack: true},
     );
   });
 
@@ -499,7 +510,9 @@ describe('create-react-class-integration', () => {
     });
     expect(() =>
       ReactDOM.render(<Component />, document.createElement('div')),
-    ).toWarnDev('Did not properly initialize state during construction.');
+    ).toWarnDev('Did not properly initialize state during construction.', {
+      withoutStack: true,
+    });
   });
 
   it('should not invoke deprecated lifecycles (cWM/cWRP/cWU) if new static gDSFP is present', () => {
@@ -536,6 +549,7 @@ describe('create-react-class-integration', () => {
         '  componentWillUpdate\n\n' +
         'The above lifecycles should be removed. Learn more about this warning here:\n' +
         'https://fb.me/react-async-component-lifecycle-hooks',
+      {withoutStack: true},
     );
     ReactDOM.render(<Component foo={1} />, document.createElement('div'));
   });
@@ -570,6 +584,7 @@ describe('create-react-class-integration', () => {
         '  componentWillUpdate\n\n' +
         'The above lifecycles should be removed. Learn more about this warning here:\n' +
         'https://fb.me/react-async-component-lifecycle-hooks',
+      {withoutStack: true},
     );
     ReactDOM.render(<Component foo={1} />, document.createElement('div'));
   });
diff --git a/packages/react/src/__tests__/forwardRef-test.js b/packages/react/src/__tests__/forwardRef-test.js
index b14408bd28..4693b9c44e 100644
--- a/packages/react/src/__tests__/forwardRef-test.js
+++ b/packages/react/src/__tests__/forwardRef-test.js
@@ -120,18 +120,22 @@ describe('forwardRef', () => {
   it('should warn if not provided a callback during creation', () => {
     expect(() => React.forwardRef(undefined)).toWarnDev(
       'forwardRef requires a render function but was given undefined.',
+      {withoutStack: true},
     );
     expect(() => React.forwardRef(null)).toWarnDev(
       'forwardRef requires a render function but was given null.',
+      {withoutStack: true},
     );
     expect(() => React.forwardRef('foo')).toWarnDev(
       'forwardRef requires a render function but was given string.',
+      {withoutStack: true},
     );
   });
 
   it('should warn if no render function is provided', () => {
     expect(React.forwardRef).toWarnDev(
       'forwardRef requires a render function but was given undefined.',
+      {withoutStack: true},
     );
   });
 
@@ -149,10 +153,12 @@ describe('forwardRef', () => {
     expect(() => React.forwardRef(renderWithPropTypes)).toWarnDev(
       'forwardRef render functions do not support propTypes or defaultProps. ' +
         'Did you accidentally pass a React component?',
+      {withoutStack: true},
     );
     expect(() => React.forwardRef(renderWithDefaultProps)).toWarnDev(
       'forwardRef render functions do not support propTypes or defaultProps. ' +
         'Did you accidentally pass a React component?',
+      {withoutStack: true},
     );
   });
 
@@ -166,11 +172,13 @@ describe('forwardRef', () => {
     expect(() => React.forwardRef(arityOfZero)).toWarnDev(
       'forwardRef render functions accept two parameters: props and ref. ' +
         'Did you forget to use the ref parameter?',
+      {withoutStack: true},
     );
 
     expect(() => React.forwardRef(arityOfOne)).toWarnDev(
       'forwardRef render functions accept two parameters: props and ref. ' +
         'Did you forget to use the ref parameter?',
+      {withoutStack: true},
     );
   });
 });
diff --git a/packages/shared/__tests__/ReactDOMFrameScheduling-test.js b/packages/shared/__tests__/ReactDOMFrameScheduling-test.js
index 68dfdbfa14..bc2308fbb9 100644
--- a/packages/shared/__tests__/ReactDOMFrameScheduling-test.js
+++ b/packages/shared/__tests__/ReactDOMFrameScheduling-test.js
@@ -17,6 +17,7 @@ describe('ReactDOMFrameScheduling', () => {
       jest.resetModules();
       expect(() => require('react-dom')).toWarnDev(
         "This browser doesn't support requestAnimationFrame.",
+        {withoutStack: true},
       );
     } finally {
       global.requestAnimationFrame = previousRAF;
diff --git a/packages/simple-cache-provider/src/__tests__/SimpleCacheProvider-test.js b/packages/simple-cache-provider/src/__tests__/SimpleCacheProvider-test.js
index 4d775e255c..8d60122f87 100644
--- a/packages/simple-cache-provider/src/__tests__/SimpleCacheProvider-test.js
+++ b/packages/simple-cache-provider/src/__tests__/SimpleCacheProvider-test.js
@@ -149,14 +149,17 @@ describe('SimpleCacheProvider', () => {
     }
 
     if (__DEV__) {
-      expect(fn).toWarnDev([
-        'Invalid resourceType: Expected a symbol, object, or function, but ' +
-          'instead received: foo. Strings and numbers are not permitted as ' +
-          'resource types.',
-        'Invalid resourceType: Expected a symbol, object, or function, but ' +
-          'instead received: 123. Strings and numbers are not permitted as ' +
-          'resource types.',
-      ]);
+      expect(fn).toWarnDev(
+        [
+          'Invalid resourceType: Expected a symbol, object, or function, but ' +
+            'instead received: foo. Strings and numbers are not permitted as ' +
+            'resource types.',
+          'Invalid resourceType: Expected a symbol, object, or function, but ' +
+            'instead received: 123. Strings and numbers are not permitted as ' +
+            'resource types.',
+        ],
+        {withoutStack: true},
+      );
     } else {
       fn();
     }
@@ -179,12 +182,15 @@ describe('SimpleCacheProvider', () => {
     }
 
     if (__DEV__) {
-      expect(fn).toWarnDev([
-        'preload: Invalid key type. Expected a string, number, symbol, or ' +
-          'boolean, but instead received: 5,5\n\n' +
-          'To use non-primitive values as keys, you must pass a hash ' +
-          'function as the second argument to createResource().',
-      ]);
+      expect(fn).toWarnDev(
+        [
+          'preload: Invalid key type. Expected a string, number, symbol, or ' +
+            'boolean, but instead received: 5,5\n\n' +
+            'To use non-primitive values as keys, you must pass a hash ' +
+            'function as the second argument to createResource().',
+        ],
+        {withoutStack: true},
+      );
     } else {
       fn();
     }
diff --git a/scripts/jest/matchers/__tests__/toWarnDev-test.js b/scripts/jest/matchers/__tests__/toWarnDev-test.js
new file mode 100644
index 0000000000..e0f6e07691
--- /dev/null
+++ b/scripts/jest/matchers/__tests__/toWarnDev-test.js
@@ -0,0 +1,137 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react-core
+ */
+
+'use strict';
+
+describe('toWarnDev', () => {
+  it('does not fail if a warning contains a stack', () => {
+    expect(() => {
+      console.error('Hello\n    in div');
+    }).toWarnDev('Hello');
+  });
+
+  it('does not fail if all warnings contain a stack', () => {
+    expect(() => {
+      console.error('Hello\n    in div');
+      console.error('Good day\n    in div');
+      console.error('Bye\n    in div');
+    }).toWarnDev(['Hello', 'Good day', 'Bye']);
+  });
+
+  it('does not fail if warnings without stack explicitly opt out', () => {
+    expect(() => {
+      console.error('Hello');
+    }).toWarnDev('Hello', {withoutStack: true});
+    expect(() => {
+      console.error('Hello');
+      console.error('Good day');
+      console.error('Bye');
+    }).toWarnDev(['Hello', 'Good day', 'Bye'], {withoutStack: true});
+  });
+
+  it('does not fail when expected stack-less warning number matches the actual one', () => {
+    expect(() => {
+      console.error('Hello\n    in div');
+      console.error('Good day');
+      console.error('Bye\n    in div');
+    }).toWarnDev(['Hello', 'Good day', 'Bye'], {withoutStack: 1});
+  });
+
+  it('fails if a warning does not contain a stack', () => {
+    expect(() => {
+      expect(() => {
+        console.error('Hello');
+      }).toWarnDev('Hello');
+    }).toThrow(
+      'Received warning unexpectedly does not include a component stack'
+    );
+  });
+
+  it('fails if some warnings do not contain a stack', () => {
+    expect(() => {
+      expect(() => {
+        console.error('Hello\n    in div');
+        console.error('Good day\n    in div');
+        console.error('Bye');
+      }).toWarnDev(['Hello', 'Good day', 'Bye']);
+    }).toThrow(
+      'Received warning unexpectedly does not include a component stack'
+    );
+    expect(() => {
+      expect(() => {
+        console.error('Hello');
+        console.error('Good day\n    in div');
+        console.error('Bye\n    in div');
+      }).toWarnDev(['Hello', 'Good day', 'Bye']);
+    }).toThrow(
+      'Received warning unexpectedly does not include a component stack'
+    );
+    expect(() => {
+      expect(() => {
+        console.error('Hello\n    in div');
+        console.error('Good day');
+        console.error('Bye\n    in div');
+      }).toWarnDev(['Hello', 'Good day', 'Bye']);
+    }).toThrow(
+      'Received warning unexpectedly does not include a component stack'
+    );
+    expect(() => {
+      expect(() => {
+        console.error('Hello');
+        console.error('Good day');
+        console.error('Bye');
+      }).toWarnDev(['Hello', 'Good day', 'Bye']);
+    }).toThrow(
+      'Received warning unexpectedly does not include a component stack'
+    );
+  });
+
+  it('fails if warning is expected to not have a stack, but does', () => {
+    expect(() => {
+      expect(() => {
+        console.error('Hello\n    in div');
+      }).toWarnDev('Hello', {withoutStack: true});
+    }).toThrow('Received warning unexpectedly includes a component stack');
+    expect(() => {
+      expect(() => {
+        console.error('Hello\n    in div');
+        console.error('Good day');
+        console.error('Bye\n    in div');
+      }).toWarnDev(['Hello', 'Good day', 'Bye'], {withoutStack: true});
+    }).toThrow('Received warning unexpectedly includes a component stack');
+  });
+
+  it('fails if expected stack-less warning number does not match the actual one', () => {
+    expect(() => {
+      expect(() => {
+        console.error('Hello\n    in div');
+        console.error('Good day');
+        console.error('Bye\n    in div');
+      }).toWarnDev(['Hello', 'Good day', 'Bye'], {withoutStack: 4});
+    }).toThrow('Expected 4 warnings without a component stack but received 1');
+  });
+
+  it('fails if withoutStack is invalid', () => {
+    expect(() => {
+      expect(() => {
+        console.error('Hi');
+      }).toWarnDev('Hi', {withoutStack: null});
+    }).toThrow('Instead received object');
+    expect(() => {
+      expect(() => {
+        console.error('Hi');
+      }).toWarnDev('Hi', {withoutStack: {}});
+    }).toThrow('Instead received object');
+    expect(() => {
+      expect(() => {
+        console.error('Hi');
+      }).toWarnDev('Hi', {withoutStack: 'haha'});
+    }).toThrow('Instead received string');
+  });
+});
diff --git a/scripts/jest/matchers/toWarnDev.js b/scripts/jest/matchers/toWarnDev.js
index c8e17d794c..aa262a626e 100644
--- a/scripts/jest/matchers/toWarnDev.js
+++ b/scripts/jest/matchers/toWarnDev.js
@@ -7,7 +7,7 @@ function normalizeCodeLocInfo(str) {
 }
 
 const createMatcherFor = consoleMethod =>
-  function matcher(callback, expectedMessages) {
+  function matcher(callback, expectedMessages, options = {}) {
     if (__DEV__) {
       // Warn about incorrect usage of matcher.
       if (typeof expectedMessages === 'string') {
@@ -19,6 +19,9 @@ const createMatcherFor = consoleMethod =>
         );
       }
 
+      const withoutStack = options.withoutStack;
+      const warningsWithoutComponentStack = [];
+      const warningsWithComponentStack = [];
       const unexpectedWarnings = [];
 
       // Catch errors thrown by the callback,
@@ -36,6 +39,11 @@ const createMatcherFor = consoleMethod =>
             normalizedMessage === expectedMessage ||
             normalizedMessage.includes(expectedMessage)
           ) {
+            if (normalizedMessage.includes('\n    in ')) {
+              warningsWithComponentStack.push(normalizedMessage);
+            } else {
+              warningsWithoutComponentStack.push(normalizedMessage);
+            }
             expectedMessages.splice(index, 1);
             return;
           }
@@ -103,6 +111,55 @@ const createMatcherFor = consoleMethod =>
           };
         }
 
+        if (typeof withoutStack === 'number') {
+          // We're expecting a particular number of warnings without stacks.
+          if (withoutStack !== warningsWithoutComponentStack.length) {
+            return {
+              message: () =>
+                `Expected ${withoutStack} warnings without a component stack but received ${
+                  warningsWithoutComponentStack.length
+                }:\n` +
+                warningsWithoutComponentStack.map(warning =>
+                  this.utils.printReceived(warning)
+                ),
+              pass: false,
+            };
+          }
+        } else if (withoutStack === true) {
+          // We're expecting that all warnings won't have the stack.
+          // If some warnings have it, it's an error.
+          if (warningsWithComponentStack.length > 0) {
+            return {
+              message: () =>
+                `Received warning unexpectedly includes a component stack:\n  ${this.utils.printReceived(
+                  warningsWithComponentStack[0]
+                )}\nIf this warning intentionally includes the component stack, remove ` +
+                `{withoutStack: true} from the toWarnDev() call. If you have a mix of ` +
+                `warnings with and without stack in one toWarnDev() call, pass ` +
+                `{withoutStack: N} where N is the number of warnings without stacks.`,
+              pass: false,
+            };
+          }
+        } else if (withoutStack === false || withoutStack === undefined) {
+          // We're expecting that all warnings *do* have the stack (default).
+          // If some warnings don't have it, it's an error.
+          if (warningsWithoutComponentStack.length > 0) {
+            return {
+              message: () =>
+                `Received warning unexpectedly does not include a component stack:\n  ${this.utils.printReceived(
+                  warningsWithoutComponentStack[0]
+                )}\nIf this warning intentionally omits the component stack, add ` +
+                `{withoutStack: true} to the toWarnDev() call.`,
+              pass: false,
+            };
+          }
+        } else {
+          throw Error(
+            `The second argument for toWarnDev(), when specified, must be an object. It may have a ` +
+              `property called "withoutStack" whose value may be undefined, boolean, or a number. ` +
+              `Instead received ${typeof withoutStack}.`
+          );
+        }
         return {pass: true};
       }
     } else {
diff --git a/scripts/jest/typescript/jest.d.ts b/scripts/jest/typescript/jest.d.ts
index 2426374c4d..4bc4f8a84d 100644
--- a/scripts/jest/typescript/jest.d.ts
+++ b/scripts/jest/typescript/jest.d.ts
@@ -21,8 +21,8 @@ interface Expect {
   not: Expect
   toThrow(message?: string): void
   toThrowError(message?: string): void
-  toWarnDev(message?: string | Array<string>): void
-  toLowPriorityWarnDev(message?: string | Array<string>): void
+  toWarnDev(message?: string | Array<string>, options?: any): void
+  toLowPriorityWarnDev(message?: string | Array<string>, options?: any): void
   toBe(value: any): void
   toEqual(value: any): void
   toBeFalsy(): void

From 854c9539058834038b67a87a7146a1ec2a2ceeb6 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 16 Jul 2018 20:35:43 +0100
Subject: [PATCH 228/277] Fix matcher tests to be DEV-only

---
 .../jest/matchers/__tests__/toWarnDev-test.js | 188 ++++++++++--------
 1 file changed, 101 insertions(+), 87 deletions(-)

diff --git a/scripts/jest/matchers/__tests__/toWarnDev-test.js b/scripts/jest/matchers/__tests__/toWarnDev-test.js
index e0f6e07691..cf88d53323 100644
--- a/scripts/jest/matchers/__tests__/toWarnDev-test.js
+++ b/scripts/jest/matchers/__tests__/toWarnDev-test.js
@@ -12,126 +12,140 @@
 describe('toWarnDev', () => {
   it('does not fail if a warning contains a stack', () => {
     expect(() => {
-      console.error('Hello\n    in div');
+      if (__DEV__) {
+        console.error('Hello\n    in div');
+      }
     }).toWarnDev('Hello');
   });
 
   it('does not fail if all warnings contain a stack', () => {
     expect(() => {
-      console.error('Hello\n    in div');
-      console.error('Good day\n    in div');
-      console.error('Bye\n    in div');
+      if (__DEV__) {
+        console.error('Hello\n    in div');
+        console.error('Good day\n    in div');
+        console.error('Bye\n    in div');
+      }
     }).toWarnDev(['Hello', 'Good day', 'Bye']);
   });
 
   it('does not fail if warnings without stack explicitly opt out', () => {
     expect(() => {
-      console.error('Hello');
+      if (__DEV__) {
+        console.error('Hello');
+      }
     }).toWarnDev('Hello', {withoutStack: true});
     expect(() => {
-      console.error('Hello');
-      console.error('Good day');
-      console.error('Bye');
+      if (__DEV__) {
+        console.error('Hello');
+        console.error('Good day');
+        console.error('Bye');
+      }
     }).toWarnDev(['Hello', 'Good day', 'Bye'], {withoutStack: true});
   });
 
   it('does not fail when expected stack-less warning number matches the actual one', () => {
     expect(() => {
-      console.error('Hello\n    in div');
-      console.error('Good day');
-      console.error('Bye\n    in div');
+      if (__DEV__) {
+        console.error('Hello\n    in div');
+        console.error('Good day');
+        console.error('Bye\n    in div');
+      }
     }).toWarnDev(['Hello', 'Good day', 'Bye'], {withoutStack: 1});
   });
 
-  it('fails if a warning does not contain a stack', () => {
-    expect(() => {
+  if (__DEV__) {
+    it('fails if a warning does not contain a stack', () => {
       expect(() => {
-        console.error('Hello');
-      }).toWarnDev('Hello');
-    }).toThrow(
-      'Received warning unexpectedly does not include a component stack'
-    );
-  });
+        expect(() => {
+          console.error('Hello');
+        }).toWarnDev('Hello');
+      }).toThrow(
+        'Received warning unexpectedly does not include a component stack'
+      );
+    });
 
-  it('fails if some warnings do not contain a stack', () => {
-    expect(() => {
+    it('fails if some warnings do not contain a stack', () => {
       expect(() => {
-        console.error('Hello\n    in div');
-        console.error('Good day\n    in div');
-        console.error('Bye');
-      }).toWarnDev(['Hello', 'Good day', 'Bye']);
-    }).toThrow(
-      'Received warning unexpectedly does not include a component stack'
-    );
-    expect(() => {
+        expect(() => {
+          console.error('Hello\n    in div');
+          console.error('Good day\n    in div');
+          console.error('Bye');
+        }).toWarnDev(['Hello', 'Good day', 'Bye']);
+      }).toThrow(
+        'Received warning unexpectedly does not include a component stack'
+      );
       expect(() => {
-        console.error('Hello');
-        console.error('Good day\n    in div');
-        console.error('Bye\n    in div');
-      }).toWarnDev(['Hello', 'Good day', 'Bye']);
-    }).toThrow(
-      'Received warning unexpectedly does not include a component stack'
-    );
-    expect(() => {
+        expect(() => {
+          console.error('Hello');
+          console.error('Good day\n    in div');
+          console.error('Bye\n    in div');
+        }).toWarnDev(['Hello', 'Good day', 'Bye']);
+      }).toThrow(
+        'Received warning unexpectedly does not include a component stack'
+      );
       expect(() => {
-        console.error('Hello\n    in div');
-        console.error('Good day');
-        console.error('Bye\n    in div');
-      }).toWarnDev(['Hello', 'Good day', 'Bye']);
-    }).toThrow(
-      'Received warning unexpectedly does not include a component stack'
-    );
-    expect(() => {
+        expect(() => {
+          console.error('Hello\n    in div');
+          console.error('Good day');
+          console.error('Bye\n    in div');
+        }).toWarnDev(['Hello', 'Good day', 'Bye']);
+      }).toThrow(
+        'Received warning unexpectedly does not include a component stack'
+      );
       expect(() => {
-        console.error('Hello');
-        console.error('Good day');
-        console.error('Bye');
-      }).toWarnDev(['Hello', 'Good day', 'Bye']);
-    }).toThrow(
-      'Received warning unexpectedly does not include a component stack'
-    );
-  });
+        expect(() => {
+          console.error('Hello');
+          console.error('Good day');
+          console.error('Bye');
+        }).toWarnDev(['Hello', 'Good day', 'Bye']);
+      }).toThrow(
+        'Received warning unexpectedly does not include a component stack'
+      );
+    });
 
-  it('fails if warning is expected to not have a stack, but does', () => {
-    expect(() => {
+    it('fails if warning is expected to not have a stack, but does', () => {
       expect(() => {
-        console.error('Hello\n    in div');
-      }).toWarnDev('Hello', {withoutStack: true});
-    }).toThrow('Received warning unexpectedly includes a component stack');
-    expect(() => {
+        expect(() => {
+          console.error('Hello\n    in div');
+        }).toWarnDev('Hello', {withoutStack: true});
+      }).toThrow('Received warning unexpectedly includes a component stack');
       expect(() => {
-        console.error('Hello\n    in div');
-        console.error('Good day');
-        console.error('Bye\n    in div');
-      }).toWarnDev(['Hello', 'Good day', 'Bye'], {withoutStack: true});
-    }).toThrow('Received warning unexpectedly includes a component stack');
-  });
+        expect(() => {
+          console.error('Hello\n    in div');
+          console.error('Good day');
+          console.error('Bye\n    in div');
+        }).toWarnDev(['Hello', 'Good day', 'Bye'], {withoutStack: true});
+      }).toThrow('Received warning unexpectedly includes a component stack');
+    });
 
-  it('fails if expected stack-less warning number does not match the actual one', () => {
-    expect(() => {
+    it('fails if expected stack-less warning number does not match the actual one', () => {
       expect(() => {
-        console.error('Hello\n    in div');
-        console.error('Good day');
-        console.error('Bye\n    in div');
-      }).toWarnDev(['Hello', 'Good day', 'Bye'], {withoutStack: 4});
-    }).toThrow('Expected 4 warnings without a component stack but received 1');
-  });
+        expect(() => {
+          console.error('Hello\n    in div');
+          console.error('Good day');
+          console.error('Bye\n    in div');
+        }).toWarnDev(['Hello', 'Good day', 'Bye'], {withoutStack: 4});
+      }).toThrow(
+        'Expected 4 warnings without a component stack but received 1'
+      );
+    });
 
-  it('fails if withoutStack is invalid', () => {
-    expect(() => {
+    it('fails if withoutStack is invalid', () => {
       expect(() => {
-        console.error('Hi');
-      }).toWarnDev('Hi', {withoutStack: null});
-    }).toThrow('Instead received object');
-    expect(() => {
+        expect(() => {
+          console.error('Hi');
+        }).toWarnDev('Hi', {withoutStack: null});
+      }).toThrow('Instead received object');
       expect(() => {
-        console.error('Hi');
-      }).toWarnDev('Hi', {withoutStack: {}});
-    }).toThrow('Instead received object');
-    expect(() => {
+        expect(() => {
+          console.error('Hi');
+        }).toWarnDev('Hi', {withoutStack: {}});
+      }).toThrow('Instead received object');
       expect(() => {
-        console.error('Hi');
-      }).toWarnDev('Hi', {withoutStack: 'haha'});
-    }).toThrow('Instead received string');
-  });
+        expect(() => {
+          console.error('Hi');
+        }).toWarnDev('Hi', {withoutStack: 'haha'});
+      }).toThrow('Instead received string');
+    });
+  }
 });

From f9358c51c8de93abe3cdd0f4720b489befad8c48 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 16 Jul 2018 22:31:59 +0100
Subject: [PATCH 229/277] Change warning() to automatically inject the stack,
 and add warningWithoutStack() as opt-out (#13161)

* Use %s in the console calls

* Add shared/warningWithStack

* Convert some warning callsites to warningWithStack

* Use warningInStack in shared utilities and remove unnecessary checks

* Replace more warning() calls with warningWithStack()

* Fixes after rebase + use warningWithStack in react

* Make warning have stack by default; warningWithoutStack opts out

* Forbid builds that may not use internals

* Revert newly added stacks

I changed my mind and want to keep this PR without functional changes. So we won't "fix" any warnings that are already missing stacks. We'll do it in follow-ups instead.

* Fix silly find/replace mistake

* Reorder imports

* Add protection against warning argument count mismatches

* Address review
---
 .../src/createSubscription.js                 |  6 +-
 packages/events/EventPluginUtils.js           |  6 +-
 packages/events/EventPropagators.js           |  4 +-
 packages/events/ResponderTouchHistoryStore.js |  6 +-
 packages/events/SyntheticEvent.js             |  6 +-
 packages/react-dom/src/client/ReactDOM.js     | 20 +++----
 .../src/client/ReactDOMFiberComponent.js      | 56 +++++++----------
 .../src/client/ReactDOMFiberInput.js          | 22 +++----
 .../src/client/ReactDOMFiberOption.js         |  4 +-
 .../src/client/ReactDOMFiberSelect.js         | 19 ++----
 .../src/client/ReactDOMFiberTextarea.js       | 14 ++---
 .../src/client/validateDOMNesting.js          |  8 +--
 .../react-dom/src/events/SimpleEventPlugin.js |  4 +-
 .../src/server/ReactPartialRenderer.js        | 54 +++++++----------
 .../src/shared/CSSPropertyOperations.js       |  4 +-
 packages/react-dom/src/shared/DOMProperty.js  |  4 +-
 .../shared/ReactControlledValuePropTypes.js   | 19 ++++--
 .../src/shared/ReactDOMInvalidARIAHook.js     | 18 ++----
 .../shared/ReactDOMNullInputValuePropHook.js  |  9 +--
 .../src/shared/ReactDOMUnknownPropertyHook.js | 45 +++++---------
 .../react-dom/src/shared/assertValidProps.js  | 17 ++++--
 .../react-dom/src/shared/warnValidStyle.js    | 37 +++++-------
 .../react-native-renderer/src/ReactFabric.js  |  4 +-
 .../src/ReactNativeEventEmitter.js            |  4 +-
 .../src/ReactNativeRenderer.js                |  4 +-
 .../react-reconciler/src/ReactChildFiber.js   | 15 ++---
 .../src/ReactFiberBeginWork.js                | 14 ++---
 .../src/ReactFiberClassComponent.js           | 60 ++++++++++---------
 .../src/ReactFiberCommitWork.js               |  6 +-
 .../react-reconciler/src/ReactFiberContext.js |  4 +-
 .../src/ReactFiberDevToolsHook.js             | 16 +++--
 .../src/ReactFiberNewContext.js               |  6 +-
 .../src/ReactFiberReconciler.js               |  6 +-
 .../src/ReactFiberScheduler.js                | 10 ++--
 .../react-reconciler/src/ReactFiberStack.js   |  8 +--
 .../src/ReactFiberTreeReflection.js           |  4 +-
 .../src/ReactProfilerTimer.js                 |  8 +--
 .../src/ReactStrictModeWarnings.js            | 10 ++--
 .../react-reconciler/src/ReactUpdateQueue.js  |  4 +-
 .../ReactNewContext-test.internal.js          | 17 ++----
 .../react-scheduler/src/ReactScheduler.js     |  6 +-
 packages/react/src/ReactChildren.js           |  3 +-
 packages/react/src/ReactContext.js            |  4 +-
 packages/react/src/ReactElement.js            |  6 +-
 packages/react/src/ReactElementValidator.js   | 19 ++----
 packages/react/src/ReactNoopUpdateQueue.js    |  4 +-
 packages/react/src/forwardRef.js              |  8 +--
 packages/shared/getComponentName.js           |  4 +-
 packages/shared/lowPriorityWarning.js         |  2 +-
 packages/shared/warning.js                    | 33 ++++------
 packages/shared/warningWithoutStack.js        | 43 +++++++++++++
 .../src/SimpleCacheProvider.js                | 10 ++--
 .../wrap-warning-with-env-check-test.js       |  7 +++
 scripts/babel/wrap-warning-with-env-check.js  |  5 +-
 .../warning-and-invariant-args.js             |  4 +-
 .../jest/matchers/__tests__/toWarnDev-test.js | 14 +++++
 scripts/jest/matchers/toWarnDev.js            | 33 +++++++++-
 scripts/rollup/forks.js                       | 15 ++++-
 scripts/rollup/plugins/use-forks-plugin.js    | 14 ++++-
 59 files changed, 426 insertions(+), 390 deletions(-)
 create mode 100644 packages/shared/warningWithoutStack.js

diff --git a/packages/create-subscription/src/createSubscription.js b/packages/create-subscription/src/createSubscription.js
index 16c5998139..213fddca7c 100644
--- a/packages/create-subscription/src/createSubscription.js
+++ b/packages/create-subscription/src/createSubscription.js
@@ -9,7 +9,7 @@
 
 import React from 'react';
 import invariant from 'shared/invariant';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 type Unsubscribe = () => void;
 
@@ -36,11 +36,11 @@ export function createSubscription<Property, Value>(
 }> {
   const {getCurrentValue, subscribe} = config;
 
-  warning(
+  warningWithoutStack(
     typeof getCurrentValue === 'function',
     'Subscription must specify a getCurrentValue function',
   );
-  warning(
+  warningWithoutStack(
     typeof subscribe === 'function',
     'Subscription must specify a subscribe function',
   );
diff --git a/packages/events/EventPluginUtils.js b/packages/events/EventPluginUtils.js
index 28f8c7f89b..2bbe2b36d9 100644
--- a/packages/events/EventPluginUtils.js
+++ b/packages/events/EventPluginUtils.js
@@ -7,7 +7,7 @@
 
 import ReactErrorUtils from 'shared/ReactErrorUtils';
 import invariant from 'shared/invariant';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 export let getFiberCurrentPropsFromNode = null;
 export let getInstanceFromNode = null;
@@ -21,7 +21,7 @@ export const injection = {
       getNodeFromInstance,
     } = Injected);
     if (__DEV__) {
-      warning(
+      warningWithoutStack(
         getNodeFromInstance && getInstanceFromNode,
         'EventPluginUtils.injection.injectComponentTree(...): Injected ' +
           'module is missing getNodeFromInstance or getInstanceFromNode.',
@@ -46,7 +46,7 @@ if (__DEV__) {
       ? dispatchInstances.length
       : dispatchInstances ? 1 : 0;
 
-    warning(
+    warningWithoutStack(
       instancesIsArr === listenersIsArr && instancesLen === listenersLen,
       'EventPluginUtils: Invalid `event`.',
     );
diff --git a/packages/events/EventPropagators.js b/packages/events/EventPropagators.js
index 12acf93606..6e04d758b9 100644
--- a/packages/events/EventPropagators.js
+++ b/packages/events/EventPropagators.js
@@ -10,7 +10,7 @@ import {
   traverseTwoPhase,
   traverseEnterLeave,
 } from 'shared/ReactTreeTraversal';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import {getListener} from './EventPluginHub';
 import accumulateInto from './accumulateInto';
@@ -46,7 +46,7 @@ function listenerAtPhase(inst, event, propagationPhase: PropagationPhases) {
  */
 function accumulateDirectionalDispatches(inst, phase, event) {
   if (__DEV__) {
-    warning(inst, 'Dispatching inst must not be null');
+    warningWithoutStack(inst, 'Dispatching inst must not be null');
   }
   const listener = listenerAtPhase(inst, event, phase);
   if (listener) {
diff --git a/packages/events/ResponderTouchHistoryStore.js b/packages/events/ResponderTouchHistoryStore.js
index a7bee3acd2..3fd9c6978d 100644
--- a/packages/events/ResponderTouchHistoryStore.js
+++ b/packages/events/ResponderTouchHistoryStore.js
@@ -8,7 +8,7 @@
  */
 
 import invariant from 'shared/invariant';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import {isStartish, isMoveish, isEndish} from './ResponderTopLevelEventTypes';
 
@@ -95,7 +95,7 @@ function resetTouchRecord(touchRecord: TouchRecord, touch: Touch): void {
 function getTouchIdentifier({identifier}: Touch): number {
   invariant(identifier != null, 'Touch object is missing identifier.');
   if (__DEV__) {
-    warning(
+    warningWithoutStack(
       identifier <= MAX_TOUCH_BANK,
       'Touch identifier %s is greater than maximum supported %s which causes ' +
         'performance issues backfilling array locations for all of the indices.',
@@ -200,7 +200,7 @@ const ResponderTouchHistoryStore = {
         }
         if (__DEV__) {
           const activeRecord = touchBank[touchHistory.indexOfSingleActiveTouch];
-          warning(
+          warningWithoutStack(
             activeRecord != null && activeRecord.touchActive,
             'Cannot find single active touch.',
           );
diff --git a/packages/events/SyntheticEvent.js b/packages/events/SyntheticEvent.js
index cdb1382e17..9c2d9eee1c 100644
--- a/packages/events/SyntheticEvent.js
+++ b/packages/events/SyntheticEvent.js
@@ -8,7 +8,7 @@
 /* eslint valid-typeof: 0 */
 
 import invariant from 'shared/invariant';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 let didWarnForAddedNewProperty = false;
 const EVENT_POOL_SIZE = 10;
@@ -261,7 +261,7 @@ if (__DEV__) {
               !target.constructor.Interface.hasOwnProperty(prop) &&
               shouldBeReleasedProperties.indexOf(prop) === -1
             ) {
-              warning(
+              warningWithoutStack(
                 didWarnForAddedNewProperty || target.isPersistent(),
                 "This synthetic event is reused for performance reasons. If you're " +
                   "seeing this, you're adding a new property in the synthetic event object. " +
@@ -316,7 +316,7 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
 
   function warn(action, result) {
     const warningCondition = false;
-    warning(
+    warningWithoutStack(
       warningCondition,
       "This synthetic event is reused for performance reasons. If you're seeing this, " +
         "you're %s `%s` on a released/nullified synthetic event. %s. " +
diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js
index b5e60ecf1c..55760eaff5 100644
--- a/packages/react-dom/src/client/ReactDOM.js
+++ b/packages/react-dom/src/client/ReactDOM.js
@@ -33,7 +33,7 @@ import ReactSharedInternals from 'shared/ReactSharedInternals';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'shared/invariant';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import * as ReactDOMComponentTree from './ReactDOMComponentTree';
 import * as ReactDOMFiberComponent from './ReactDOMFiberComponent';
@@ -64,7 +64,7 @@ if (__DEV__) {
     typeof Set.prototype.clear !== 'function' ||
     typeof Set.prototype.forEach !== 'function'
   ) {
-    warning(
+    warningWithoutStack(
       false,
       'React depends on Map and Set built-in types. Make sure that you load a ' +
         'polyfill in older browsers. https://fb.me/react-polyfills',
@@ -77,7 +77,7 @@ if (__DEV__) {
         container._reactRootContainer._internalRoot.current,
       );
       if (hostInstance) {
-        warning(
+        warningWithoutStack(
           hostInstance.parentNode === container,
           'render(...): It looks like the React-rendered content of this ' +
             'container was removed without using React. This is not ' +
@@ -93,7 +93,7 @@ if (__DEV__) {
       rootEl && ReactDOMComponentTree.getInstanceFromNode(rootEl)
     );
 
-    warning(
+    warningWithoutStack(
       !hasNonRootReactChild || isRootRenderedBySomeReact,
       'render(...): Replacing React-rendered children with a new root ' +
         'component. If you intended to update the children of this node, ' +
@@ -101,7 +101,7 @@ if (__DEV__) {
         'and render the new components instead of calling ReactDOM.render.',
     );
 
-    warning(
+    warningWithoutStack(
       container.nodeType !== ELEMENT_NODE ||
         !((container: any): Element).tagName ||
         ((container: any): Element).tagName.toUpperCase() !== 'BODY',
@@ -114,7 +114,7 @@ if (__DEV__) {
   };
 
   warnOnInvalidCallback = function(callback: mixed, callerName: string) {
-    warning(
+    warningWithoutStack(
       callback === null || typeof callback === 'function',
       '%s(...): Expected the last optional `callback` argument to be a ' +
         'function. Instead received: %s.',
@@ -472,7 +472,7 @@ function legacyCreateRootFromDOMContainer(
           (rootSibling: any).hasAttribute(ROOT_ATTRIBUTE_NAME)
         ) {
           warned = true;
-          warning(
+          warningWithoutStack(
             false,
             'render(): Target node has markup rendered by React, but there ' +
               'are unrelated nodes as well. This is most commonly caused by ' +
@@ -590,7 +590,7 @@ const ReactDOM: Object = {
       if (owner !== null && owner.stateNode !== null) {
         const warnedAboutRefsInRender =
           owner.stateNode._warnedAboutRefsInRender;
-        warning(
+        warningWithoutStack(
           warnedAboutRefsInRender,
           '%s is accessing findDOMNode inside its render(). ' +
             'render() should be a pure function of props and state. It should ' +
@@ -667,7 +667,7 @@ const ReactDOM: Object = {
         const rootEl = getReactRootElementInContainer(container);
         const renderedByDifferentReact =
           rootEl && !ReactDOMComponentTree.getInstanceFromNode(rootEl);
-        warning(
+        warningWithoutStack(
           !renderedByDifferentReact,
           "unmountComponentAtNode(): The node you're attempting to unmount " +
             'was rendered by another copy of React.',
@@ -696,7 +696,7 @@ const ReactDOM: Object = {
           isValidContainer(container.parentNode) &&
           !!container.parentNode._reactRootContainer;
 
-        warning(
+        warningWithoutStack(
           !hasNonRootReactChild,
           "unmountComponentAtNode(): The node you're attempting to unmount " +
             'was rendered by React and is not a top-level container. %s',
diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js
index c21e3cc568..d44e243e5d 100644
--- a/packages/react-dom/src/client/ReactDOMFiberComponent.js
+++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js
@@ -8,12 +8,10 @@
  */
 
 // TODO: direct imports like some-package/src/* are bad. Fix me.
-import {
-  getCurrentFiberOwnerNameInDevOrNull,
-  getCurrentFiberStackInDev,
-} from 'react-reconciler/src/ReactCurrentFiber';
+import {getCurrentFiberOwnerNameInDevOrNull} from 'react-reconciler/src/ReactCurrentFiber';
 import {registrationNameModules} from 'events/EventPluginRegistry';
 import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import * as DOMPropertyOperations from './DOMPropertyOperations';
 import * as ReactDOMFiberInput from './ReactDOMFiberInput';
@@ -61,8 +59,6 @@ const HTML = '__html';
 
 const {html: HTML_NAMESPACE} = Namespaces;
 
-let getStackInDev = () => '';
-
 let warnedUnknownTags;
 let suppressHydrationWarning;
 
@@ -76,8 +72,6 @@ let normalizeMarkupForTextOrAttribute;
 let normalizeHTML;
 
 if (__DEV__) {
-  getStackInDev = getCurrentFiberStackInDev;
-
   warnedUnknownTags = {
     // Chrome is the only major browser not shipping <time>. But as of July
     // 2017 it intends to ship it due to widespread usage. We intentionally
@@ -123,7 +117,7 @@ if (__DEV__) {
       return;
     }
     didWarnInvalidHydration = true;
-    warning(
+    warningWithoutStack(
       false,
       'Text content did not match. Server: "%s" Client: "%s"',
       normalizedServerText,
@@ -149,7 +143,7 @@ if (__DEV__) {
       return;
     }
     didWarnInvalidHydration = true;
-    warning(
+    warningWithoutStack(
       false,
       'Prop `%s` did not match. Server: %s Client: %s',
       propName,
@@ -167,7 +161,7 @@ if (__DEV__) {
     attributeNames.forEach(function(name) {
       names.push(name);
     });
-    warning(false, 'Extra attributes from the server: %s', names);
+    warningWithoutStack(false, 'Extra attributes from the server: %s', names);
   };
 
   warnForInvalidEventListener = function(registrationName, listener) {
@@ -176,19 +170,17 @@ if (__DEV__) {
         false,
         'Expected `%s` listener to be a function, instead got `false`.\n\n' +
           'If you used to conditionally omit it with %s={condition && value}, ' +
-          'pass %s={condition ? value : undefined} instead.%s',
+          'pass %s={condition ? value : undefined} instead.',
         registrationName,
         registrationName,
         registrationName,
-        getCurrentFiberStackInDev(),
       );
     } else {
       warning(
         false,
-        'Expected `%s` listener to be a function, instead got a value of `%s` type.%s',
+        'Expected `%s` listener to be a function, instead got a value of `%s` type.',
         registrationName,
         typeof listener,
-        getCurrentFiberStackInDev(),
       );
     }
   };
@@ -266,11 +258,7 @@ function setInitialDOMProperties(
         }
       }
       // Relies on `updateStylesByID` not mutating `styleUpdates`.
-      CSSPropertyOperations.setValueForStyles(
-        domElement,
-        nextProp,
-        getStackInDev,
-      );
+      CSSPropertyOperations.setValueForStyles(domElement, nextProp);
     } else if (propKey === DANGEROUSLY_SET_INNER_HTML) {
       const nextHtml = nextProp ? nextProp[HTML] : undefined;
       if (nextHtml != null) {
@@ -326,11 +314,7 @@ function updateDOMProperties(
     const propKey = updatePayload[i];
     const propValue = updatePayload[i + 1];
     if (propKey === STYLE) {
-      CSSPropertyOperations.setValueForStyles(
-        domElement,
-        propValue,
-        getStackInDev,
-      );
+      CSSPropertyOperations.setValueForStyles(domElement, propValue);
     } else if (propKey === DANGEROUSLY_SET_INNER_HTML) {
       setInnerHTML(domElement, propValue);
     } else if (propKey === CHILDREN) {
@@ -369,7 +353,7 @@ export function createElement(
       isCustomComponentTag = isCustomComponent(type, props);
       // Should this check be gated by parent namespace? Not sure we want to
       // allow <SVG> or <mATH>.
-      warning(
+      warningWithoutStack(
         isCustomComponentTag || type === type.toLowerCase(),
         '<%s /> is using incorrect casing. ' +
           'Use PascalCase for React components, ' +
@@ -408,7 +392,7 @@ export function createElement(
         !Object.prototype.hasOwnProperty.call(warnedUnknownTags, type)
       ) {
         warnedUnknownTags[type] = true;
-        warning(
+        warningWithoutStack(
           false,
           'The tag <%s> is unrecognized in this browser. ' +
             'If you meant to render a React component, start its name with ' +
@@ -445,7 +429,7 @@ export function setInitialProperties(
       !didWarnShadyDOM &&
       (domElement: any).shadyRoot
     ) {
-      warning(
+      warningWithoutStack(
         false,
         '%s is using shady DOM. Using shady DOM with React can ' +
           'cause things to break subtly.',
@@ -523,7 +507,7 @@ export function setInitialProperties(
       props = rawProps;
   }
 
-  assertValidProps(tag, props, getStackInDev);
+  assertValidProps(tag, props);
 
   setInitialDOMProperties(
     tag,
@@ -611,7 +595,7 @@ export function diffProperties(
       break;
   }
 
-  assertValidProps(tag, nextProps, getStackInDev);
+  assertValidProps(tag, nextProps);
 
   let propKey;
   let styleName;
@@ -837,7 +821,7 @@ export function diffHydratedProperties(
       !didWarnShadyDOM &&
       (domElement: any).shadyRoot
     ) {
-      warning(
+      warningWithoutStack(
         false,
         '%s is using shady DOM. Using shady DOM with React can ' +
           'cause things to break subtly.',
@@ -902,7 +886,7 @@ export function diffHydratedProperties(
       break;
   }
 
-  assertValidProps(tag, rawProps, getStackInDev);
+  assertValidProps(tag, rawProps);
 
   if (__DEV__) {
     extraAttributeNames = new Set();
@@ -1132,7 +1116,7 @@ export function warnForDeletedHydratableElement(
       return;
     }
     didWarnInvalidHydration = true;
-    warning(
+    warningWithoutStack(
       false,
       'Did not expect server HTML to contain a <%s> in <%s>.',
       child.nodeName.toLowerCase(),
@@ -1150,7 +1134,7 @@ export function warnForDeletedHydratableText(
       return;
     }
     didWarnInvalidHydration = true;
-    warning(
+    warningWithoutStack(
       false,
       'Did not expect server HTML to contain the text node "%s" in <%s>.',
       child.nodeValue,
@@ -1169,7 +1153,7 @@ export function warnForInsertedHydratedElement(
       return;
     }
     didWarnInvalidHydration = true;
-    warning(
+    warningWithoutStack(
       false,
       'Expected server HTML to contain a matching <%s> in <%s>.',
       tag,
@@ -1194,7 +1178,7 @@ export function warnForInsertedHydratedText(
       return;
     }
     didWarnInvalidHydration = true;
-    warning(
+    warningWithoutStack(
       false,
       'Expected server HTML to contain a matching text node for "%s" in <%s>.',
       text,
diff --git a/packages/react-dom/src/client/ReactDOMFiberInput.js b/packages/react-dom/src/client/ReactDOMFiberInput.js
index 7aaa773078..b6c113bfaf 100644
--- a/packages/react-dom/src/client/ReactDOMFiberInput.js
+++ b/packages/react-dom/src/client/ReactDOMFiberInput.js
@@ -8,12 +8,10 @@
  */
 
 // TODO: direct imports like some-package/src/* are bad. Fix me.
-import {
-  getCurrentFiberOwnerNameInDevOrNull,
-  getCurrentFiberStackInDev,
-} from 'react-reconciler/src/ReactCurrentFiber';
+import {getCurrentFiberOwnerNameInDevOrNull} from 'react-reconciler/src/ReactCurrentFiber';
 import invariant from 'shared/invariant';
 import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import * as DOMPropertyOperations from './DOMPropertyOperations';
 import {getFiberCurrentPropsFromNode} from './ReactDOMComponentTree';
@@ -71,18 +69,14 @@ export function getHostProps(element: Element, props: Object) {
 
 export function initWrapperState(element: Element, props: Object) {
   if (__DEV__) {
-    ReactControlledValuePropTypes.checkPropTypes(
-      'input',
-      props,
-      getCurrentFiberStackInDev,
-    );
+    ReactControlledValuePropTypes.checkPropTypes('input', props);
 
     if (
       props.checked !== undefined &&
       props.defaultChecked !== undefined &&
       !didWarnCheckedDefaultChecked
     ) {
-      warning(
+      warningWithoutStack(
         false,
         '%s contains an input of type %s with both checked and defaultChecked props. ' +
           'Input elements must be either controlled or uncontrolled ' +
@@ -100,7 +94,7 @@ export function initWrapperState(element: Element, props: Object) {
       props.defaultValue !== undefined &&
       !didWarnValueDefaultValue
     ) {
-      warning(
+      warningWithoutStack(
         false,
         '%s contains an input of type %s with both value and defaultValue props. ' +
           'Input elements must be either controlled or uncontrolled ' +
@@ -151,9 +145,8 @@ export function updateWrapper(element: Element, props: Object) {
         '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%s',
+          'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
         props.type,
-        getCurrentFiberStackInDev(),
       );
       didWarnUncontrolledToControlled = true;
     }
@@ -167,9 +160,8 @@ export function updateWrapper(element: Element, props: Object) {
         '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%s',
+          'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
         props.type,
-        getCurrentFiberStackInDev(),
       );
       didWarnControlledToUncontrolled = true;
     }
diff --git a/packages/react-dom/src/client/ReactDOMFiberOption.js b/packages/react-dom/src/client/ReactDOMFiberOption.js
index e5c04d2392..386f0052b8 100644
--- a/packages/react-dom/src/client/ReactDOMFiberOption.js
+++ b/packages/react-dom/src/client/ReactDOMFiberOption.js
@@ -8,7 +8,7 @@
  */
 
 import React from 'react';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 let didWarnSelectedSetOnOption = false;
 
@@ -39,7 +39,7 @@ export function validateProps(element: Element, props: Object) {
   // TODO (yungsters): Remove support for `selected` in <option>.
   if (__DEV__) {
     if (props.selected != null && !didWarnSelectedSetOnOption) {
-      warning(
+      warningWithoutStack(
         false,
         'Use the `defaultValue` or `value` props on <select> instead of ' +
           'setting `selected` on <option>.',
diff --git a/packages/react-dom/src/client/ReactDOMFiberSelect.js b/packages/react-dom/src/client/ReactDOMFiberSelect.js
index 1ea9ccb084..09b5d14f30 100644
--- a/packages/react-dom/src/client/ReactDOMFiberSelect.js
+++ b/packages/react-dom/src/client/ReactDOMFiberSelect.js
@@ -8,11 +8,8 @@
  */
 
 // TODO: direct imports like some-package/src/* are bad. Fix me.
-import {
-  getCurrentFiberOwnerNameInDevOrNull,
-  getCurrentFiberStackInDev,
-} from 'react-reconciler/src/ReactCurrentFiber';
-import warning from 'shared/warning';
+import {getCurrentFiberOwnerNameInDevOrNull} from 'react-reconciler/src/ReactCurrentFiber';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import ReactControlledValuePropTypes from '../shared/ReactControlledValuePropTypes';
 
@@ -43,11 +40,7 @@ const valuePropNames = ['value', 'defaultValue'];
  * Validation function for `value` and `defaultValue`.
  */
 function checkSelectPropTypes(props) {
-  ReactControlledValuePropTypes.checkPropTypes(
-    'select',
-    props,
-    getCurrentFiberStackInDev,
-  );
+  ReactControlledValuePropTypes.checkPropTypes('select', props);
 
   for (let i = 0; i < valuePropNames.length; i++) {
     const propName = valuePropNames[i];
@@ -56,7 +49,7 @@ function checkSelectPropTypes(props) {
     }
     const isArray = Array.isArray(props[propName]);
     if (props.multiple && !isArray) {
-      warning(
+      warningWithoutStack(
         false,
         'The `%s` prop supplied to <select> must be an array if ' +
           '`multiple` is true.%s',
@@ -64,7 +57,7 @@ function checkSelectPropTypes(props) {
         getDeclarationErrorAddendum(),
       );
     } else if (!props.multiple && isArray) {
-      warning(
+      warningWithoutStack(
         false,
         'The `%s` prop supplied to <select> must be a scalar ' +
           'value if `multiple` is false.%s',
@@ -165,7 +158,7 @@ export function initWrapperState(element: Element, props: Object) {
       props.defaultValue !== undefined &&
       !didWarnValueDefaultValue
     ) {
-      warning(
+      warningWithoutStack(
         false,
         'Select elements must be either controlled or uncontrolled ' +
           '(specify either the value prop, or the defaultValue prop, but not ' +
diff --git a/packages/react-dom/src/client/ReactDOMFiberTextarea.js b/packages/react-dom/src/client/ReactDOMFiberTextarea.js
index 3b6648b244..3d1af204aa 100644
--- a/packages/react-dom/src/client/ReactDOMFiberTextarea.js
+++ b/packages/react-dom/src/client/ReactDOMFiberTextarea.js
@@ -8,9 +8,7 @@
  */
 
 import invariant from 'shared/invariant';
-import warning from 'shared/warning';
-// TODO: direct imports like some-package/src/* are bad. Fix me.
-import {getCurrentFiberStackInDev} from 'react-reconciler/src/ReactCurrentFiber';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import ReactControlledValuePropTypes from '../shared/ReactControlledValuePropTypes';
 
@@ -64,17 +62,13 @@ export function getHostProps(element: Element, props: Object) {
 export function initWrapperState(element: Element, props: Object) {
   const node = ((element: any): TextAreaWithWrapperState);
   if (__DEV__) {
-    ReactControlledValuePropTypes.checkPropTypes(
-      'textarea',
-      props,
-      getCurrentFiberStackInDev,
-    );
+    ReactControlledValuePropTypes.checkPropTypes('textarea', props);
     if (
       props.value !== undefined &&
       props.defaultValue !== undefined &&
       !didWarnValDefaultVal
     ) {
-      warning(
+      warningWithoutStack(
         false,
         'Textarea elements must be either controlled or uncontrolled ' +
           '(specify either the value prop, or the defaultValue prop, but not ' +
@@ -95,7 +89,7 @@ export function initWrapperState(element: Element, props: Object) {
     let children = props.children;
     if (children != null) {
       if (__DEV__) {
-        warning(
+        warningWithoutStack(
           false,
           'Use the `defaultValue` or `value` props instead of setting ' +
             'children on <textarea>.',
diff --git a/packages/react-dom/src/client/validateDOMNesting.js b/packages/react-dom/src/client/validateDOMNesting.js
index 7738cae42f..a9283bcf7b 100644
--- a/packages/react-dom/src/client/validateDOMNesting.js
+++ b/packages/react-dom/src/client/validateDOMNesting.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 // TODO: direct imports like some-package/src/* are bad. Fix me.
 import {getCurrentFiberStackInDev} from 'react-reconciler/src/ReactCurrentFiber';
 
@@ -407,7 +407,7 @@ if (__DEV__) {
     const parentTag = parentInfo && parentInfo.tag;
 
     if (childText != null) {
-      warning(
+      warningWithoutStack(
         childTag == null,
         'validateDOMNesting: when childText is passed, childTag should be null',
       );
@@ -457,7 +457,7 @@ if (__DEV__) {
           ' Add a <tbody> to your code to match the DOM tree generated by ' +
           'the browser.';
       }
-      warning(
+      warningWithoutStack(
         false,
         'validateDOMNesting(...): %s cannot appear as a child of <%s>.%s%s%s',
         tagDisplayName,
@@ -467,7 +467,7 @@ if (__DEV__) {
         addendum,
       );
     } else {
-      warning(
+      warningWithoutStack(
         false,
         'validateDOMNesting(...): %s cannot appear as a descendant of ' +
           '<%s>.%s',
diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js
index e1b1203b9e..b3a45bfbe8 100644
--- a/packages/react-dom/src/events/SimpleEventPlugin.js
+++ b/packages/react-dom/src/events/SimpleEventPlugin.js
@@ -22,7 +22,7 @@ import {accumulateTwoPhaseDispatches} from 'events/EventPropagators';
 import SyntheticEvent from 'events/SyntheticEvent';
 
 import * as DOMTopLevelEventTypes from './DOMTopLevelEventTypes';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import SyntheticAnimationEvent from './SyntheticAnimationEvent';
 import SyntheticClipboardEvent from './SyntheticClipboardEvent';
@@ -304,7 +304,7 @@ const SimpleEventPlugin: PluginModule<MouseEvent> & {
       default:
         if (__DEV__) {
           if (knownHTMLTopLevelTypes.indexOf(topLevelType) === -1) {
-            warning(
+            warningWithoutStack(
               false,
               'SimpleEventPlugin: Unhandled event type, `%s`. This warning ' +
                 'is likely caused by a bug in React. Please file an issue.',
diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index 83e3b805a2..230d881a8f 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -18,7 +18,7 @@ import React from 'react';
 import invariant from 'shared/invariant';
 import getComponentName from 'shared/getComponentName';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 import checkPropTypes from 'prop-types/checkPropTypes';
 import describeComponentFrame from 'shared/describeComponentFrame';
 import ReactSharedInternals from 'shared/ReactSharedInternals';
@@ -203,7 +203,7 @@ function createMarkupForStyles(styles): string | null {
     const styleValue = styles[styleName];
     if (__DEV__) {
       if (!isCustomProperty) {
-        warnValidStyle(styleName, styleValue, getCurrentServerStackImpl);
+        warnValidStyle(styleName, styleValue);
       }
     }
     if (styleValue != null) {
@@ -233,7 +233,7 @@ function warnNoop(
       return;
     }
 
-    warning(
+    warningWithoutStack(
       false,
       '%s(...): Can only update a mounting component. ' +
         'This usually means you called %s() outside componentWillMount() on the server. ' +
@@ -298,7 +298,7 @@ function flattenOptionChildren(children: mixed): ?string {
       if (__DEV__) {
         if (!didWarnInvalidOptionChildren) {
           didWarnInvalidOptionChildren = true;
-          warning(
+          warningWithoutStack(
             false,
             'Only strings and numbers are supported as <option> children.',
           );
@@ -472,7 +472,7 @@ function resolve(
           if (inst.state === null || inst.state === undefined) {
             const componentName = getComponentName(Component) || 'Unknown';
             if (!didWarnAboutUninitializedState[componentName]) {
-              warning(
+              warningWithoutStack(
                 false,
                 '%s: Did not properly initialize state during construction. ' +
                   'Expected state to be an object, but it was %s.',
@@ -494,7 +494,7 @@ function resolve(
           if (partialState === undefined) {
             const componentName = getComponentName(Component) || 'Unknown';
             if (!didWarnAboutUndefinedDerivedState[componentName]) {
-              warning(
+              warningWithoutStack(
                 false,
                 '%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. ' +
                   'You have returned undefined.',
@@ -518,7 +518,7 @@ function resolve(
           const componentName = getComponentName(Component) || 'Unknown';
 
           if (!didWarnAboutBadClass[componentName]) {
-            warning(
+            warningWithoutStack(
               false,
               "The <%s /> component appears to have a render method, but doesn't extend React.Component. " +
                 'This is likely to cause errors. Change %s to extend React.Component instead.',
@@ -645,7 +645,7 @@ function resolve(
           );
         }
       } else {
-        warning(
+        warningWithoutStack(
           false,
           '%s.getChildContext(): childContextTypes must be defined in order to ' +
             'use getChildContext().',
@@ -747,7 +747,7 @@ class ReactDOMServerRenderer {
   popProvider<T>(provider: ReactProvider<T>): void {
     const index = this.contextIndex;
     if (__DEV__) {
-      warning(
+      warningWithoutStack(
         index > -1 && provider === (this.contextProviderStack: any)[index],
         'Unexpected pop.',
       );
@@ -1022,7 +1022,7 @@ class ReactDOMServerRenderer {
       if (namespace === Namespaces.html) {
         // Should this check be gated by parent namespace? Not sure we want to
         // allow <SVG> or <mATH>.
-        warning(
+        warningWithoutStack(
           tag === element.type,
           '<%s /> is using incorrect casing. ' +
             'Use PascalCase for React components, ' +
@@ -1037,18 +1037,14 @@ class ReactDOMServerRenderer {
     let props = element.props;
     if (tag === 'input') {
       if (__DEV__) {
-        ReactControlledValuePropTypes.checkPropTypes(
-          'input',
-          props,
-          getCurrentServerStackImpl,
-        );
+        ReactControlledValuePropTypes.checkPropTypes('input', props);
 
         if (
           props.checked !== undefined &&
           props.defaultChecked !== undefined &&
           !didWarnDefaultChecked
         ) {
-          warning(
+          warningWithoutStack(
             false,
             '%s contains an input of type %s with both checked and defaultChecked props. ' +
               'Input elements must be either controlled or uncontrolled ' +
@@ -1066,7 +1062,7 @@ class ReactDOMServerRenderer {
           props.defaultValue !== undefined &&
           !didWarnDefaultInputValue
         ) {
-          warning(
+          warningWithoutStack(
             false,
             '%s contains an input of type %s with both value and defaultValue props. ' +
               'Input elements must be either controlled or uncontrolled ' +
@@ -1095,17 +1091,13 @@ class ReactDOMServerRenderer {
       );
     } else if (tag === 'textarea') {
       if (__DEV__) {
-        ReactControlledValuePropTypes.checkPropTypes(
-          'textarea',
-          props,
-          getCurrentServerStackImpl,
-        );
+        ReactControlledValuePropTypes.checkPropTypes('textarea', props);
         if (
           props.value !== undefined &&
           props.defaultValue !== undefined &&
           !didWarnDefaultTextareaValue
         ) {
-          warning(
+          warningWithoutStack(
             false,
             'Textarea elements must be either controlled or uncontrolled ' +
               '(specify either the value prop, or the defaultValue prop, but not ' +
@@ -1124,7 +1116,7 @@ class ReactDOMServerRenderer {
         let textareaChildren = props.children;
         if (textareaChildren != null) {
           if (__DEV__) {
-            warning(
+            warningWithoutStack(
               false,
               'Use the `defaultValue` or `value` props instead of setting ' +
                 'children on <textarea>.',
@@ -1156,11 +1148,7 @@ class ReactDOMServerRenderer {
       });
     } else if (tag === 'select') {
       if (__DEV__) {
-        ReactControlledValuePropTypes.checkPropTypes(
-          'select',
-          props,
-          getCurrentServerStackImpl,
-        );
+        ReactControlledValuePropTypes.checkPropTypes('select', props);
 
         for (let i = 0; i < valuePropNames.length; i++) {
           const propName = valuePropNames[i];
@@ -1169,7 +1157,7 @@ class ReactDOMServerRenderer {
           }
           const isArray = Array.isArray(props[propName]);
           if (props.multiple && !isArray) {
-            warning(
+            warningWithoutStack(
               false,
               'The `%s` prop supplied to <select> must be an array if ' +
                 '`multiple` is true.%s',
@@ -1177,7 +1165,7 @@ class ReactDOMServerRenderer {
               '', // getDeclarationErrorAddendum(),
             );
           } else if (!props.multiple && isArray) {
-            warning(
+            warningWithoutStack(
               false,
               'The `%s` prop supplied to <select> must be a scalar ' +
                 'value if `multiple` is false.%s',
@@ -1192,7 +1180,7 @@ class ReactDOMServerRenderer {
           props.defaultValue !== undefined &&
           !didWarnDefaultSelectValue
         ) {
-          warning(
+          warningWithoutStack(
             false,
             'Select elements must be either controlled or uncontrolled ' +
               '(specify either the value prop, or the defaultValue prop, but not ' +
@@ -1250,7 +1238,7 @@ class ReactDOMServerRenderer {
       validatePropertiesInDevelopment(tag, props);
     }
 
-    assertValidProps(tag, props, getCurrentServerStackImpl);
+    assertValidProps(tag, props);
 
     let out = createOpenTagMarkup(
       element.type,
diff --git a/packages/react-dom/src/shared/CSSPropertyOperations.js b/packages/react-dom/src/shared/CSSPropertyOperations.js
index f7a01331a0..f39cf3b942 100644
--- a/packages/react-dom/src/shared/CSSPropertyOperations.js
+++ b/packages/react-dom/src/shared/CSSPropertyOperations.js
@@ -51,7 +51,7 @@ export function createDangerousStringForStyles(styles) {
  * @param {DOMElement} node
  * @param {object} styles
  */
-export function setValueForStyles(node, styles, getStack) {
+export function setValueForStyles(node, styles) {
   const style = node.style;
   for (let styleName in styles) {
     if (!styles.hasOwnProperty(styleName)) {
@@ -60,7 +60,7 @@ export function setValueForStyles(node, styles, getStack) {
     const isCustomProperty = styleName.indexOf('--') === 0;
     if (__DEV__) {
       if (!isCustomProperty) {
-        warnValidStyle(styleName, styles[styleName], getStack);
+        warnValidStyle(styleName, styles[styleName]);
       }
     }
     const styleValue = dangerousStyleValue(
diff --git a/packages/react-dom/src/shared/DOMProperty.js b/packages/react-dom/src/shared/DOMProperty.js
index 31f222b978..036e7344c2 100644
--- a/packages/react-dom/src/shared/DOMProperty.js
+++ b/packages/react-dom/src/shared/DOMProperty.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 type PropertyType = 0 | 1 | 2 | 3 | 4 | 5 | 6;
 
@@ -82,7 +82,7 @@ export function isAttributeNameSafe(attributeName: string): boolean {
   }
   illegalAttributeNameCache[attributeName] = true;
   if (__DEV__) {
-    warning(false, 'Invalid attribute name: `%s`', attributeName);
+    warningWithoutStack(false, 'Invalid attribute name: `%s`', attributeName);
   }
   return false;
 }
diff --git a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
index 5b8dbdde2f..0f4fe58ee2 100644
--- a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
+++ b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
@@ -6,12 +6,17 @@
  */
 
 import checkPropTypes from 'prop-types/checkPropTypes';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
+
+let ReactDebugCurrentFrame = null;
 
 const ReactControlledValuePropTypes = {
   checkPropTypes: null,
 };
 
 if (__DEV__) {
+  ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+
   const hasReadOnlyValue = {
     button: true,
     checkbox: true,
@@ -62,12 +67,14 @@ if (__DEV__) {
    * Provide a linked `value` attribute for controlled forms. You should not use
    * this outside of the ReactDOM controlled form components.
    */
-  ReactControlledValuePropTypes.checkPropTypes = function(
-    tagName,
-    props,
-    getStack,
-  ) {
-    checkPropTypes(propTypes, props, 'prop', tagName, getStack);
+  ReactControlledValuePropTypes.checkPropTypes = function(tagName, props) {
+    checkPropTypes(
+      propTypes,
+      props,
+      'prop',
+      tagName,
+      ReactDebugCurrentFrame.getStackAddendum,
+    );
   };
 }
 
diff --git a/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js b/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js
index bcc5c4b758..8fef6d9855 100644
--- a/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js
+++ b/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js
@@ -6,14 +6,11 @@
  */
 
 import warning from 'shared/warning';
-import ReactSharedInternals from 'shared/ReactSharedInternals';
 
 import {ATTRIBUTE_NAME_CHAR} from './DOMProperty';
 import isCustomComponent from './isCustomComponent';
 import validAriaProperties from './validAriaProperties';
 
-const ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
-
 const warnedProperties = {};
 const rARIA = new RegExp('^(aria)-[' + ATTRIBUTE_NAME_CHAR + ']*$');
 const rARIACamel = new RegExp('^(aria)[A-Z][' + ATTRIBUTE_NAME_CHAR + ']*$');
@@ -36,9 +33,8 @@ function validateProperty(tagName, name) {
     if (correctName == null) {
       warning(
         false,
-        'Invalid ARIA attribute `%s`. ARIA attributes follow the pattern aria-* and must be lowercase.%s',
+        'Invalid ARIA attribute `%s`. ARIA attributes follow the pattern aria-* and must be lowercase.',
         name,
-        ReactDebugCurrentFrame.getStackAddendum(),
       );
       warnedProperties[name] = true;
       return true;
@@ -47,10 +43,9 @@ function validateProperty(tagName, name) {
     if (name !== correctName) {
       warning(
         false,
-        'Invalid ARIA attribute `%s`. Did you mean `%s`?%s',
+        'Invalid ARIA attribute `%s`. Did you mean `%s`?',
         name,
         correctName,
-        ReactDebugCurrentFrame.getStackAddendum(),
       );
       warnedProperties[name] = true;
       return true;
@@ -73,10 +68,9 @@ function validateProperty(tagName, name) {
     if (name !== standardName) {
       warning(
         false,
-        'Unknown ARIA attribute `%s`. Did you mean `%s`?%s',
+        'Unknown ARIA attribute `%s`. Did you mean `%s`?',
         name,
         standardName,
-        ReactDebugCurrentFrame.getStackAddendum(),
       );
       warnedProperties[name] = true;
       return true;
@@ -104,19 +98,17 @@ function warnInvalidARIAProps(type, props) {
     warning(
       false,
       'Invalid aria prop %s on <%s> tag. ' +
-        'For details, see https://fb.me/invalid-aria-prop%s',
+        'For details, see https://fb.me/invalid-aria-prop',
       unknownPropString,
       type,
-      ReactDebugCurrentFrame.getStackAddendum(),
     );
   } else if (invalidProps.length > 1) {
     warning(
       false,
       'Invalid aria props %s on <%s> tag. ' +
-        'For details, see https://fb.me/invalid-aria-prop%s',
+        'For details, see https://fb.me/invalid-aria-prop',
       unknownPropString,
       type,
-      ReactDebugCurrentFrame.getStackAddendum(),
     );
   }
 }
diff --git a/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js b/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js
index 71a14f8123..8b0b210188 100644
--- a/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js
+++ b/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js
@@ -5,11 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import ReactSharedInternals from 'shared/ReactSharedInternals';
 import warning from 'shared/warning';
 
-let ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
-
 let didWarnValueNull = false;
 
 export function validateProperties(type, props) {
@@ -24,18 +21,16 @@ export function validateProperties(type, props) {
         false,
         '`value` prop on `%s` should not be null. ' +
           'Consider using an empty array when `multiple` is set to `true` ' +
-          'to clear the component or `undefined` for uncontrolled components.%s',
+          'to clear the component or `undefined` for uncontrolled components.',
         type,
-        ReactDebugCurrentFrame.getStackAddendum(),
       );
     } else {
       warning(
         false,
         '`value` prop on `%s` should not be null. ' +
           'Consider using an empty string to clear the component or `undefined` ' +
-          'for uncontrolled components.%s',
+          'for uncontrolled components.',
         type,
-        ReactDebugCurrentFrame.getStackAddendum(),
       );
     }
   }
diff --git a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js
index 891682fbb7..e6b59385e0 100644
--- a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js
+++ b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js
@@ -9,8 +9,8 @@ import {
   registrationNameModules,
   possibleRegistrationNames,
 } from 'events/EventPluginRegistry';
-import ReactSharedInternals from 'shared/ReactSharedInternals';
 import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import {
   ATTRIBUTE_NAME_CHAR,
@@ -21,13 +21,9 @@ import {
 import isCustomComponent from './isCustomComponent';
 import possibleStandardNames from './possibleStandardNames';
 
-let ReactDebugCurrentFrame = null;
-
 let validateProperty = () => {};
 
 if (__DEV__) {
-  ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
-
   const warnedProperties = {};
   const hasOwnProperty = Object.prototype.hasOwnProperty;
   const EVENT_NAME_REGEX = /^on./;
@@ -42,7 +38,7 @@ if (__DEV__) {
 
     const lowerCasedName = name.toLowerCase();
     if (lowerCasedName === 'onfocusin' || lowerCasedName === 'onfocusout') {
-      warning(
+      warningWithoutStack(
         false,
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut. ' +
           'All React events are normalized to bubble, so onFocusIn and onFocusOut ' +
@@ -65,10 +61,9 @@ if (__DEV__) {
       if (registrationName != null) {
         warning(
           false,
-          'Invalid event handler property `%s`. Did you mean `%s`?%s',
+          'Invalid event handler property `%s`. Did you mean `%s`?',
           name,
           registrationName,
-          ReactDebugCurrentFrame.getStackAddendum(),
         );
         warnedProperties[name] = true;
         return true;
@@ -76,9 +71,8 @@ if (__DEV__) {
       if (EVENT_NAME_REGEX.test(name)) {
         warning(
           false,
-          'Unknown event handler property `%s`. It will be ignored.%s',
+          'Unknown event handler property `%s`. It will be ignored.',
           name,
-          ReactDebugCurrentFrame.getStackAddendum(),
         );
         warnedProperties[name] = true;
         return true;
@@ -91,9 +85,8 @@ if (__DEV__) {
         warning(
           false,
           'Invalid event handler property `%s`. ' +
-            'React events use the camelCase naming convention, for example `onClick`.%s',
+            'React events use the camelCase naming convention, for example `onClick`.',
           name,
-          ReactDebugCurrentFrame.getStackAddendum(),
         );
       }
       warnedProperties[name] = true;
@@ -106,7 +99,7 @@ if (__DEV__) {
     }
 
     if (lowerCasedName === 'innerhtml') {
-      warning(
+      warningWithoutStack(
         false,
         'Directly setting property `innerHTML` is not permitted. ' +
           'For more information, lookup documentation on `dangerouslySetInnerHTML`.',
@@ -116,7 +109,7 @@ if (__DEV__) {
     }
 
     if (lowerCasedName === 'aria') {
-      warning(
+      warningWithoutStack(
         false,
         'The `aria` attribute is reserved for future use in React. ' +
           'Pass individual `aria-` attributes instead.',
@@ -134,9 +127,8 @@ if (__DEV__) {
       warning(
         false,
         'Received a `%s` for a string attribute `is`. If this is expected, cast ' +
-          'the value to a string.%s',
+          'the value to a string.',
         typeof value,
-        ReactDebugCurrentFrame.getStackAddendum(),
       );
       warnedProperties[name] = true;
       return true;
@@ -146,9 +138,8 @@ if (__DEV__) {
       warning(
         false,
         'Received NaN for the `%s` attribute. If this is expected, cast ' +
-          'the value to a string.%s',
+          'the value to a string.',
         name,
-        ReactDebugCurrentFrame.getStackAddendum(),
       );
       warnedProperties[name] = true;
       return true;
@@ -163,10 +154,9 @@ if (__DEV__) {
       if (standardName !== name) {
         warning(
           false,
-          'Invalid DOM property `%s`. Did you mean `%s`?%s',
+          'Invalid DOM property `%s`. Did you mean `%s`?',
           name,
           standardName,
-          ReactDebugCurrentFrame.getStackAddendum(),
         );
         warnedProperties[name] = true;
         return true;
@@ -180,10 +170,9 @@ if (__DEV__) {
           'intentionally want it to appear in the DOM as a custom ' +
           'attribute, spell it as lowercase `%s` instead. ' +
           'If you accidentally passed it from a parent component, remove ' +
-          'it from the DOM element.%s',
+          'it from the DOM element.',
         name,
         lowerCasedName,
-        ReactDebugCurrentFrame.getStackAddendum(),
       );
       warnedProperties[name] = true;
       return true;
@@ -198,13 +187,12 @@ if (__DEV__) {
           false,
           'Received `%s` for a non-boolean attribute `%s`.\n\n' +
             'If you want to write it to the DOM, pass a string instead: ' +
-            '%s="%s" or %s={value.toString()}.%s',
+            '%s="%s" or %s={value.toString()}.',
           value,
           name,
           name,
           value,
           name,
-          ReactDebugCurrentFrame.getStackAddendum(),
         );
       } else {
         warning(
@@ -213,7 +201,7 @@ if (__DEV__) {
             'If you want to write it to the DOM, pass a string instead: ' +
             '%s="%s" or %s={value.toString()}.\n\n' +
             'If you used to conditionally omit it with %s={condition && value}, ' +
-            'pass %s={condition ? value : undefined} instead.%s',
+            'pass %s={condition ? value : undefined} instead.',
           value,
           name,
           name,
@@ -221,7 +209,6 @@ if (__DEV__) {
           name,
           name,
           name,
-          ReactDebugCurrentFrame.getStackAddendum(),
         );
       }
       warnedProperties[name] = true;
@@ -261,20 +248,18 @@ const warnUnknownProperties = function(type, props, canUseEventSystem) {
       false,
       'Invalid value for prop %s on <%s> tag. Either remove it from the element, ' +
         'or pass a string or number value to keep it in the DOM. ' +
-        'For details, see https://fb.me/react-attribute-behavior%s',
+        'For details, see https://fb.me/react-attribute-behavior',
       unknownPropString,
       type,
-      ReactDebugCurrentFrame.getStackAddendum(),
     );
   } else if (unknownProps.length > 1) {
     warning(
       false,
       'Invalid values for props %s on <%s> tag. Either remove them from the element, ' +
         'or pass a string or number value to keep them in the DOM. ' +
-        'For details, see https://fb.me/react-attribute-behavior%s',
+        'For details, see https://fb.me/react-attribute-behavior',
       unknownPropString,
       type,
-      ReactDebugCurrentFrame.getStackAddendum(),
     );
   }
 };
diff --git a/packages/react-dom/src/shared/assertValidProps.js b/packages/react-dom/src/shared/assertValidProps.js
index b798585877..7c7c3e1933 100644
--- a/packages/react-dom/src/shared/assertValidProps.js
+++ b/packages/react-dom/src/shared/assertValidProps.js
@@ -7,12 +7,20 @@
 
 import invariant from 'shared/invariant';
 import warning from 'shared/warning';
+// TODO: We can remove this if we add invariantWithStack()
+// or add stack by default to invariants where possible.
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 
 import voidElementTags from './voidElementTags';
 
 const HTML = '__html';
 
-function assertValidProps(tag: string, props: ?Object, getStack: () => string) {
+let ReactDebugCurrentFrame = null;
+if (__DEV__) {
+  ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+}
+
+function assertValidProps(tag: string, props: ?Object) {
   if (!props) {
     return;
   }
@@ -23,7 +31,7 @@ function assertValidProps(tag: string, props: ?Object, getStack: () => string) {
       '%s is a void element tag and must neither have `children` nor ' +
         'use `dangerouslySetInnerHTML`.%s',
       tag,
-      getStack(),
+      __DEV__ ? ReactDebugCurrentFrame.getStackAddendum() : '',
     );
   }
   if (props.dangerouslySetInnerHTML != null) {
@@ -47,8 +55,7 @@ function assertValidProps(tag: string, props: ?Object, getStack: () => string) {
       'A component is `contentEditable` and contains `children` managed by ' +
         'React. It is now your responsibility to guarantee that none of ' +
         'those nodes are unexpectedly modified or duplicated. This is ' +
-        'probably not intentional.%s',
-      getStack(),
+        'probably not intentional.',
     );
   }
   invariant(
@@ -56,7 +63,7 @@ function assertValidProps(tag: string, props: ?Object, getStack: () => string) {
     'The `style` prop expects a mapping from style properties to values, ' +
       "not a string. For example, style={{marginRight: spacing + 'em'}} when " +
       'using JSX.%s',
-    getStack(),
+    __DEV__ ? ReactDebugCurrentFrame.getStackAddendum() : '',
   );
 }
 
diff --git a/packages/react-dom/src/shared/warnValidStyle.js b/packages/react-dom/src/shared/warnValidStyle.js
index d616c9b3c9..51bf189e85 100644
--- a/packages/react-dom/src/shared/warnValidStyle.js
+++ b/packages/react-dom/src/shared/warnValidStyle.js
@@ -29,7 +29,7 @@ if (__DEV__) {
     });
   };
 
-  const warnHyphenatedStyleName = function(name, getStack) {
+  const warnHyphenatedStyleName = function(name) {
     if (warnedStyleNames.hasOwnProperty(name) && warnedStyleNames[name]) {
       return;
     }
@@ -37,17 +37,16 @@ if (__DEV__) {
     warnedStyleNames[name] = true;
     warning(
       false,
-      'Unsupported style property %s. Did you mean %s?%s',
+      'Unsupported style property %s. Did you mean %s?',
       name,
       // As Andi Smith suggests
       // (http://www.andismith.com/blog/2012/02/modernizr-prefixed/), an `-ms` prefix
       // is converted to lowercase `ms`.
       camelize(name.replace(msPattern, 'ms-')),
-      getStack(),
     );
   };
 
-  const warnBadVendoredStyleName = function(name, getStack) {
+  const warnBadVendoredStyleName = function(name) {
     if (warnedStyleNames.hasOwnProperty(name) && warnedStyleNames[name]) {
       return;
     }
@@ -55,14 +54,13 @@ if (__DEV__) {
     warnedStyleNames[name] = true;
     warning(
       false,
-      'Unsupported vendor-prefixed style property %s. Did you mean %s?%s',
+      'Unsupported vendor-prefixed style property %s. Did you mean %s?',
       name,
       name.charAt(0).toUpperCase() + name.slice(1),
-      getStack(),
     );
   };
 
-  const warnStyleValueWithSemicolon = function(name, value, getStack) {
+  const warnStyleValueWithSemicolon = function(name, value) {
     if (warnedStyleValues.hasOwnProperty(value) && warnedStyleValues[value]) {
       return;
     }
@@ -71,14 +69,13 @@ if (__DEV__) {
     warning(
       false,
       "Style property values shouldn't contain a semicolon. " +
-        'Try "%s: %s" instead.%s',
+        'Try "%s: %s" instead.',
       name,
       value.replace(badStyleValueWithSemicolonPattern, ''),
-      getStack(),
     );
   };
 
-  const warnStyleValueIsNaN = function(name, value, getStack) {
+  const warnStyleValueIsNaN = function(name, value) {
     if (warnedForNaNValue) {
       return;
     }
@@ -86,13 +83,12 @@ if (__DEV__) {
     warnedForNaNValue = true;
     warning(
       false,
-      '`NaN` is an invalid value for the `%s` css style property.%s',
+      '`NaN` is an invalid value for the `%s` css style property.',
       name,
-      getStack(),
     );
   };
 
-  const warnStyleValueIsInfinity = function(name, value, getStack) {
+  const warnStyleValueIsInfinity = function(name, value) {
     if (warnedForInfinityValue) {
       return;
     }
@@ -100,26 +96,25 @@ if (__DEV__) {
     warnedForInfinityValue = true;
     warning(
       false,
-      '`Infinity` is an invalid value for the `%s` css style property.%s',
+      '`Infinity` is an invalid value for the `%s` css style property.',
       name,
-      getStack(),
     );
   };
 
-  warnValidStyle = function(name, value, getStack) {
+  warnValidStyle = function(name, value) {
     if (name.indexOf('-') > -1) {
-      warnHyphenatedStyleName(name, getStack);
+      warnHyphenatedStyleName(name);
     } else if (badVendoredStyleNamePattern.test(name)) {
-      warnBadVendoredStyleName(name, getStack);
+      warnBadVendoredStyleName(name);
     } else if (badStyleValueWithSemicolonPattern.test(value)) {
-      warnStyleValueWithSemicolon(name, value, getStack);
+      warnStyleValueWithSemicolon(name, value);
     }
 
     if (typeof value === 'number') {
       if (isNaN(value)) {
-        warnStyleValueIsNaN(name, value, getStack);
+        warnStyleValueIsNaN(name, value);
       } else if (!isFinite(value)) {
-        warnStyleValueIsInfinity(name, value, getStack);
+        warnStyleValueIsInfinity(name, value);
       }
     }
   };
diff --git a/packages/react-native-renderer/src/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js
index 2ceb95e360..8963ae4d46 100644
--- a/packages/react-native-renderer/src/ReactFabric.js
+++ b/packages/react-native-renderer/src/ReactFabric.js
@@ -25,7 +25,7 @@ import {getInspectorDataForViewTag} from './ReactNativeFiberInspector';
 
 import ReactSharedInternals from 'shared/ReactSharedInternals';
 import getComponentName from 'shared/getComponentName';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
 const findHostInstance = ReactFabricRenderer.findHostInstance;
@@ -34,7 +34,7 @@ function findNodeHandle(componentOrHandle: any): ?number {
   if (__DEV__) {
     const owner = ReactCurrentOwner.current;
     if (owner !== null && owner.stateNode !== null) {
-      warning(
+      warningWithoutStack(
         owner.stateNode._warnedAboutRefsInRender,
         '%s is accessing findNodeHandle inside its render(). ' +
           'render() should be a pure function of props and state. It should ' +
diff --git a/packages/react-native-renderer/src/ReactNativeEventEmitter.js b/packages/react-native-renderer/src/ReactNativeEventEmitter.js
index 760887abba..2b36748479 100644
--- a/packages/react-native-renderer/src/ReactNativeEventEmitter.js
+++ b/packages/react-native-renderer/src/ReactNativeEventEmitter.js
@@ -10,7 +10,7 @@
 import {getListener, runExtractedEventsInBatch} from 'events/EventPluginHub';
 import {registrationNameModules} from 'events/EventPluginRegistry';
 import {batchedUpdates} from 'events/ReactGenericBatching';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import {getInstanceFromNode} from './ReactNativeComponentTree';
 
@@ -168,7 +168,7 @@ export function receiveTouches(
     if (target !== null && target !== undefined) {
       if (target < 1) {
         if (__DEV__) {
-          warning(
+          warningWithoutStack(
             false,
             'A view is reporting that a touch occurred on tag zero.',
           );
diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js
index af8f94d3f0..803d5e0257 100644
--- a/packages/react-native-renderer/src/ReactNativeRenderer.js
+++ b/packages/react-native-renderer/src/ReactNativeRenderer.js
@@ -28,7 +28,7 @@ import {getInspectorDataForViewTag} from './ReactNativeFiberInspector';
 
 import ReactSharedInternals from 'shared/ReactSharedInternals';
 import getComponentName from 'shared/getComponentName';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
 const findHostInstance = ReactNativeFiberRenderer.findHostInstance;
@@ -37,7 +37,7 @@ function findNodeHandle(componentOrHandle: any): ?number {
   if (__DEV__) {
     const owner = ReactCurrentOwner.current;
     if (owner !== null && owner.stateNode !== null) {
-      warning(
+      warningWithoutStack(
         owner.stateNode._warnedAboutRefsInRender,
         '%s is accessing findNodeHandle inside its render(). ' +
           'render() should be a pure function of props and state. It should ' +
diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js
index 34cad7de9e..97aaac8c2c 100644
--- a/packages/react-reconciler/src/ReactChildFiber.js
+++ b/packages/react-reconciler/src/ReactChildFiber.js
@@ -29,6 +29,7 @@ import {
 } from 'shared/ReactTypeOfWork';
 import invariant from 'shared/invariant';
 import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import {
   createWorkInProgress,
@@ -90,8 +91,7 @@ if (__DEV__) {
       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',
-      getCurrentFiberStackInDev(),
+        'more information.',
     );
   };
 }
@@ -113,7 +113,7 @@ function coerceRef(
       if (returnFiber.mode & StrictMode) {
         const componentName = getComponentName(returnFiber.type) || 'Component';
         if (!didWarnAboutStringRefInStrictMode[componentName]) {
-          warning(
+          warningWithoutStack(
             false,
             'A string ref, "%s", has been found within a strict mode tree. ' +
               'String refs are a source of potential bugs and should be avoided. ' +
@@ -226,8 +226,7 @@ function warnOnFunctionType() {
     false,
     'Functions are not valid as a React child. This may happen if ' +
       'you return a Component instead of <Component /> from render. ' +
-      'Or maybe you meant to call this function rather than return it.%s',
-    getCurrentFiberStackInDev(),
+      'Or maybe you meant to call this function rather than return it.',
   );
 }
 
@@ -717,9 +716,8 @@ function ChildReconciler(shouldTrackSideEffects) {
               'Keys should be unique so that components maintain their identity ' +
               'across updates. Non-unique keys may cause children to be ' +
               'duplicated and/or omitted — the behavior is unsupported and ' +
-              'could change in a future version.%s',
+              'could change in a future version.',
             key,
-            getCurrentFiberStackInDev(),
           );
           break;
         default:
@@ -911,8 +909,7 @@ function ChildReconciler(shouldTrackSideEffects) {
           didWarnAboutMaps,
           'Using Maps as children is unsupported and will likely yield ' +
             'unexpected results. Convert it to a sequence/iterable of keyed ' +
-            'ReactElements instead.%s',
-          getCurrentFiberStackInDev(),
+            'ReactElements instead.',
         );
         didWarnAboutMaps = true;
       }
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 0f7d0c3b18..5137674cf9 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -50,6 +50,7 @@ import invariant from 'shared/invariant';
 import getComponentName from 'shared/getComponentName';
 import ReactStrictModeWarnings from './ReactStrictModeWarnings';
 import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 import * as ReactCurrentFiber from './ReactCurrentFiber';
 import {cancelWorkTimer} from './ReactDebugFiberPerf';
 
@@ -586,7 +587,7 @@ function mountIndeterminateComponent(
       const componentName = getComponentName(fn) || 'Unknown';
 
       if (!didWarnAboutBadClass[componentName]) {
-        warning(
+        warningWithoutStack(
           false,
           "The <%s /> component appears to have a render method, but doesn't extend React.Component. " +
             'This is likely to cause errors. Change %s to extend React.Component instead.',
@@ -652,7 +653,7 @@ function mountIndeterminateComponent(
       const Component = workInProgress.type;
 
       if (Component) {
-        warning(
+        warningWithoutStack(
           !Component.childContextTypes,
           '%s(...): childContextTypes cannot be defined on a functional component.',
           Component.displayName || Component.name || 'Component',
@@ -675,9 +676,8 @@ function mountIndeterminateComponent(
           warning(
             false,
             'Stateless function components cannot be given refs. ' +
-              'Attempts to access this ref will fail.%s%s',
+              'Attempts to access this ref will fail.%s',
             info,
-            ReactCurrentFiber.getCurrentFiberStackInDev(),
           );
         }
       }
@@ -686,7 +686,7 @@ function mountIndeterminateComponent(
         const componentName = getComponentName(fn) || 'Unknown';
 
         if (!didWarnAboutGetDerivedStateOnFunctionalComponent[componentName]) {
-          warning(
+          warningWithoutStack(
             false,
             '%s: Stateless functional components do not support getDerivedStateFromProps.',
             componentName,
@@ -976,7 +976,7 @@ function updateContextProvider(current, workInProgress, renderExpirationTime) {
             ? context._calculateChangedBits(oldValue, newValue)
             : MAX_SIGNED_31_BIT_INT;
         if (__DEV__) {
-          warning(
+          warningWithoutStack(
             (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
             'calculateChangedBits: Expected the return value to be a ' +
               '31-bit integer. Instead received: %s',
@@ -1057,7 +1057,7 @@ function updateContextConsumer(current, workInProgress, renderExpirationTime) {
   const render = newProps.children;
 
   if (__DEV__) {
-    warning(
+    warningWithoutStack(
       typeof render === 'function',
       'A context consumer was rendered with multiple children, or a child ' +
         "that isn't a function. A context consumer expects a single child " +
diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js
index 2464b3545d..40485c9705 100644
--- a/packages/react-reconciler/src/ReactFiberClassComponent.js
+++ b/packages/react-reconciler/src/ReactFiberClassComponent.js
@@ -23,7 +23,7 @@ import * as ReactInstanceMap from 'shared/ReactInstanceMap';
 import shallowEqual from 'shared/shallowEqual';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'shared/invariant';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import {startPhaseTimer, stopPhaseTimer} from './ReactDebugFiberPerf';
 import {StrictMode} from './ReactTypeOfMode';
@@ -82,7 +82,7 @@ if (__DEV__) {
     const key = `${callerName}_${(callback: any)}`;
     if (!didWarnOnInvalidCallback.has(key)) {
       didWarnOnInvalidCallback.add(key);
-      warning(
+      warningWithoutStack(
         false,
         '%s(...): Expected the last optional `callback` argument to be a ' +
           'function. Instead received: %s.',
@@ -97,7 +97,7 @@ if (__DEV__) {
       const componentName = getComponentName(type) || 'Component';
       if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
         didWarnAboutUndefinedDerivedState.add(componentName);
-        warning(
+        warningWithoutStack(
           false,
           '%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. ' +
             'You have returned undefined.',
@@ -245,7 +245,7 @@ function checkShouldComponentUpdate(
     stopPhaseTimer();
 
     if (__DEV__) {
-      warning(
+      warningWithoutStack(
         shouldUpdate !== undefined,
         '%s.shouldComponentUpdate(): Returned undefined instead of a ' +
           'boolean value. Make sure to return true or false.',
@@ -274,14 +274,14 @@ function checkClassInstance(workInProgress: Fiber) {
 
     if (!renderPresent) {
       if (type.prototype && typeof type.prototype.render === 'function') {
-        warning(
+        warningWithoutStack(
           false,
           '%s(...): No `render` method found on the returned component ' +
             'instance: did you accidentally return an object from the constructor?',
           name,
         );
       } else {
-        warning(
+        warningWithoutStack(
           false,
           '%s(...): No `render` method found on the returned component ' +
             'instance: you may have forgotten to define `render`.',
@@ -294,7 +294,7 @@ function checkClassInstance(workInProgress: Fiber) {
       !instance.getInitialState ||
       instance.getInitialState.isReactClassApproved ||
       instance.state;
-    warning(
+    warningWithoutStack(
       noGetInitialStateOnES6,
       'getInitialState was defined on %s, a plain JavaScript class. ' +
         'This is only supported for classes created using React.createClass. ' +
@@ -304,7 +304,7 @@ function checkClassInstance(workInProgress: Fiber) {
     const noGetDefaultPropsOnES6 =
       !instance.getDefaultProps ||
       instance.getDefaultProps.isReactClassApproved;
-    warning(
+    warningWithoutStack(
       noGetDefaultPropsOnES6,
       'getDefaultProps was defined on %s, a plain JavaScript class. ' +
         'This is only supported for classes created using React.createClass. ' +
@@ -312,14 +312,14 @@ function checkClassInstance(workInProgress: Fiber) {
       name,
     );
     const noInstancePropTypes = !instance.propTypes;
-    warning(
+    warningWithoutStack(
       noInstancePropTypes,
       'propTypes was defined as an instance property on %s. Use a static ' +
         'property to define propTypes instead.',
       name,
     );
     const noInstanceContextTypes = !instance.contextTypes;
-    warning(
+    warningWithoutStack(
       noInstanceContextTypes,
       'contextTypes was defined as an instance property on %s. Use a static ' +
         'property to define contextTypes instead.',
@@ -327,7 +327,7 @@ function checkClassInstance(workInProgress: Fiber) {
     );
     const noComponentShouldUpdate =
       typeof instance.componentShouldUpdate !== 'function';
-    warning(
+    warningWithoutStack(
       noComponentShouldUpdate,
       '%s has a method called ' +
         'componentShouldUpdate(). Did you mean shouldComponentUpdate()? ' +
@@ -340,7 +340,7 @@ function checkClassInstance(workInProgress: Fiber) {
       type.prototype.isPureReactComponent &&
       typeof instance.shouldComponentUpdate !== 'undefined'
     ) {
-      warning(
+      warningWithoutStack(
         false,
         '%s has a method called shouldComponentUpdate(). ' +
           'shouldComponentUpdate should not be used when extending React.PureComponent. ' +
@@ -350,7 +350,7 @@ function checkClassInstance(workInProgress: Fiber) {
     }
     const noComponentDidUnmount =
       typeof instance.componentDidUnmount !== 'function';
-    warning(
+    warningWithoutStack(
       noComponentDidUnmount,
       '%s has a method called ' +
         'componentDidUnmount(). But there is no such lifecycle method. ' +
@@ -359,7 +359,7 @@ function checkClassInstance(workInProgress: Fiber) {
     );
     const noComponentDidReceiveProps =
       typeof instance.componentDidReceiveProps !== 'function';
-    warning(
+    warningWithoutStack(
       noComponentDidReceiveProps,
       '%s has a method called ' +
         'componentDidReceiveProps(). But there is no such lifecycle method. ' +
@@ -370,7 +370,7 @@ function checkClassInstance(workInProgress: Fiber) {
     );
     const noComponentWillRecieveProps =
       typeof instance.componentWillRecieveProps !== 'function';
-    warning(
+    warningWithoutStack(
       noComponentWillRecieveProps,
       '%s has a method called ' +
         'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
@@ -378,14 +378,14 @@ function checkClassInstance(workInProgress: Fiber) {
     );
     const noUnsafeComponentWillRecieveProps =
       typeof instance.UNSAFE_componentWillRecieveProps !== 'function';
-    warning(
+    warningWithoutStack(
       noUnsafeComponentWillRecieveProps,
       '%s has a method called ' +
         'UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?',
       name,
     );
     const hasMutatedProps = instance.props !== workInProgress.pendingProps;
-    warning(
+    warningWithoutStack(
       instance.props === undefined || !hasMutatedProps,
       '%s(...): When calling super() in `%s`, make sure to pass ' +
         "up the same props that your component's constructor was passed.",
@@ -393,7 +393,7 @@ function checkClassInstance(workInProgress: Fiber) {
       name,
     );
     const noInstanceDefaultProps = !instance.defaultProps;
-    warning(
+    warningWithoutStack(
       noInstanceDefaultProps,
       'Setting defaultProps as an instance property on %s is not supported and will be ignored.' +
         ' Instead, define defaultProps as a static property on %s.',
@@ -407,7 +407,7 @@ function checkClassInstance(workInProgress: Fiber) {
       !didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.has(type)
     ) {
       didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.add(type);
-      warning(
+      warningWithoutStack(
         false,
         '%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). ' +
           'This component defines getSnapshotBeforeUpdate() only.',
@@ -417,7 +417,7 @@ function checkClassInstance(workInProgress: Fiber) {
 
     const noInstanceGetDerivedStateFromProps =
       typeof instance.getDerivedStateFromProps !== 'function';
-    warning(
+    warningWithoutStack(
       noInstanceGetDerivedStateFromProps,
       '%s: getDerivedStateFromProps() is defined as an instance method ' +
         'and will be ignored. Instead, declare it as a static method.',
@@ -425,7 +425,7 @@ function checkClassInstance(workInProgress: Fiber) {
     );
     const noInstanceGetDerivedStateFromCatch =
       typeof instance.getDerivedStateFromCatch !== 'function';
-    warning(
+    warningWithoutStack(
       noInstanceGetDerivedStateFromCatch,
       '%s: getDerivedStateFromCatch() is defined as an instance method ' +
         'and will be ignored. Instead, declare it as a static method.',
@@ -433,7 +433,7 @@ function checkClassInstance(workInProgress: Fiber) {
     );
     const noStaticGetSnapshotBeforeUpdate =
       typeof type.getSnapshotBeforeUpdate !== 'function';
-    warning(
+    warningWithoutStack(
       noStaticGetSnapshotBeforeUpdate,
       '%s: getSnapshotBeforeUpdate() is defined as a static method ' +
         'and will be ignored. Instead, declare it as an instance method.',
@@ -441,10 +441,14 @@ function checkClassInstance(workInProgress: Fiber) {
     );
     const state = instance.state;
     if (state && (typeof state !== 'object' || isArray(state))) {
-      warning(false, '%s.state: must be set to an object or null', name);
+      warningWithoutStack(
+        false,
+        '%s.state: must be set to an object or null',
+        name,
+      );
     }
     if (typeof instance.getChildContext === 'function') {
-      warning(
+      warningWithoutStack(
         typeof type.childContextTypes === 'object',
         '%s.getChildContext(): childContextTypes must be defined in order to ' +
           'use getChildContext().',
@@ -499,7 +503,7 @@ function constructClassInstance(
       const componentName = getComponentName(ctor) || 'Component';
       if (!didWarnAboutUninitializedState.has(componentName)) {
         didWarnAboutUninitializedState.add(componentName);
-        warning(
+        warningWithoutStack(
           false,
           '%s: Did not properly initialize state during construction. ' +
             'Expected state to be an object, but it was %s.',
@@ -557,7 +561,7 @@ function constructClassInstance(
             : 'getSnapshotBeforeUpdate()';
         if (!didWarnAboutLegacyLifecyclesAndDerivedState.has(componentName)) {
           didWarnAboutLegacyLifecyclesAndDerivedState.add(componentName);
-          warning(
+          warningWithoutStack(
             false,
             'Unsafe legacy lifecycles will not be called for components using new component APIs.\n\n' +
               '%s uses %s but also contains the following legacy lifecycles:%s%s%s\n\n' +
@@ -600,7 +604,7 @@ function callComponentWillMount(workInProgress, instance) {
 
   if (oldState !== instance.state) {
     if (__DEV__) {
-      warning(
+      warningWithoutStack(
         false,
         '%s.componentWillMount(): Assigning directly to this.state is ' +
           "deprecated (except inside a component's " +
@@ -634,7 +638,7 @@ function callComponentWillReceiveProps(
         getComponentName(workInProgress.type) || 'Component';
       if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
         didWarnAboutStateAssignmentForComponent.add(componentName);
-        warning(
+        warningWithoutStack(
           false,
           '%s.componentWillReceiveProps(): Assigning directly to ' +
             "this.state is deprecated (except inside a component's " +
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index 53a3774ab4..80b391e631 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -39,7 +39,7 @@ import {
 } from 'shared/ReactTypeOfSideEffect';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'shared/invariant';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import {Sync} from './ReactFiberExpirationTime';
 import {onCommitUnmount} from './ReactFiberDevToolsHook';
@@ -199,7 +199,7 @@ function commitBeforeMutationLifeCycles(
             >);
             if (snapshot === undefined && !didWarnSet.has(finishedWork.type)) {
               didWarnSet.add(finishedWork.type);
-              warning(
+              warningWithoutStack(
                 false,
                 '%s.getSnapshotBeforeUpdate(): A snapshot value (or null) ' +
                   'must be returned. You have returned undefined.',
@@ -368,7 +368,7 @@ function commitAttachRef(finishedWork: Fiber) {
     } else {
       if (__DEV__) {
         if (!ref.hasOwnProperty('current')) {
-          warning(
+          warningWithoutStack(
             false,
             'Unexpected ref object provided for %s. ' +
               'Use either a ref-setter function or React.createRef().%s',
diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js
index 78d7cb316f..27c36b0d9d 100644
--- a/packages/react-reconciler/src/ReactFiberContext.js
+++ b/packages/react-reconciler/src/ReactFiberContext.js
@@ -14,7 +14,7 @@ import {isFiberMounted} from 'react-reconciler/reflection';
 import {ClassComponent, HostRoot} from 'shared/ReactTypeOfWork';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'shared/invariant';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 import checkPropTypes from 'prop-types/checkPropTypes';
 
 import * as ReactCurrentFiber from './ReactCurrentFiber';
@@ -163,7 +163,7 @@ function processChildContext(fiber: Fiber, parentContext: Object): Object {
 
       if (!warnedAboutMissingGetChildContext[componentName]) {
         warnedAboutMissingGetChildContext[componentName] = true;
-        warning(
+        warningWithoutStack(
           false,
           '%s.childContextTypes is specified but there is no getChildContext() method ' +
             'on the instance. You can either define getChildContext() on %s or remove ' +
diff --git a/packages/react-reconciler/src/ReactFiberDevToolsHook.js b/packages/react-reconciler/src/ReactFiberDevToolsHook.js
index 4995978b11..7d3f9897f7 100644
--- a/packages/react-reconciler/src/ReactFiberDevToolsHook.js
+++ b/packages/react-reconciler/src/ReactFiberDevToolsHook.js
@@ -10,7 +10,7 @@
 import type {Fiber} from './ReactFiber';
 import type {FiberRoot} from './ReactFiberRoot';
 
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 declare var __REACT_DEVTOOLS_GLOBAL_HOOK__: Object | void;
 
@@ -25,7 +25,11 @@ function catchErrors(fn) {
     } catch (err) {
       if (__DEV__ && !hasLoggedError) {
         hasLoggedError = true;
-        warning(false, 'React DevTools encountered an error: %s', err);
+        warningWithoutStack(
+          false,
+          'React DevTools encountered an error: %s',
+          err,
+        );
       }
     }
   };
@@ -48,7 +52,7 @@ export function injectInternals(internals: Object): boolean {
   }
   if (!hook.supportsFiber) {
     if (__DEV__) {
-      warning(
+      warningWithoutStack(
         false,
         'The installed version of React DevTools is too old and will not work ' +
           'with the current version of React. Please update React DevTools. ' +
@@ -70,7 +74,11 @@ export function injectInternals(internals: Object): boolean {
   } catch (err) {
     // Catch all errors because it is unsafe to throw during initialization.
     if (__DEV__) {
-      warning(false, 'React DevTools encountered an error: %s.', err);
+      warningWithoutStack(
+        false,
+        'React DevTools encountered an error: %s.',
+        err,
+      );
     }
   }
   // DevTools exists
diff --git a/packages/react-reconciler/src/ReactFiberNewContext.js b/packages/react-reconciler/src/ReactFiberNewContext.js
index 4826412dde..729f7469e2 100644
--- a/packages/react-reconciler/src/ReactFiberNewContext.js
+++ b/packages/react-reconciler/src/ReactFiberNewContext.js
@@ -18,7 +18,7 @@ export type NewContext = {
   getContextChangedBits(context: ReactContext<any>): number,
 };
 
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 import {isPrimaryRenderer} from './ReactFiberHostConfig';
 import {createCursor, push, pop} from './ReactFiberStack';
 
@@ -43,7 +43,7 @@ function pushProvider(providerFiber: Fiber): void {
     context._currentValue = providerFiber.pendingProps.value;
     context._changedBits = providerFiber.stateNode;
     if (__DEV__) {
-      warning(
+      warningWithoutStack(
         context._currentRenderer === undefined ||
           context._currentRenderer === null ||
           context._currentRenderer === rendererSigil,
@@ -60,7 +60,7 @@ function pushProvider(providerFiber: Fiber): void {
     context._currentValue2 = providerFiber.pendingProps.value;
     context._changedBits2 = providerFiber.stateNode;
     if (__DEV__) {
-      warning(
+      warningWithoutStack(
         context._currentRenderer2 === undefined ||
           context._currentRenderer2 === null ||
           context._currentRenderer2 === rendererSigil,
diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js
index 6e9fc37e42..ce9e54c972 100644
--- a/packages/react-reconciler/src/ReactFiberReconciler.js
+++ b/packages/react-reconciler/src/ReactFiberReconciler.js
@@ -26,7 +26,7 @@ import * as ReactInstanceMap from 'shared/ReactInstanceMap';
 import {HostComponent} from 'shared/ReactTypeOfWork';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'shared/invariant';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import {getPublicInstance} from './ReactFiberHostConfig';
 import {
@@ -109,7 +109,7 @@ function scheduleRootUpdate(
       !didWarnAboutNestedUpdates
     ) {
       didWarnAboutNestedUpdates = true;
-      warning(
+      warningWithoutStack(
         false,
         'Render methods should be a pure function of props and state; ' +
           'triggering nested component updates from render is not allowed. ' +
@@ -127,7 +127,7 @@ function scheduleRootUpdate(
 
   callback = callback === undefined ? null : callback;
   if (callback !== null) {
-    warning(
+    warningWithoutStack(
       typeof callback === 'function',
       'render(...): Expected the last optional `callback` argument to be a ' +
         'function. Instead received: %s.',
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index e2b0653d6a..2bf21ab1b2 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -46,7 +46,7 @@ import {
 } from 'shared/ReactFeatureFlags';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'shared/invariant';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import {
   scheduleTimeout,
@@ -179,7 +179,7 @@ if (__DEV__) {
     if (didWarnStateUpdateForUnmountedComponent[componentName]) {
       return;
     }
-    warning(
+    warningWithoutStack(
       false,
       "Can't call setState (or forceUpdate) on an unmounted component. This " +
         'is a no-op, but it indicates a memory leak in your application. To ' +
@@ -196,7 +196,7 @@ if (__DEV__) {
         if (didWarnSetStateChildContext) {
           return;
         }
-        warning(
+        warningWithoutStack(
           false,
           'setState(...): Cannot call setState() inside getChildContext()',
         );
@@ -206,7 +206,7 @@ if (__DEV__) {
         if (didWarnAboutStateTransition) {
           return;
         }
-        warning(
+        warningWithoutStack(
           false,
           'Cannot update during an existing state transition (such as within ' +
             "`render` or another component's constructor). Render methods should " +
@@ -275,7 +275,7 @@ if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
     // Restore the original state of the work-in-progress
     if (stashedWorkInProgressProperties === null) {
       // This should never happen. Don't throw because this code is DEV-only.
-      warning(
+      warningWithoutStack(
         false,
         'Could not replay rendering after an error. This is likely a bug in React. ' +
           'Please file an issue.',
diff --git a/packages/react-reconciler/src/ReactFiberStack.js b/packages/react-reconciler/src/ReactFiberStack.js
index c108e89891..8adfe8d51c 100644
--- a/packages/react-reconciler/src/ReactFiberStack.js
+++ b/packages/react-reconciler/src/ReactFiberStack.js
@@ -9,7 +9,7 @@
 
 import type {Fiber} from './ReactFiber';
 
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 export type StackCursor<T> = {
   current: T,
@@ -38,14 +38,14 @@ function isEmpty(): boolean {
 function pop<T>(cursor: StackCursor<T>, fiber: Fiber): void {
   if (index < 0) {
     if (__DEV__) {
-      warning(false, 'Unexpected pop.');
+      warningWithoutStack(false, 'Unexpected pop.');
     }
     return;
   }
 
   if (__DEV__) {
     if (fiber !== fiberStack[index]) {
-      warning(false, 'Unexpected Fiber popped.');
+      warningWithoutStack(false, 'Unexpected Fiber popped.');
     }
   }
 
@@ -75,7 +75,7 @@ function push<T>(cursor: StackCursor<T>, value: T, fiber: Fiber): void {
 function checkThatStackIsEmpty() {
   if (__DEV__) {
     if (index !== -1) {
-      warning(
+      warningWithoutStack(
         false,
         'Expected an empty stack. Something was not reset properly.',
       );
diff --git a/packages/react-reconciler/src/ReactFiberTreeReflection.js b/packages/react-reconciler/src/ReactFiberTreeReflection.js
index 7ee0ff5cc3..e3429c55a8 100644
--- a/packages/react-reconciler/src/ReactFiberTreeReflection.js
+++ b/packages/react-reconciler/src/ReactFiberTreeReflection.js
@@ -10,7 +10,7 @@
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
 
 import invariant from 'shared/invariant';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import * as ReactInstanceMap from 'shared/ReactInstanceMap';
 import ReactSharedInternals from 'shared/ReactSharedInternals';
@@ -69,7 +69,7 @@ export function isMounted(component: React$Component<any, any>): boolean {
     if (owner !== null && owner.tag === ClassComponent) {
       const ownerFiber: Fiber = owner;
       const instance = ownerFiber.stateNode;
-      warning(
+      warningWithoutStack(
         instance._warnedAboutRefsInRender,
         '%s is accessing isMounted inside its render() function. ' +
           'render() should be a pure function of props and state. It should ' +
diff --git a/packages/react-reconciler/src/ReactProfilerTimer.js b/packages/react-reconciler/src/ReactProfilerTimer.js
index c8982baf42..1136e30f44 100644
--- a/packages/react-reconciler/src/ReactProfilerTimer.js
+++ b/packages/react-reconciler/src/ReactProfilerTimer.js
@@ -12,7 +12,7 @@ import type {Fiber} from './ReactFiber';
 import getComponentName from 'shared/getComponentName';
 import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
 
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 import {now} from './ReactFiberHostConfig';
 
 export type ProfilerTimer = {
@@ -64,7 +64,7 @@ function checkActualRenderTimeStackEmpty(): void {
     return;
   }
   if (__DEV__) {
-    warning(
+    warningWithoutStack(
       fiberStack.length === 0,
       'Expected an empty stack. Something was not reset properly.',
     );
@@ -106,7 +106,7 @@ function recordElapsedActualRenderTime(fiber: Fiber): void {
     return;
   }
   if (__DEV__) {
-    warning(
+    warningWithoutStack(
       fiber === fiberStack.pop(),
       'Unexpected Fiber (%s) popped.',
       getComponentName(fiber.type),
@@ -163,7 +163,7 @@ function startBaseRenderTimer(): void {
   }
   if (__DEV__) {
     if (baseStartTime !== -1) {
-      warning(
+      warningWithoutStack(
         false,
         'Cannot start base timer that is already running. ' +
           'This error is likely caused by a bug in React. ' +
diff --git a/packages/react-reconciler/src/ReactStrictModeWarnings.js b/packages/react-reconciler/src/ReactStrictModeWarnings.js
index 83c354af0b..4de192e315 100644
--- a/packages/react-reconciler/src/ReactStrictModeWarnings.js
+++ b/packages/react-reconciler/src/ReactStrictModeWarnings.js
@@ -14,7 +14,7 @@ import {getStackByFiberInDevAndProd} from './ReactCurrentFiber';
 import getComponentName from 'shared/getComponentName';
 import {StrictMode} from './ReactTypeOfMode';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 type LIFECYCLE =
   | 'UNSAFE_componentWillMount'
@@ -99,7 +99,7 @@ if (__DEV__) {
             strictRoot,
           );
 
-          warning(
+          warningWithoutStack(
             false,
             'Unsafe lifecycle methods were found within a strict-mode tree:%s' +
               '\n\n%s' +
@@ -235,7 +235,7 @@ if (__DEV__) {
   ) => {
     const strictRoot = findStrictRoot(fiber);
     if (strictRoot === null) {
-      warning(
+      warningWithoutStack(
         false,
         'Expected to find a StrictMode component in a strict mode tree. ' +
           'This error is likely caused by a bug in React. Please file an issue.',
@@ -304,7 +304,7 @@ if (__DEV__) {
   ) => {
     const strictRoot = findStrictRoot(fiber);
     if (strictRoot === null) {
-      warning(
+      warningWithoutStack(
         false,
         'Expected to find a StrictMode component in a strict mode tree. ' +
           'This error is likely caused by a bug in React. Please file an issue.',
@@ -346,7 +346,7 @@ if (__DEV__) {
           strictRoot,
         );
 
-        warning(
+        warningWithoutStack(
           false,
           'Legacy context API has been detected within a strict-mode tree: %s' +
             '\n\nPlease update the following components: %s' +
diff --git a/packages/react-reconciler/src/ReactUpdateQueue.js b/packages/react-reconciler/src/ReactUpdateQueue.js
index 1e28051d58..f592d9e54f 100644
--- a/packages/react-reconciler/src/ReactUpdateQueue.js
+++ b/packages/react-reconciler/src/ReactUpdateQueue.js
@@ -103,7 +103,7 @@ import {
 import {StrictMode} from './ReactTypeOfMode';
 
 import invariant from 'shared/invariant';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 export type Update<State> = {
   expirationTime: ExpirationTime,
@@ -296,7 +296,7 @@ export function enqueueUpdate<State>(
         (queue2 !== null && currentlyProcessingQueue === queue2)) &&
       !didWarnUpdateInsideUpdate
     ) {
-      warning(
+      warningWithoutStack(
         false,
         'An update (setState, replaceState, or forceUpdate) was scheduled ' +
           'from inside an update function. Update functions should be pure, ' +
diff --git a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
index 44ae40bc12..872ce0abaf 100644
--- a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
@@ -701,8 +701,6 @@ describe('ReactNewContext', () => {
   });
 
   it('warns if calculateChangedBits returns larger than a 31-bit integer', () => {
-    spyOnDev(console, 'error');
-
     const Context = React.createContext(
       0,
       (a, b) => Math.pow(2, 32) - 1, // Return 32 bit int
@@ -713,16 +711,11 @@ describe('ReactNewContext', () => {
 
     // Update
     ReactNoop.render(<Context.Provider value={2} />);
-    ReactNoop.flush();
-
-    if (__DEV__) {
-      expect(console.error).toHaveBeenCalledTimes(1);
-      expect(console.error.calls.argsFor(0)[0]).toContain(
-        'calculateChangedBits: Expected the return value to be a 31-bit ' +
-          'integer. Instead received: 4294967295',
-        {withoutStack: true}, // TODO: add a stack
-      );
-    }
+    expect(ReactNoop.flush).toWarnDev(
+      'calculateChangedBits: Expected the return value to be a 31-bit ' +
+        'integer. Instead received: 4294967295',
+      {withoutStack: true}, // TODO: add a stack
+    );
   });
 
   it('warns if multiple renderers concurrently render the same context', () => {
diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index e59176411d..bb389ea10f 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -42,7 +42,7 @@ type CallbackConfigType = {|
 export type CallbackIdType = CallbackConfigType;
 
 import {canUseDOM} from 'shared/ExecutionEnvironment';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 // We capture a local reference to any global, in case it gets polyfilled after
 // this module is initially evaluated.
@@ -124,7 +124,7 @@ if (!canUseDOM) {
   };
 } else {
   if (typeof localRequestAnimationFrame !== 'function') {
-    warning(
+    warningWithoutStack(
       false,
       "This browser doesn't support requestAnimationFrame. " +
         'Make sure that you load a ' +
@@ -132,7 +132,7 @@ if (!canUseDOM) {
     );
   }
   if (typeof localCancelAnimationFrame !== 'function') {
-    warning(
+    warningWithoutStack(
       false,
       "This browser doesn't support cancelAnimationFrame. " +
         'Make sure that you load a ' +
diff --git a/packages/react/src/ReactChildren.js b/packages/react/src/ReactChildren.js
index 0bbe5bee14..57c4655b20 100644
--- a/packages/react/src/ReactChildren.js
+++ b/packages/react/src/ReactChildren.js
@@ -166,8 +166,7 @@ function traverseAllChildrenImpl(
             didWarnAboutMaps,
             'Using Maps as children is unsupported and will likely yield ' +
               'unexpected results. Convert it to a sequence/iterable of keyed ' +
-              'ReactElements instead.%s',
-            ReactDebugCurrentFrame.getStackAddendum(),
+              'ReactElements instead.',
           );
           didWarnAboutMaps = true;
         }
diff --git a/packages/react/src/ReactContext.js b/packages/react/src/ReactContext.js
index 4c1b06bfed..69461b7a9f 100644
--- a/packages/react/src/ReactContext.js
+++ b/packages/react/src/ReactContext.js
@@ -11,7 +11,7 @@ import {REACT_PROVIDER_TYPE, REACT_CONTEXT_TYPE} from 'shared/ReactSymbols';
 
 import type {ReactContext} from 'shared/ReactTypes';
 
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 export function createContext<T>(
   defaultValue: T,
@@ -21,7 +21,7 @@ export function createContext<T>(
     calculateChangedBits = null;
   } else {
     if (__DEV__) {
-      warning(
+      warningWithoutStack(
         calculateChangedBits === null ||
           typeof calculateChangedBits === 'function',
         'createContext: Expected the optional second argument to be a ' +
diff --git a/packages/react/src/ReactElement.js b/packages/react/src/ReactElement.js
index 80cd607956..5404671ee2 100644
--- a/packages/react/src/ReactElement.js
+++ b/packages/react/src/ReactElement.js
@@ -6,7 +6,7 @@
  */
 
 import invariant from 'shared/invariant';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 import {REACT_ELEMENT_TYPE} from 'shared/ReactSymbols';
 
 import ReactCurrentOwner from './ReactCurrentOwner';
@@ -50,7 +50,7 @@ function defineKeyPropWarningGetter(props, displayName) {
   const warnAboutAccessingKey = function() {
     if (!specialPropKeyWarningShown) {
       specialPropKeyWarningShown = true;
-      warning(
+      warningWithoutStack(
         false,
         '%s: `key` is not a prop. Trying to access it will result ' +
           'in `undefined` being returned. If you need to access the same ' +
@@ -71,7 +71,7 @@ function defineRefPropWarningGetter(props, displayName) {
   const warnAboutAccessingRef = function() {
     if (!specialPropRefWarningShown) {
       specialPropRefWarningShown = true;
-      warning(
+      warningWithoutStack(
         false,
         '%s: `ref` is not a prop. Trying to access it will result ' +
           'in `undefined` being returned. If you need to access the same ' +
diff --git a/packages/react/src/ReactElementValidator.js b/packages/react/src/ReactElementValidator.js
index 9648e072be..543b74d1b1 100644
--- a/packages/react/src/ReactElementValidator.js
+++ b/packages/react/src/ReactElementValidator.js
@@ -22,6 +22,7 @@ import {
 } from 'shared/ReactSymbols';
 import checkPropTypes from 'prop-types/checkPropTypes';
 import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 import ReactCurrentOwner from './ReactCurrentOwner';
 import {isValidElement, createElement, cloneElement} from './ReactElement';
@@ -124,10 +125,9 @@ function validateExplicitKey(element, parentType) {
     warning(
       false,
       'Each child in an array or iterator should have a unique "key" prop.' +
-        '%s%s See https://fb.me/react-warning-keys for more information.%s',
+        '%s%s See https://fb.me/react-warning-keys for more information.',
       currentComponentErrorInfo,
       childOwner,
-      ReactDebugCurrentFrame.getStackAddendum(),
     );
   }
   setCurrentlyValidatingElement(null);
@@ -213,14 +213,14 @@ function validatePropTypes(element) {
     setCurrentlyValidatingElement(null);
   } else if (type.PropTypes !== undefined && !propTypesMisspellWarningShown) {
     propTypesMisspellWarningShown = true;
-    warning(
+    warningWithoutStack(
       false,
       'Component %s declared `PropTypes` instead of `propTypes`. Did you misspell the property assignment?',
       name || 'Unknown',
     );
   }
   if (typeof type.getDefaultProps === 'function') {
-    warning(
+    warningWithoutStack(
       type.getDefaultProps.isReactClassApproved,
       'getDefaultProps is only used on classic React.createClass ' +
         'definitions. Use a static property named `defaultProps` instead.',
@@ -242,20 +242,15 @@ function validateFragmentProps(fragment) {
       warning(
         false,
         'Invalid prop `%s` supplied to `React.Fragment`. ' +
-          'React.Fragment can only have `key` and `children` props.%s',
+          'React.Fragment can only have `key` and `children` props.',
         key,
-        ReactDebugCurrentFrame.getStackAddendum(),
       );
       break;
     }
   }
 
   if (fragment.ref !== null) {
-    warning(
-      false,
-      'Invalid attribute `ref` supplied to `React.Fragment`.%s',
-      ReactDebugCurrentFrame.getStackAddendum(),
-    );
+    warning(false, 'Invalid attribute `ref` supplied to `React.Fragment`.');
   }
 
   setCurrentlyValidatingElement(null);
@@ -286,8 +281,6 @@ export function createElementWithValidation(type, props, children) {
       info += getDeclarationErrorAddendum();
     }
 
-    info += ReactDebugCurrentFrame.getStackAddendum();
-
     let typeString;
     if (type === null) {
       typeString = 'null';
diff --git a/packages/react/src/ReactNoopUpdateQueue.js b/packages/react/src/ReactNoopUpdateQueue.js
index d21cd561ce..85d16a119a 100644
--- a/packages/react/src/ReactNoopUpdateQueue.js
+++ b/packages/react/src/ReactNoopUpdateQueue.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 const didWarnStateUpdateForUnmountedComponent = {};
 
@@ -19,7 +19,7 @@ function warnNoop(publicInstance, callerName) {
     if (didWarnStateUpdateForUnmountedComponent[warningKey]) {
       return;
     }
-    warning(
+    warningWithoutStack(
       false,
       "Can't call %s on a component that is not yet mounted. " +
         'This is a no-op, but it might indicate a bug in your application. ' +
diff --git a/packages/react/src/forwardRef.js b/packages/react/src/forwardRef.js
index ec78565211..5333c710e4 100644
--- a/packages/react/src/forwardRef.js
+++ b/packages/react/src/forwardRef.js
@@ -7,20 +7,20 @@
 
 import {REACT_FORWARD_REF_TYPE} from 'shared/ReactSymbols';
 
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 export default function forwardRef<Props, ElementType: React$ElementType>(
   render: (props: Props, ref: React$Ref<ElementType>) => React$Node,
 ) {
   if (__DEV__) {
     if (typeof render !== 'function') {
-      warning(
+      warningWithoutStack(
         false,
         'forwardRef requires a render function but was given %s.',
         render === null ? 'null' : typeof render,
       );
     } else {
-      warning(
+      warningWithoutStack(
         render.length === 2,
         'forwardRef render functions accept two parameters: props and ref. ' +
           'Did you forget to use the ref parameter?',
@@ -28,7 +28,7 @@ export default function forwardRef<Props, ElementType: React$ElementType>(
     }
 
     if (render != null) {
-      warning(
+      warningWithoutStack(
         render.defaultProps == null && render.propTypes == null,
         'forwardRef render functions do not support propTypes or defaultProps. ' +
           'Did you accidentally pass a React component?',
diff --git a/packages/shared/getComponentName.js b/packages/shared/getComponentName.js
index 1149b04f46..28664e2412 100644
--- a/packages/shared/getComponentName.js
+++ b/packages/shared/getComponentName.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 import {
   REACT_ASYNC_MODE_TYPE,
   REACT_CONTEXT_TYPE,
@@ -27,7 +27,7 @@ function getComponentName(type: mixed): string | null {
   }
   if (__DEV__) {
     if (typeof (type: any).tag === 'number') {
-      warning(
+      warningWithoutStack(
         false,
         'Received an unexpected object in getComponentName(). ' +
           'This is likely a bug in React. Please file an issue.',
diff --git a/packages/shared/lowPriorityWarning.js b/packages/shared/lowPriorityWarning.js
index ba2e7ee987..299d306aae 100644
--- a/packages/shared/lowPriorityWarning.js
+++ b/packages/shared/lowPriorityWarning.js
@@ -39,7 +39,7 @@ if (__DEV__) {
   lowPriorityWarning = function(condition, format, ...args) {
     if (format === undefined) {
       throw new Error(
-        '`warning(condition, format, ...args)` requires a warning ' +
+        '`warningWithoutStack(condition, format, ...args)` requires a warning ' +
           'message argument',
       );
     }
diff --git a/packages/shared/warning.js b/packages/shared/warning.js
index 4a8ef4e465..e4a9c2855d 100644
--- a/packages/shared/warning.js
+++ b/packages/shared/warning.js
@@ -5,6 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import warningWithoutStack from 'shared/warningWithoutStack';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
+
 /**
  * Similar to invariant but only logs a warning if the condition is not met.
  * This can be used to log issues in development environments in critical
@@ -12,33 +15,17 @@
  * same logic and follow the same code paths.
  */
 
-let warning = () => {};
+let warning = warningWithoutStack;
 
 if (__DEV__) {
-  const printWarning = function(format, ...args) {
-    let argIndex = 0;
-    const message = 'Warning: ' + format.replace(/%s/g, () => args[argIndex++]);
-    if (typeof console !== 'undefined') {
-      console.error(message);
-    }
-    try {
-      // --- Welcome to debugging React ---
-      // This error was thrown as a convenience so that you can use this stack
-      // to find the callsite that caused this warning to fire.
-      throw new Error(message);
-    } catch (x) {}
-  };
-
   warning = function(condition, format, ...args) {
-    if (format === undefined) {
-      throw new Error(
-        '`warning(condition, format, ...args)` requires a warning ' +
-          'message argument',
-      );
-    }
-    if (!condition) {
-      printWarning(format, ...args);
+    if (condition) {
+      return;
     }
+    const ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+    const stack = ReactDebugCurrentFrame.getStackAddendum();
+    // eslint-disable-next-line react-internal/warning-and-invariant-args
+    warningWithoutStack(false, format + '%s', ...args, stack);
   };
 }
 
diff --git a/packages/shared/warningWithoutStack.js b/packages/shared/warningWithoutStack.js
new file mode 100644
index 0000000000..50b58a85d6
--- /dev/null
+++ b/packages/shared/warningWithoutStack.js
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
+
+let warningWithoutStack = () => {};
+
+if (__DEV__) {
+  warningWithoutStack = function(condition, format, ...args) {
+    if (format === undefined) {
+      throw new Error(
+        '`warningWithoutStack(condition, format, ...args)` requires a warning ' +
+          'message argument',
+      );
+    }
+    if (condition) {
+      return;
+    }
+    if (typeof console !== 'undefined') {
+      console.error('Warning: ' + format, ...args);
+    }
+    try {
+      // --- Welcome to debugging React ---
+      // This error was thrown as a convenience so that you can use this stack
+      // to find the callsite that caused this warning to fire.
+      let argIndex = 0;
+      const message =
+        'Warning: ' + format.replace(/%s/g, () => args[argIndex++]);
+      throw new Error(message);
+    } catch (x) {}
+  };
+}
+
+export default warningWithoutStack;
diff --git a/packages/simple-cache-provider/src/SimpleCacheProvider.js b/packages/simple-cache-provider/src/SimpleCacheProvider.js
index 13620cced1..adce8c11de 100644
--- a/packages/simple-cache-provider/src/SimpleCacheProvider.js
+++ b/packages/simple-cache-provider/src/SimpleCacheProvider.js
@@ -8,7 +8,7 @@
  */
 
 import React from 'react';
-import warning from 'shared/warning';
+import warningWithoutStack from 'shared/warningWithoutStack';
 
 function noop() {}
 
@@ -154,7 +154,7 @@ export function createCache(invalidator: () => mixed): Cache {
 
   function accessRecord<K, V>(resourceType: any, key: K): Record<K, V> {
     if (__DEV__) {
-      warning(
+      warningWithoutStack(
         typeof resourceType !== 'string' && typeof resourceType !== 'number',
         'Invalid resourceType: Expected a symbol, object, or function, but ' +
           'instead received: %s. Strings and numbers are not permitted as ' +
@@ -314,7 +314,7 @@ export function createCache(invalidator: () => mixed): Cache {
 let warnIfNonPrimitiveKey;
 if (__DEV__) {
   warnIfNonPrimitiveKey = (key, methodName) => {
-    warning(
+    warningWithoutStack(
       typeof key === 'string' ||
         typeof key === 'number' ||
         typeof key === 'boolean' ||
@@ -361,7 +361,7 @@ export function createResource<V, K, H: primitive>(
   const resource = {
     read(cache, key) {
       if (__DEV__) {
-        warning(
+        warningWithoutStack(
           isCache(cache),
           'read(): The first argument must be a cache. Instead received: %s',
           cache,
@@ -378,7 +378,7 @@ export function createResource<V, K, H: primitive>(
     },
     preload(cache, key) {
       if (__DEV__) {
-        warning(
+        warningWithoutStack(
           isCache(cache),
           'preload(): The first argument must be a cache. Instead received: %s',
           cache,
diff --git a/scripts/babel/__tests__/wrap-warning-with-env-check-test.js b/scripts/babel/__tests__/wrap-warning-with-env-check-test.js
index 7e81a66342..39760410da 100644
--- a/scripts/babel/__tests__/wrap-warning-with-env-check-test.js
+++ b/scripts/babel/__tests__/wrap-warning-with-env-check-test.js
@@ -40,6 +40,13 @@ describe('wrap-warning-with-env-check', () => {
     );
   });
 
+  it('should wrap warningWithoutStack calls', () => {
+    compare(
+      "warningWithoutStack(condition, 'a %s b', 'c');",
+      "__DEV__ ? !condition ? warningWithoutStack(false, 'a %s b', 'c') : void 0 : void 0;"
+    );
+  });
+
   it('should not wrap invariant calls', () => {
     compare(
       "invariant(condition, 'a %s b', 'c');",
diff --git a/scripts/babel/wrap-warning-with-env-check.js b/scripts/babel/wrap-warning-with-env-check.js
index e760854ab2..85b7728914 100644
--- a/scripts/babel/wrap-warning-with-env-check.js
+++ b/scripts/babel/wrap-warning-with-env-check.js
@@ -24,7 +24,10 @@ module.exports = function(babel, options) {
             return;
           }
 
-          if (path.get('callee').isIdentifier({name: 'warning'})) {
+          if (
+            path.get('callee').isIdentifier({name: 'warning'}) ||
+            path.get('callee').isIdentifier({name: 'warningWithoutStack'})
+          ) {
             // Turns this code:
             //
             // warning(condition, argument, argument);
diff --git a/scripts/eslint-rules/warning-and-invariant-args.js b/scripts/eslint-rules/warning-and-invariant-args.js
index ff7e6a9eed..85cee9406f 100644
--- a/scripts/eslint-rules/warning-and-invariant-args.js
+++ b/scripts/eslint-rules/warning-and-invariant-args.js
@@ -35,7 +35,9 @@ module.exports = function(context) {
       // how warning/invariant was defined.
       const isWarningOrInvariant =
         node.callee.type === 'Identifier' &&
-        (node.callee.name === 'warning' || node.callee.name === 'invariant');
+        (node.callee.name === 'warning' ||
+          node.callee.name === 'warningWithoutStack' ||
+          node.callee.name === 'invariant');
       if (!isWarningOrInvariant) {
         return;
       }
diff --git a/scripts/jest/matchers/__tests__/toWarnDev-test.js b/scripts/jest/matchers/__tests__/toWarnDev-test.js
index cf88d53323..67f4c99e97 100644
--- a/scripts/jest/matchers/__tests__/toWarnDev-test.js
+++ b/scripts/jest/matchers/__tests__/toWarnDev-test.js
@@ -147,5 +147,19 @@ describe('toWarnDev', () => {
         }).toWarnDev('Hi', {withoutStack: 'haha'});
       }).toThrow('Instead received string');
     });
+
+    it('fails if the argument number does not match', () => {
+      expect(() => {
+        expect(() => {
+          console.error('Hi %s', 'Sara', 'extra');
+        }).toWarnDev('Hi', {withoutStack: true});
+      }).toThrow('Received 2 arguments for a message with 1 placeholders');
+
+      expect(() => {
+        expect(() => {
+          console.error('Hi %s');
+        }).toWarnDev('Hi', {withoutStack: true});
+      }).toThrow('Received 0 arguments for a message with 1 placeholders');
+    });
   }
 });
diff --git a/scripts/jest/matchers/toWarnDev.js b/scripts/jest/matchers/toWarnDev.js
index aa262a626e..6404a54c7b 100644
--- a/scripts/jest/matchers/toWarnDev.js
+++ b/scripts/jest/matchers/toWarnDev.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const jestDiff = require('jest-diff');
+const util = require('util');
 
 function normalizeCodeLocInfo(str) {
   return str && str.replace(/at .+?:\d+/g, 'at **');
@@ -23,6 +24,7 @@ const createMatcherFor = consoleMethod =>
       const warningsWithoutComponentStack = [];
       const warningsWithComponentStack = [];
       const unexpectedWarnings = [];
+      let lastWarningWithMismatchingFormat = null;
 
       // Catch errors thrown by the callback,
       // But only rethrow them if all test expectations have been satisfied.
@@ -30,9 +32,23 @@ const createMatcherFor = consoleMethod =>
       // and result in a test that passes when it shouldn't.
       let caughtError;
 
-      const consoleSpy = message => {
+      const consoleSpy = (format, ...args) => {
+        const message = util.format(format, ...args);
         const normalizedMessage = normalizeCodeLocInfo(message);
 
+        // Remember if the number of %s interpolations
+        // doesn't match the number of arguments.
+        // We'll fail the test if it happens.
+        let argIndex = 0;
+        format.replace(/%s/g, () => argIndex++);
+        if (argIndex !== args.length) {
+          lastWarningWithMismatchingFormat = {
+            format,
+            args,
+            expectedArgCount: argIndex,
+          };
+        }
+
         for (let index = 0; index < expectedMessages.length; index++) {
           const expectedMessage = expectedMessages[index];
           if (
@@ -160,6 +176,21 @@ const createMatcherFor = consoleMethod =>
               `Instead received ${typeof withoutStack}.`
           );
         }
+
+        if (lastWarningWithMismatchingFormat !== null) {
+          return {
+            message: () =>
+              `Received ${
+                lastWarningWithMismatchingFormat.args.length
+              } arguments for a message with ${
+                lastWarningWithMismatchingFormat.expectedArgCount
+              } placeholders:\n  ${this.utils.printReceived(
+                lastWarningWithMismatchingFormat.format
+              )}`,
+            pass: false,
+          };
+        }
+
         return {pass: true};
       }
     } else {
diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js
index 74d4df6c36..680f5f0709 100644
--- a/scripts/rollup/forks.js
+++ b/scripts/rollup/forks.js
@@ -40,10 +40,23 @@ const forks = Object.freeze({
 
   // Without this fork, importing `shared/ReactSharedInternals` inside
   // the `react` package itself would not work due to a cyclical dependency.
-  'shared/ReactSharedInternals': (bundleType, entry) => {
+  'shared/ReactSharedInternals': (bundleType, entry, dependencies) => {
     if (entry === 'react') {
       return 'react/src/ReactSharedInternals';
     }
+    if (dependencies.indexOf('react') === -1) {
+      // React internals are unavailable if we can't reference the package.
+      // We return an error because we only want to throw if this module gets used.
+      return new Error(
+        'Cannot use a module that depends on ReactSharedInternals ' +
+          'from "' +
+          entry +
+          '" because it does not declare "react" in the package ' +
+          'dependencies or peerDependencies. For example, this can happen if you use ' +
+          'warning() instead of warningWithoutStack() in a package that does not ' +
+          'depend on React.'
+      );
+    }
     return null;
   },
 
diff --git a/scripts/rollup/plugins/use-forks-plugin.js b/scripts/rollup/plugins/use-forks-plugin.js
index b0f7e4e1b9..12018da0ee 100644
--- a/scripts/rollup/plugins/use-forks-plugin.js
+++ b/scripts/rollup/plugins/use-forks-plugin.js
@@ -33,7 +33,13 @@ function useForks(forks) {
     const targetModule = forks[srcModule];
     resolvedForks.set(
       require.resolve(srcModule),
-      require.resolve(targetModule)
+      // targetModule could be a string (a file path),
+      // or an error (which we'd throw if it gets used).
+      // Don't try to "resolve" errors, but cache
+      // resolved file paths.
+      typeof targetModule === 'string'
+        ? require.resolve(targetModule)
+        : targetModule
     );
   });
   return {
@@ -64,7 +70,11 @@ function useForks(forks) {
       }
       if (resolvedImportee && resolvedForks.has(resolvedImportee)) {
         // We found a fork!
-        return resolvedForks.get(resolvedImportee);
+        const fork = resolvedForks.get(resolvedImportee);
+        if (fork instanceof Error) {
+          throw fork;
+        }
+        return fork;
       }
       return null;
     },

From fd410f43fcb771aa38215d17d7a487d1bc789d71 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 16 Jul 2018 22:47:37 +0100
Subject: [PATCH 230/277] Protect against passing component stack twice

This is a leftover from #13161 that I forgot to include.
It ensures we don't accidentally write code in the old way and end up passing the stack twice.
---
 .../jest/matchers/__tests__/toWarnDev-test.js |  8 +++++
 scripts/jest/matchers/toWarnDev.js            | 30 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/scripts/jest/matchers/__tests__/toWarnDev-test.js b/scripts/jest/matchers/__tests__/toWarnDev-test.js
index 67f4c99e97..d5ef59abe6 100644
--- a/scripts/jest/matchers/__tests__/toWarnDev-test.js
+++ b/scripts/jest/matchers/__tests__/toWarnDev-test.js
@@ -161,5 +161,13 @@ describe('toWarnDev', () => {
         }).toWarnDev('Hi', {withoutStack: true});
       }).toThrow('Received 0 arguments for a message with 1 placeholders');
     });
+
+    it('fails if stack is passed twice', () => {
+      expect(() => {
+        expect(() => {
+          console.error('Hi %s%s', '\n    in div', '\n    in div');
+        }).toWarnDev('Hi');
+      }).toThrow('Received more than one component stack for a warning');
+    });
   }
 });
diff --git a/scripts/jest/matchers/toWarnDev.js b/scripts/jest/matchers/toWarnDev.js
index 6404a54c7b..187de91e54 100644
--- a/scripts/jest/matchers/toWarnDev.js
+++ b/scripts/jest/matchers/toWarnDev.js
@@ -24,7 +24,9 @@ const createMatcherFor = consoleMethod =>
       const warningsWithoutComponentStack = [];
       const warningsWithComponentStack = [];
       const unexpectedWarnings = [];
+
       let lastWarningWithMismatchingFormat = null;
+      let lastWarningWithExtraComponentStack = null;
 
       // Catch errors thrown by the callback,
       // But only rethrow them if all test expectations have been satisfied.
@@ -32,6 +34,9 @@ const createMatcherFor = consoleMethod =>
       // and result in a test that passes when it shouldn't.
       let caughtError;
 
+      const isLikelyAComponentStack = message =>
+        typeof message === 'string' && message.includes('\n    in ');
+
       const consoleSpy = (format, ...args) => {
         const message = util.format(format, ...args);
         const normalizedMessage = normalizeCodeLocInfo(message);
@@ -49,13 +54,25 @@ const createMatcherFor = consoleMethod =>
           };
         }
 
+        // Protect against accidentally passing a component stack
+        // to warning() which already injects the component stack.
+        if (
+          args.length >= 2 &&
+          isLikelyAComponentStack(args[args.length - 1]) &&
+          isLikelyAComponentStack(args[args.length - 2])
+        ) {
+          lastWarningWithExtraComponentStack = {
+            format,
+          };
+        }
+
         for (let index = 0; index < expectedMessages.length; index++) {
           const expectedMessage = expectedMessages[index];
           if (
             normalizedMessage === expectedMessage ||
             normalizedMessage.includes(expectedMessage)
           ) {
-            if (normalizedMessage.includes('\n    in ')) {
+            if (isLikelyAComponentStack(normalizedMessage)) {
               warningsWithComponentStack.push(normalizedMessage);
             } else {
               warningsWithoutComponentStack.push(normalizedMessage);
@@ -191,6 +208,17 @@ const createMatcherFor = consoleMethod =>
           };
         }
 
+        if (lastWarningWithExtraComponentStack !== null) {
+          return {
+            message: () =>
+              `Received more than one component stack for a warning:\n  ${this.utils.printReceived(
+                lastWarningWithExtraComponentStack.format
+              )}\nDid you accidentally pass a stack to warning() as the last argument? ` +
+              `Don't forget warning() already injects the component stack automatically.`,
+            pass: false,
+          };
+        }
+
         return {pass: true};
       }
     } else {

From d6a0626b38de863a447b7e2e1346216a226cdfe1 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 17 Jul 2018 01:11:56 +0100
Subject: [PATCH 231/277] Set current fiber during before-mutation traversal
 (#13219)

---
 packages/react-reconciler/src/ReactFiberScheduler.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 2bf21ab1b2..72f2022c6d 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -428,8 +428,11 @@ function commitAllHostEffects() {
 
 function commitBeforeMutationLifecycles() {
   while (nextEffect !== null) {
-    const effectTag = nextEffect.effectTag;
+    if (__DEV__) {
+      ReactCurrentFiber.setCurrentFiber(nextEffect);
+    }
 
+    const effectTag = nextEffect.effectTag;
     if (effectTag & Snapshot) {
       recordEffect();
       const current = nextEffect.alternate;
@@ -440,6 +443,10 @@ function commitBeforeMutationLifecycles() {
     // This will be done by commitAllLifeCycles()
     nextEffect = nextEffect.nextEffect;
   }
+
+  if (__DEV__) {
+    ReactCurrentFiber.resetCurrentFiber();
+  }
 }
 
 function commitAllLifeCycles(

From 21ac62c77ac68c66b2a1f0adcc60f7760b884a0e Mon Sep 17 00:00:00 2001
From: Thibault Malbranche <thibault.malbranche@epitech.eu>
Date: Tue, 17 Jul 2018 02:35:33 +0200
Subject: [PATCH 232/277] Fix a portal unmounting crash for renderers with
 distinct Instance and Container (#13220)

* Fix Portal unmount

Before that change, currentParent is not set as a container even if it should so it break on react-native and probably other custom renderers

* Assert that *ToContainer() methods receive containers

* Add regression tests

* Add comments
---
 .../src/createReactNoop.js                    | 139 ++++++++++++++----
 .../src/ReactFiberCommitWork.js               |   8 +-
 .../ReactIncrementalPerf-test.internal.js     |   8 +-
 ...actIncrementalSideEffects-test.internal.js | 131 ++++++++++++++++-
 4 files changed, 255 insertions(+), 31 deletions(-)

diff --git a/packages/react-noop-renderer/src/createReactNoop.js b/packages/react-noop-renderer/src/createReactNoop.js
index 648b72d7ee..65af5f42d6 100644
--- a/packages/react-noop-renderer/src/createReactNoop.js
+++ b/packages/react-noop-renderer/src/createReactNoop.js
@@ -45,8 +45,8 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
   let failInBeginPhase = false;
   let failInCompletePhase = false;
 
-  function appendChild(
-    parentInstance: Instance | Container,
+  function appendChildToContainerOrInstance(
+    parentInstance: Container | Instance,
     child: Instance | TextInstance,
   ): void {
     const index = parentInstance.children.indexOf(child);
@@ -56,8 +56,34 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
     parentInstance.children.push(child);
   }
 
-  function insertBefore(
-    parentInstance: Instance | Container,
+  function appendChildToContainer(
+    parentInstance: Container,
+    child: Instance | TextInstance,
+  ): void {
+    if (typeof parentInstance.rootID !== 'string') {
+      // Some calls to this aren't typesafe.
+      // This helps surface mistakes in tests.
+      throw new Error(
+        'appendChildToContainer() first argument is not a container.',
+      );
+    }
+    appendChildToContainerOrInstance(parentInstance, child);
+  }
+
+  function appendChild(
+    parentInstance: Instance,
+    child: Instance | TextInstance,
+  ): void {
+    if (typeof (parentInstance: any).rootID === 'string') {
+      // Some calls to this aren't typesafe.
+      // This helps surface mistakes in tests.
+      throw new Error('appendChild() first argument is not an instance.');
+    }
+    appendChildToContainerOrInstance(parentInstance, child);
+  }
+
+  function insertInContainerOrInstanceBefore(
+    parentInstance: Container | Instance,
     child: Instance | TextInstance,
     beforeChild: Instance | TextInstance,
   ): void {
@@ -72,8 +98,36 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
     parentInstance.children.splice(beforeIndex, 0, child);
   }
 
-  function removeChild(
-    parentInstance: Instance | Container,
+  function insertInContainerBefore(
+    parentInstance: Container,
+    child: Instance | TextInstance,
+    beforeChild: Instance | TextInstance,
+  ) {
+    if (typeof parentInstance.rootID !== 'string') {
+      // Some calls to this aren't typesafe.
+      // This helps surface mistakes in tests.
+      throw new Error(
+        'insertInContainerBefore() first argument is not a container.',
+      );
+    }
+    insertInContainerOrInstanceBefore(parentInstance, child, beforeChild);
+  }
+
+  function insertBefore(
+    parentInstance: Instance,
+    child: Instance | TextInstance,
+    beforeChild: Instance | TextInstance,
+  ) {
+    if (typeof (parentInstance: any).rootID === 'string') {
+      // Some calls to this aren't typesafe.
+      // This helps surface mistakes in tests.
+      throw new Error('insertBefore() first argument is not an instance.');
+    }
+    insertInContainerOrInstanceBefore(parentInstance, child, beforeChild);
+  }
+
+  function removeChildFromContainerOrInstance(
+    parentInstance: Container | Instance,
     child: Instance | TextInstance,
   ): void {
     const index = parentInstance.children.indexOf(child);
@@ -83,6 +137,32 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
     parentInstance.children.splice(index, 1);
   }
 
+  function removeChildFromContainer(
+    parentInstance: Container,
+    child: Instance | TextInstance,
+  ): void {
+    if (typeof parentInstance.rootID !== 'string') {
+      // Some calls to this aren't typesafe.
+      // This helps surface mistakes in tests.
+      throw new Error(
+        'removeChildFromContainer() first argument is not a container.',
+      );
+    }
+    removeChildFromContainerOrInstance(parentInstance, child);
+  }
+
+  function removeChild(
+    parentInstance: Instance,
+    child: Instance | TextInstance,
+  ): void {
+    if (typeof (parentInstance: any).rootID === 'string') {
+      // Some calls to this aren't typesafe.
+      // This helps surface mistakes in tests.
+      throw new Error('removeChild() first argument is not an instance.');
+    }
+    removeChildFromContainerOrInstance(parentInstance, child);
+  }
+
   let elapsedTimeInMs = 0;
 
   const sharedHostConfig = {
@@ -234,12 +314,12 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
           textInstance.text = newText;
         },
 
-        appendChild: appendChild,
-        appendChildToContainer: appendChild,
-        insertBefore: insertBefore,
-        insertInContainerBefore: insertBefore,
-        removeChild: removeChild,
-        removeChildFromContainer: removeChild,
+        appendChild,
+        appendChildToContainer,
+        insertBefore,
+        insertInContainerBefore,
+        removeChild,
+        removeChildFromContainer,
 
         resetTextContent(instance: Instance): void {},
       }
@@ -348,6 +428,20 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
       }
     },
 
+    getOrCreateRootContainer(
+      rootID: string = DEFAULT_ROOT_ID,
+      isAsync: boolean = false,
+    ) {
+      let root = roots.get(rootID);
+      if (!root) {
+        const container = {rootID: rootID, children: []};
+        rootContainers.set(rootID, container);
+        root = NoopRenderer.createContainer(container, isAsync, false);
+        roots.set(rootID, root);
+      }
+      return root.current.stateNode.containerInfo;
+    },
+
     createPortal(
       children: ReactNodeList,
       container: Container,
@@ -363,14 +457,9 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
 
     renderLegacySyncRoot(element: React$Element<any>, callback: ?Function) {
       const rootID = DEFAULT_ROOT_ID;
-      let root = roots.get(rootID);
-      if (!root) {
-        const container = {rootID: rootID, children: []};
-        rootContainers.set(rootID, container);
-        const isAsync = false;
-        root = NoopRenderer.createContainer(container, isAsync, false);
-        roots.set(rootID, root);
-      }
+      const isAsync = false;
+      const container = ReactNoop.getOrCreateRootContainer(rootID, isAsync);
+      const root = roots.get(container.rootID);
       NoopRenderer.updateContainer(element, root, null, callback);
     },
 
@@ -379,13 +468,9 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
       rootID: string,
       callback: ?Function,
     ) {
-      let root = roots.get(rootID);
-      if (!root) {
-        const container = {rootID: rootID, children: []};
-        rootContainers.set(rootID, container);
-        root = NoopRenderer.createContainer(container, true, false);
-        roots.set(rootID, root);
-      }
+      const isAsync = true;
+      const container = ReactNoop.getOrCreateRootContainer(rootID, isAsync);
+      const root = roots.get(container.rootID);
       NoopRenderer.updateContainer(element, root, null, callback);
     },
 
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index 80b391e631..533e173faf 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -598,8 +598,11 @@ function commitPlacement(finishedWork: Fiber): void {
 
   // Recursively insert all host nodes into the parent.
   const parentFiber = getHostParentFiber(finishedWork);
+
+  // Note: these two variables *must* always be updated together.
   let parent;
   let isContainer;
+
   switch (parentFiber.tag) {
     case HostComponent:
       parent = parentFiber.stateNode;
@@ -670,13 +673,15 @@ function commitPlacement(finishedWork: Fiber): void {
 }
 
 function unmountHostComponents(current): void {
-  // We only have the top Fiber that was inserted but we need recurse down its
+  // We only have the top Fiber that was deleted but we need recurse down its
   // children to find all the terminal nodes.
   let node: Fiber = current;
 
   // Each iteration, currentParent is populated with node's host parent if not
   // currentParentIsValid.
   let currentParentIsValid = false;
+
+  // Note: these two variables *must* always be updated together.
   let currentParent;
   let currentParentIsContainer;
 
@@ -722,6 +727,7 @@ function unmountHostComponents(current): void {
       // When we go into a portal, it becomes the parent to remove from.
       // We will reassign it back when we pop the portal on the way up.
       currentParent = node.stateNode.containerInfo;
+      currentParentIsContainer = true;
       // Visit children because portals might contain host components.
       if (node.child !== null) {
         node.child.return = node;
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
index d5d335a169..5001b6968e 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
@@ -539,9 +539,13 @@ describe('ReactDebugFiberPerf', () => {
   });
 
   it('supports portals', () => {
-    const noopContainer = {children: []};
+    const portalContainer = ReactNoop.getOrCreateRootContainer(
+      'portalContainer',
+    );
     ReactNoop.render(
-      <Parent>{ReactNoop.createPortal(<Child />, noopContainer, null)}</Parent>,
+      <Parent>
+        {ReactNoop.createPortal(<Child />, portalContainer, null)}
+      </Parent>,
     );
     ReactNoop.flush();
     expect(getFlameChart()).toMatchSnapshot();
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalSideEffects-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalSideEffects-test.internal.js
index d51115b301..4b814eeb7c 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalSideEffects-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalSideEffects-test.internal.js
@@ -24,7 +24,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};
   }
 
@@ -32,6 +32,10 @@ describe('ReactIncrementalSideEffects', () => {
     return {type: 'span', children: [], prop};
   }
 
+  function text(t) {
+    return {text: t};
+  }
+
   it('can update child nodes of a host instance', () => {
     function Bar(props) {
       return <span>{props.text}</span>;
@@ -240,6 +244,131 @@ describe('ReactIncrementalSideEffects', () => {
     expect(ReactNoop.getChildren()).toEqual([div('Trail')]);
   });
 
+  it('can delete a child when it unmounts inside a portal', () => {
+    function Bar(props) {
+      return <span prop={props.children} />;
+    }
+
+    const portalContainer = ReactNoop.getOrCreateRootContainer(
+      'portalContainer',
+    );
+    function Foo(props) {
+      return ReactNoop.createPortal(
+        props.show ? [<div key="a" />, <Bar key="b">Hello</Bar>, 'World'] : [],
+        portalContainer,
+        null,
+      );
+    }
+
+    ReactNoop.render(
+      <div>
+        <Foo show={true} />
+      </div>,
+    );
+    ReactNoop.flush();
+    expect(ReactNoop.getChildren()).toEqual([div()]);
+    expect(ReactNoop.getChildren('portalContainer')).toEqual([
+      div(),
+      span('Hello'),
+      text('World'),
+    ]);
+
+    ReactNoop.render(
+      <div>
+        <Foo show={false} />
+      </div>,
+    );
+    ReactNoop.flush();
+    expect(ReactNoop.getChildren()).toEqual([div()]);
+    expect(ReactNoop.getChildren('portalContainer')).toEqual([]);
+
+    ReactNoop.render(
+      <div>
+        <Foo show={true} />
+      </div>,
+    );
+    ReactNoop.flush();
+    expect(ReactNoop.getChildren()).toEqual([div()]);
+    expect(ReactNoop.getChildren('portalContainer')).toEqual([
+      div(),
+      span('Hello'),
+      text('World'),
+    ]);
+
+    ReactNoop.render(null);
+    ReactNoop.flush();
+    expect(ReactNoop.getChildren()).toEqual([]);
+    expect(ReactNoop.getChildren('portalContainer')).toEqual([]);
+
+    ReactNoop.render(<Foo show={false} />);
+    ReactNoop.flush();
+    expect(ReactNoop.getChildren()).toEqual([]);
+    expect(ReactNoop.getChildren('portalContainer')).toEqual([]);
+
+    ReactNoop.render(<Foo show={true} />);
+    ReactNoop.flush();
+    expect(ReactNoop.getChildren()).toEqual([]);
+    expect(ReactNoop.getChildren('portalContainer')).toEqual([
+      div(),
+      span('Hello'),
+      text('World'),
+    ]);
+
+    ReactNoop.render(null);
+    ReactNoop.flush();
+    expect(ReactNoop.getChildren()).toEqual([]);
+    expect(ReactNoop.getChildren('portalContainer')).toEqual([]);
+  });
+
+  it('can delete a child when it unmounts with a portal', () => {
+    function Bar(props) {
+      return <span prop={props.children} />;
+    }
+
+    const portalContainer = ReactNoop.getOrCreateRootContainer(
+      'portalContainer',
+    );
+    function Foo(props) {
+      return ReactNoop.createPortal(
+        [<div key="a" />, <Bar key="b">Hello</Bar>, 'World'],
+        portalContainer,
+        null,
+      );
+    }
+
+    ReactNoop.render(
+      <div>
+        <Foo />
+      </div>,
+    );
+    ReactNoop.flush();
+    expect(ReactNoop.getChildren()).toEqual([div()]);
+    expect(ReactNoop.getChildren('portalContainer')).toEqual([
+      div(),
+      span('Hello'),
+      text('World'),
+    ]);
+
+    ReactNoop.render(null);
+    ReactNoop.flush();
+    expect(ReactNoop.getChildren()).toEqual([]);
+    expect(ReactNoop.getChildren('portalContainer')).toEqual([]);
+
+    ReactNoop.render(<Foo />);
+    ReactNoop.flush();
+    expect(ReactNoop.getChildren()).toEqual([]);
+    expect(ReactNoop.getChildren('portalContainer')).toEqual([
+      div(),
+      span('Hello'),
+      text('World'),
+    ]);
+
+    ReactNoop.render(null);
+    ReactNoop.flush();
+    expect(ReactNoop.getChildren()).toEqual([]);
+    expect(ReactNoop.getChildren('portalContainer')).toEqual([]);
+  });
+
   it('does not update child nodes if a flush is aborted', () => {
     function Bar(props) {
       return <span prop={props.text} />;

From 82c7ca4cca90976cd1230e03ea1a4372a4276e67 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 17 Jul 2018 20:15:03 +0100
Subject: [PATCH 233/277] Add component stacks to some warnings (#13218)

---
 .../src/__tests__/ReactDOMComponent-test.js   | 40 ++++---------------
 .../src/__tests__/ReactDOMInput-test.js       |  2 -
 .../src/__tests__/ReactDOMSelect-test.js      | 21 ++++------
 ...eactDOMServerIntegrationAttributes-test.js |  4 +-
 .../ReactDOMServerIntegrationElements-test.js |  4 +-
 .../src/__tests__/ReactDOMTextarea-test.js    |  7 ----
 .../__tests__/ReactServerRendering-test.js    | 21 +++++-----
 .../src/client/ReactDOMFiberComponent.js      |  8 ++--
 .../src/client/ReactDOMFiberInput.js          |  5 +--
 .../src/client/ReactDOMFiberOption.js         |  4 +-
 .../src/client/ReactDOMFiberSelect.js         |  8 ++--
 .../src/client/ReactDOMFiberTextarea.js       |  6 +--
 .../src/server/ReactPartialRenderer.js        | 23 +++++------
 packages/react-dom/src/shared/DOMProperty.js  |  4 +-
 .../src/shared/ReactDOMUnknownPropertyHook.js |  7 ++--
 .../src/ReactFiberBeginWork.js                |  2 +-
 .../ReactNewContext-test.internal.js          |  9 +++--
 17 files changed, 65 insertions(+), 110 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
index 08a83ace2e..441545fc0a 100644
--- a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
@@ -567,7 +567,6 @@ describe('ReactDOMComponent', () => {
         }
       }).toWarnDev(
         'Warning: Invalid attribute name: `blah" onclick="beevil" noise="hi`',
-        {withoutStack: true}, // TODO: add a stack
       );
     });
 
@@ -587,7 +586,6 @@ describe('ReactDOMComponent', () => {
         }
       }).toWarnDev(
         'Warning: Invalid attribute name: `blah" onclick="beevil" noise="hi`',
-        {withoutStack: true}, // TODO: add a stack
       );
     });
 
@@ -1006,7 +1004,6 @@ describe('ReactDOMComponent', () => {
         '<BR /> is using incorrect casing. ' +
           'Use PascalCase for React components, ' +
           'or lowercase for HTML elements.',
-        {withoutStack: true}, // TODO: add a stack
       );
       expect(returnedValue).not.toContain('</BR>');
     });
@@ -1023,7 +1020,6 @@ describe('ReactDOMComponent', () => {
         '<IMG /> is using incorrect casing. ' +
           'Use PascalCase for React components, ' +
           'or lowercase for HTML elements.',
-        {withoutStack: true}, // TODO: add a stack
       );
     });
 
@@ -1033,7 +1029,6 @@ describe('ReactDOMComponent', () => {
       ).toWarnDev(
         'The `aria` attribute is reserved for future use in React. ' +
           'Pass individual `aria-` attributes instead.',
-        {withoutStack: true}, // TODO: add a stack
       );
     });
 
@@ -1056,12 +1051,10 @@ describe('ReactDOMComponent', () => {
 
         expect(() => ReactTestUtils.renderIntoDocument(<bar />)).toWarnDev(
           'The tag <bar> is unrecognized in this browser',
-          {withoutStack: true}, // TODO: add a stack
         );
         // Test deduplication
         expect(() => ReactTestUtils.renderIntoDocument(<foo />)).toWarnDev(
           'The tag <foo> is unrecognized in this browser',
-          {withoutStack: true}, // TODO: add a stack
         );
         ReactTestUtils.renderIntoDocument(<foo />);
         // This is a funny case.
@@ -1073,15 +1066,12 @@ describe('ReactDOMComponent', () => {
         // Corner case. Make sure out deduplication logic doesn't break with weird tag.
         expect(() =>
           ReactTestUtils.renderIntoDocument(<hasOwnProperty />),
-        ).toWarnDev(
-          [
-            '<hasOwnProperty /> is using incorrect casing. ' +
-              'Use PascalCase for React components, ' +
-              'or lowercase for HTML elements.',
-            'The tag <hasOwnProperty> is unrecognized in this browser',
-          ],
-          {withoutStack: true}, // TODO: add a stack
-        );
+        ).toWarnDev([
+          '<hasOwnProperty /> is using incorrect casing. ' +
+            'Use PascalCase for React components, ' +
+            'or lowercase for HTML elements.',
+          'The tag <hasOwnProperty> is unrecognized in this browser',
+        ]);
       } finally {
         Object.prototype.toString = realToString; // eslint-disable-line no-extend-native
       }
@@ -1140,7 +1130,6 @@ describe('ReactDOMComponent', () => {
         expect(() => ReactDOM.render(<ShadyComponent />, node)).toWarnDev(
           'ShadyComponent is using shady DOM. Using shady DOM with React can ' +
             'cause things to break subtly.',
-          {withoutStack: true}, // TODO: add a stack
         );
         mountComponent({is: 'custom-shady-div2'});
       } finally {
@@ -1161,7 +1150,6 @@ describe('ReactDOMComponent', () => {
         expect(() => mountComponent({is: 'custom-shady-div'})).toWarnDev(
           'A component is using shady DOM. Using shady DOM with React can ' +
             'cause things to break subtly.',
-          {withoutStack: true}, // TODO: add a stack
         );
 
         // No additional warnings are expected
@@ -1209,17 +1197,13 @@ describe('ReactDOMComponent', () => {
     it('should validate against use of innerHTML', () => {
       expect(() =>
         mountComponent({innerHTML: '<span>Hi Jim!</span>'}),
-      ).toWarnDev('Directly setting property `innerHTML` is not permitted. ', {
-        withoutStack: true, // TODO: add a stack
-      });
+      ).toWarnDev('Directly setting property `innerHTML` is not permitted. ');
     });
 
     it('should validate against use of innerHTML without case sensitivity', () => {
       expect(() =>
         mountComponent({innerhtml: '<span>Hi Jim!</span>'}),
-      ).toWarnDev('Directly setting property `innerHTML` is not permitted. ', {
-        withoutStack: true, // TODO: add a stack
-      });
+      ).toWarnDev('Directly setting property `innerHTML` is not permitted. ');
     });
 
     it('should validate use of dangerouslySetInnerHTML', () => {
@@ -1812,13 +1796,11 @@ describe('ReactDOMComponent', () => {
         ReactTestUtils.renderIntoDocument(<div onFocusIn={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
-        {withoutStack: true}, // TODO: add a stack
       );
       expect(() =>
         ReactTestUtils.renderIntoDocument(<div onFocusOut={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
-        {withoutStack: true}, // TODO: add a stack
       );
     });
 
@@ -1828,13 +1810,11 @@ describe('ReactDOMComponent', () => {
         ReactTestUtils.renderIntoDocument(<div onfocusin={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
-        {withoutStack: true}, // TODO: add a stack
       );
       expect(() =>
         ReactTestUtils.renderIntoDocument(<div onfocusout={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
-        {withoutStack: true}, // TODO: add a stack
       );
     });
 
@@ -1844,13 +1824,11 @@ describe('ReactDOMComponent', () => {
         ReactDOMServer.renderToString(<div onFocusIn={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
-        {withoutStack: true}, // TODO: add a stack
       );
       expect(() =>
         ReactDOMServer.renderToString(<div onFocusOut={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
-        {withoutStack: true}, // TODO: add a stack
       );
     });
 
@@ -1860,13 +1838,11 @@ describe('ReactDOMComponent', () => {
         ReactDOMServer.renderToString(<div onfocusin={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
-        {withoutStack: true}, // TODO: add a stack
       );
       expect(() =>
         ReactDOMServer.renderToString(<div onfocusout={() => {}} />),
       ).toWarnDev(
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut.',
-        {withoutStack: true}, // TODO: add a stack
       );
     });
 
diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index aaa2083934..480287cfc0 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -930,7 +930,6 @@ describe('ReactDOMInput', () => {
         'both). Decide between using a controlled or uncontrolled input ' +
         'element and remove one of these props. More info: ' +
         'https://fb.me/react-controlled-components',
-      {withoutStack: true}, // TODO: add a stack
     );
     ReactDOM.unmountComponentAtNode(container);
 
@@ -958,7 +957,6 @@ describe('ReactDOMInput', () => {
         'both). Decide between using a controlled or uncontrolled input ' +
         'element and remove one of these props. More info: ' +
         'https://fb.me/react-controlled-components',
-      {withoutStack: true}, // TODO: add a stack
     );
     ReactDOM.unmountComponentAtNode(container);
 
diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index 8ed6f32d0f..5548c03931 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -566,25 +566,21 @@ describe('ReactDOMSelect', () => {
   });
 
   it('should warn if selected is set on <option>', () => {
-    expect(() =>
-      ReactTestUtils.renderIntoDocument(
+    function App() {
+      return (
         <select>
           <option selected={true} />
           <option selected={true} />
-        </select>,
-      ),
-    ).toWarnDev(
+        </select>
+      );
+    }
+
+    expect(() => ReactTestUtils.renderIntoDocument(<App />)).toWarnDev(
       'Use the `defaultValue` or `value` props on <select> instead of ' +
         'setting `selected` on <option>.',
-      {withoutStack: true}, // TODO: add a stack
     );
 
-    ReactTestUtils.renderIntoDocument(
-      <select>
-        <option selected={true} />
-        <option selected={true} />
-      </select>,
-    );
+    ReactTestUtils.renderIntoDocument(<App />);
   });
 
   it('should warn if value is null and multiple is true', () => {
@@ -647,7 +643,6 @@ describe('ReactDOMSelect', () => {
         'both). Decide between using a controlled or uncontrolled select ' +
         'element and remove one of these props. More info: ' +
         'https://fb.me/react-controlled-components',
-      {withoutStack: true}, // TODO: add a stack
     );
 
     ReactTestUtils.renderIntoDocument(
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationAttributes-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationAttributes-test.js
index 0211f483f5..2838ad660a 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationAttributes-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationAttributes-test.js
@@ -598,9 +598,7 @@ describe('ReactDOMServerIntegration', () => {
         // so that it gets deduplicated later, and doesn't fail the test.
         expect(() => {
           ReactDOM.render(<nonstandard />, document.createElement('div'));
-        }).toWarnDev('The tag <nonstandard> is unrecognized in this browser.', {
-          withoutStack: true, // TODO: add a stack
-        });
+        }).toWarnDev('The tag <nonstandard> is unrecognized in this browser.');
 
         const e = await render(<nonstandard foo="bar" />);
         expect(e.getAttribute('foo')).toBe('bar');
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationElements-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationElements-test.js
index 087b66474c..dc0631d1d0 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationElements-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationElements-test.js
@@ -142,9 +142,7 @@ describe('ReactDOMServerIntegration', () => {
         // so that it gets deduplicated later, and doesn't fail the test.
         expect(() => {
           ReactDOM.render(<nonstandard />, document.createElement('div'));
-        }).toWarnDev('The tag <nonstandard> is unrecognized in this browser.', {
-          withoutStack: true, // TODO: add a stack
-        });
+        }).toWarnDev('The tag <nonstandard> is unrecognized in this browser.');
 
         const e = await render(<nonstandard>Text</nonstandard>);
         expect(e.tagName).toBe('NONSTANDARD');
diff --git a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
index 619d59380f..73522ace5d 100644
--- a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
@@ -267,7 +267,6 @@ describe('ReactDOMTextarea', () => {
       node = renderTextarea(stub, container);
     }).toWarnDev(
       'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',
-      {withoutStack: true}, // TODO: add a stack
     );
 
     expect(node.value).toBe('giraffe');
@@ -320,7 +319,6 @@ describe('ReactDOMTextarea', () => {
       node = renderTextarea(<textarea>{17}</textarea>);
     }).toWarnDev(
       'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',
-      {withoutStack: true}, // TODO: add a stack
     );
     expect(node.value).toBe('17');
   });
@@ -331,7 +329,6 @@ describe('ReactDOMTextarea', () => {
       node = renderTextarea(<textarea>{false}</textarea>);
     }).toWarnDev(
       'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',
-      {withoutStack: true}, // TODO: add a stack
     );
     expect(node.value).toBe('false');
   });
@@ -347,7 +344,6 @@ describe('ReactDOMTextarea', () => {
       node = renderTextarea(<textarea>{obj}</textarea>);
     }).toWarnDev(
       'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',
-      {withoutStack: true}, // TODO: add a stack
     );
     expect(node.value).toBe('sharkswithlasers');
   });
@@ -363,7 +359,6 @@ describe('ReactDOMTextarea', () => {
         ),
       ).toWarnDev(
         'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',
-        {withoutStack: true}, // TODO: add a stack
       );
     }).toThrow();
 
@@ -378,7 +373,6 @@ describe('ReactDOMTextarea', () => {
           )),
       ).toWarnDev(
         'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',
-        {withoutStack: true}, // TODO: add a stack
       );
     }).not.toThrow();
 
@@ -415,7 +409,6 @@ describe('ReactDOMTextarea', () => {
         'both). Decide between using a controlled or uncontrolled textarea ' +
         'and remove one of these props. More info: ' +
         'https://fb.me/react-controlled-components',
-      {withoutStack: true}, // TODO: add a stack
     );
 
     // No additional warnings are expected
diff --git a/packages/react-dom/src/__tests__/ReactServerRendering-test.js b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
index e3b05d7328..9c6c8c29ee 100644
--- a/packages/react-dom/src/__tests__/ReactServerRendering-test.js
+++ b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
@@ -601,18 +601,15 @@ describe('ReactDOMServer', () => {
           </svg>
         </div>,
       ),
-    ).toWarnDev(
-      [
-        'Warning: <inPUT /> is using incorrect casing. ' +
-          'Use PascalCase for React components, ' +
-          'or lowercase for HTML elements.',
-        // linearGradient doesn't warn
-        'Warning: <iFrame /> is using incorrect casing. ' +
-          'Use PascalCase for React components, ' +
-          'or lowercase for HTML elements.',
-      ],
-      {withoutStack: true},
-    );
+    ).toWarnDev([
+      'Warning: <inPUT /> is using incorrect casing. ' +
+        'Use PascalCase for React components, ' +
+        'or lowercase for HTML elements.',
+      // linearGradient doesn't warn
+      'Warning: <iFrame /> is using incorrect casing. ' +
+        'Use PascalCase for React components, ' +
+        'or lowercase for HTML elements.',
+    ]);
   });
 
   it('should warn about contentEditable and children', () => {
diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js
index d44e243e5d..bad296429e 100644
--- a/packages/react-dom/src/client/ReactDOMFiberComponent.js
+++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js
@@ -353,7 +353,7 @@ export function createElement(
       isCustomComponentTag = isCustomComponent(type, props);
       // Should this check be gated by parent namespace? Not sure we want to
       // allow <SVG> or <mATH>.
-      warningWithoutStack(
+      warning(
         isCustomComponentTag || type === type.toLowerCase(),
         '<%s /> is using incorrect casing. ' +
           'Use PascalCase for React components, ' +
@@ -392,7 +392,7 @@ export function createElement(
         !Object.prototype.hasOwnProperty.call(warnedUnknownTags, type)
       ) {
         warnedUnknownTags[type] = true;
-        warningWithoutStack(
+        warning(
           false,
           'The tag <%s> is unrecognized in this browser. ' +
             'If you meant to render a React component, start its name with ' +
@@ -429,7 +429,7 @@ export function setInitialProperties(
       !didWarnShadyDOM &&
       (domElement: any).shadyRoot
     ) {
-      warningWithoutStack(
+      warning(
         false,
         '%s is using shady DOM. Using shady DOM with React can ' +
           'cause things to break subtly.',
@@ -821,7 +821,7 @@ export function diffHydratedProperties(
       !didWarnShadyDOM &&
       (domElement: any).shadyRoot
     ) {
-      warningWithoutStack(
+      warning(
         false,
         '%s is using shady DOM. Using shady DOM with React can ' +
           'cause things to break subtly.',
diff --git a/packages/react-dom/src/client/ReactDOMFiberInput.js b/packages/react-dom/src/client/ReactDOMFiberInput.js
index b6c113bfaf..8547aa50c1 100644
--- a/packages/react-dom/src/client/ReactDOMFiberInput.js
+++ b/packages/react-dom/src/client/ReactDOMFiberInput.js
@@ -11,7 +11,6 @@
 import {getCurrentFiberOwnerNameInDevOrNull} from 'react-reconciler/src/ReactCurrentFiber';
 import invariant from 'shared/invariant';
 import warning from 'shared/warning';
-import warningWithoutStack from 'shared/warningWithoutStack';
 
 import * as DOMPropertyOperations from './DOMPropertyOperations';
 import {getFiberCurrentPropsFromNode} from './ReactDOMComponentTree';
@@ -76,7 +75,7 @@ export function initWrapperState(element: Element, props: Object) {
       props.defaultChecked !== undefined &&
       !didWarnCheckedDefaultChecked
     ) {
-      warningWithoutStack(
+      warning(
         false,
         '%s contains an input of type %s with both checked and defaultChecked props. ' +
           'Input elements must be either controlled or uncontrolled ' +
@@ -94,7 +93,7 @@ export function initWrapperState(element: Element, props: Object) {
       props.defaultValue !== undefined &&
       !didWarnValueDefaultValue
     ) {
-      warningWithoutStack(
+      warning(
         false,
         '%s contains an input of type %s with both value and defaultValue props. ' +
           'Input elements must be either controlled or uncontrolled ' +
diff --git a/packages/react-dom/src/client/ReactDOMFiberOption.js b/packages/react-dom/src/client/ReactDOMFiberOption.js
index 386f0052b8..e5c04d2392 100644
--- a/packages/react-dom/src/client/ReactDOMFiberOption.js
+++ b/packages/react-dom/src/client/ReactDOMFiberOption.js
@@ -8,7 +8,7 @@
  */
 
 import React from 'react';
-import warningWithoutStack from 'shared/warningWithoutStack';
+import warning from 'shared/warning';
 
 let didWarnSelectedSetOnOption = false;
 
@@ -39,7 +39,7 @@ export function validateProps(element: Element, props: Object) {
   // TODO (yungsters): Remove support for `selected` in <option>.
   if (__DEV__) {
     if (props.selected != null && !didWarnSelectedSetOnOption) {
-      warningWithoutStack(
+      warning(
         false,
         'Use the `defaultValue` or `value` props on <select> instead of ' +
           'setting `selected` on <option>.',
diff --git a/packages/react-dom/src/client/ReactDOMFiberSelect.js b/packages/react-dom/src/client/ReactDOMFiberSelect.js
index 09b5d14f30..dfe71a6ae9 100644
--- a/packages/react-dom/src/client/ReactDOMFiberSelect.js
+++ b/packages/react-dom/src/client/ReactDOMFiberSelect.js
@@ -9,7 +9,7 @@
 
 // TODO: direct imports like some-package/src/* are bad. Fix me.
 import {getCurrentFiberOwnerNameInDevOrNull} from 'react-reconciler/src/ReactCurrentFiber';
-import warningWithoutStack from 'shared/warningWithoutStack';
+import warning from 'shared/warning';
 
 import ReactControlledValuePropTypes from '../shared/ReactControlledValuePropTypes';
 
@@ -49,7 +49,7 @@ function checkSelectPropTypes(props) {
     }
     const isArray = Array.isArray(props[propName]);
     if (props.multiple && !isArray) {
-      warningWithoutStack(
+      warning(
         false,
         'The `%s` prop supplied to <select> must be an array if ' +
           '`multiple` is true.%s',
@@ -57,7 +57,7 @@ function checkSelectPropTypes(props) {
         getDeclarationErrorAddendum(),
       );
     } else if (!props.multiple && isArray) {
-      warningWithoutStack(
+      warning(
         false,
         'The `%s` prop supplied to <select> must be a scalar ' +
           'value if `multiple` is false.%s',
@@ -158,7 +158,7 @@ export function initWrapperState(element: Element, props: Object) {
       props.defaultValue !== undefined &&
       !didWarnValueDefaultValue
     ) {
-      warningWithoutStack(
+      warning(
         false,
         'Select elements must be either controlled or uncontrolled ' +
           '(specify either the value prop, or the defaultValue prop, but not ' +
diff --git a/packages/react-dom/src/client/ReactDOMFiberTextarea.js b/packages/react-dom/src/client/ReactDOMFiberTextarea.js
index 3d1af204aa..b891872653 100644
--- a/packages/react-dom/src/client/ReactDOMFiberTextarea.js
+++ b/packages/react-dom/src/client/ReactDOMFiberTextarea.js
@@ -8,7 +8,7 @@
  */
 
 import invariant from 'shared/invariant';
-import warningWithoutStack from 'shared/warningWithoutStack';
+import warning from 'shared/warning';
 
 import ReactControlledValuePropTypes from '../shared/ReactControlledValuePropTypes';
 
@@ -68,7 +68,7 @@ export function initWrapperState(element: Element, props: Object) {
       props.defaultValue !== undefined &&
       !didWarnValDefaultVal
     ) {
-      warningWithoutStack(
+      warning(
         false,
         'Textarea elements must be either controlled or uncontrolled ' +
           '(specify either the value prop, or the defaultValue prop, but not ' +
@@ -89,7 +89,7 @@ export function initWrapperState(element: Element, props: Object) {
     let children = props.children;
     if (children != null) {
       if (__DEV__) {
-        warningWithoutStack(
+        warning(
           false,
           'Use the `defaultValue` or `value` props instead of setting ' +
             'children on <textarea>.',
diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index 230d881a8f..357eb8eb8e 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -18,6 +18,7 @@ import React from 'react';
 import invariant from 'shared/invariant';
 import getComponentName from 'shared/getComponentName';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
+import warning from 'shared/warning';
 import warningWithoutStack from 'shared/warningWithoutStack';
 import checkPropTypes from 'prop-types/checkPropTypes';
 import describeComponentFrame from 'shared/describeComponentFrame';
@@ -1022,7 +1023,7 @@ class ReactDOMServerRenderer {
       if (namespace === Namespaces.html) {
         // Should this check be gated by parent namespace? Not sure we want to
         // allow <SVG> or <mATH>.
-        warningWithoutStack(
+        warning(
           tag === element.type,
           '<%s /> is using incorrect casing. ' +
             'Use PascalCase for React components, ' +
@@ -1044,7 +1045,7 @@ class ReactDOMServerRenderer {
           props.defaultChecked !== undefined &&
           !didWarnDefaultChecked
         ) {
-          warningWithoutStack(
+          warning(
             false,
             '%s contains an input of type %s with both checked and defaultChecked props. ' +
               'Input elements must be either controlled or uncontrolled ' +
@@ -1062,7 +1063,7 @@ class ReactDOMServerRenderer {
           props.defaultValue !== undefined &&
           !didWarnDefaultInputValue
         ) {
-          warningWithoutStack(
+          warning(
             false,
             '%s contains an input of type %s with both value and defaultValue props. ' +
               'Input elements must be either controlled or uncontrolled ' +
@@ -1097,7 +1098,7 @@ class ReactDOMServerRenderer {
           props.defaultValue !== undefined &&
           !didWarnDefaultTextareaValue
         ) {
-          warningWithoutStack(
+          warning(
             false,
             'Textarea elements must be either controlled or uncontrolled ' +
               '(specify either the value prop, or the defaultValue prop, but not ' +
@@ -1116,7 +1117,7 @@ class ReactDOMServerRenderer {
         let textareaChildren = props.children;
         if (textareaChildren != null) {
           if (__DEV__) {
-            warningWithoutStack(
+            warning(
               false,
               'Use the `defaultValue` or `value` props instead of setting ' +
                 'children on <textarea>.',
@@ -1157,20 +1158,18 @@ class ReactDOMServerRenderer {
           }
           const isArray = Array.isArray(props[propName]);
           if (props.multiple && !isArray) {
-            warningWithoutStack(
+            warning(
               false,
               'The `%s` prop supplied to <select> must be an array if ' +
-                '`multiple` is true.%s',
+                '`multiple` is true.',
               propName,
-              '', // getDeclarationErrorAddendum(),
             );
           } else if (!props.multiple && isArray) {
-            warningWithoutStack(
+            warning(
               false,
               'The `%s` prop supplied to <select> must be a scalar ' +
-                'value if `multiple` is false.%s',
+                'value if `multiple` is false.',
               propName,
-              '', // getDeclarationErrorAddendum(),
             );
           }
         }
@@ -1180,7 +1179,7 @@ class ReactDOMServerRenderer {
           props.defaultValue !== undefined &&
           !didWarnDefaultSelectValue
         ) {
-          warningWithoutStack(
+          warning(
             false,
             'Select elements must be either controlled or uncontrolled ' +
               '(specify either the value prop, or the defaultValue prop, but not ' +
diff --git a/packages/react-dom/src/shared/DOMProperty.js b/packages/react-dom/src/shared/DOMProperty.js
index 036e7344c2..31f222b978 100644
--- a/packages/react-dom/src/shared/DOMProperty.js
+++ b/packages/react-dom/src/shared/DOMProperty.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import warningWithoutStack from 'shared/warningWithoutStack';
+import warning from 'shared/warning';
 
 type PropertyType = 0 | 1 | 2 | 3 | 4 | 5 | 6;
 
@@ -82,7 +82,7 @@ export function isAttributeNameSafe(attributeName: string): boolean {
   }
   illegalAttributeNameCache[attributeName] = true;
   if (__DEV__) {
-    warningWithoutStack(false, 'Invalid attribute name: `%s`', attributeName);
+    warning(false, 'Invalid attribute name: `%s`', attributeName);
   }
   return false;
 }
diff --git a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js
index e6b59385e0..9e7fda4e6c 100644
--- a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js
+++ b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js
@@ -10,7 +10,6 @@ import {
   possibleRegistrationNames,
 } from 'events/EventPluginRegistry';
 import warning from 'shared/warning';
-import warningWithoutStack from 'shared/warningWithoutStack';
 
 import {
   ATTRIBUTE_NAME_CHAR,
@@ -38,7 +37,7 @@ if (__DEV__) {
 
     const lowerCasedName = name.toLowerCase();
     if (lowerCasedName === 'onfocusin' || lowerCasedName === 'onfocusout') {
-      warningWithoutStack(
+      warning(
         false,
         'React uses onFocus and onBlur instead of onFocusIn and onFocusOut. ' +
           'All React events are normalized to bubble, so onFocusIn and onFocusOut ' +
@@ -99,7 +98,7 @@ if (__DEV__) {
     }
 
     if (lowerCasedName === 'innerhtml') {
-      warningWithoutStack(
+      warning(
         false,
         'Directly setting property `innerHTML` is not permitted. ' +
           'For more information, lookup documentation on `dangerouslySetInnerHTML`.',
@@ -109,7 +108,7 @@ if (__DEV__) {
     }
 
     if (lowerCasedName === 'aria') {
-      warningWithoutStack(
+      warning(
         false,
         'The `aria` attribute is reserved for future use in React. ' +
           'Pass individual `aria-` attributes instead.',
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 5137674cf9..8eb9e2188b 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -976,7 +976,7 @@ function updateContextProvider(current, workInProgress, renderExpirationTime) {
             ? context._calculateChangedBits(oldValue, newValue)
             : MAX_SIGNED_31_BIT_INT;
         if (__DEV__) {
-          warningWithoutStack(
+          warning(
             (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
             'calculateChangedBits: Expected the return value to be a ' +
               '31-bit integer. Instead received: %s',
diff --git a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
index 872ce0abaf..5b56fbf287 100644
--- a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
@@ -706,15 +706,18 @@ describe('ReactNewContext', () => {
       (a, b) => Math.pow(2, 32) - 1, // Return 32 bit int
     );
 
-    ReactNoop.render(<Context.Provider value={1} />);
+    function App(props) {
+      return <Context.Provider value={props.value} />;
+    }
+
+    ReactNoop.render(<App value={1} />);
     ReactNoop.flush();
 
     // Update
-    ReactNoop.render(<Context.Provider value={2} />);
+    ReactNoop.render(<App value={2} />);
     expect(ReactNoop.flush).toWarnDev(
       'calculateChangedBits: Expected the return value to be a 31-bit ' +
         'integer. Instead received: 4294967295',
-      {withoutStack: true}, // TODO: add a stack
     );
   });
 

From 6d3e2628809b94b334551344b4f1fe1c79c16e5b Mon Sep 17 00:00:00 2001
From: jddxf <740531372@qq.com>
Date: Wed, 18 Jul 2018 03:18:15 +0800
Subject: [PATCH 234/277] Remove unnecessary `typeof` checks (#13196)

This aligns with #10351 which removed extra check on `injectInternals`.
---
 packages/react-reconciler/src/ReactFiberCommitWork.js       | 4 +---
 packages/react-reconciler/src/ReactFiberScheduler.js        | 4 +---
 packages/react/src/__tests__/ReactProfiler-test.internal.js | 2 ++
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index 533e173faf..d5fb55b492 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -398,9 +398,7 @@ function commitDetachRef(current: Fiber) {
 // deletion, so don't let them throw. Host-originating errors should
 // interrupt deletion, so it's okay
 function commitUnmount(current: Fiber): void {
-  if (typeof onCommitUnmount === 'function') {
-    onCommitUnmount(current);
-  }
+  onCommitUnmount(current);
 
   switch (current.tag) {
     case ClassComponent: {
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 72f2022c6d..13a321f60d 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -700,9 +700,7 @@ function commitRoot(root: FiberRoot, finishedWork: Fiber): void {
   isWorking = false;
   stopCommitLifeCyclesTimer();
   stopCommitTimer();
-  if (typeof onCommitRoot === 'function') {
-    onCommitRoot(finishedWork.stateNode);
-  }
+  onCommitRoot(finishedWork.stateNode);
   if (__DEV__ && ReactFiberInstrumentation.debugTool) {
     ReactFiberInstrumentation.debugTool.onCommitWork(finishedWork);
   }
diff --git a/packages/react/src/__tests__/ReactProfiler-test.internal.js b/packages/react/src/__tests__/ReactProfiler-test.internal.js
index 74f491a01f..d124729564 100644
--- a/packages/react/src/__tests__/ReactProfiler-test.internal.js
+++ b/packages/react/src/__tests__/ReactProfiler-test.internal.js
@@ -37,6 +37,8 @@ function loadModules({
 const mockDevToolsForTest = () => {
   jest.mock('react-reconciler/src/ReactFiberDevToolsHook', () => ({
     injectInternals: () => {},
+    onCommitRoot: () => {},
+    onCommitUnmount: () => {},
     isDevToolsPresent: true,
   }));
 };

From 9f78913b20d52a5849dd26aafebfbc3caf190812 Mon Sep 17 00:00:00 2001
From: Johan Henriksson <johan.c.henriksson@gmail.com>
Date: Tue, 17 Jul 2018 21:18:34 +0200
Subject: [PATCH 235/277] Update prettier (#13205)

* Update Prettier to 1.13.7

* Apply Prettier changes

* Pin prettier version

* EOL
---
 .prettierrc.js                                            | 1 +
 package.json                                              | 2 +-
 packages/events/EventPluginUtils.js                       | 8 ++++++--
 packages/events/ResponderEventPlugin.js                   | 8 ++++++--
 .../src/__tests__/ReactComponentLifeCycle-test.js         | 3 ++-
 packages/react-dom/src/events/SyntheticWheelEvent.js      | 8 ++++++--
 packages/react-dom/src/events/TapEventPlugin.js           | 4 +++-
 packages/react-test-renderer/src/ReactShallowRenderer.js  | 4 +++-
 packages/shared/describeComponentFrame.js                 | 4 +++-
 scripts/bench/stats.js                                    | 2 +-
 yarn.lock                                                 | 6 +++---
 11 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/.prettierrc.js b/.prettierrc.js
index 9792c85118..16d8927169 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -6,6 +6,7 @@ module.exports = {
   jsxBracketSameLine: true,
   trailingComma: 'es5',
   printWidth: 80,
+  parser: 'babylon',
 
   overrides: [
     {
diff --git a/package.json b/package.json
index b484024e86..cb79d5b7db 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "ncp": "^2.0.0",
     "object-assign": "^4.1.1",
     "platform": "^1.1.0",
-    "prettier": "1.11.1",
+    "prettier": "1.13.7",
     "prop-types": "^15.6.2",
     "random-seed": "^0.3.0",
     "react-lifecycles-compat": "^3.0.2",
diff --git a/packages/events/EventPluginUtils.js b/packages/events/EventPluginUtils.js
index 2bbe2b36d9..6e7397d69f 100644
--- a/packages/events/EventPluginUtils.js
+++ b/packages/events/EventPluginUtils.js
@@ -39,12 +39,16 @@ if (__DEV__) {
     const listenersIsArr = Array.isArray(dispatchListeners);
     const listenersLen = listenersIsArr
       ? dispatchListeners.length
-      : dispatchListeners ? 1 : 0;
+      : dispatchListeners
+        ? 1
+        : 0;
 
     const instancesIsArr = Array.isArray(dispatchInstances);
     const instancesLen = instancesIsArr
       ? dispatchInstances.length
-      : dispatchInstances ? 1 : 0;
+      : dispatchInstances
+        ? 1
+        : 0;
 
     warningWithoutStack(
       instancesIsArr === listenersIsArr && instancesLen === listenersLen,
diff --git a/packages/events/ResponderEventPlugin.js b/packages/events/ResponderEventPlugin.js
index dc14523fff..f8acb05f5b 100644
--- a/packages/events/ResponderEventPlugin.js
+++ b/packages/events/ResponderEventPlugin.js
@@ -548,7 +548,9 @@ const ResponderEventPlugin = {
       ? eventTypes.responderStart
       : isResponderTouchMove
         ? eventTypes.responderMove
-        : isResponderTouchEnd ? eventTypes.responderEnd : null;
+        : isResponderTouchEnd
+          ? eventTypes.responderEnd
+          : null;
 
     if (incrementalTouch) {
       const gesture = ResponderSyntheticEvent.getPooled(
@@ -571,7 +573,9 @@ const ResponderEventPlugin = {
       noResponderTouches(nativeEvent);
     const finalTouch = isResponderTerminate
       ? eventTypes.responderTerminate
-      : isResponderRelease ? eventTypes.responderRelease : null;
+      : isResponderRelease
+        ? eventTypes.responderRelease
+        : null;
     if (finalTouch) {
       const finalEvent = ResponderSyntheticEvent.getPooled(
         finalTouch,
diff --git a/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js b/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js
index bace77fda7..496e003a78 100644
--- a/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js
+++ b/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js
@@ -68,7 +68,8 @@ type ComponentLifeCycle =
    * Mounted components have a DOM node representation and are capable of
    * receiving new props.
    */
-  | 'MOUNTED' /**
+  | 'MOUNTED'
+  /**
    * Unmounted components are inactive and cannot receive new props.
    */
   | 'UNMOUNTED';
diff --git a/packages/react-dom/src/events/SyntheticWheelEvent.js b/packages/react-dom/src/events/SyntheticWheelEvent.js
index b4c49f430a..16435febcc 100644
--- a/packages/react-dom/src/events/SyntheticWheelEvent.js
+++ b/packages/react-dom/src/events/SyntheticWheelEvent.js
@@ -16,7 +16,9 @@ const SyntheticWheelEvent = SyntheticMouseEvent.extend({
     return 'deltaX' in event
       ? event.deltaX
       : // Fallback to `wheelDeltaX` for Webkit and normalize (right is positive).
-        'wheelDeltaX' in event ? -event.wheelDeltaX : 0;
+        'wheelDeltaX' in event
+        ? -event.wheelDeltaX
+        : 0;
   },
   deltaY(event) {
     return 'deltaY' in event
@@ -25,7 +27,9 @@ const SyntheticWheelEvent = SyntheticMouseEvent.extend({
         'wheelDeltaY' in event
         ? -event.wheelDeltaY
         : // Fallback to `wheelDelta` for IE<9 and normalize (down is positive).
-          'wheelDelta' in event ? -event.wheelDelta : 0;
+          'wheelDelta' in event
+          ? -event.wheelDelta
+          : 0;
   },
   deltaZ: null,
 
diff --git a/packages/react-dom/src/events/TapEventPlugin.js b/packages/react-dom/src/events/TapEventPlugin.js
index 61e51f7792..e3b03456c3 100644
--- a/packages/react-dom/src/events/TapEventPlugin.js
+++ b/packages/react-dom/src/events/TapEventPlugin.js
@@ -94,7 +94,9 @@ function extractSingleTouch(nativeEvent) {
 
   return !hasTouches && hasChangedTouches
     ? changedTouches[0]
-    : hasTouches ? touches[0] : nativeEvent;
+    : hasTouches
+      ? touches[0]
+      : nativeEvent;
 }
 
 function getAxisCoordOfEvent(
diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js
index dd1e8f750d..de873596e7 100644
--- a/packages/react-test-renderer/src/ReactShallowRenderer.js
+++ b/packages/react-test-renderer/src/ReactShallowRenderer.js
@@ -66,7 +66,9 @@ class ReactShallowRenderer {
         'components, but the provided element type was `%s`.',
       Array.isArray(element.type)
         ? 'array'
-        : element.type === null ? 'null' : typeof element.type,
+        : element.type === null
+          ? 'null'
+          : typeof element.type,
     );
 
     if (this._rendering) {
diff --git a/packages/shared/describeComponentFrame.js b/packages/shared/describeComponentFrame.js
index 3494c31e23..5c619e6164 100644
--- a/packages/shared/describeComponentFrame.js
+++ b/packages/shared/describeComponentFrame.js
@@ -21,6 +21,8 @@ export default function(
         ':' +
         source.lineNumber +
         ')'
-      : ownerName ? ' (created by ' + ownerName + ')' : '')
+      : ownerName
+        ? ' (created by ' + ownerName + ')'
+        : '')
   );
 }
diff --git a/scripts/bench/stats.js b/scripts/bench/stats.js
index d178be65ad..9fb5883d83 100644
--- a/scripts/bench/stats.js
+++ b/scripts/bench/stats.js
@@ -33,7 +33,7 @@ function calculateMeanAndSdOfRatioFromDeltaMethod(
 ) {
   const mean =
     (meanTest - meanControl) / meanControl -
-    Math.pow(semControl, 2) * meanTest / Math.pow(meanControl, 3);
+    (Math.pow(semControl, 2) * meanTest) / Math.pow(meanControl, 3);
   const variance =
     Math.pow(semTest / meanControl, 2) +
     Math.pow(semControl * meanTest, 2) / Math.pow(meanControl, 4);
diff --git a/yarn.lock b/yarn.lock
index 51f12689e3..edc36b37be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4570,9 +4570,9 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@1.11.1, prettier@^1.0.0:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
+prettier@1.13.7, prettier@^1.0.0:
+  version "1.13.7"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281"
 
 pretty-format@^23.0.1:
   version "23.0.1"

From 606c30aa5f37f335f14ff94659ffcadfbdf4c791 Mon Sep 17 00:00:00 2001
From: Fumiya Shibusawa <shibusawa@basicinc.jp>
Date: Wed, 18 Jul 2018 04:21:53 +0900
Subject: [PATCH 236/277] fixed a typo in commentout in ReactFiberUnwindWork.js
 (#13172)

---
 packages/react-reconciler/src/ReactFiberUnwindWork.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index 432c30d442..f60e314793 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -271,7 +271,7 @@ function throwException(
             return;
           }
 
-          // Confirmed that the bounary is in a strict mode tree. Continue with
+          // Confirmed that the boundary is in a strict mode tree. Continue with
           // the normal suspend path.
 
           let absoluteTimeoutMs;

From 171e0b7d447a20b7cc90808a95478c6e5b8b6af0 Mon Sep 17 00:00:00 2001
From: Nicole Levy <seriff@protonmail.com>
Date: Tue, 17 Jul 2018 17:46:43 -0400
Subject: [PATCH 237/277] =?UTF-8?q?Fix=20=E2=80=9Cno=20onChange=20handler?=
 =?UTF-8?q?=E2=80=9D=20warning=20to=20fire=20on=20falsy=20values=20("",=20?=
 =?UTF-8?q?0,=20false)=20too=20(#12628)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* throw warning for falsey `value` prop

* add nop onChange handler to tests for `value` prop

* prettier

* check for falsey checked

* fix tests for `checked` prop

* new tests for `value` prop

* test formatting

* forgot 0 (:

* test for falsey `checked` prop

* add null check

* Update ReactDOMInput-test.js

* revert unneeded change

* prettier

* Update DOMPropertyOperations-test.js

* Update ReactDOMInput-test.js

* Update ReactDOMSelect-test.js

* Fixes and tests

* Remove unnecessary changes
---
 .../__tests__/DOMPropertyOperations-test.js   |   2 +-
 .../src/__tests__/ReactDOMInput-test.js       | 136 ++++++++++++++----
 .../src/__tests__/ReactDOMSelect-test.js      |   7 +
 .../src/__tests__/ReactDOMTextarea-test.js    |   9 +-
 .../shared/ReactControlledValuePropTypes.js   |  10 +-
 5 files changed, 128 insertions(+), 36 deletions(-)

diff --git a/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js b/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js
index 1fba16247e..56319c95d7 100644
--- a/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js
+++ b/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js
@@ -79,7 +79,7 @@ describe('DOMPropertyOperations', () => {
 
     it('should not remove empty attributes for special properties', () => {
       const container = document.createElement('div');
-      ReactDOM.render(<input value="" />, container);
+      ReactDOM.render(<input value="" onChange={() => {}} />, container);
       expect(container.firstChild.getAttribute('value')).toBe('');
       expect(container.firstChild.value).toBe('');
     });
diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index 480287cfc0..5afa9dcf7a 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -47,6 +47,71 @@ describe('ReactDOMInput', () => {
     document.body.removeChild(container);
   });
 
+  it('should warn for controlled value of 0 with missing onChange', () => {
+    expect(() => {
+      ReactDOM.render(<input type="text" value={0} />, container);
+    }).toWarnDev(
+      'Failed prop type: You provided a `value` prop to a form field without an `onChange` handler.',
+    );
+  });
+
+  it('should warn for controlled value of "" with missing onChange', () => {
+    expect(() => {
+      ReactDOM.render(<input type="text" value="" />, container);
+    }).toWarnDev(
+      'Failed prop type: You provided a `value` prop to a form field without an `onChange` handler.',
+    );
+  });
+
+  it('should warn for controlled value of "0" with missing onChange', () => {
+    expect(() => {
+      ReactDOM.render(<input type="text" value="0" />, container);
+    }).toWarnDev(
+      'Failed prop type: You provided a `value` prop to a form field without an `onChange` handler.',
+    );
+  });
+
+  it('should warn for controlled value of false with missing onChange', () => {
+    expect(() =>
+      ReactDOM.render(<input type="checkbox" checked={false} />, container),
+    ).toWarnDev(
+      'Failed prop type: You provided a `checked` prop to a form field without an `onChange` handler.',
+    );
+  });
+
+  it('should warn with checked and no onChange handler with readOnly specified', () => {
+    ReactDOM.render(
+      <input type="checkbox" checked={false} readOnly={true} />,
+      container,
+    );
+    ReactDOM.unmountComponentAtNode(container);
+
+    expect(() =>
+      ReactDOM.render(
+        <input type="checkbox" checked={false} readOnly={false} />,
+        container,
+      ),
+    ).toWarnDev(
+      'Failed prop type: You provided a `checked` prop to a form field without an `onChange` handler. ' +
+        'This will render a read-only field. If the field should be mutable use `defaultChecked`. ' +
+        'Otherwise, set either `onChange` or `readOnly`.',
+    );
+  });
+
+  it('should not warn about missing onChange in uncontrolled inputs', () => {
+    ReactDOM.render(<input />, container);
+    ReactDOM.unmountComponentAtNode(container);
+    ReactDOM.render(<input value={undefined} />, container);
+    ReactDOM.unmountComponentAtNode(container);
+    ReactDOM.render(<input type="text" />, container);
+    ReactDOM.unmountComponentAtNode(container);
+    ReactDOM.render(<input type="text" value={undefined} />, container);
+    ReactDOM.unmountComponentAtNode(container);
+    ReactDOM.render(<input type="checkbox" />, container);
+    ReactDOM.unmountComponentAtNode(container);
+    ReactDOM.render(<input type="checkbox" checked={undefined} />, container);
+  });
+
   it('should properly control a value even if no event listener exists', () => {
     let node;
 
@@ -452,7 +517,7 @@ describe('ReactDOMInput', () => {
   });
 
   it('should display `value` of number 0', () => {
-    const stub = <input type="text" value={0} />;
+    const stub = <input type="text" value={0} onChange={emptyFunction} />;
     const node = ReactDOM.render(stub, container);
 
     expect(node.value).toBe('0');
@@ -590,8 +655,14 @@ describe('ReactDOMInput', () => {
   });
 
   it('should properly transition from an empty value to 0', function() {
-    ReactDOM.render(<input type="text" value="" />, container);
-    ReactDOM.render(<input type="text" value={0} />, container);
+    ReactDOM.render(
+      <input type="text" value="" onChange={emptyFunction} />,
+      container,
+    );
+    ReactDOM.render(
+      <input type="text" value={0} onChange={emptyFunction} />,
+      container,
+    );
 
     const node = container.firstChild;
 
@@ -600,8 +671,14 @@ describe('ReactDOMInput', () => {
   });
 
   it('should properly transition from 0 to an empty value', function() {
-    ReactDOM.render(<input type="text" value={0} />, container);
-    ReactDOM.render(<input type="text" value="" />, container);
+    ReactDOM.render(
+      <input type="text" value={0} onChange={emptyFunction} />,
+      container,
+    );
+    ReactDOM.render(
+      <input type="text" value="" onChange={emptyFunction} />,
+      container,
+    );
 
     const node = container.firstChild;
 
@@ -610,8 +687,14 @@ describe('ReactDOMInput', () => {
   });
 
   it('should properly transition a text input from 0 to an empty 0.0', function() {
-    ReactDOM.render(<input type="text" value={0} />, container);
-    ReactDOM.render(<input type="text" value="0.0" />, container);
+    ReactDOM.render(
+      <input type="text" value={0} onChange={emptyFunction} />,
+      container,
+    );
+    ReactDOM.render(
+      <input type="text" value="0.0" onChange={emptyFunction} />,
+      container,
+    );
 
     const node = container.firstChild;
 
@@ -620,8 +703,14 @@ describe('ReactDOMInput', () => {
   });
 
   it('should properly transition a number input from "" to 0', function() {
-    ReactDOM.render(<input type="number" value="" />, container);
-    ReactDOM.render(<input type="number" value={0} />, container);
+    ReactDOM.render(
+      <input type="number" value="" onChange={emptyFunction} />,
+      container,
+    );
+    ReactDOM.render(
+      <input type="number" value={0} onChange={emptyFunction} />,
+      container,
+    );
 
     const node = container.firstChild;
 
@@ -630,8 +719,14 @@ describe('ReactDOMInput', () => {
   });
 
   it('should properly transition a number input from "" to "0"', function() {
-    ReactDOM.render(<input type="number" value="" />, container);
-    ReactDOM.render(<input type="number" value="0" />, container);
+    ReactDOM.render(
+      <input type="number" value="" onChange={emptyFunction} />,
+      container,
+    );
+    ReactDOM.render(
+      <input type="number" value="0" onChange={emptyFunction} />,
+      container,
+    );
 
     const node = container.firstChild;
 
@@ -874,25 +969,6 @@ describe('ReactDOMInput', () => {
     dispatchEventOnNode(node, 'input');
   });
 
-  it('should warn with checked and no onChange handler with readOnly specified', () => {
-    ReactDOM.render(
-      <input type="checkbox" checked="false" readOnly={true} />,
-      container,
-    );
-    ReactDOM.unmountComponentAtNode(container);
-
-    expect(() =>
-      ReactDOM.render(
-        <input type="checkbox" checked="false" readOnly={false} />,
-        container,
-      ),
-    ).toWarnDev(
-      'Failed prop type: You provided a `checked` prop to a form field without an `onChange` handler. ' +
-        'This will render a read-only field. If the field should be mutable use `defaultChecked`. ' +
-        'Otherwise, set either `onChange` or `readOnly`.',
-    );
-  });
-
   it('should update defaultValue to empty string', () => {
     ReactDOM.render(<input type="text" defaultValue={'foo'} />, container);
     ReactDOM.render(<input type="text" defaultValue={''} />, container);
diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index 5548c03931..e94cc7895c 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -654,6 +654,13 @@ describe('ReactDOMSelect', () => {
     );
   });
 
+  it('should not warn about missing onChange in uncontrolled textareas', () => {
+    const container = document.createElement('div');
+    ReactDOM.render(<select />, container);
+    ReactDOM.unmountComponentAtNode(container);
+    ReactDOM.render(<select value={undefined} />, container);
+  });
+
   it('should be able to safely remove select onChange', () => {
     function changeView() {
       ReactDOM.unmountComponentAtNode(container);
diff --git a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
index 73522ace5d..fa5d717974 100644
--- a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
@@ -97,7 +97,7 @@ describe('ReactDOMTextarea', () => {
   });
 
   it('should display `value` of number 0', () => {
-    const stub = <textarea value={0} />;
+    const stub = <textarea value={0} onChange={emptyFunction} />;
     const node = renderTextarea(stub);
 
     expect(node.value).toBe('0');
@@ -416,4 +416,11 @@ describe('ReactDOMTextarea', () => {
       <textarea value="foo" defaultValue="bar" readOnly={true} />,
     );
   });
+
+  it('should not warn about missing onChange in uncontrolled textareas', () => {
+    const container = document.createElement('div');
+    ReactDOM.render(<textarea />, container);
+    ReactDOM.unmountComponentAtNode(container);
+    ReactDOM.render(<textarea value={undefined} />, container);
+  });
 });
diff --git a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
index 0f4fe58ee2..65e16ffbe2 100644
--- a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
+++ b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
@@ -30,11 +30,12 @@ if (__DEV__) {
   const propTypes = {
     value: function(props, propName, componentName) {
       if (
-        !props[propName] ||
+        !(propName in props) ||
         hasReadOnlyValue[props.type] ||
         props.onChange ||
         props.readOnly ||
-        props.disabled
+        props.disabled ||
+        props[propName] == null
       ) {
         return null;
       }
@@ -47,10 +48,11 @@ if (__DEV__) {
     },
     checked: function(props, propName, componentName) {
       if (
-        !props[propName] ||
+        !(propName in props) ||
         props.onChange ||
         props.readOnly ||
-        props.disabled
+        props.disabled ||
+        props[propName] == null
       ) {
         return null;
       }

From acbb4f93f09ca37f02136f9aa6f7425fde1da2cc Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 18 Jul 2018 00:14:13 +0100
Subject: [PATCH 238/277] Remove the use of proxies for synthetic events in DEV
 (#13225)

* Revert #5947 and disable the test

* Fix isDefaultPrevented and isPropagationStopped to not get nulled

This was a bug introduced by #5947. It's very confusing that they become nulled while stopPropagation/preventDefault don't.

* Add a comment

* Run Prettier

* Fix grammar
---
 packages/events/SyntheticEvent.js             | 84 ++++++-------------
 .../events/__tests__/SyntheticEvent-test.js   | 82 +++++++++++++++---
 2 files changed, 95 insertions(+), 71 deletions(-)

diff --git a/packages/events/SyntheticEvent.js b/packages/events/SyntheticEvent.js
index 9c2d9eee1c..d8335085e6 100644
--- a/packages/events/SyntheticEvent.js
+++ b/packages/events/SyntheticEvent.js
@@ -10,19 +10,8 @@
 import invariant from 'shared/invariant';
 import warningWithoutStack from 'shared/warningWithoutStack';
 
-let didWarnForAddedNewProperty = false;
 const EVENT_POOL_SIZE = 10;
 
-const shouldBeReleasedProperties = [
-  'dispatchConfig',
-  '_targetInst',
-  'nativeEvent',
-  'isDefaultPrevented',
-  'isPropagationStopped',
-  '_dispatchListeners',
-  '_dispatchInstances',
-];
-
 /**
  * @interface Event
  * @see http://www.w3.org/TR/DOM-Level-3-Events/
@@ -81,6 +70,8 @@ function SyntheticEvent(
     delete this.nativeEvent;
     delete this.preventDefault;
     delete this.stopPropagation;
+    delete this.isDefaultPrevented;
+    delete this.isPropagationStopped;
   }
 
   this.dispatchConfig = dispatchConfig;
@@ -188,15 +179,35 @@ Object.assign(SyntheticEvent.prototype, {
         this[propName] = null;
       }
     }
-    for (let i = 0; i < shouldBeReleasedProperties.length; i++) {
-      this[shouldBeReleasedProperties[i]] = null;
-    }
+    this.dispatchConfig = null;
+    this._targetInst = null;
+    this.nativeEvent = null;
+    this.isDefaultPrevented = functionThatReturnsFalse;
+    this.isPropagationStopped = functionThatReturnsFalse;
+    this._dispatchListeners = null;
+    this._dispatchInstances = null;
     if (__DEV__) {
       Object.defineProperty(
         this,
         'nativeEvent',
         getPooledWarningPropertyDefinition('nativeEvent', null),
       );
+      Object.defineProperty(
+        this,
+        'isDefaultPrevented',
+        getPooledWarningPropertyDefinition(
+          'isDefaultPrevented',
+          functionThatReturnsFalse,
+        ),
+      );
+      Object.defineProperty(
+        this,
+        'isPropagationStopped',
+        getPooledWarningPropertyDefinition(
+          'isPropagationStopped',
+          functionThatReturnsFalse,
+        ),
+      );
       Object.defineProperty(
         this,
         'preventDefault',
@@ -237,49 +248,6 @@ SyntheticEvent.extend = function(Interface) {
   return Class;
 };
 
-/** Proxying after everything set on SyntheticEvent
- * to resolve Proxy issue on some WebKit browsers
- * in which some Event properties are set to undefined (GH#10010)
- */
-if (__DEV__) {
-  const isProxySupported =
-    typeof Proxy === 'function' &&
-    // https://github.com/facebook/react/issues/12011
-    !Object.isSealed(new Proxy({}, {}));
-
-  if (isProxySupported) {
-    /*eslint-disable no-func-assign */
-    SyntheticEvent = new Proxy(SyntheticEvent, {
-      construct: function(target, args) {
-        return this.apply(target, Object.create(target.prototype), args);
-      },
-      apply: function(constructor, that, args) {
-        return new Proxy(constructor.apply(that, args), {
-          set: function(target, prop, value) {
-            if (
-              prop !== 'isPersistent' &&
-              !target.constructor.Interface.hasOwnProperty(prop) &&
-              shouldBeReleasedProperties.indexOf(prop) === -1
-            ) {
-              warningWithoutStack(
-                didWarnForAddedNewProperty || target.isPersistent(),
-                "This synthetic event is reused for performance reasons. If you're " +
-                  "seeing this, you're adding a new property in the synthetic event object. " +
-                  'The property is never released. See ' +
-                  'https://fb.me/react-event-pooling for more information.',
-              );
-              didWarnForAddedNewProperty = true;
-            }
-            target[prop] = value;
-            return true;
-          },
-        });
-      },
-    });
-    /*eslint-enable no-func-assign */
-  }
-}
-
 addEventPoolingTo(SyntheticEvent);
 
 /**
@@ -354,7 +322,7 @@ function releasePooledEvent(event) {
   const EventConstructor = this;
   invariant(
     event instanceof EventConstructor,
-    'Trying to release an event instance  into a pool of a different type.',
+    'Trying to release an event instance into a pool of a different type.',
   );
   event.destructor();
   if (EventConstructor.eventPool.length < EVENT_POOL_SIZE) {
diff --git a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js
index 6d98060e9e..d0049bc962 100644
--- a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js
+++ b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js
@@ -249,6 +249,62 @@ describe('SyntheticEvent', () => {
     expect(expectedCount).toBe(1);
   });
 
+  it('should warn when calling `isPropagationStopped` if the synthetic event has not been persisted', () => {
+    let node;
+    let expectedCount = 0;
+    let syntheticEvent;
+
+    const eventHandler = e => {
+      syntheticEvent = e;
+      expectedCount++;
+    };
+    node = ReactDOM.render(<div onClick={eventHandler} />, container);
+
+    const event = document.createEvent('Event');
+    event.initEvent('click', true, true);
+    node.dispatchEvent(event);
+
+    expect(() =>
+      expect(syntheticEvent.isPropagationStopped()).toBe(false),
+    ).toWarnDev(
+      'Warning: This synthetic event is reused for performance reasons. If ' +
+        "you're seeing this, you're accessing the method `isPropagationStopped` on a " +
+        'released/nullified synthetic event. This is a no-op function. If you must ' +
+        'keep the original synthetic event around, use event.persist(). ' +
+        'See https://fb.me/react-event-pooling for more information.',
+      {withoutStack: true},
+    );
+    expect(expectedCount).toBe(1);
+  });
+
+  it('should warn when calling `isDefaultPrevented` if the synthetic event has not been persisted', () => {
+    let node;
+    let expectedCount = 0;
+    let syntheticEvent;
+
+    const eventHandler = e => {
+      syntheticEvent = e;
+      expectedCount++;
+    };
+    node = ReactDOM.render(<div onClick={eventHandler} />, container);
+
+    const event = document.createEvent('Event');
+    event.initEvent('click', true, true);
+    node.dispatchEvent(event);
+
+    expect(() =>
+      expect(syntheticEvent.isDefaultPrevented()).toBe(false),
+    ).toWarnDev(
+      'Warning: This synthetic event is reused for performance reasons. If ' +
+        "you're seeing this, you're accessing the method `isDefaultPrevented` on a " +
+        'released/nullified synthetic event. This is a no-op function. If you must ' +
+        'keep the original synthetic event around, use event.persist(). ' +
+        'See https://fb.me/react-event-pooling for more information.',
+      {withoutStack: true},
+    );
+    expect(expectedCount).toBe(1);
+  });
+
   it('should properly log warnings when events simulated with rendered components', () => {
     let event;
     function assignEvent(e) {
@@ -270,25 +326,25 @@ describe('SyntheticEvent', () => {
     );
   });
 
-  it('should warn if Proxy is supported and the synthetic event is added a property', () => {
+  // TODO: we might want to re-add a warning like this in the future,
+  // but it shouldn't use Proxies because they make debugging difficult.
+  // Or we might disallow this pattern altogether:
+  // https://github.com/facebook/react/issues/13224
+  xit('should warn if a property is added to the synthetic event', () => {
     let node;
     let expectedCount = 0;
     let syntheticEvent;
 
     const eventHandler = e => {
-      if (typeof Proxy === 'function') {
-        expect(() => {
-          e.foo = 'bar';
-        }).toWarnDev(
-          'Warning: This synthetic event is reused for performance reasons. If ' +
-            "you're seeing this, you're adding a new property in the synthetic " +
-            'event object. The property is never released. ' +
-            'See https://fb.me/react-event-pooling for more information.',
-          {withoutStack: true},
-        );
-      } else {
+      expect(() => {
         e.foo = 'bar';
-      }
+      }).toWarnDev(
+        'Warning: This synthetic event is reused for performance reasons. If ' +
+          "you're seeing this, you're adding a new property in the synthetic " +
+          'event object. The property is never released. ' +
+          'See https://fb.me/react-event-pooling for more information.',
+        {withoutStack: true},
+      );
       syntheticEvent = e;
       expectedCount++;
     };

From 236f6087236c42ccafe94674cd1c5736a1868b00 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 18 Jul 2018 02:38:39 +0100
Subject: [PATCH 239/277] Fail tests if toWarnDev() does not wrap warnings in
 array (#13227)

* Fail tests if toWarn() does not wrap warnings in array

* Fix newly failing tests

* Another fix
---
 .../__tests__/ReactChildReconciler-test.js    |  8 ++--
 .../src/__tests__/ReactDOMFiber-test.js       |  5 +-
 .../src/__tests__/ReactMultiChild-test.js     |  8 ++--
 .../jest/matchers/__tests__/toWarnDev-test.js | 46 +++++++++++++++++++
 scripts/jest/matchers/toWarnDev.js            | 16 +++++++
 5 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactChildReconciler-test.js b/packages/react-dom/src/__tests__/ReactChildReconciler-test.js
index 20c7e24631..d697cea603 100644
--- a/packages/react-dom/src/__tests__/ReactChildReconciler-test.js
+++ b/packages/react-dom/src/__tests__/ReactChildReconciler-test.js
@@ -80,8 +80,8 @@ describe('ReactChildReconciler', () => {
         'Keys should be unique so that components maintain their identity ' +
         'across updates. Non-unique keys may cause children to be ' +
         'duplicated and/or omitted — the behavior is unsupported and ' +
-        'could change in a future version.',
-      '    in div (at **)\n' +
+        'could change in a future version.\n' +
+        '    in div (at **)\n' +
         '    in Component (at **)\n' +
         '    in Parent (at **)\n' +
         '    in GrandParent (at **)',
@@ -127,8 +127,8 @@ describe('ReactChildReconciler', () => {
         'Keys should be unique so that components maintain their identity ' +
         'across updates. Non-unique keys may cause children to be ' +
         'duplicated and/or omitted — the behavior is unsupported and ' +
-        'could change in a future version.',
-      '    in div (at **)\n' +
+        'could change in a future version.\n' +
+        '    in div (at **)\n' +
         '    in Component (at **)\n' +
         '    in Parent (at **)\n' +
         '    in GrandParent (at **)',
diff --git a/packages/react-dom/src/__tests__/ReactDOMFiber-test.js b/packages/react-dom/src/__tests__/ReactDOMFiber-test.js
index c47653fba4..18e95407a8 100644
--- a/packages/react-dom/src/__tests__/ReactDOMFiber-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMFiber-test.js
@@ -980,8 +980,9 @@ describe('ReactDOMFiber', () => {
     expect(() => ReactDOM.render(<Example />, container)).toWarnDev(
       'Expected `onClick` listener to be a function, instead got `false`.\n\n' +
         'If you used to conditionally omit it with onClick={condition && value}, ' +
-        'pass onClick={condition ? value : undefined} instead.\n',
-      '    in div (at **)\n' + '    in Example (at **)',
+        'pass onClick={condition ? value : undefined} instead.\n' +
+        '    in div (at **)\n' +
+        '    in Example (at **)',
     );
   });
 
diff --git a/packages/react-dom/src/__tests__/ReactMultiChild-test.js b/packages/react-dom/src/__tests__/ReactMultiChild-test.js
index 37c2e6305c..906934cfa6 100644
--- a/packages/react-dom/src/__tests__/ReactMultiChild-test.js
+++ b/packages/react-dom/src/__tests__/ReactMultiChild-test.js
@@ -209,8 +209,8 @@ describe('ReactMultiChild', () => {
           'Keys should be unique so that components maintain their identity ' +
           'across updates. Non-unique keys may cause children to be ' +
           'duplicated and/or omitted — the behavior is unsupported and ' +
-          'could change in a future version.',
-        '    in div (at **)\n' +
+          'could change in a future version.\n' +
+          '    in div (at **)\n' +
           '    in WrapperComponent (at **)\n' +
           '    in div (at **)\n' +
           '    in Parent (at **)',
@@ -269,8 +269,8 @@ describe('ReactMultiChild', () => {
           'Keys should be unique so that components maintain their identity ' +
           'across updates. Non-unique keys may cause children to be ' +
           'duplicated and/or omitted — the behavior is unsupported and ' +
-          'could change in a future version.',
-        '    in div (at **)\n' +
+          'could change in a future version.\n' +
+          '    in div (at **)\n' +
           '    in WrapperComponent (at **)\n' +
           '    in div (at **)\n' +
           '    in Parent (at **)',
diff --git a/scripts/jest/matchers/__tests__/toWarnDev-test.js b/scripts/jest/matchers/__tests__/toWarnDev-test.js
index d5ef59abe6..8f109a2a56 100644
--- a/scripts/jest/matchers/__tests__/toWarnDev-test.js
+++ b/scripts/jest/matchers/__tests__/toWarnDev-test.js
@@ -169,5 +169,51 @@ describe('toWarnDev', () => {
         }).toWarnDev('Hi');
       }).toThrow('Received more than one component stack for a warning');
     });
+
+    it('fails if multiple strings are passed without an array wrapper', () => {
+      expect(() => {
+        expect(() => {
+          console.error('Hi \n    in div');
+        }).toWarnDev('Hi', 'Bye');
+      }).toThrow(
+        'toWarnDev() second argument, when present, should be an object'
+      );
+      expect(() => {
+        expect(() => {
+          console.error('Hi \n    in div');
+          console.error('Bye \n    in div');
+        }).toWarnDev('Hi', 'Bye');
+      }).toThrow(
+        'toWarnDev() second argument, when present, should be an object'
+      );
+      expect(() => {
+        expect(() => {
+          console.error('Hi \n    in div');
+          console.error('Wow \n    in div');
+          console.error('Bye \n    in div');
+        }).toWarnDev('Hi', 'Bye');
+      }).toThrow(
+        'toWarnDev() second argument, when present, should be an object'
+      );
+      expect(() => {
+        expect(() => {
+          console.error('Hi \n    in div');
+          console.error('Wow \n    in div');
+          console.error('Bye \n    in div');
+        }).toWarnDev('Hi', 'Wow', 'Bye');
+      }).toThrow(
+        'toWarnDev() second argument, when present, should be an object'
+      );
+    });
+
+    it('fails on more than two arguments', () => {
+      expect(() => {
+        expect(() => {
+          console.error('Hi \n    in div');
+          console.error('Wow \n    in div');
+          console.error('Bye \n    in div');
+        }).toWarnDev('Hi', undefined, 'Bye');
+      }).toThrow('toWarnDev() received more than two arguments.');
+    });
   }
 });
diff --git a/scripts/jest/matchers/toWarnDev.js b/scripts/jest/matchers/toWarnDev.js
index 187de91e54..705ac3e859 100644
--- a/scripts/jest/matchers/toWarnDev.js
+++ b/scripts/jest/matchers/toWarnDev.js
@@ -19,6 +19,22 @@ const createMatcherFor = consoleMethod =>
             `but was given ${typeof expectedMessages}.`
         );
       }
+      if (
+        options != null &&
+        (typeof options !== 'object' || Array.isArray(options))
+      ) {
+        throw new Error(
+          'toWarnDev() second argument, when present, should be an object. ' +
+            'Did you forget to wrap the messages into an array?'
+        );
+      }
+      if (arguments.length > 3) {
+        // `matcher` comes from Jest, so it's more than 2 in practice
+        throw new Error(
+          'toWarnDev() received more than two arguments. ' +
+            'Did you forget to wrap the messages into an array?'
+        );
+      }
 
       const withoutStack = options.withoutStack;
       const warningsWithoutComponentStack = [];

From 0e235bb8f78a4f9bac5ce74051de9c0fbb92eaca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= <mateuszburzynski@gmail.com>
Date: Wed, 18 Jul 2018 22:52:59 +0200
Subject: [PATCH 240/277] Removed unused state argument in unsubscribe method
 of <Subscription /> (#13233)

---
 packages/create-subscription/src/createSubscription.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/create-subscription/src/createSubscription.js b/packages/create-subscription/src/createSubscription.js
index 213fddca7c..7eac29e82b 100644
--- a/packages/create-subscription/src/createSubscription.js
+++ b/packages/create-subscription/src/createSubscription.js
@@ -87,13 +87,13 @@ export function createSubscription<Property, Value>(
 
     componentDidUpdate(prevProps, prevState) {
       if (this.state.source !== prevState.source) {
-        this.unsubscribe(prevState);
+        this.unsubscribe();
         this.subscribe();
       }
     }
 
     componentWillUnmount() {
-      this.unsubscribe(this.state);
+      this.unsubscribe();
 
       // Track mounted to avoid calling setState after unmounting
       // For source like Promises that can't be unsubscribed from.
@@ -147,7 +147,7 @@ export function createSubscription<Property, Value>(
       }
     }
 
-    unsubscribe(state: State) {
+    unsubscribe() {
       if (typeof this._unsubscribe === 'function') {
         this._unsubscribe();
       }

From e4e58343e4d869adc9e3ad725dbaba5b9aff6d75 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Wed, 18 Jul 2018 16:10:56 -0700
Subject: [PATCH 241/277] Move unstable_yield to main export (#13232)

The `yield` method isn't tied to any specific root. Putting this
on the main export enables test components that are not within scope
to yield even if they don't have access to the currently rendering
root instance. This follows the pattern established by ReactNoop.

Added a `clearYields` method, too, for reading values that were yielded
out of band. This is also based on ReactNoop.
---
 .../src/ReactTestRenderer.js                  | 13 ++--
 .../src/ReactTestRendererScheduling.js        |  6 +-
 .../__tests__/ReactTestRendererAsync-test.js  | 12 ++--
 .../__tests__/ReactProfiler-test.internal.js  | 62 ++++++++++---------
 4 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js
index ed4c59fb38..861504436d 100644
--- a/packages/react-test-renderer/src/ReactTestRenderer.js
+++ b/packages/react-test-renderer/src/ReactTestRenderer.js
@@ -466,14 +466,14 @@ const ReactTestRendererFiber = {
         }
         return TestRenderer.getPublicRootInstance(root);
       },
+
       unstable_flushAll: TestRendererScheduling.flushAll,
-      unstable_flushSync(fn: Function) {
-        return TestRendererScheduling.withCleanYields(() => {
-          TestRenderer.flushSync(fn);
-        });
+      unstable_flushSync<T>(fn: () => T): T {
+        TestRendererScheduling.clearYields();
+        return TestRenderer.flushSync(fn);
       },
       unstable_flushThrough: TestRendererScheduling.flushThrough,
-      unstable_yield: TestRendererScheduling.yieldValue,
+      unstable_clearYields: TestRendererScheduling.clearYields,
     };
 
     Object.defineProperty(
@@ -504,6 +504,9 @@ const ReactTestRendererFiber = {
     return entry;
   },
 
+  unstable_yield: TestRendererScheduling.yieldValue,
+  unstable_clearYields: TestRendererScheduling.clearYields,
+
   /* eslint-disable camelcase */
   unstable_batchedUpdates: batchedUpdates,
   /* eslint-enable camelcase */
diff --git a/packages/react-test-renderer/src/ReactTestRendererScheduling.js b/packages/react-test-renderer/src/ReactTestRendererScheduling.js
index 5cb66088fb..1855db197a 100644
--- a/packages/react-test-renderer/src/ReactTestRendererScheduling.js
+++ b/packages/react-test-renderer/src/ReactTestRendererScheduling.js
@@ -112,8 +112,8 @@ export function yieldValue(value: mixed): void {
   yieldedValues.push(value);
 }
 
-export function withCleanYields(fn: Function) {
+export function clearYields(): Array<mixed> {
+  const values = yieldedValues;
   yieldedValues = [];
-  fn();
-  return yieldedValues;
+  return values;
 }
diff --git a/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js b/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js
index abc72c0e0f..f25c0134da 100644
--- a/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js
@@ -46,7 +46,7 @@ describe('ReactTestRendererAsync', () => {
 
   it('flushAll returns array of yielded values', () => {
     function Child(props) {
-      renderer.unstable_yield(props.children);
+      ReactTestRenderer.unstable_yield(props.children);
       return props.children;
     }
     function Parent(props) {
@@ -72,7 +72,7 @@ describe('ReactTestRendererAsync', () => {
 
   it('flushThrough flushes until the expected values is yielded', () => {
     function Child(props) {
-      renderer.unstable_yield(props.children);
+      ReactTestRenderer.unstable_yield(props.children);
       return props.children;
     }
     function Parent(props) {
@@ -103,7 +103,7 @@ describe('ReactTestRendererAsync', () => {
 
   it('supports high priority interruptions', () => {
     function Child(props) {
-      renderer.unstable_yield(props.children);
+      ReactTestRenderer.unstable_yield(props.children);
       return props.children;
     }
 
@@ -143,7 +143,7 @@ describe('ReactTestRendererAsync', () => {
 
   it('should error if flushThrough params dont match yielded values', () => {
     const Yield = ({id}) => {
-      renderer.unstable_yield(id);
+      ReactTestRenderer.unstable_yield(id);
       return id;
     };
 
@@ -165,7 +165,7 @@ describe('ReactTestRendererAsync', () => {
 
   it('should error if flushAll params dont match yielded values', () => {
     const Yield = ({id}) => {
-      renderer.unstable_yield(id);
+      ReactTestRenderer.unstable_yield(id);
       return id;
     };
 
@@ -199,7 +199,7 @@ describe('ReactTestRendererAsync', () => {
 
   it('should error if flushThrough yields the wrong number of values', () => {
     const Yield = ({id}) => {
-      renderer.unstable_yield(id);
+      ReactTestRenderer.unstable_yield(id);
       return id;
     };
 
diff --git a/packages/react/src/__tests__/ReactProfiler-test.internal.js b/packages/react/src/__tests__/ReactProfiler-test.internal.js
index d124729564..aca0d331d1 100644
--- a/packages/react/src/__tests__/ReactProfiler-test.internal.js
+++ b/packages/react/src/__tests__/ReactProfiler-test.internal.js
@@ -163,7 +163,7 @@ describe('Profiler', () => {
       const callback = jest.fn();
 
       const Yield = ({value}) => {
-        renderer.unstable_yield(value);
+        ReactTestRenderer.unstable_yield(value);
         return null;
       };
 
@@ -514,7 +514,7 @@ describe('Profiler', () => {
 
         const Yield = ({renderTime}) => {
           advanceTimeBy(renderTime);
-          renderer.unstable_yield('Yield:' + renderTime);
+          ReactTestRenderer.unstable_yield('Yield:' + renderTime);
           return null;
         };
 
@@ -550,7 +550,7 @@ describe('Profiler', () => {
 
         const Yield = ({renderTime}) => {
           advanceTimeBy(renderTime);
-          renderer.unstable_yield('Yield:' + renderTime);
+          ReactTestRenderer.unstable_yield('Yield:' + renderTime);
           return null;
         };
 
@@ -602,7 +602,7 @@ describe('Profiler', () => {
 
         const Yield = ({renderTime}) => {
           advanceTimeBy(renderTime);
-          renderer.unstable_yield('Yield:' + renderTime);
+          ReactTestRenderer.unstable_yield('Yield:' + renderTime);
           return null;
         };
 
@@ -627,15 +627,14 @@ describe('Profiler', () => {
 
         // Interrupt with higher priority work.
         // The interrupted work simulates an additional 5ms of time.
-        expect(
-          renderer.unstable_flushSync(() => {
-            renderer.update(
-              <React.unstable_Profiler id="test" onRender={callback}>
-                <Yield renderTime={5} />
-              </React.unstable_Profiler>,
-            );
-          }),
-        ).toEqual(['Yield:5']);
+        renderer.unstable_flushSync(() => {
+          renderer.update(
+            <React.unstable_Profiler id="test" onRender={callback}>
+              <Yield renderTime={5} />
+            </React.unstable_Profiler>,
+          );
+        });
+        expect(ReactTestRenderer.unstable_clearYields()).toEqual(['Yield:5']);
 
         // The initial work was thrown away in this case,
         // So the actual and base times should only include the final rendered tree times.
@@ -658,7 +657,7 @@ describe('Profiler', () => {
 
         const Yield = ({renderTime}) => {
           advanceTimeBy(renderTime);
-          renderer.unstable_yield('Yield:' + renderTime);
+          ReactTestRenderer.unstable_yield('Yield:' + renderTime);
           return null;
         };
 
@@ -714,15 +713,14 @@ describe('Profiler', () => {
 
         // Interrupt with higher priority work.
         // The interrupted work simulates an additional 11ms of time.
-        expect(
-          renderer.unstable_flushSync(() => {
-            renderer.update(
-              <React.unstable_Profiler id="test" onRender={callback}>
-                <Yield renderTime={11} />
-              </React.unstable_Profiler>,
-            );
-          }),
-        ).toEqual(['Yield:11']);
+        renderer.unstable_flushSync(() => {
+          renderer.update(
+            <React.unstable_Profiler id="test" onRender={callback}>
+              <Yield renderTime={11} />
+            </React.unstable_Profiler>,
+          );
+        });
+        expect(ReactTestRenderer.unstable_clearYields()).toEqual(['Yield:11']);
 
         // The actual time should include only the most recent render,
         // Because this lets us avoid a lot of commit phase reset complexity.
@@ -744,7 +742,7 @@ describe('Profiler', () => {
 
         const Yield = ({renderTime}) => {
           advanceTimeBy(renderTime);
-          renderer.unstable_yield('Yield:' + renderTime);
+          ReactTestRenderer.unstable_yield('Yield:' + renderTime);
           return null;
         };
 
@@ -754,7 +752,9 @@ describe('Profiler', () => {
           render() {
             first = this;
             advanceTimeBy(this.state.renderTime);
-            renderer.unstable_yield('FirstComponent:' + this.state.renderTime);
+            ReactTestRenderer.unstable_yield(
+              'FirstComponent:' + this.state.renderTime,
+            );
             return <Yield renderTime={4} />;
           }
         }
@@ -764,7 +764,9 @@ describe('Profiler', () => {
           render() {
             second = this;
             advanceTimeBy(this.state.renderTime);
-            renderer.unstable_yield('SecondComponent:' + this.state.renderTime);
+            ReactTestRenderer.unstable_yield(
+              'SecondComponent:' + this.state.renderTime,
+            );
             return <Yield renderTime={7} />;
           }
         }
@@ -812,9 +814,11 @@ describe('Profiler', () => {
 
         // Interrupt with higher priority work.
         // This simulates a total of 37ms of actual render time.
-        expect(
-          renderer.unstable_flushSync(() => second.setState({renderTime: 30})),
-        ).toEqual(['SecondComponent:30', 'Yield:7']);
+        renderer.unstable_flushSync(() => second.setState({renderTime: 30}));
+        expect(ReactTestRenderer.unstable_clearYields()).toEqual([
+          'SecondComponent:30',
+          'Yield:7',
+        ]);
 
         // The actual time should include only the most recent render (37ms),
         // Because this lets us avoid a lot of commit phase reset complexity.

From ead08827d05c6d292cb5953355dccc19553a1215 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 19 Jul 2018 00:23:10 +0100
Subject: [PATCH 242/277] Add more flexibility in testing errors in
 begin/complete phases (#13235)

* Add more flexibility in testing errors in begin/complete phases

* Update too
---
 .../src/createReactNoop.js                    | 32 ++++---------------
 ...tIncrementalErrorHandling-test.internal.js |  6 ++--
 .../ReactIncrementalErrorReplay-test.js       |  6 ++--
 .../__tests__/ReactProfiler-test.internal.js  | 14 ++++----
 4 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/packages/react-noop-renderer/src/createReactNoop.js b/packages/react-noop-renderer/src/createReactNoop.js
index 65af5f42d6..1505beb083 100644
--- a/packages/react-noop-renderer/src/createReactNoop.js
+++ b/packages/react-noop-renderer/src/createReactNoop.js
@@ -40,10 +40,7 @@ if (__DEV__) {
 
 function createReactNoop(reconciler: Function, useMutation: boolean) {
   let scheduledCallback = null;
-
   let instanceCounter = 0;
-  let failInBeginPhase = false;
-  let failInCompletePhase = false;
 
   function appendChildToContainerOrInstance(
     parentInstance: Container | Instance,
@@ -167,9 +164,6 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
 
   const sharedHostConfig = {
     getRootHostContext() {
-      if (failInBeginPhase) {
-        throw new Error('Error in host config.');
-      }
       return NO_CONTEXT;
     },
 
@@ -182,7 +176,7 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
     },
 
     createInstance(type: string, props: Props): Instance {
-      if (failInCompletePhase) {
+      if (type === 'errorInCompletePhase') {
         throw new Error('Error in host config.');
       }
       const inst = {
@@ -217,6 +211,9 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
       oldProps: Props,
       newProps: Props,
     ): null | {} {
+      if (type === 'errorInCompletePhase') {
+        throw new Error('Error in host config.');
+      }
       if (oldProps === null) {
         throw new Error('Should have old props');
       }
@@ -227,6 +224,9 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
     },
 
     shouldSetTextContent(type: string, props: Props): boolean {
+      if (type === 'errorInBeginPhase') {
+        throw new Error('Error in host config.');
+      }
       return (
         typeof props.children === 'string' || typeof props.children === 'number'
       );
@@ -695,24 +695,6 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
       console.log(...bufferedLog);
     },
 
-    simulateErrorInHostConfigDuringBeginPhase(fn: () => void) {
-      failInBeginPhase = true;
-      try {
-        fn();
-      } finally {
-        failInBeginPhase = false;
-      }
-    },
-
-    simulateErrorInHostConfigDuringCompletePhase(fn: () => void) {
-      failInCompletePhase = true;
-      try {
-        fn();
-      } finally {
-        failInCompletePhase = false;
-      }
-    },
-
     flushWithoutCommitting(
       expectedFlush: Array<mixed>,
       rootID: string = DEFAULT_ROOT_ID,
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
index 8e1945f283..fd5b1c8a33 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
@@ -1212,10 +1212,8 @@ describe('ReactIncrementalErrorHandling', () => {
   });
 
   it('handles error thrown by host config while working on failed root', () => {
-    ReactNoop.simulateErrorInHostConfigDuringBeginPhase(() => {
-      ReactNoop.render(<span />);
-      expect(() => ReactNoop.flush()).toThrow('Error in host config.');
-    });
+    ReactNoop.render(<errorInBeginPhase />);
+    expect(() => ReactNoop.flush()).toThrow('Error in host config.');
   });
 
   it('handles error thrown by top-level callback', () => {
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.js
index 57bd42bc05..0ac3718d97 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.js
@@ -21,10 +21,8 @@ describe('ReactIncrementalErrorReplay', () => {
   });
 
   it('should fail gracefully on error in the host environment', () => {
-    ReactNoop.simulateErrorInHostConfigDuringBeginPhase(() => {
-      ReactNoop.render(<span />);
-      expect(() => ReactNoop.flush()).toThrow('Error in host config.');
-    });
+    ReactNoop.render(<errorInBeginPhase />);
+    expect(() => ReactNoop.flush()).toThrow('Error in host config.');
   });
 
   it("should ignore error if it doesn't throw on retry", () => {
diff --git a/packages/react/src/__tests__/ReactProfiler-test.internal.js b/packages/react/src/__tests__/ReactProfiler-test.internal.js
index aca0d331d1..9c1bec7218 100644
--- a/packages/react/src/__tests__/ReactProfiler-test.internal.js
+++ b/packages/react/src/__tests__/ReactProfiler-test.internal.js
@@ -992,14 +992,12 @@ describe('Profiler', () => {
 
             // Simulate a renderer error during the "complete" phase.
             // This mimics behavior like React Native's View/Text nesting validation.
-            ReactNoop.simulateErrorInHostConfigDuringCompletePhase(() => {
-              ReactNoop.render(
-                <React.unstable_Profiler id="profiler" onRender={jest.fn()}>
-                  <span>hi</span>
-                </React.unstable_Profiler>,
-              );
-              expect(ReactNoop.flush).toThrow('Error in host config.');
-            });
+            ReactNoop.render(
+              <React.unstable_Profiler id="profiler" onRender={jest.fn()}>
+                <errorInCompletePhase>hi</errorInCompletePhase>
+              </React.unstable_Profiler>,
+            );
+            expect(ReactNoop.flush).toThrow('Error in host config.');
 
             // So long as the profiler timer's fiber stack is reset correctly,
             // Subsequent renders should not error.

From 2c560cb9952c05fb0a45aed87723c9a8bf6ff8d4 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 19 Jul 2018 02:16:10 +0100
Subject: [PATCH 243/277] Fix unwinding starting with a wrong Fiber on error in
 the complete phase (#13237)

* Add a repro case for profiler unwinding

This currently fails the tests due to an unexpected warning.

* Add a regression test for context stack

* Simplify the first test case

* Update nextUnitOfWork inside completeUnitOfWork()

The bug was caused by a structure like this:

    </Provider>
  </div>
</errorInCompletePhase>

We forgot to update nextUnitOfWork so it was still pointing at Provider when errorInCompletePhase threw. As a result, we would try to unwind from Provider (rather than from errorInCompletePhase), and thus pop the Provider twice.
---
 .../src/ReactFiberScheduler.js                |  3 ++-
 .../ReactNewContext-test.internal.js          | 21 +++++++++++++++++++
 .../__tests__/ReactProfiler-test.internal.js  | 11 ++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 13a321f60d..06b0041a76 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -791,11 +791,12 @@ function completeUnitOfWork(workInProgress: Fiber): Fiber | null {
 
     if ((workInProgress.effectTag & Incomplete) === NoEffect) {
       // This fiber completed.
-      let next = completeWork(
+      nextUnitOfWork = completeWork(
         current,
         workInProgress,
         nextRenderExpirationTime,
       );
+      let next = nextUnitOfWork;
       stopWorkTimer(workInProgress);
       resetExpirationTime(workInProgress, nextRenderExpirationTime);
       if (__DEV__) {
diff --git a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
index 5b56fbf287..09f9d6ec6f 100644
--- a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
@@ -1128,6 +1128,27 @@ describe('ReactNewContext', () => {
     ]);
   });
 
+  it('unwinds after errors in complete phase', () => {
+    const Context = React.createContext(0);
+
+    // This is a regression test for stack misalignment
+    // caused by unwinding the context from wrong point.
+    ReactNoop.render(
+      <errorInCompletePhase>
+        <Context.Provider />
+      </errorInCompletePhase>,
+    );
+    expect(ReactNoop.flush).toThrow('Error in host config.');
+
+    ReactNoop.render(
+      <Context.Provider value={10}>
+        <Context.Consumer>{value => <span prop={value} />}</Context.Consumer>
+      </Context.Provider>,
+    );
+    ReactNoop.flush();
+    expect(ReactNoop.getChildren()).toEqual([span(10)]);
+  });
+
   describe('fuzz test', () => {
     const Fragment = React.Fragment;
     const contextKeys = ['A', 'B', 'C', 'D', 'E', 'F', 'G'];
diff --git a/packages/react/src/__tests__/ReactProfiler-test.internal.js b/packages/react/src/__tests__/ReactProfiler-test.internal.js
index 9c1bec7218..39a512a0c5 100644
--- a/packages/react/src/__tests__/ReactProfiler-test.internal.js
+++ b/packages/react/src/__tests__/ReactProfiler-test.internal.js
@@ -999,6 +999,17 @@ describe('Profiler', () => {
             );
             expect(ReactNoop.flush).toThrow('Error in host config.');
 
+            // A similar case we've seen caused by an invariant in ReactDOM.
+            // It didn't reproduce without a host component inside.
+            ReactNoop.render(
+              <React.unstable_Profiler id="profiler" onRender={jest.fn()}>
+                <errorInCompletePhase>
+                  <span>hi</span>
+                </errorInCompletePhase>
+              </React.unstable_Profiler>,
+            );
+            expect(ReactNoop.flush).toThrow('Error in host config.');
+
             // So long as the profiler timer's fiber stack is reset correctly,
             // Subsequent renders should not error.
             ReactNoop.render(

From 2a1bc3f74c1d0f1f12359216d1c57ab6e73867dd Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 19 Jul 2018 12:15:01 +0100
Subject: [PATCH 244/277] Format messages in unexpected console.error() test
 failure

---
 scripts/jest/setupTests.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/jest/setupTests.js b/scripts/jest/setupTests.js
index bc09104a5d..3a9b7396c3 100644
--- a/scripts/jest/setupTests.js
+++ b/scripts/jest/setupTests.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const chalk = require('chalk');
+const util = require('util');
 
 if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
   // Inside the class equivalence tester, we have a custom environment, let's
@@ -63,14 +64,14 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
 
   ['error', 'warn'].forEach(methodName => {
     const unexpectedConsoleCallStacks = [];
-    const newMethod = function(message) {
+    const newMethod = function(format, ...args) {
       // Capture the call stack now so we can warn about it later.
       // The call stack has helpful information for the test author.
       // Don't throw yet though b'c it might be accidentally caught and suppressed.
       const stack = new Error().stack;
       unexpectedConsoleCallStacks.push([
         stack.substr(stack.indexOf('\n') + 1),
-        message,
+        util.format(format, ...args),
       ]);
     };
 

From 8121212f0db77a263a778a658c59ed7ba1f71d2d Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 19 Jul 2018 13:04:56 +0100
Subject: [PATCH 245/277] Fix warning extraction script

---
 scripts/print-warnings/print-warnings.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/print-warnings/print-warnings.js b/scripts/print-warnings/print-warnings.js
index 90db42caba..25d10714da 100644
--- a/scripts/print-warnings/print-warnings.js
+++ b/scripts/print-warnings/print-warnings.js
@@ -45,6 +45,7 @@ function transform(file, enc, cb) {
           const callee = astPath.get('callee');
           if (
             callee.isIdentifier({name: 'warning'}) ||
+            callee.isIdentifier({name: 'warningWithoutStack'}) ||
             callee.isIdentifier({name: 'lowPriorityWarning'})
           ) {
             const node = astPath.node;
@@ -62,7 +63,12 @@ function transform(file, enc, cb) {
   });
 }
 
-gs(['packages/**/*.js', '!**/__tests__/**/*.js', '!**/__mocks__/**/*.js']).pipe(
+gs([
+  'packages/**/*.js',
+  '!packages/shared/warning.js',
+  '!**/__tests__/**/*.js',
+  '!**/__mocks__/**/*.js',
+]).pipe(
   through.obj(transform, cb => {
     process.stdout.write(
       Array.from(warnings)

From 71b4e99901a98396ca34655e0cc1c03eadcbc49b Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Thu, 19 Jul 2018 10:26:24 -0700
Subject: [PATCH 246/277] [react-test-renderer] Jest matchers for async tests
 (#13236)

Adds custom Jest matchers that help with writing async tests:

- `toFlushThrough`
- `toFlushAll`
- `toFlushAndThrow`
- `toClearYields`

Each one accepts an array of expected yielded values, to prevent
false negatives.

Eventually I imagine we'll want to publish this on npm.
---
 .../src/ReactTestRenderer.js                  |   2 +-
 .../src/ReactTestRendererScheduling.js        |  39 +--
 .../__tests__/ReactTestRendererAsync-test.js  | 222 +++++++++++-------
 .../__tests__/ReactProfiler-test.internal.js  |  48 ++--
 scripts/jest/matchers/testRenderer.js         |  57 +++++
 scripts/jest/setupTests.js                    |   1 +
 .../spec-equivalence-reporter/setupTests.js   |   1 +
 7 files changed, 214 insertions(+), 156 deletions(-)
 create mode 100644 scripts/jest/matchers/testRenderer.js

diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js
index 861504436d..9102963b6a 100644
--- a/packages/react-test-renderer/src/ReactTestRenderer.js
+++ b/packages/react-test-renderer/src/ReactTestRenderer.js
@@ -472,7 +472,7 @@ const ReactTestRendererFiber = {
         TestRendererScheduling.clearYields();
         return TestRenderer.flushSync(fn);
       },
-      unstable_flushThrough: TestRendererScheduling.flushThrough,
+      unstable_flushNumberOfYields: TestRendererScheduling.flushNumberOfYields,
       unstable_clearYields: TestRendererScheduling.clearYields,
     };
 
diff --git a/packages/react-test-renderer/src/ReactTestRendererScheduling.js b/packages/react-test-renderer/src/ReactTestRendererScheduling.js
index 1855db197a..311c112cc7 100644
--- a/packages/react-test-renderer/src/ReactTestRendererScheduling.js
+++ b/packages/react-test-renderer/src/ReactTestRendererScheduling.js
@@ -31,38 +31,7 @@ export function setNowImplementation(implementation: () => number): void {
   nowImplementation = implementation;
 }
 
-function verifyExpectedValues(expectedValues: Array<mixed>): void {
-  for (let i = 0; i < expectedValues.length; i++) {
-    const expectedValue = `"${(expectedValues[i]: any)}"`;
-    const yieldedValue =
-      i < yieldedValues.length ? `"${(yieldedValues[i]: any)}"` : 'nothing';
-    if (yieldedValue !== expectedValue) {
-      const error = new Error(
-        `Flush expected to yield ${(expectedValue: any)}, but ${(yieldedValue: any)} was yielded`,
-      );
-      // Attach expected and yielded arrays,
-      // So the caller could pretty print the diff (if desired).
-      (error: any).expectedValues = expectedValues;
-      (error: any).actualValues = yieldedValues;
-      throw error;
-    }
-  }
-
-  if (expectedValues.length !== yieldedValues.length) {
-    const error = new Error(
-      `Flush expected to yield ${expectedValues.length} values, but yielded ${
-        yieldedValues.length
-      }`,
-    );
-    // Attach expected and yielded arrays,
-    // So the caller could pretty print the diff (if desired).
-    (error: any).expectedValues = expectedValues;
-    (error: any).actualValues = yieldedValues;
-    throw error;
-  }
-}
-
-export function flushAll(expectedValues: Array<mixed>): Array<mixed> {
+export function flushAll(): Array<mixed> {
   yieldedValues = [];
   while (scheduledCallback !== null) {
     const cb = scheduledCallback;
@@ -78,11 +47,10 @@ export function flushAll(expectedValues: Array<mixed>): Array<mixed> {
       didTimeout: false,
     });
   }
-  verifyExpectedValues(expectedValues);
   return yieldedValues;
 }
 
-export function flushThrough(expectedValues: Array<mixed>): Array<mixed> {
+export function flushNumberOfYields(count: number): Array<mixed> {
   let didStop = false;
   yieldedValues = [];
   while (scheduledCallback !== null && !didStop) {
@@ -90,7 +58,7 @@ export function flushThrough(expectedValues: Array<mixed>): Array<mixed> {
     scheduledCallback = null;
     cb({
       timeRemaining() {
-        if (yieldedValues.length >= expectedValues.length) {
+        if (yieldedValues.length >= count) {
           // We at least as many values as expected. Stop rendering.
           didStop = true;
           return 0;
@@ -104,7 +72,6 @@ export function flushThrough(expectedValues: Array<mixed>): Array<mixed> {
       didTimeout: false,
     });
   }
-  verifyExpectedValues(expectedValues);
   return yieldedValues;
 }
 
diff --git a/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js b/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js
index f25c0134da..f0f4e48391 100644
--- a/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js
@@ -32,7 +32,7 @@ describe('ReactTestRendererAsync', () => {
     expect(renderer.toJSON()).toEqual(null);
 
     // Flush initial mount.
-    renderer.unstable_flushAll([]);
+    expect(renderer).toFlushAll([]);
     expect(renderer.toJSON()).toEqual('Hi');
 
     // Update
@@ -40,7 +40,7 @@ describe('ReactTestRendererAsync', () => {
     // Not yet updated.
     expect(renderer.toJSON()).toEqual('Hi');
     // Flush update.
-    renderer.unstable_flushAll([]);
+    expect(renderer).toFlushAll([]);
     expect(renderer.toJSON()).toEqual('Bye');
   });
 
@@ -62,11 +62,11 @@ describe('ReactTestRendererAsync', () => {
       unstable_isAsync: true,
     });
 
-    renderer.unstable_flushAll(['A:1', 'B:1', 'C:1']);
+    expect(renderer).toFlushAll(['A:1', 'B:1', 'C:1']);
     expect(renderer.toJSON()).toEqual(['A:1', 'B:1', 'C:1']);
 
     renderer.update(<Parent step={2} />);
-    renderer.unstable_flushAll(['A:2', 'B:2', 'C:2']);
+    expect(renderer).toFlushAll(['A:2', 'B:2', 'C:2']);
     expect(renderer.toJSON()).toEqual(['A:2', 'B:2', 'C:2']);
   });
 
@@ -89,15 +89,12 @@ describe('ReactTestRendererAsync', () => {
     });
 
     // Flush the first two siblings
-    expect(renderer.unstable_flushThrough(['A:1', 'B:1'])).toEqual([
-      'A:1',
-      'B:1',
-    ]);
+    expect(renderer).toFlushThrough(['A:1', 'B:1']);
     // Did not commit yet.
     expect(renderer.toJSON()).toEqual(null);
 
     // Flush the remaining work
-    renderer.unstable_flushAll(['C:1']);
+    expect(renderer).toFlushAll(['C:1']);
     expect(renderer.toJSON()).toEqual(['A:1', 'B:1', 'C:1']);
   });
 
@@ -129,7 +126,7 @@ describe('ReactTestRendererAsync', () => {
     });
 
     // Flush the some of the changes, but don't commit
-    expect(renderer.unstable_flushThrough(['A:1'])).toEqual(['A:1']);
+    expect(renderer).toFlushThrough(['A:1']);
     expect(renderer.toJSON()).toEqual(null);
 
     // Interrupt with higher priority properties
@@ -141,89 +138,136 @@ describe('ReactTestRendererAsync', () => {
     expect(renderer.toJSON()).toEqual(['A:2', 'B:2']);
   });
 
-  it('should error if flushThrough params dont match yielded values', () => {
-    const Yield = ({id}) => {
-      ReactTestRenderer.unstable_yield(id);
-      return id;
-    };
+  describe('Jest matchers', () => {
+    it('toFlushThrough', () => {
+      const Yield = ({id}) => {
+        ReactTestRenderer.unstable_yield(id);
+        return id;
+      };
 
-    const renderer = ReactTestRenderer.create(
-      <div>
-        <Yield id="foo" />
-        <Yield id="bar" />
-        <Yield id="baz" />
-      </div>,
-      {
-        unstable_isAsync: true,
-      },
-    );
+      const renderer = ReactTestRenderer.create(
+        <div>
+          <Yield id="foo" />
+          <Yield id="bar" />
+          <Yield id="baz" />
+        </div>,
+        {
+          unstable_isAsync: true,
+        },
+      );
 
-    expect(() => renderer.unstable_flushThrough(['foo', 'baz'])).toThrow(
-      'Flush expected to yield "baz", but "bar" was yielded',
-    );
-  });
-
-  it('should error if flushAll params dont match yielded values', () => {
-    const Yield = ({id}) => {
-      ReactTestRenderer.unstable_yield(id);
-      return id;
-    };
-
-    const renderer = ReactTestRenderer.create(
-      <div>
-        <Yield id="foo" />
-        <Yield id="bar" />
-        <Yield id="baz" />
-      </div>,
-      {
-        unstable_isAsync: true,
-      },
-    );
-
-    expect(() => renderer.unstable_flushAll([])).toThrow(
-      'Flush expected to yield 0 values, but yielded 3',
-    );
-
-    renderer.update(
-      <div>
-        <Yield id="foo" />
-        <Yield id="bar" />
-        <Yield id="baz" />
-      </div>,
-    );
-
-    expect(() => renderer.unstable_flushAll(['foo', 'baz'])).toThrow(
-      'Flush expected to yield "baz", but "bar" was yielded',
-    );
-  });
-
-  it('should error if flushThrough yields the wrong number of values', () => {
-    const Yield = ({id}) => {
-      ReactTestRenderer.unstable_yield(id);
-      return id;
-    };
-
-    const renderer = ReactTestRenderer.create(
-      <div>
-        <Yield id="foo" />
-      </div>,
-      {
-        unstable_isAsync: true,
-      },
-    );
-
-    expect(() => renderer.unstable_flushThrough(['foo', 'bar'])).toThrow(
-      'Flush expected to yield "bar", but nothing was yielded',
-    );
-  });
-
-  it('should error if flushThrough yields no values', () => {
-    const renderer = ReactTestRenderer.create(null, {
-      unstable_isAsync: true,
+      expect(() => expect(renderer).toFlushThrough(['foo', 'baz'])).toThrow(
+        'Expected value to equal:',
+      );
     });
 
-    expect(() => renderer.unstable_flushThrough(['foo'])).toThrow(
-      'Flush expected to yield "foo", but nothing was yielded',
+    it('toFlushAll', () => {
+      const Yield = ({id}) => {
+        ReactTestRenderer.unstable_yield(id);
+        return id;
+      };
+
+      const renderer = ReactTestRenderer.create(
+        <div>
+          <Yield id="foo" />
+          <Yield id="bar" />
+          <Yield id="baz" />
+        </div>,
+        {
+          unstable_isAsync: true,
+        },
+      );
+
+      expect(() => expect(renderer).toFlushAll([])).toThrowError(
+        'Expected value to equal:',
+      );
+
+      renderer.update(
+        <div>
+          <Yield id="foo" />
+          <Yield id="bar" />
+          <Yield id="baz" />
+        </div>,
+      );
+
+      expect(() => expect(renderer).toFlushAll(['foo', 'baz'])).toThrow(
+        'Expected value to equal:',
+      );
+    });
+
+    it('toFlushAndThrow', () => {
+      const Yield = ({id}) => {
+        ReactTestRenderer.unstable_yield(id);
+        return id;
+      };
+
+      function BadRender() {
+        throw new Error('Oh no!');
+      }
+
+      function App() {
+        return (
+          <div>
+            <Yield id="A" />
+            <Yield id="B" />
+            <BadRender />
+            <Yield id="C" />
+            <Yield id="D" />
+          </div>
+        );
+      }
+
+      const renderer = ReactTestRenderer.create(<App />, {
+        unstable_isAsync: true,
+      });
+
+      expect(() => {
+        expect(renderer).toFlushAndThrow(
+          // Wrong expected values
+          ['A', 'B'],
+          'Oh no!',
+        );
+      }).toThrow('Expected value to equal:');
+
+      renderer.update(<App />);
+
+      expect(() => {
+        expect(renderer).toFlushAndThrow(
+          ['A', 'B', 'C', 'D', 'A', 'B', 'C', 'D'],
+          // Wrong error message
+          'Oops!',
+        );
+      }).toThrow('Expected the function to throw an error matching:');
+
+      renderer.update(<App />);
+
+      // Passes
+      expect(renderer).toFlushAndThrow(
+        ['A', 'B', 'C', 'D', 'A', 'B', 'C', 'D'],
+        'Oh no!',
+      );
+    });
+  });
+
+  it('toClearYields', () => {
+    const Yield = ({id}) => {
+      ReactTestRenderer.unstable_yield(id);
+      return id;
+    };
+
+    function App() {
+      return (
+        <div>
+          <Yield id="A" />
+          <Yield id="B" />
+          <Yield id="C" />
+        </div>
+      );
+    }
+
+    ReactTestRenderer.create(<App />);
+    expect(() => expect(ReactTestRenderer).toClearYields(['A', 'B'])).toThrow(
+      'Expected value to equal:',
     );
   });
 });
diff --git a/packages/react/src/__tests__/ReactProfiler-test.internal.js b/packages/react/src/__tests__/ReactProfiler-test.internal.js
index 39a512a0c5..b105363f06 100644
--- a/packages/react/src/__tests__/ReactProfiler-test.internal.js
+++ b/packages/react/src/__tests__/ReactProfiler-test.internal.js
@@ -178,9 +178,9 @@ describe('Profiler', () => {
       );
 
       // Times are logged until a render is committed.
-      renderer.unstable_flushThrough(['first']);
+      expect(renderer).toFlushThrough(['first']);
       expect(callback).toHaveBeenCalledTimes(0);
-      renderer.unstable_flushAll(['last']);
+      expect(renderer).toFlushAll(['last']);
       expect(callback).toHaveBeenCalledTimes(1);
     });
 
@@ -528,13 +528,11 @@ describe('Profiler', () => {
           </React.unstable_Profiler>,
           {unstable_isAsync: true},
         );
-        expect(renderer.unstable_flushThrough(['Yield:2'])).toEqual([
-          'Yield:2',
-        ]);
+        expect(renderer).toFlushThrough(['Yield:2']);
         expect(callback).toHaveBeenCalledTimes(0);
 
         // Resume render for remaining children.
-        renderer.unstable_flushAll(['Yield:3']);
+        expect(renderer).toFlushAll(['Yield:3']);
 
         // Verify that logged times include both durations above.
         expect(callback).toHaveBeenCalledTimes(1);
@@ -568,9 +566,7 @@ describe('Profiler', () => {
           </React.unstable_Profiler>,
           {unstable_isAsync: true},
         );
-        expect(renderer.unstable_flushThrough(['Yield:5'])).toEqual([
-          'Yield:5',
-        ]);
+        expect(renderer).toFlushThrough(['Yield:5']);
         expect(callback).toHaveBeenCalledTimes(0);
 
         // Simulate time moving forward while frame is paused.
@@ -578,7 +574,7 @@ describe('Profiler', () => {
 
         // Flush the remaninig work,
         // Which should take an additional 10ms of simulated time.
-        renderer.unstable_flushAll(['Yield:10', 'Yield:17']);
+        expect(renderer).toFlushAll(['Yield:10', 'Yield:17']);
         expect(callback).toHaveBeenCalledTimes(2);
 
         const [innerCall, outerCall] = callback.mock.calls;
@@ -617,9 +613,7 @@ describe('Profiler', () => {
           </React.unstable_Profiler>,
           {unstable_isAsync: true},
         );
-        expect(renderer.unstable_flushThrough(['Yield:10'])).toEqual([
-          'Yield:10',
-        ]);
+        expect(renderer).toFlushThrough(['Yield:10']);
         expect(callback).toHaveBeenCalledTimes(0);
 
         // Simulate time moving forward while frame is paused.
@@ -634,7 +628,7 @@ describe('Profiler', () => {
             </React.unstable_Profiler>,
           );
         });
-        expect(ReactTestRenderer.unstable_clearYields()).toEqual(['Yield:5']);
+        expect(ReactTestRenderer).toClearYields(['Yield:5']);
 
         // The initial work was thrown away in this case,
         // So the actual and base times should only include the final rendered tree times.
@@ -648,7 +642,7 @@ describe('Profiler', () => {
         callback.mockReset();
 
         // Verify no more unexpected callbacks from low priority work
-        renderer.unstable_flushAll([]);
+        expect(renderer).toFlushAll([]);
         expect(callback).toHaveBeenCalledTimes(0);
       });
 
@@ -673,7 +667,7 @@ describe('Profiler', () => {
 
         // Render everything initially.
         // This should take 21 seconds of actual and base time.
-        renderer.unstable_flushAll(['Yield:6', 'Yield:15']);
+        expect(renderer).toFlushAll(['Yield:6', 'Yield:15']);
         expect(callback).toHaveBeenCalledTimes(1);
         let call = callback.mock.calls[0];
         expect(call[2]).toBe(21); // actual time
@@ -694,18 +688,14 @@ describe('Profiler', () => {
             <Yield renderTime={9} />
           </React.unstable_Profiler>,
         );
-        expect(renderer.unstable_flushThrough(['Yield:3'])).toEqual([
-          'Yield:3',
-        ]);
+        expect(renderer).toFlushThrough(['Yield:3']);
         expect(callback).toHaveBeenCalledTimes(0);
 
         // Simulate time moving forward while frame is paused.
         advanceTimeBy(100); // 59 -> 159
 
         // Render another 5ms of simulated time.
-        expect(renderer.unstable_flushThrough(['Yield:5'])).toEqual([
-          'Yield:5',
-        ]);
+        expect(renderer).toFlushThrough(['Yield:5']);
         expect(callback).toHaveBeenCalledTimes(0);
 
         // Simulate time moving forward while frame is paused.
@@ -720,7 +710,7 @@ describe('Profiler', () => {
             </React.unstable_Profiler>,
           );
         });
-        expect(ReactTestRenderer.unstable_clearYields()).toEqual(['Yield:11']);
+        expect(ReactTestRenderer).toClearYields(['Yield:11']);
 
         // The actual time should include only the most recent render,
         // Because this lets us avoid a lot of commit phase reset complexity.
@@ -733,7 +723,7 @@ describe('Profiler', () => {
         expect(call[5]).toBe(275); // commit time
 
         // Verify no more unexpected callbacks from low priority work
-        renderer.unstable_flushAll([]);
+        expect(renderer).toFlushAll([]);
         expect(callback).toHaveBeenCalledTimes(1);
       });
 
@@ -784,7 +774,7 @@ describe('Profiler', () => {
         // Render everything initially.
         // This simulates a total of 14ms of actual render time.
         // The base render time is also 14ms for the initial render.
-        renderer.unstable_flushAll([
+        expect(renderer).toFlushAll([
           'FirstComponent:1',
           'Yield:4',
           'SecondComponent:2',
@@ -804,9 +794,7 @@ describe('Profiler', () => {
         // Render a partially update, but don't finish.
         // This partial render will take 10ms of actual render time.
         first.setState({renderTime: 10});
-        expect(renderer.unstable_flushThrough(['FirstComponent:10'])).toEqual([
-          'FirstComponent:10',
-        ]);
+        expect(renderer).toFlushThrough(['FirstComponent:10']);
         expect(callback).toHaveBeenCalledTimes(0);
 
         // Simulate time moving forward while frame is paused.
@@ -815,7 +803,7 @@ describe('Profiler', () => {
         // Interrupt with higher priority work.
         // This simulates a total of 37ms of actual render time.
         renderer.unstable_flushSync(() => second.setState({renderTime: 30}));
-        expect(ReactTestRenderer.unstable_clearYields()).toEqual([
+        expect(ReactTestRenderer).toClearYields([
           'SecondComponent:30',
           'Yield:7',
         ]);
@@ -842,7 +830,7 @@ describe('Profiler', () => {
         // The tree contains 42ms of base render time at this point,
         // Reflecting the most recent (longer) render durations.
         // TODO: This actual time should decrease by 10ms once the scheduler supports resuming.
-        renderer.unstable_flushAll(['FirstComponent:10', 'Yield:4']);
+        expect(renderer).toFlushAll(['FirstComponent:10', 'Yield:4']);
         expect(callback).toHaveBeenCalledTimes(1);
         call = callback.mock.calls[0];
         expect(call[2]).toBe(14); // actual time
diff --git a/scripts/jest/matchers/testRenderer.js b/scripts/jest/matchers/testRenderer.js
new file mode 100644
index 0000000000..7f1bcd36d7
--- /dev/null
+++ b/scripts/jest/matchers/testRenderer.js
@@ -0,0 +1,57 @@
+'use strict';
+
+function captureAssertion(fn) {
+  // Trick to use a Jest matcher inside another Jest matcher. `fn` contains an
+  // assertion; if it throws, we capture the error and return it, so the stack
+  // trace presented to the user points to the original assertion in the
+  // test file.
+  try {
+    fn();
+  } catch (error) {
+    return {
+      pass: false,
+      message: () => error.message,
+    };
+  }
+  return {pass: true};
+}
+
+function toFlushAll(renderer, expectedYields) {
+  const actualYields = renderer.unstable_flushAll();
+  return captureAssertion(() => expect(actualYields).toEqual(expectedYields));
+}
+
+function toFlushThrough(renderer, expectedYields) {
+  const actualYields = renderer.unstable_flushNumberOfYields(
+    expectedYields.length
+  );
+  return captureAssertion(() => expect(actualYields).toEqual(expectedYields));
+}
+
+function toClearYields(ReactTestRenderer, expectedYields) {
+  const actualYields = ReactTestRenderer.unstable_clearYields();
+  return captureAssertion(() => expect(actualYields).toEqual(expectedYields));
+}
+
+function toFlushAndThrow(renderer, expectedYields, ...rest) {
+  return captureAssertion(() => {
+    try {
+      expect(() => {
+        renderer.unstable_flushAll();
+      }).toThrow(...rest);
+    } catch (error) {
+      const actualYields = renderer.unstable_clearYields();
+      expect(actualYields).toEqual(expectedYields);
+      throw error;
+    }
+    const actualYields = renderer.unstable_clearYields();
+    expect(actualYields).toEqual(expectedYields);
+  });
+}
+
+module.exports = {
+  toFlushAll,
+  toFlushThrough,
+  toFlushAndThrow,
+  toClearYields,
+};
diff --git a/scripts/jest/setupTests.js b/scripts/jest/setupTests.js
index 3a9b7396c3..63bdd6e529 100644
--- a/scripts/jest/setupTests.js
+++ b/scripts/jest/setupTests.js
@@ -44,6 +44,7 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
 
   expect.extend({
     ...require('./matchers/toWarnDev'),
+    ...require('./matchers/testRenderer'),
   });
 
   // We have a Babel transform that inserts guards against infinite loops.
diff --git a/scripts/jest/spec-equivalence-reporter/setupTests.js b/scripts/jest/spec-equivalence-reporter/setupTests.js
index e91d34b1b1..76c71fe716 100644
--- a/scripts/jest/spec-equivalence-reporter/setupTests.js
+++ b/scripts/jest/spec-equivalence-reporter/setupTests.js
@@ -47,6 +47,7 @@ global.spyOnProd = function(...args) {
 
 expect.extend({
   ...require('../matchers/toWarnDev'),
+  ...require('../matchers/testRenderer'),
 });
 
 beforeEach(() => (numExpectations = 0));

From 3d3506d37d6a3b398e29696458f696e86ec5d576 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 19 Jul 2018 22:11:59 +0100
Subject: [PATCH 247/277] Include Modes in the component stack (#13240)

* Add a test that StrictMode shows up in the component stack

The SSR test passes. The client one doesn't.

* Include Modes in component stack

* Update other tests to include modes
---
 .../ReactServerRenderingHydration.js          |  1 -
 .../react-reconciler/src/ReactCurrentFiber.js |  2 +
 .../ReactStrictMode-test.internal.js          | 10 +++
 .../src/__tests__/ReactStrictMode-test.js     | 65 +++++++++++++++++++
 4 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 packages/react/src/__tests__/ReactStrictMode-test.js

diff --git a/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js b/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
index 9f15eab857..63a0104f0c 100644
--- a/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
+++ b/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
@@ -292,7 +292,6 @@ describe('ReactDOMServerHydration', () => {
 
     expect(() => ReactDOM.hydrate(markup, element)).toWarnDev(
       'Please update the following components to use componentDidMount instead: ComponentWithWarning',
-      {withoutStack: true},
     );
     expect(element.textContent).toBe('Hi');
   });
diff --git a/packages/react-reconciler/src/ReactCurrentFiber.js b/packages/react-reconciler/src/ReactCurrentFiber.js
index 0a47c6ba90..cd72ffc520 100644
--- a/packages/react-reconciler/src/ReactCurrentFiber.js
+++ b/packages/react-reconciler/src/ReactCurrentFiber.js
@@ -13,6 +13,7 @@ import {
   FunctionalComponent,
   ClassComponent,
   HostComponent,
+  Mode,
 } from 'shared/ReactTypeOfWork';
 import describeComponentFrame from 'shared/describeComponentFrame';
 import getComponentName from 'shared/getComponentName';
@@ -29,6 +30,7 @@ function describeFiber(fiber: Fiber): string {
     case FunctionalComponent:
     case ClassComponent:
     case HostComponent:
+    case Mode:
       const owner = fiber._debugOwner;
       const source = fiber._debugSource;
       const name = getComponentName(fiber.type);
diff --git a/packages/react/src/__tests__/ReactStrictMode-test.internal.js b/packages/react/src/__tests__/ReactStrictMode-test.internal.js
index 10c53cc9ed..fffb538571 100644
--- a/packages/react/src/__tests__/ReactStrictMode-test.internal.js
+++ b/packages/react/src/__tests__/ReactStrictMode-test.internal.js
@@ -357,6 +357,7 @@ describe('ReactStrictMode', () => {
         rendered = ReactTestRenderer.create(<SyncRoot />);
       }).toWarnDev(
         'Unsafe lifecycle methods were found within a strict-mode tree:' +
+          '\n    in AsyncMode (at **)' +
           '\n    in SyncRoot (at **)' +
           '\n\ncomponentWillMount: Please update the following components ' +
           'to use componentDidMount instead: AsyncRoot' +
@@ -414,6 +415,7 @@ describe('ReactStrictMode', () => {
         () => (rendered = ReactTestRenderer.create(<SyncRoot />)),
       ).toWarnDev(
         'Unsafe lifecycle methods were found within a strict-mode tree:' +
+          '\n    in AsyncMode (at **)' +
           '\n    in SyncRoot (at **)' +
           '\n\ncomponentWillMount: Please update the following components ' +
           'to use componentDidMount instead: AsyncRoot, Parent' +
@@ -491,12 +493,14 @@ describe('ReactStrictMode', () => {
         () => (rendered = ReactTestRenderer.create(<SyncRoot />)),
       ).toWarnDev([
         'Unsafe lifecycle methods were found within a strict-mode tree:' +
+          '\n    in AsyncMode (at **)' +
           '\n    in AsyncRootOne (at **)' +
           '\n    in div (at **)' +
           '\n    in SyncRoot (at **)' +
           '\n\ncomponentWillMount: Please update the following components ' +
           'to use componentDidMount instead: Bar, Foo',
         'Unsafe lifecycle methods were found within a strict-mode tree:' +
+          '\n    in AsyncMode (at **)' +
           '\n    in AsyncRootTwo (at **)' +
           '\n    in div (at **)' +
           '\n    in SyncRoot (at **)' +
@@ -537,6 +541,7 @@ describe('ReactStrictMode', () => {
         rendered = ReactTestRenderer.create(<AsyncRoot foo={true} />);
       }).toWarnDev(
         'Unsafe lifecycle methods were found within a strict-mode tree:' +
+          '\n    in AsyncMode (at **)' +
           '\n    in AsyncRoot (at **)' +
           '\n\ncomponentWillMount: Please update the following components ' +
           'to use componentDidMount instead: Foo' +
@@ -546,6 +551,7 @@ describe('ReactStrictMode', () => {
 
       expect(() => rendered.update(<AsyncRoot foo={false} />)).toWarnDev(
         'Unsafe lifecycle methods were found within a strict-mode tree:' +
+          '\n    in AsyncMode (at **)' +
           '\n    in AsyncRoot (at **)' +
           '\n\ncomponentWillMount: Please update the following components ' +
           'to use componentDidMount instead: Bar' +
@@ -596,6 +602,7 @@ describe('ReactStrictMode', () => {
 
       expect(() => ReactTestRenderer.create(<SyncRoot />)).toWarnDev(
         'Unsafe lifecycle methods were found within a strict-mode tree:' +
+          '\n    in StrictMode (at **)' +
           '\n    in SyncRoot (at **)' +
           '\n\ncomponentWillReceiveProps: Please update the following components ' +
           'to use static getDerivedStateFromProps instead: Bar, Foo' +
@@ -755,6 +762,7 @@ describe('ReactStrictMode', () => {
         'Warning: A string ref, "somestring", has been found within a strict mode tree. ' +
           'String refs are a source of potential bugs and should be avoided. ' +
           'We recommend using createRef() instead.\n\n' +
+          '    in StrictMode (at **)\n' +
           '    in OuterComponent (at **)\n\n' +
           'Learn more about using refs safely here:\n' +
           'https://fb.me/react-strict-mode-string-ref',
@@ -797,6 +805,7 @@ describe('ReactStrictMode', () => {
           'String refs are a source of potential bugs and should be avoided. ' +
           'We recommend using createRef() instead.\n\n' +
           '    in InnerComponent (at **)\n' +
+          '    in StrictMode (at **)\n' +
           '    in OuterComponent (at **)\n\n' +
           'Learn more about using refs safely here:\n' +
           'https://fb.me/react-strict-mode-string-ref',
@@ -888,6 +897,7 @@ describe('ReactStrictMode', () => {
         rendered = ReactTestRenderer.create(<Root />);
       }).toWarnDev(
         'Warning: Legacy context API has been detected within a strict-mode tree: ' +
+          '\n    in StrictMode (at **)' +
           '\n    in div (at **)' +
           '\n    in Root (at **)' +
           '\n\nPlease update the following components: FactoryLegacyContextConsumer, ' +
diff --git a/packages/react/src/__tests__/ReactStrictMode-test.js b/packages/react/src/__tests__/ReactStrictMode-test.js
new file mode 100644
index 0000000000..f4ba917432
--- /dev/null
+++ b/packages/react/src/__tests__/ReactStrictMode-test.js
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react-core
+ */
+
+'use strict';
+
+let React;
+let ReactDOM;
+let ReactDOMServer;
+
+describe('ReactStrictMode', () => {
+  beforeEach(() => {
+    jest.resetModules();
+    React = require('react');
+    ReactDOM = require('react-dom');
+    ReactDOMServer = require('react-dom/server');
+  });
+
+  it('should appear in the client component stack', () => {
+    function Foo() {
+      return <div ariaTypo="" />;
+    }
+
+    const container = document.createElement('div');
+    expect(() => {
+      ReactDOM.render(
+        <React.StrictMode>
+          <Foo />
+        </React.StrictMode>,
+        container,
+      );
+    }).toWarnDev(
+      'Invalid ARIA attribute `ariaTypo`. ' +
+        'ARIA attributes follow the pattern aria-* and must be lowercase.\n' +
+        '    in div (at **)\n' +
+        '    in Foo (at **)\n' +
+        '    in StrictMode (at **)',
+    );
+  });
+
+  it('should appear in the SSR component stack', () => {
+    function Foo() {
+      return <div ariaTypo="" />;
+    }
+
+    expect(() => {
+      ReactDOMServer.renderToString(
+        <React.StrictMode>
+          <Foo />
+        </React.StrictMode>,
+      );
+    }).toWarnDev(
+      'Invalid ARIA attribute `ariaTypo`. ' +
+        'ARIA attributes follow the pattern aria-* and must be lowercase.\n' +
+        '    in div (at **)\n' +
+        '    in Foo (at **)\n' +
+        '    in StrictMode (at **)',
+    );
+  });
+});

From 5776fa3fcff2c93491e95c261d98af3cebf2cac9 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 20 Jul 2018 16:50:43 +0100
Subject: [PATCH 248/277] Update www warning shim (#13244)

---
 .../forks/{warning.www.js => warningWithoutStack.www.js}      | 0
 packages/shared/lowPriorityWarning.js                         | 2 +-
 scripts/rollup/forks.js                                       | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/shared/forks/{warning.www.js => warningWithoutStack.www.js} (100%)

diff --git a/packages/shared/forks/warning.www.js b/packages/shared/forks/warningWithoutStack.www.js
similarity index 100%
rename from packages/shared/forks/warning.www.js
rename to packages/shared/forks/warningWithoutStack.www.js
diff --git a/packages/shared/lowPriorityWarning.js b/packages/shared/lowPriorityWarning.js
index 299d306aae..993cdc7df7 100644
--- a/packages/shared/lowPriorityWarning.js
+++ b/packages/shared/lowPriorityWarning.js
@@ -39,7 +39,7 @@ if (__DEV__) {
   lowPriorityWarning = function(condition, format, ...args) {
     if (format === undefined) {
       throw new Error(
-        '`warningWithoutStack(condition, format, ...args)` requires a warning ' +
+        '`lowPriorityWarning(condition, format, ...args)` requires a warning ' +
           'message argument',
       );
     }
diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js
index 680f5f0709..3bd99dafce 100644
--- a/scripts/rollup/forks.js
+++ b/scripts/rollup/forks.js
@@ -150,12 +150,12 @@ const forks = Object.freeze({
   },
 
   // This logic is forked on www to blacklist warnings.
-  'shared/warning': (bundleType, entry) => {
+  'shared/warningWithoutStack': (bundleType, entry) => {
     switch (bundleType) {
       case FB_WWW_DEV:
       case FB_WWW_PROD:
       case FB_WWW_PROFILING:
-        return 'shared/forks/warning.www.js';
+        return 'shared/forks/warningWithoutStack.www.js';
       default:
         return null;
     }

From 2b509e2c8c8c1fbc33ae59ce7c7dca0107732ff4 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Fri, 20 Jul 2018 16:49:06 -0700
Subject: [PATCH 249/277] [Experimental] API for reading context from within
 any render phase function (#13139)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Store list of contexts on the fiber

Currently, context can only be read by a special type of component,
ContextConsumer. We want to add support to all fibers, including
classes and functional components.

Each fiber may read from one or more contexts. To enable quick, mono-
morphic access of this list, we'll store them on a fiber property.

* Context.unstable_read

unstable_read can be called anywhere within the render phase. That
includes the render method, getDerivedStateFromProps, constructors,
functional components, and context consumer render props.

If it's called outside the render phase, an error is thrown.

* Remove vestigial context cursor

Wasn't being used.

* Split fiber.expirationTime into two separate fields

Currently, the `expirationTime` field represents the pending work of
both the fiber itself — including new props, state, and context — and of
any updates in that fiber's subtree.

This commit adds a second field called `childExpirationTime`. Now
`expirationTime` only represents the pending work of the fiber itself.
The subtree's pending work is represented by `childExpirationTime`.

The biggest advantage is it requires fewer checks to bailout on already
finished work. For most types of work, if the `expirationTime` does not
match the render expiration time, we can bailout immediately without
any further checks. This won't work for fibers that have
`shouldComponentUpdate` semantics (class components), for which we still
need to check for props and state changes explicitly.

* Performance nits

Optimize `readContext` for most common case
---
 .../src/createReactNoop.js                    |    5 +-
 packages/react-reconciler/src/ReactFiber.js   |   24 +-
 .../src/ReactFiberBeginWork.js                |  631 ++---
 .../src/ReactFiberClassComponent.js           |   62 +-
 .../src/ReactFiberDispatcher.js               |   14 +
 .../src/ReactFiberNewContext.js               |  251 +-
 .../src/ReactFiberReconciler.js               |    2 +-
 .../src/ReactFiberScheduler.js                |  144 +-
 .../src/ReactFiberUnwindWork.js               |   11 +-
 .../react-reconciler/src/ReactUpdateQueue.js  |   52 +-
 .../ReactNewContext-test.internal.js          | 2275 +++++++++--------
 packages/react/src/ReactContext.js            |   18 +
 packages/react/src/ReactCurrentOwner.js       |    2 +
 packages/shared/ReactTypes.js                 |    1 +
 14 files changed, 1933 insertions(+), 1559 deletions(-)
 create mode 100644 packages/react-reconciler/src/ReactFiberDispatcher.js

diff --git a/packages/react-noop-renderer/src/createReactNoop.js b/packages/react-noop-renderer/src/createReactNoop.js
index 1505beb083..81f2081f2f 100644
--- a/packages/react-noop-renderer/src/createReactNoop.js
+++ b/packages/react-noop-renderer/src/createReactNoop.js
@@ -662,7 +662,10 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
             '- ' +
             // need to explicitly coerce Symbol to a string
             (fiber.type ? fiber.type.name || fiber.type.toString() : '[root]'),
-          '[' + fiber.expirationTime + (fiber.pendingProps ? '*' : '') + ']',
+          '[' +
+            fiber.childExpirationTime +
+            (fiber.pendingProps ? '*' : '') +
+            ']',
         );
         if (fiber.updateQueue) {
           logUpdateQueue(fiber.updateQueue, depth);
diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js
index e0b325f67e..a39f5f3328 100644
--- a/packages/react-reconciler/src/ReactFiber.js
+++ b/packages/react-reconciler/src/ReactFiber.js
@@ -14,6 +14,7 @@ import type {TypeOfMode} from './ReactTypeOfMode';
 import type {TypeOfSideEffect} from 'shared/ReactTypeOfSideEffect';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 import type {UpdateQueue} from './ReactUpdateQueue';
+import type {ContextDependency} from './ReactFiberNewContext';
 
 import invariant from 'shared/invariant';
 import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
@@ -124,6 +125,9 @@ export type Fiber = {|
   // The state used to create the output
   memoizedState: any,
 
+  // A linked-list of contexts that this fiber depends on
+  firstContextDependency: ContextDependency<mixed> | null,
+
   // Bitfield that describes properties about the fiber and its subtree. E.g.
   // the AsyncMode flag indicates whether the subtree should be async-by-
   // default. When a fiber is created, it inherits the mode of its
@@ -145,9 +149,12 @@ export type Fiber = {|
   lastEffect: Fiber | null,
 
   // Represents a time in the future by which this work should be completed.
-  // This is also used to quickly determine if a subtree has no pending changes.
+  // Does not include work found in its subtree.
   expirationTime: ExpirationTime,
 
+  // This is used to quickly determine if a subtree has no pending changes.
+  childExpirationTime: ExpirationTime,
+
   // This is a pooled version of a Fiber. Every fiber that gets updated will
   // eventually have a pair. There are cases when we can clean up pairs to save
   // memory if we need to.
@@ -213,6 +220,7 @@ function FiberNode(
   this.memoizedProps = null;
   this.updateQueue = null;
   this.memoizedState = null;
+  this.firstContextDependency = null;
 
   this.mode = mode;
 
@@ -224,6 +232,7 @@ function FiberNode(
   this.lastEffect = null;
 
   this.expirationTime = NoWork;
+  this.childExpirationTime = NoWork;
 
   this.alternate = null;
 
@@ -325,12 +334,21 @@ export function createWorkInProgress(
     }
   }
 
-  workInProgress.expirationTime = expirationTime;
+  // Don't touching the subtree's expiration time, which has not changed.
+  workInProgress.childExpirationTime = current.childExpirationTime;
+  if (pendingProps !== current.pendingProps) {
+    // This fiber has new props.
+    workInProgress.expirationTime = expirationTime;
+  } else {
+    // This fiber's props have not changed.
+    workInProgress.expirationTime = current.expirationTime;
+  }
 
   workInProgress.child = current.child;
   workInProgress.memoizedProps = current.memoizedProps;
   workInProgress.memoizedState = current.memoizedState;
   workInProgress.updateQueue = current.updateQueue;
+  workInProgress.firstContextDependency = current.firstContextDependency;
 
   // These will be overridden during the parent's reconciliation
   workInProgress.sibling = current.sibling;
@@ -559,12 +577,14 @@ export function assignFiberPropertiesInDEV(
   target.memoizedProps = source.memoizedProps;
   target.updateQueue = source.updateQueue;
   target.memoizedState = source.memoizedState;
+  target.firstContextDependency = source.firstContextDependency;
   target.mode = source.mode;
   target.effectTag = source.effectTag;
   target.nextEffect = source.nextEffect;
   target.firstEffect = source.firstEffect;
   target.lastEffect = source.lastEffect;
   target.expirationTime = source.expirationTime;
+  target.childExpirationTime = source.childExpirationTime;
   target.alternate = source.alternate;
   if (enableProfilerTimer) {
     target.actualDuration = source.actualDuration;
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 8eb9e2188b..2f64fb6146 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -70,8 +70,9 @@ import {
 import {pushHostContext, pushHostContainer} from './ReactFiberHostContext';
 import {
   pushProvider,
-  getContextCurrentValue,
-  getContextChangedBits,
+  propagateContextChange,
+  readContext,
+  prepareToReadContext,
 } from './ReactFiberNewContext';
 import {
   markActualRenderTimeStarted,
@@ -111,17 +112,7 @@ if (__DEV__) {
   didWarnAboutStatelessRefs = {};
 }
 
-// TODO: Remove this and use reconcileChildrenAtExpirationTime directly.
-function reconcileChildren(current, workInProgress, nextChildren) {
-  reconcileChildrenAtExpirationTime(
-    current,
-    workInProgress,
-    nextChildren,
-    workInProgress.expirationTime,
-  );
-}
-
-export function reconcileChildrenAtExpirationTime(
+export function reconcileChildren(
   current: Fiber | null,
   workInProgress: Fiber,
   nextChildren: any,
@@ -154,7 +145,7 @@ export function reconcileChildrenAtExpirationTime(
   }
 }
 
-function updateForwardRef(current, workInProgress) {
+function updateForwardRef(current, workInProgress, renderExpirationTime) {
   const render = workInProgress.type.render;
   const nextProps = workInProgress.pendingProps;
   const ref = workInProgress.ref;
@@ -164,7 +155,11 @@ function updateForwardRef(current, workInProgress) {
   } else if (workInProgress.memoizedProps === nextProps) {
     const currentRef = current !== null ? current.ref : null;
     if (ref === currentRef) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      return bailoutOnAlreadyFinishedWork(
+        current,
+        workInProgress,
+        renderExpirationTime,
+      );
     }
   }
 
@@ -178,50 +173,52 @@ function updateForwardRef(current, workInProgress) {
     nextChildren = render(nextProps, ref);
   }
 
-  reconcileChildren(current, workInProgress, nextChildren);
+  reconcileChildren(
+    current,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime,
+  );
   memoizeProps(workInProgress, nextProps);
   return workInProgress.child;
 }
 
-function updateFragment(current, workInProgress) {
+function updateFragment(current, workInProgress, renderExpirationTime) {
   const nextChildren = workInProgress.pendingProps;
-  if (hasLegacyContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (workInProgress.memoizedProps === nextChildren) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
-  reconcileChildren(current, workInProgress, nextChildren);
+  reconcileChildren(
+    current,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime,
+  );
   memoizeProps(workInProgress, nextChildren);
   return workInProgress.child;
 }
 
-function updateMode(current, workInProgress) {
+function updateMode(current, workInProgress, renderExpirationTime) {
   const nextChildren = workInProgress.pendingProps.children;
-  if (hasLegacyContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (
-    nextChildren === null ||
-    workInProgress.memoizedProps === nextChildren
-  ) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
-  reconcileChildren(current, workInProgress, nextChildren);
+  reconcileChildren(
+    current,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime,
+  );
   memoizeProps(workInProgress, nextChildren);
   return workInProgress.child;
 }
 
-function updateProfiler(current, workInProgress) {
-  const nextProps = workInProgress.pendingProps;
+function updateProfiler(current, workInProgress, renderExpirationTime) {
   if (enableProfilerTimer) {
     workInProgress.effectTag |= Update;
   }
-  if (workInProgress.memoizedProps === nextProps) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
+  const nextProps = workInProgress.pendingProps;
   const nextChildren = nextProps.children;
-  reconcileChildren(current, workInProgress, nextChildren);
+  reconcileChildren(
+    current,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime,
+  );
   memoizeProps(workInProgress, nextProps);
   return workInProgress.child;
 }
@@ -237,26 +234,18 @@ function markRef(current: Fiber | null, workInProgress: Fiber) {
   }
 }
 
-function updateFunctionalComponent(current, workInProgress) {
+function updateFunctionalComponent(
+  current,
+  workInProgress,
+  renderExpirationTime,
+) {
   const fn = workInProgress.type;
   const nextProps = workInProgress.pendingProps;
-
-  if (hasLegacyContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else {
-    if (workInProgress.memoizedProps === nextProps) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-    // TODO: consider bringing fn.shouldComponentUpdate() back.
-    // It used to be here.
-  }
-
   const unmaskedContext = getUnmaskedContext(workInProgress);
   const context = getMaskedContext(workInProgress, unmaskedContext);
 
   let nextChildren;
-
+  prepareToReadContext(workInProgress, renderExpirationTime);
   if (__DEV__) {
     ReactCurrentOwner.current = workInProgress;
     ReactCurrentFiber.setCurrentPhase('render');
@@ -265,9 +254,15 @@ function updateFunctionalComponent(current, workInProgress) {
   } else {
     nextChildren = fn(nextProps, context);
   }
+
   // React DevTools reads this flag.
   workInProgress.effectTag |= PerformedWork;
-  reconcileChildren(current, workInProgress, nextChildren);
+  reconcileChildren(
+    current,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime,
+  );
   memoizeProps(workInProgress, nextProps);
   return workInProgress.child;
 }
@@ -281,6 +276,11 @@ function updateClassComponent(
   // During mounting we don't know the child context yet as the instance doesn't exist.
   // We will invalidate the child context in finishClassComponent() right after rendering.
   const hasContext = pushLegacyContextProvider(workInProgress);
+  const hasPendingNewContext = prepareToReadContext(
+    workInProgress,
+    renderExpirationTime,
+  );
+
   let shouldUpdate;
   if (current === null) {
     if (workInProgress.stateNode === null) {
@@ -297,6 +297,7 @@ function updateClassComponent(
       // In a resume, we'll already have an instance we can reuse.
       shouldUpdate = resumeMountClassInstance(
         workInProgress,
+        hasPendingNewContext,
         renderExpirationTime,
       );
     }
@@ -304,6 +305,7 @@ function updateClassComponent(
     shouldUpdate = updateClassInstance(
       current,
       workInProgress,
+      hasPendingNewContext,
       renderExpirationTime,
     );
   }
@@ -334,7 +336,11 @@ function finishClassComponent(
       invalidateContextProvider(workInProgress, false);
     }
 
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    return bailoutOnAlreadyFinishedWork(
+      current,
+      workInProgress,
+      renderExpirationTime,
+    );
   }
 
   const ctor = workInProgress.type;
@@ -380,18 +386,13 @@ function finishClassComponent(
   if (current !== null && didCaptureError) {
     // If we're recovering from an error, reconcile twice: first to delete
     // all the existing children.
-    reconcileChildrenAtExpirationTime(
-      current,
-      workInProgress,
-      null,
-      renderExpirationTime,
-    );
+    reconcileChildren(current, workInProgress, null, renderExpirationTime);
     workInProgress.child = null;
     // Now we can continue reconciling like normal. This has the effect of
     // remounting all children regardless of whether their their
     // identity matches.
   }
-  reconcileChildrenAtExpirationTime(
+  reconcileChildren(
     current,
     workInProgress,
     nextChildren,
@@ -427,66 +428,75 @@ function pushHostRootContext(workInProgress) {
 
 function updateHostRoot(current, workInProgress, renderExpirationTime) {
   pushHostRootContext(workInProgress);
-  let updateQueue = workInProgress.updateQueue;
-  if (updateQueue !== null) {
-    const nextProps = workInProgress.pendingProps;
-    const prevState = workInProgress.memoizedState;
-    const prevChildren = prevState !== null ? prevState.element : null;
-    processUpdateQueue(
+  const updateQueue = workInProgress.updateQueue;
+  invariant(
+    updateQueue !== null,
+    'If the root does not have an updateQueue, we should have already ' +
+      'bailed out. This error is likely caused by a bug in React. Please ' +
+      'file an issue.',
+  );
+  const nextProps = workInProgress.pendingProps;
+  const prevState = workInProgress.memoizedState;
+  const prevChildren = prevState !== null ? prevState.element : null;
+  processUpdateQueue(
+    workInProgress,
+    updateQueue,
+    nextProps,
+    null,
+    renderExpirationTime,
+  );
+  const nextState = workInProgress.memoizedState;
+  // Caution: React DevTools currently depends on this property
+  // being called "element".
+  const nextChildren = nextState.element;
+  if (nextChildren === prevChildren) {
+    // If the state is the same as before, that's a bailout because we had
+    // no work that expires at this time.
+    resetHydrationState();
+    return bailoutOnAlreadyFinishedWork(
+      current,
       workInProgress,
-      updateQueue,
-      nextProps,
-      null,
       renderExpirationTime,
     );
-    const nextState = workInProgress.memoizedState;
-    // Caution: React DevTools currently depends on this property
-    // being called "element".
-    const nextChildren = nextState.element;
-
-    if (nextChildren === prevChildren) {
-      // If the state is the same as before, that's a bailout because we had
-      // no work that expires at this time.
-      resetHydrationState();
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-    const root: FiberRoot = workInProgress.stateNode;
-    if (
-      (current === null || current.child === null) &&
-      root.hydrate &&
-      enterHydrationState(workInProgress)
-    ) {
-      // If we don't have any current children this might be the first pass.
-      // We always try to hydrate. If this isn't a hydration pass there won't
-      // be any children to hydrate which is effectively the same thing as
-      // not hydrating.
-
-      // This is a bit of a hack. We track the host root as a placement to
-      // know that we're currently in a mounting state. That way isMounted
-      // works as expected. We must reset this before committing.
-      // TODO: Delete this when we delete isMounted and findDOMNode.
-      workInProgress.effectTag |= Placement;
-
-      // Ensure that children mount into this root without tracking
-      // side-effects. This ensures that we don't store Placement effects on
-      // nodes that will be hydrated.
-      workInProgress.child = mountChildFibers(
-        workInProgress,
-        null,
-        nextChildren,
-        renderExpirationTime,
-      );
-    } else {
-      // Otherwise reset hydration state in case we aborted and resumed another
-      // root.
-      resetHydrationState();
-      reconcileChildren(current, workInProgress, nextChildren);
-    }
-    return workInProgress.child;
   }
-  resetHydrationState();
-  // If there is no update queue, that's a bailout because the root has no props.
-  return bailoutOnAlreadyFinishedWork(current, workInProgress);
+  const root: FiberRoot = workInProgress.stateNode;
+  if (
+    (current === null || current.child === null) &&
+    root.hydrate &&
+    enterHydrationState(workInProgress)
+  ) {
+    // If we don't have any current children this might be the first pass.
+    // We always try to hydrate. If this isn't a hydration pass there won't
+    // be any children to hydrate which is effectively the same thing as
+    // not hydrating.
+
+    // This is a bit of a hack. We track the host root as a placement to
+    // know that we're currently in a mounting state. That way isMounted
+    // works as expected. We must reset this before committing.
+    // TODO: Delete this when we delete isMounted and findDOMNode.
+    workInProgress.effectTag |= Placement;
+
+    // Ensure that children mount into this root without tracking
+    // side-effects. This ensures that we don't store Placement effects on
+    // nodes that will be hydrated.
+    workInProgress.child = mountChildFibers(
+      workInProgress,
+      null,
+      nextChildren,
+      renderExpirationTime,
+    );
+  } else {
+    // Otherwise reset hydration state in case we aborted and resumed another
+    // root.
+    reconcileChildren(
+      current,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime,
+    );
+    resetHydrationState();
+  }
+  return workInProgress.child;
 }
 
 function updateHostComponent(current, workInProgress, renderExpirationTime) {
@@ -497,28 +507,9 @@ function updateHostComponent(current, workInProgress, renderExpirationTime) {
   }
 
   const type = workInProgress.type;
-  const memoizedProps = workInProgress.memoizedProps;
   const nextProps = workInProgress.pendingProps;
   const prevProps = current !== null ? current.memoizedProps : null;
 
-  if (hasLegacyContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (memoizedProps === nextProps) {
-    const isHidden =
-      workInProgress.mode & AsyncMode &&
-      shouldDeprioritizeSubtree(type, nextProps);
-    if (isHidden) {
-      // Before bailing out, make sure we've deprioritized a hidden component.
-      workInProgress.expirationTime = Never;
-    }
-    if (!isHidden || renderExpirationTime !== Never) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-    // If we're rendering a hidden node at hidden priority, don't bailout. The
-    // parent is complete, but the children may not be.
-  }
-
   let nextChildren = nextProps.children;
   const isDirectTextChild = shouldSetTextContent(type, nextProps);
 
@@ -528,7 +519,7 @@ function updateHostComponent(current, workInProgress, renderExpirationTime) {
     // this in the host environment that also have access to this prop. That
     // avoids allocating another HostText fiber and traversing it.
     nextChildren = null;
-  } else if (prevProps && shouldSetTextContent(type, prevProps)) {
+  } else if (prevProps !== null && shouldSetTextContent(type, prevProps)) {
     // If we're switching from a direct text child to a normal child, or to
     // empty, we need to schedule the text content to be reset.
     workInProgress.effectTag |= ContentReset;
@@ -542,14 +533,18 @@ function updateHostComponent(current, workInProgress, renderExpirationTime) {
     workInProgress.mode & AsyncMode &&
     shouldDeprioritizeSubtree(type, nextProps)
   ) {
-    // Down-prioritize the children.
+    // Schedule this fiber to re-render at offscreen priority. Then bailout.
     workInProgress.expirationTime = Never;
-    // Bailout and come back to this fiber later.
     workInProgress.memoizedProps = nextProps;
     return null;
   }
 
-  reconcileChildren(current, workInProgress, nextChildren);
+  reconcileChildren(
+    current,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime,
+  );
   memoizeProps(workInProgress, nextProps);
   return workInProgress.child;
 }
@@ -580,6 +575,8 @@ function mountIndeterminateComponent(
   const unmaskedContext = getUnmaskedContext(workInProgress);
   const context = getMaskedContext(workInProgress, unmaskedContext);
 
+  prepareToReadContext(workInProgress, renderExpirationTime);
+
   let value;
 
   if (__DEV__) {
@@ -697,7 +694,7 @@ function mountIndeterminateComponent(
         }
       }
     }
-    reconcileChildren(current, workInProgress, value);
+    reconcileChildren(current, workInProgress, value, renderExpirationTime);
     memoizeProps(workInProgress, props);
     return workInProgress.child;
   }
@@ -710,9 +707,6 @@ function updatePlaceholderComponent(
 ) {
   if (enableSuspense) {
     const nextProps = workInProgress.pendingProps;
-    const prevProps = workInProgress.memoizedProps;
-
-    const prevDidTimeout = workInProgress.memoizedState === true;
 
     // Check if we already attempted to render the normal state. If we did,
     // and we timed out, render the placeholder state.
@@ -727,12 +721,7 @@ function updatePlaceholderComponent(
       nextDidTimeout = true;
       // If we're recovering from an error, reconcile twice: first to delete
       // all the existing children.
-      reconcileChildrenAtExpirationTime(
-        current,
-        workInProgress,
-        null,
-        renderExpirationTime,
-      );
+      reconcileChildren(current, workInProgress, null, renderExpirationTime);
       current.child = null;
       // Now we can continue reconciling like normal. This has the effect of
       // remounting all children regardless of whether their their
@@ -741,13 +730,6 @@ function updatePlaceholderComponent(
       nextDidTimeout = !alreadyCaptured;
     }
 
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (nextProps === prevProps && nextDidTimeout === prevDidTimeout) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-
     if ((workInProgress.mode & StrictMode) !== NoEffect) {
       if (nextDidTimeout) {
         // If the timed-out view commits, schedule an update effect to record
@@ -772,7 +754,12 @@ function updatePlaceholderComponent(
 
     workInProgress.memoizedProps = nextProps;
     workInProgress.memoizedState = nextDidTimeout;
-    reconcileChildren(current, workInProgress, nextChildren);
+    reconcileChildren(
+      current,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime,
+    );
     return workInProgress.child;
   } else {
     return null;
@@ -782,13 +769,6 @@ function updatePlaceholderComponent(
 function updatePortalComponent(current, workInProgress, renderExpirationTime) {
   pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
   const nextChildren = workInProgress.pendingProps;
-  if (hasLegacyContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (workInProgress.memoizedProps === nextChildren) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
-
   if (current === null) {
     // Portals are special because we don't append the children during mount
     // but at commit. Therefore we need to track insertions which the normal
@@ -803,125 +783,23 @@ function updatePortalComponent(current, workInProgress, renderExpirationTime) {
     );
     memoizeProps(workInProgress, nextChildren);
   } else {
-    reconcileChildren(current, workInProgress, nextChildren);
+    reconcileChildren(
+      current,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime,
+    );
     memoizeProps(workInProgress, nextChildren);
   }
   return workInProgress.child;
 }
 
-function propagateContextChange<V>(
-  workInProgress: Fiber,
-  context: ReactContext<V>,
-  changedBits: number,
-  renderExpirationTime: ExpirationTime,
-): void {
-  let fiber = workInProgress.child;
-  if (fiber !== null) {
-    // Set the return pointer of the child to the work-in-progress fiber.
-    fiber.return = workInProgress;
-  }
-  while (fiber !== null) {
-    let nextFiber;
-    // Visit this fiber.
-    switch (fiber.tag) {
-      case ContextConsumer:
-        // Check if the context matches.
-        const observedBits: number = fiber.stateNode | 0;
-        if (fiber.type === context && (observedBits & changedBits) !== 0) {
-          // Update the expiration time of all the ancestors, including
-          // the alternates.
-
-          let node = fiber;
-          do {
-            const alternate = node.alternate;
-            if (
-              node.expirationTime === NoWork ||
-              node.expirationTime > renderExpirationTime
-            ) {
-              node.expirationTime = renderExpirationTime;
-              if (
-                alternate !== null &&
-                (alternate.expirationTime === NoWork ||
-                  alternate.expirationTime > renderExpirationTime)
-              ) {
-                alternate.expirationTime = renderExpirationTime;
-              }
-            } else if (
-              alternate !== null &&
-              (alternate.expirationTime === NoWork ||
-                alternate.expirationTime > renderExpirationTime)
-            ) {
-              alternate.expirationTime = renderExpirationTime;
-            } else {
-              // Neither alternate was updated, which means the rest of the
-              // ancestor path already has sufficient priority.
-              break;
-            }
-            node = node.return;
-          } while (node !== null);
-
-          // Don't scan deeper than a matching consumer. When we render the
-          // consumer, we'll continue scanning from that point. This way the
-          // scanning work is time-sliced.
-          nextFiber = null;
-        } else {
-          // Traverse down.
-          nextFiber = fiber.child;
-        }
-        break;
-      case ContextProvider:
-        // Don't scan deeper if this is a matching provider
-        nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
-        break;
-      default:
-        // Traverse down.
-        nextFiber = fiber.child;
-        break;
-    }
-    if (nextFiber !== null) {
-      // Set the return pointer of the child to the work-in-progress fiber.
-      nextFiber.return = fiber;
-    } else {
-      // No child. Traverse to next sibling.
-      nextFiber = fiber;
-      while (nextFiber !== null) {
-        if (nextFiber === workInProgress) {
-          // We're back to the root of this subtree. Exit.
-          nextFiber = null;
-          break;
-        }
-        let sibling = nextFiber.sibling;
-        if (sibling !== null) {
-          // Set the return pointer of the sibling to the work-in-progress fiber.
-          sibling.return = nextFiber.return;
-          nextFiber = sibling;
-          break;
-        }
-        // No more siblings. Traverse up.
-        nextFiber = nextFiber.return;
-      }
-    }
-    fiber = nextFiber;
-  }
-}
-
 function updateContextProvider(current, workInProgress, renderExpirationTime) {
   const providerType: ReactProviderType<any> = workInProgress.type;
   const context: ReactContext<any> = providerType._context;
 
   const newProps = workInProgress.pendingProps;
   const oldProps = workInProgress.memoizedProps;
-  let canBailOnProps = true;
-
-  if (hasLegacyContextChanged()) {
-    canBailOnProps = false;
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (oldProps === newProps) {
-    workInProgress.stateNode = 0;
-    pushProvider(workInProgress);
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
 
   const newValue = newProps.value;
   workInProgress.memoizedProps = newProps;
@@ -947,10 +825,17 @@ function updateContextProvider(current, workInProgress, renderExpirationTime) {
   } else {
     if (oldProps.value === newProps.value) {
       // No change. Bailout early if children are the same.
-      if (oldProps.children === newProps.children && canBailOnProps) {
+      if (
+        oldProps.children === newProps.children &&
+        !hasLegacyContextChanged()
+      ) {
         workInProgress.stateNode = 0;
         pushProvider(workInProgress);
-        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+        return bailoutOnAlreadyFinishedWork(
+          current,
+          workInProgress,
+          renderExpirationTime,
+        );
       }
       changedBits = 0;
     } else {
@@ -964,10 +849,17 @@ function updateContextProvider(current, workInProgress, renderExpirationTime) {
         (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
       ) {
         // No change. Bailout early if children are the same.
-        if (oldProps.children === newProps.children && canBailOnProps) {
+        if (
+          oldProps.children === newProps.children &&
+          !hasLegacyContextChanged()
+        ) {
           workInProgress.stateNode = 0;
           pushProvider(workInProgress);
-          return bailoutOnAlreadyFinishedWork(current, workInProgress);
+          return bailoutOnAlreadyFinishedWork(
+            current,
+            workInProgress,
+            renderExpirationTime,
+          );
         }
         changedBits = 0;
       } else {
@@ -987,10 +879,17 @@ function updateContextProvider(current, workInProgress, renderExpirationTime) {
 
         if (changedBits === 0) {
           // No change. Bailout early if children are the same.
-          if (oldProps.children === newProps.children && canBailOnProps) {
+          if (
+            oldProps.children === newProps.children &&
+            !hasLegacyContextChanged()
+          ) {
             workInProgress.stateNode = 0;
             pushProvider(workInProgress);
-            return bailoutOnAlreadyFinishedWork(current, workInProgress);
+            return bailoutOnAlreadyFinishedWork(
+              current,
+              workInProgress,
+              renderExpirationTime,
+            );
           }
         } else {
           propagateContextChange(
@@ -1008,52 +907,13 @@ function updateContextProvider(current, workInProgress, renderExpirationTime) {
   pushProvider(workInProgress);
 
   const newChildren = newProps.children;
-  reconcileChildren(current, workInProgress, newChildren);
+  reconcileChildren(current, workInProgress, newChildren, renderExpirationTime);
   return workInProgress.child;
 }
 
 function updateContextConsumer(current, workInProgress, renderExpirationTime) {
   const context: ReactContext<any> = workInProgress.type;
   const newProps = workInProgress.pendingProps;
-  const oldProps = workInProgress.memoizedProps;
-
-  const newValue = getContextCurrentValue(context);
-  const changedBits = getContextChangedBits(context);
-
-  if (hasLegacyContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (changedBits === 0 && oldProps === newProps) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
-  workInProgress.memoizedProps = newProps;
-
-  let observedBits = newProps.unstable_observedBits;
-  if (observedBits === undefined || observedBits === null) {
-    // Subscribe to all changes by default
-    observedBits = MAX_SIGNED_31_BIT_INT;
-  }
-  // Store the observedBits on the fiber's stateNode for quick access.
-  workInProgress.stateNode = observedBits;
-
-  if ((changedBits & observedBits) !== 0) {
-    // Context change propagation stops at matching consumers, for time-
-    // slicing. Continue the propagation here.
-    propagateContextChange(
-      workInProgress,
-      context,
-      changedBits,
-      renderExpirationTime,
-    );
-  } else if (oldProps === newProps) {
-    // Skip over a memoized parent with a bitmask bailout even
-    // if we began working on it because of a deeper matching child.
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
-  // There is no bailout on `children` equality because we expect people
-  // to often pass a bound method as a child, but it may reference
-  // `this.state` or `this.props` (and thus needs to re-render on `setState`).
-
   const render = newProps.children;
 
   if (__DEV__) {
@@ -1066,6 +926,8 @@ function updateContextConsumer(current, workInProgress, renderExpirationTime) {
     );
   }
 
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  const newValue = readContext(context, newProps.unstable_observedBits);
   let newChildren;
   if (__DEV__) {
     ReactCurrentOwner.current = workInProgress;
@@ -1078,7 +940,8 @@ function updateContextConsumer(current, workInProgress, renderExpirationTime) {
 
   // React DevTools reads this flag.
   workInProgress.effectTag |= PerformedWork;
-  reconcileChildren(current, workInProgress, newChildren);
+  reconcileChildren(current, workInProgress, newChildren, renderExpirationTime);
+  workInProgress.memoizedProps = newProps;
   return workInProgress.child;
 }
 
@@ -1102,61 +965,38 @@ function updateContextConsumer(current, workInProgress, renderExpirationTime) {
   */
 
 function bailoutOnAlreadyFinishedWork(
-  current,
+  current: Fiber | null,
   workInProgress: Fiber,
+  renderExpirationTime: ExpirationTime,
 ): Fiber | null {
   cancelWorkTimer(workInProgress);
 
-  if (enableProfilerTimer) {
-    // Don't update "base" render times for bailouts.
-    stopBaseRenderTimerIfRunning();
+  if (current !== null) {
+    // Reuse previous context list
+    workInProgress.firstContextDependency = current.firstContextDependency;
   }
 
-  // TODO: We should ideally be able to bail out early if the children have no
-  // more work to do. However, since we don't have a separation of this
-  // Fiber's priority and its children yet - we don't know without doing lots
-  // of the same work we do anyway. Once we have that separation we can just
-  // bail out here if the children has no more work at this priority level.
-  // if (workInProgress.priorityOfChildren <= priorityLevel) {
-  //   // If there are side-effects in these children that have not yet been
-  //   // committed we need to ensure that they get properly transferred up.
-  //   if (current && current.child !== workInProgress.child) {
-  //     reuseChildrenEffects(workInProgress, child);
-  //   }
-  //   return null;
-  // }
-
-  cloneChildFibers(current, workInProgress);
-  return workInProgress.child;
-}
-
-function bailoutOnLowPriority(current, workInProgress) {
-  cancelWorkTimer(workInProgress);
-
   if (enableProfilerTimer) {
     // Don't update "base" render times for bailouts.
     stopBaseRenderTimerIfRunning();
   }
 
-  // TODO: Handle HostComponent tags here as well and call pushHostContext()?
-  // See PR 8590 discussion for context
-  switch (workInProgress.tag) {
-    case HostRoot:
-      pushHostRootContext(workInProgress);
-      break;
-    case ClassComponent:
-      pushLegacyContextProvider(workInProgress);
-      break;
-    case HostPortal:
-      pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
-      break;
-    case ContextProvider:
-      pushProvider(workInProgress);
-      break;
+  // Check if the children have any pending work.
+  const childExpirationTime = workInProgress.childExpirationTime;
+  if (
+    childExpirationTime === NoWork ||
+    childExpirationTime > renderExpirationTime
+  ) {
+    // The children don't have any work either. We can skip them.
+    // TODO: Once we add back resuming, we should check if the children are
+    // a work-in-progress set. If so, we need to transfer their effects.
+    return null;
+  } else {
+    // This fiber doesn't have work, but its subtree does. Clone the child
+    // fibers and continue.
+    cloneChildFibers(current, workInProgress);
+    return workInProgress.child;
   }
-  // TODO: What if this is currently in progress?
-  // How can that happen? How is this not being cloned?
-  return null;
 }
 
 // TODO: Delete memoizeProps/State and move to reconcile/bailout instead
@@ -1181,13 +1021,52 @@ function beginWork(
     }
   }
 
+  const updateExpirationTime = workInProgress.expirationTime;
   if (
-    workInProgress.expirationTime === NoWork ||
-    workInProgress.expirationTime > renderExpirationTime
+    !hasLegacyContextChanged() &&
+    (updateExpirationTime === NoWork ||
+      updateExpirationTime > renderExpirationTime)
   ) {
-    return bailoutOnLowPriority(current, workInProgress);
+    // This fiber does not have any pending work. Bailout without entering
+    // the begin phase. There's still some bookkeeping we that needs to be done
+    // in this optimized path, mostly pushing stuff onto the stack.
+    switch (workInProgress.tag) {
+      case HostRoot:
+        pushHostRootContext(workInProgress);
+        resetHydrationState();
+        break;
+      case HostComponent:
+        pushHostContext(workInProgress);
+        break;
+      case ClassComponent:
+        pushLegacyContextProvider(workInProgress);
+        break;
+      case HostPortal:
+        pushHostContainer(
+          workInProgress,
+          workInProgress.stateNode.containerInfo,
+        );
+        break;
+      case ContextProvider:
+        workInProgress.stateNode = 0;
+        pushProvider(workInProgress);
+        break;
+      case Profiler:
+        if (enableProfilerTimer) {
+          workInProgress.effectTag |= Update;
+        }
+        break;
+    }
+    return bailoutOnAlreadyFinishedWork(
+      current,
+      workInProgress,
+      renderExpirationTime,
+    );
   }
 
+  // Before entering the begin phase, clear the expiration time.
+  workInProgress.expirationTime = NoWork;
+
   switch (workInProgress.tag) {
     case IndeterminateComponent:
       return mountIndeterminateComponent(
@@ -1196,7 +1075,11 @@ function beginWork(
         renderExpirationTime,
       );
     case FunctionalComponent:
-      return updateFunctionalComponent(current, workInProgress);
+      return updateFunctionalComponent(
+        current,
+        workInProgress,
+        renderExpirationTime,
+      );
     case ClassComponent:
       return updateClassComponent(
         current,
@@ -1222,13 +1105,13 @@ function beginWork(
         renderExpirationTime,
       );
     case ForwardRef:
-      return updateForwardRef(current, workInProgress);
+      return updateForwardRef(current, workInProgress, renderExpirationTime);
     case Fragment:
-      return updateFragment(current, workInProgress);
+      return updateFragment(current, workInProgress, renderExpirationTime);
     case Mode:
-      return updateMode(current, workInProgress);
+      return updateMode(current, workInProgress, renderExpirationTime);
     case Profiler:
-      return updateProfiler(current, workInProgress);
+      return updateProfiler(current, workInProgress, renderExpirationTime);
     case ContextProvider:
       return updateContextProvider(
         current,
diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js
index 40485c9705..cc2103fe22 100644
--- a/packages/react-reconciler/src/ReactFiberClassComponent.js
+++ b/packages/react-reconciler/src/ReactFiberClassComponent.js
@@ -162,7 +162,7 @@ export function applyDerivedStateFromProps(
   // Once the update queue is empty, persist the derived state onto the
   // base state.
   const updateQueue = workInProgress.updateQueue;
-  if (updateQueue !== null && updateQueue.expirationTime === NoWork) {
+  if (updateQueue !== null && workInProgress.expirationTime === NoWork) {
     updateQueue.baseState = memoizedState;
   }
 }
@@ -183,7 +183,7 @@ const classComponentUpdater = {
       update.callback = callback;
     }
 
-    enqueueUpdate(fiber, update, expirationTime);
+    enqueueUpdate(fiber, update);
     scheduleWork(fiber, expirationTime);
   },
   enqueueReplaceState(inst, payload, callback) {
@@ -202,7 +202,7 @@ const classComponentUpdater = {
       update.callback = callback;
     }
 
-    enqueueUpdate(fiber, update, expirationTime);
+    enqueueUpdate(fiber, update);
     scheduleWork(fiber, expirationTime);
   },
   enqueueForceUpdate(inst, callback) {
@@ -220,7 +220,7 @@ const classComponentUpdater = {
       update.callback = callback;
     }
 
-    enqueueUpdate(fiber, update, expirationTime);
+    enqueueUpdate(fiber, update);
     scheduleWork(fiber, expirationTime);
   },
 };
@@ -231,7 +231,7 @@ function checkShouldComponentUpdate(
   newProps,
   oldState,
   newState,
-  newContext,
+  nextLegacyContext,
 ) {
   const instance = workInProgress.stateNode;
   const ctor = workInProgress.type;
@@ -240,7 +240,7 @@ function checkShouldComponentUpdate(
     const shouldUpdate = instance.shouldComponentUpdate(
       newProps,
       newState,
-      newContext,
+      nextLegacyContext,
     );
     stopPhaseTimer();
 
@@ -620,15 +620,15 @@ function callComponentWillReceiveProps(
   workInProgress,
   instance,
   newProps,
-  newContext,
+  nextLegacyContext,
 ) {
   const oldState = instance.state;
   startPhaseTimer(workInProgress, 'componentWillReceiveProps');
   if (typeof instance.componentWillReceiveProps === 'function') {
-    instance.componentWillReceiveProps(newProps, newContext);
+    instance.componentWillReceiveProps(newProps, nextLegacyContext);
   }
   if (typeof instance.UNSAFE_componentWillReceiveProps === 'function') {
-    instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+    instance.UNSAFE_componentWillReceiveProps(newProps, nextLegacyContext);
   }
   stopPhaseTimer();
 
@@ -741,6 +741,7 @@ function mountClassInstance(
 
 function resumeMountClassInstance(
   workInProgress: Fiber,
+  hasPendingNewContext: boolean,
   renderExpirationTime: ExpirationTime,
 ): boolean {
   const ctor = workInProgress.type;
@@ -751,8 +752,11 @@ function resumeMountClassInstance(
   instance.props = oldProps;
 
   const oldContext = instance.context;
-  const newUnmaskedContext = getUnmaskedContext(workInProgress);
-  const newContext = getMaskedContext(workInProgress, newUnmaskedContext);
+  const nextLegacyUnmaskedContext = getUnmaskedContext(workInProgress);
+  const nextLegacyContext = getMaskedContext(
+    workInProgress,
+    nextLegacyUnmaskedContext,
+  );
 
   const getDerivedStateFromProps = ctor.getDerivedStateFromProps;
   const hasNewLifecycles =
@@ -770,12 +774,12 @@ function resumeMountClassInstance(
     (typeof instance.UNSAFE_componentWillReceiveProps === 'function' ||
       typeof instance.componentWillReceiveProps === 'function')
   ) {
-    if (oldProps !== newProps || oldContext !== newContext) {
+    if (oldProps !== newProps || oldContext !== nextLegacyContext) {
       callComponentWillReceiveProps(
         workInProgress,
         instance,
         newProps,
-        newContext,
+        nextLegacyContext,
       );
     }
   }
@@ -799,6 +803,7 @@ function resumeMountClassInstance(
     oldProps === newProps &&
     oldState === newState &&
     !hasContextChanged() &&
+    !hasPendingNewContext &&
     !checkHasForceUpdateAfterProcessing()
   ) {
     // If an update was already in progress, we should schedule an Update
@@ -820,13 +825,14 @@ function resumeMountClassInstance(
 
   const shouldUpdate =
     checkHasForceUpdateAfterProcessing() ||
+    hasPendingNewContext ||
     checkShouldComponentUpdate(
       workInProgress,
       oldProps,
       newProps,
       oldState,
       newState,
-      newContext,
+      nextLegacyContext,
     );
 
   if (shouldUpdate) {
@@ -866,7 +872,7 @@ function resumeMountClassInstance(
   // if shouldComponentUpdate returns false.
   instance.props = newProps;
   instance.state = newState;
-  instance.context = newContext;
+  instance.context = nextLegacyContext;
 
   return shouldUpdate;
 }
@@ -875,6 +881,7 @@ function resumeMountClassInstance(
 function updateClassInstance(
   current: Fiber,
   workInProgress: Fiber,
+  hasPendingNewContext: boolean,
   renderExpirationTime: ExpirationTime,
 ): boolean {
   const ctor = workInProgress.type;
@@ -885,8 +892,11 @@ function updateClassInstance(
   instance.props = oldProps;
 
   const oldContext = instance.context;
-  const newUnmaskedContext = getUnmaskedContext(workInProgress);
-  const newContext = getMaskedContext(workInProgress, newUnmaskedContext);
+  const nextLegacyUnmaskedContext = getUnmaskedContext(workInProgress);
+  const nextLegacyContext = getMaskedContext(
+    workInProgress,
+    nextLegacyUnmaskedContext,
+  );
 
   const getDerivedStateFromProps = ctor.getDerivedStateFromProps;
   const hasNewLifecycles =
@@ -904,12 +914,12 @@ function updateClassInstance(
     (typeof instance.UNSAFE_componentWillReceiveProps === 'function' ||
       typeof instance.componentWillReceiveProps === 'function')
   ) {
-    if (oldProps !== newProps || oldContext !== newContext) {
+    if (oldProps !== newProps || oldContext !== nextLegacyContext) {
       callComponentWillReceiveProps(
         workInProgress,
         instance,
         newProps,
-        newContext,
+        nextLegacyContext,
       );
     }
   }
@@ -934,6 +944,7 @@ function updateClassInstance(
     oldProps === newProps &&
     oldState === newState &&
     !hasContextChanged() &&
+    !hasPendingNewContext &&
     !checkHasForceUpdateAfterProcessing()
   ) {
     // If an update was already in progress, we should schedule an Update
@@ -968,13 +979,14 @@ function updateClassInstance(
 
   const shouldUpdate =
     checkHasForceUpdateAfterProcessing() ||
+    hasPendingNewContext ||
     checkShouldComponentUpdate(
       workInProgress,
       oldProps,
       newProps,
       oldState,
       newState,
-      newContext,
+      nextLegacyContext,
     );
 
   if (shouldUpdate) {
@@ -987,10 +999,14 @@ function updateClassInstance(
     ) {
       startPhaseTimer(workInProgress, 'componentWillUpdate');
       if (typeof instance.componentWillUpdate === 'function') {
-        instance.componentWillUpdate(newProps, newState, newContext);
+        instance.componentWillUpdate(newProps, newState, nextLegacyContext);
       }
       if (typeof instance.UNSAFE_componentWillUpdate === 'function') {
-        instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
+        instance.UNSAFE_componentWillUpdate(
+          newProps,
+          newState,
+          nextLegacyContext,
+        );
       }
       stopPhaseTimer();
     }
@@ -1030,7 +1046,7 @@ function updateClassInstance(
   // if shouldComponentUpdate returns false.
   instance.props = newProps;
   instance.state = newState;
-  instance.context = newContext;
+  instance.context = nextLegacyContext;
 
   return shouldUpdate;
 }
diff --git a/packages/react-reconciler/src/ReactFiberDispatcher.js b/packages/react-reconciler/src/ReactFiberDispatcher.js
new file mode 100644
index 0000000000..f515457770
--- /dev/null
+++ b/packages/react-reconciler/src/ReactFiberDispatcher.js
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import {readContext} from './ReactFiberNewContext';
+
+export const Dispatcher = {
+  readContext,
+};
diff --git a/packages/react-reconciler/src/ReactFiberNewContext.js b/packages/react-reconciler/src/ReactFiberNewContext.js
index 729f7469e2..a267df48bf 100644
--- a/packages/react-reconciler/src/ReactFiberNewContext.js
+++ b/packages/react-reconciler/src/ReactFiberNewContext.js
@@ -7,22 +7,26 @@
  * @flow
  */
 
-import type {Fiber} from './ReactFiber';
 import type {ReactContext} from 'shared/ReactTypes';
+import type {Fiber} from './ReactFiber';
 import type {StackCursor} from './ReactFiberStack';
+import type {ExpirationTime} from './ReactFiberExpirationTime';
 
-export type NewContext = {
-  pushProvider(providerFiber: Fiber): void,
-  popProvider(providerFiber: Fiber): void,
-  getContextCurrentValue(context: ReactContext<any>): any,
-  getContextChangedBits(context: ReactContext<any>): number,
+export type ContextDependency<T> = {
+  context: ReactContext<T>,
+  observedBits: number,
+  next: ContextDependency<mixed> | null,
 };
 
 import warningWithoutStack from 'shared/warningWithoutStack';
 import {isPrimaryRenderer} from './ReactFiberHostConfig';
 import {createCursor, push, pop} from './ReactFiberStack';
+import maxSigned31BitInt from './maxSigned31BitInt';
+import {NoWork} from './ReactFiberExpirationTime';
+import {ContextProvider} from 'shared/ReactTypeOfWork';
+
+import invariant from 'shared/invariant';
 
-const providerCursor: StackCursor<Fiber | null> = createCursor(null);
 const valueCursor: StackCursor<mixed> = createCursor(null);
 const changedBitsCursor: StackCursor<number> = createCursor(0);
 
@@ -32,13 +36,24 @@ if (__DEV__) {
   rendererSigil = {};
 }
 
-function pushProvider(providerFiber: Fiber): void {
+let currentlyRenderingFiber: Fiber | null = null;
+let lastContextDependency: ContextDependency<mixed> | null = null;
+let lastContext: ReactContext<any> | null = null;
+
+export function resetContextDependences(): void {
+  // This is called right before React yields execution, to ensure `readContext`
+  // cannot be called outside the render phase.
+  currentlyRenderingFiber = null;
+  lastContextDependency = null;
+  lastContext = null;
+}
+
+export function pushProvider(providerFiber: Fiber): void {
   const context: ReactContext<any> = providerFiber.type._context;
 
   if (isPrimaryRenderer) {
     push(changedBitsCursor, context._changedBits, providerFiber);
     push(valueCursor, context._currentValue, providerFiber);
-    push(providerCursor, providerFiber, providerFiber);
 
     context._currentValue = providerFiber.pendingProps.value;
     context._changedBits = providerFiber.stateNode;
@@ -55,7 +70,6 @@ function pushProvider(providerFiber: Fiber): void {
   } else {
     push(changedBitsCursor, context._changedBits2, providerFiber);
     push(valueCursor, context._currentValue2, providerFiber);
-    push(providerCursor, providerFiber, providerFiber);
 
     context._currentValue2 = providerFiber.pendingProps.value;
     context._changedBits2 = providerFiber.stateNode;
@@ -72,11 +86,10 @@ function pushProvider(providerFiber: Fiber): void {
   }
 }
 
-function popProvider(providerFiber: Fiber): void {
+export function popProvider(providerFiber: Fiber): void {
   const changedBits = changedBitsCursor.current;
   const currentValue = valueCursor.current;
 
-  pop(providerCursor, providerFiber);
   pop(valueCursor, providerFiber);
   pop(changedBitsCursor, providerFiber);
 
@@ -90,17 +103,207 @@ function popProvider(providerFiber: Fiber): void {
   }
 }
 
-function getContextCurrentValue(context: ReactContext<any>): any {
+export function propagateContextChange(
+  workInProgress: Fiber,
+  context: ReactContext<mixed>,
+  changedBits: number,
+  renderExpirationTime: ExpirationTime,
+): void {
+  let fiber = workInProgress.child;
+  if (fiber !== null) {
+    // Set the return pointer of the child to the work-in-progress fiber.
+    fiber.return = workInProgress;
+  }
+  while (fiber !== null) {
+    let nextFiber;
+
+    // Visit this fiber.
+    let dependency = fiber.firstContextDependency;
+    if (dependency !== null) {
+      do {
+        // Check if the context matches.
+        if (
+          dependency.context === context &&
+          (dependency.observedBits & changedBits) !== 0
+        ) {
+          // Match! Schedule an update on this fiber.
+          if (
+            fiber.expirationTime === NoWork ||
+            fiber.expirationTime > renderExpirationTime
+          ) {
+            fiber.expirationTime = renderExpirationTime;
+          }
+          let alternate = fiber.alternate;
+          if (
+            alternate !== null &&
+            (alternate.expirationTime === NoWork ||
+              alternate.expirationTime > renderExpirationTime)
+          ) {
+            alternate.expirationTime = renderExpirationTime;
+          }
+          // Update the child expiration time of all the ancestors, including
+          // the alternates.
+          let node = fiber.return;
+          while (node !== null) {
+            alternate = node.alternate;
+            if (
+              node.childExpirationTime === NoWork ||
+              node.childExpirationTime > renderExpirationTime
+            ) {
+              node.childExpirationTime = renderExpirationTime;
+              if (
+                alternate !== null &&
+                (alternate.childExpirationTime === NoWork ||
+                  alternate.childExpirationTime > renderExpirationTime)
+              ) {
+                alternate.childExpirationTime = renderExpirationTime;
+              }
+            } else if (
+              alternate !== null &&
+              (alternate.childExpirationTime === NoWork ||
+                alternate.childExpirationTime > renderExpirationTime)
+            ) {
+              alternate.childExpirationTime = renderExpirationTime;
+            } else {
+              // Neither alternate was updated, which means the rest of the
+              // ancestor path already has sufficient priority.
+              break;
+            }
+            node = node.return;
+          }
+          // Don't scan deeper than a matching consumer. When we render the
+          // consumer, we'll continue scanning from that point. This way the
+          // scanning work is time-sliced.
+          nextFiber = null;
+        } else {
+          nextFiber = fiber.child;
+        }
+        dependency = dependency.next;
+      } while (dependency !== null);
+    } else if (fiber.tag === ContextProvider) {
+      // Don't scan deeper if this is a matching provider
+      nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
+    } else {
+      // Traverse down.
+      nextFiber = fiber.child;
+    }
+
+    if (nextFiber !== null) {
+      // Set the return pointer of the child to the work-in-progress fiber.
+      nextFiber.return = fiber;
+    } else {
+      // No child. Traverse to next sibling.
+      nextFiber = fiber;
+      while (nextFiber !== null) {
+        if (nextFiber === workInProgress) {
+          // We're back to the root of this subtree. Exit.
+          nextFiber = null;
+          break;
+        }
+        let sibling = nextFiber.sibling;
+        if (sibling !== null) {
+          // Set the return pointer of the sibling to the work-in-progress fiber.
+          sibling.return = nextFiber.return;
+          nextFiber = sibling;
+          break;
+        }
+        // No more siblings. Traverse up.
+        nextFiber = nextFiber.return;
+      }
+    }
+    fiber = nextFiber;
+  }
+}
+
+export function prepareToReadContext(
+  workInProgress: Fiber,
+  renderExpirationTime: ExpirationTime,
+): boolean {
+  currentlyRenderingFiber = workInProgress;
+  lastContextDependency = null;
+  lastContext = null;
+
+  const firstContextDependency = workInProgress.firstContextDependency;
+  if (firstContextDependency !== null) {
+    // Reset the work-in-progress list
+    workInProgress.firstContextDependency = null;
+
+    // Iterate through the context dependencies and see if there were any
+    // changes. If so, continue propagating the context change by scanning
+    // the child subtree.
+    let dependency = firstContextDependency;
+    let hasPendingContext = false;
+    do {
+      const context = dependency.context;
+      const changedBits = isPrimaryRenderer
+        ? context._changedBits
+        : context._changedBits2;
+      if (changedBits !== 0) {
+        // Resume context change propagation. We need to call this even if
+        // this fiber bails out, in case deeply nested consumers observe more
+        // bits than this one.
+        propagateContextChange(
+          workInProgress,
+          context,
+          changedBits,
+          renderExpirationTime,
+        );
+        if ((changedBits & dependency.observedBits) !== 0) {
+          hasPendingContext = true;
+        }
+      }
+      dependency = dependency.next;
+    } while (dependency !== null);
+    return hasPendingContext;
+  } else {
+    return false;
+  }
+}
+
+export function readContext<T>(
+  context: ReactContext<T>,
+  observedBits: void | number | boolean,
+): T {
+  if (typeof observedBits !== 'number') {
+    if (observedBits === false) {
+      // Do not observe updates
+      observedBits = 0;
+    } else {
+      // Observe all updates
+      observedBits = maxSigned31BitInt;
+    }
+  }
+
+  if (lastContext === null) {
+    invariant(
+      currentlyRenderingFiber !== null,
+      'Context.unstable_read(): Context can only be read while React is ' +
+        'rendering, e.g. inside the render method or getDerivedStateFromProps.',
+    );
+    // This is the first dependency in the list
+    currentlyRenderingFiber.firstContextDependency = lastContextDependency = {
+      context: ((context: any): ReactContext<mixed>),
+      observedBits,
+      next: null,
+    };
+    lastContext = context;
+  } else {
+    // `lastContextDependency` is always non-null if `lastContext is.
+    const lastDependency: ContextDependency<T> = (lastContextDependency: any);
+    if (lastContext === context) {
+      // Fast path. The previous context has the same type. We can reuse
+      // the same node.
+      lastDependency.observedBits |= observedBits;
+    } else {
+      // Append a new context item.
+      lastContextDependency = lastDependency.next = {
+        context: ((context: any): ReactContext<mixed>),
+        observedBits,
+        next: null,
+      };
+      lastContext = context;
+    }
+  }
+
   return isPrimaryRenderer ? context._currentValue : context._currentValue2;
 }
-
-function getContextChangedBits(context: ReactContext<any>): number {
-  return isPrimaryRenderer ? context._changedBits : context._changedBits2;
-}
-
-export {
-  pushProvider,
-  popProvider,
-  getContextCurrentValue,
-  getContextChangedBits,
-};
diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js
index ce9e54c972..140b75e3aa 100644
--- a/packages/react-reconciler/src/ReactFiberReconciler.js
+++ b/packages/react-reconciler/src/ReactFiberReconciler.js
@@ -135,7 +135,7 @@ function scheduleRootUpdate(
     );
     update.callback = callback;
   }
-  enqueueUpdate(current, update, expirationTime);
+  enqueueUpdate(current, update);
 
   scheduleWork(current, expirationTime);
   return expirationTime;
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 06b0041a76..325522b2c4 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -109,7 +109,7 @@ import {
   popTopLevelContextObject as popTopLevelLegacyContextObject,
   popContextProvider as popLegacyContextProvider,
 } from './ReactFiberContext';
-import {popProvider} from './ReactFiberNewContext';
+import {popProvider, resetContextDependences} from './ReactFiberNewContext';
 import {popHostContext, popHostContainer} from './ReactFiberHostContext';
 import {
   checkActualRenderTimeStackEmpty,
@@ -145,6 +145,7 @@ import {
   commitAttachRef,
   commitDetachRef,
 } from './ReactFiberCommitWork';
+import {Dispatcher} from './ReactFiberDispatcher';
 
 export type Deadline = {
   timeRemaining: () => number,
@@ -532,8 +533,15 @@ function commitRoot(root: FiberRoot, finishedWork: Fiber): void {
   // Update the pending priority levels to account for the work that we are
   // about to commit. This needs to happen before calling the lifecycles, since
   // they may schedule additional updates.
-  const earliestRemainingTime = finishedWork.expirationTime;
-  markCommittedPriorityLevels(root, earliestRemainingTime);
+  const updateExpirationTimeBeforeCommit = finishedWork.expirationTime;
+  const childExpirationTimeBeforeCommit = finishedWork.childExpirationTime;
+  const earliestRemainingTimeBeforeCommit =
+    updateExpirationTimeBeforeCommit === NoWork ||
+    (childExpirationTimeBeforeCommit !== NoWork &&
+      childExpirationTimeBeforeCommit < updateExpirationTimeBeforeCommit)
+      ? childExpirationTimeBeforeCommit
+      : updateExpirationTimeBeforeCommit;
+  markCommittedPriorityLevels(root, earliestRemainingTimeBeforeCommit);
 
   // Reset this to null before calling lifecycles
   ReactCurrentOwner.current = null;
@@ -705,71 +713,85 @@ function commitRoot(root: FiberRoot, finishedWork: Fiber): void {
     ReactFiberInstrumentation.debugTool.onCommitWork(finishedWork);
   }
 
-  const expirationTime = root.expirationTime;
-  if (expirationTime === NoWork) {
+  const updateExpirationTimeAfterCommit = finishedWork.expirationTime;
+  const childExpirationTimeAfterCommit = finishedWork.childExpirationTime;
+  const earliestRemainingTimeAfterCommit =
+    updateExpirationTimeAfterCommit === NoWork ||
+    (childExpirationTimeAfterCommit !== NoWork &&
+      childExpirationTimeAfterCommit < updateExpirationTimeAfterCommit)
+      ? childExpirationTimeAfterCommit
+      : updateExpirationTimeAfterCommit;
+  if (earliestRemainingTimeAfterCommit === NoWork) {
     // If there's no remaining work, we can clear the set of already failed
     // error boundaries.
     legacyErrorBoundariesThatAlreadyFailed = null;
   }
-  onCommit(root, expirationTime);
+  onCommit(root, earliestRemainingTimeAfterCommit);
 }
 
-function resetExpirationTime(
+function resetChildExpirationTime(
   workInProgress: Fiber,
   renderTime: ExpirationTime,
 ) {
-  if (renderTime !== Never && workInProgress.expirationTime === Never) {
+  if (renderTime !== Never && workInProgress.childExpirationTime === Never) {
     // The children of this component are hidden. Don't bubble their
     // expiration times.
     return;
   }
 
-  // Check for pending updates.
-  let newExpirationTime = NoWork;
-  switch (workInProgress.tag) {
-    case HostRoot:
-    case ClassComponent: {
-      const updateQueue = workInProgress.updateQueue;
-      if (updateQueue !== null) {
-        newExpirationTime = updateQueue.expirationTime;
-      }
-    }
-  }
-
-  // TODO: Calls need to visit stateNode
+  let newChildExpirationTime = NoWork;
 
   // Bubble up the earliest expiration time.
-  // (And "base" render timers if that feature flag is enabled)
   if (enableProfilerTimer && workInProgress.mode & ProfileMode) {
+    // We're in profiling mode. Let's use this same traversal to update the
+    // "base" render times.
     let treeBaseDuration = workInProgress.selfBaseDuration;
     let child = workInProgress.child;
     while (child !== null) {
-      treeBaseDuration += child.treeBaseDuration;
+      const childUpdateExpirationTime = child.expirationTime;
+      const childChildExpirationTime = child.childExpirationTime;
       if (
-        child.expirationTime !== NoWork &&
-        (newExpirationTime === NoWork ||
-          newExpirationTime > child.expirationTime)
+        newChildExpirationTime === NoWork ||
+        (childUpdateExpirationTime !== NoWork &&
+          childUpdateExpirationTime < newChildExpirationTime)
       ) {
-        newExpirationTime = child.expirationTime;
+        newChildExpirationTime = childUpdateExpirationTime;
       }
+      if (
+        newChildExpirationTime === NoWork ||
+        (childChildExpirationTime !== NoWork &&
+          childChildExpirationTime < newChildExpirationTime)
+      ) {
+        newChildExpirationTime = childChildExpirationTime;
+      }
+      treeBaseDuration += child.treeBaseDuration;
       child = child.sibling;
     }
     workInProgress.treeBaseDuration = treeBaseDuration;
   } else {
     let child = workInProgress.child;
     while (child !== null) {
+      const childUpdateExpirationTime = child.expirationTime;
+      const childChildExpirationTime = child.childExpirationTime;
       if (
-        child.expirationTime !== NoWork &&
-        (newExpirationTime === NoWork ||
-          newExpirationTime > child.expirationTime)
+        newChildExpirationTime === NoWork ||
+        (childUpdateExpirationTime !== NoWork &&
+          childUpdateExpirationTime < newChildExpirationTime)
       ) {
-        newExpirationTime = child.expirationTime;
+        newChildExpirationTime = childUpdateExpirationTime;
+      }
+      if (
+        newChildExpirationTime === NoWork ||
+        (childChildExpirationTime !== NoWork &&
+          childChildExpirationTime < newChildExpirationTime)
+      ) {
+        newChildExpirationTime = childChildExpirationTime;
       }
       child = child.sibling;
     }
   }
 
-  workInProgress.expirationTime = newExpirationTime;
+  workInProgress.childExpirationTime = newChildExpirationTime;
 }
 
 function completeUnitOfWork(workInProgress: Fiber): Fiber | null {
@@ -798,7 +820,7 @@ function completeUnitOfWork(workInProgress: Fiber): Fiber | null {
       );
       let next = nextUnitOfWork;
       stopWorkTimer(workInProgress);
-      resetExpirationTime(workInProgress, nextRenderExpirationTime);
+      resetChildExpirationTime(workInProgress, nextRenderExpirationTime);
       if (__DEV__) {
         ReactCurrentFiber.resetCurrentFiber();
       }
@@ -1017,6 +1039,7 @@ function renderRoot(
       'by a bug in React. Please file an issue.',
   );
   isWorking = true;
+  ReactCurrentOwner.currentDispatcher = Dispatcher;
 
   const expirationTime = root.nextExpirationTimeToWorkOn;
 
@@ -1107,6 +1130,8 @@ function renderRoot(
 
   // We're done performing work. Time to clean up.
   isWorking = false;
+  ReactCurrentOwner.currentDispatcher = null;
+  resetContextDependences();
 
   // Yield back to main thread.
   if (didFatal) {
@@ -1267,7 +1292,7 @@ function dispatch(
             errorInfo,
             expirationTime,
           );
-          enqueueUpdate(fiber, update, expirationTime);
+          enqueueUpdate(fiber, update);
           scheduleWork(fiber, expirationTime);
           return;
         }
@@ -1275,7 +1300,7 @@ function dispatch(
       case HostRoot: {
         const errorInfo = createCapturedValue(value, sourceFiber);
         const update = createRootErrorUpdate(fiber, errorInfo, expirationTime);
-        enqueueUpdate(fiber, update, expirationTime);
+        enqueueUpdate(fiber, update);
         scheduleWork(fiber, expirationTime);
         return;
       }
@@ -1289,7 +1314,7 @@ function dispatch(
     const rootFiber = sourceFiber;
     const errorInfo = createCapturedValue(value, rootFiber);
     const update = createRootErrorUpdate(rootFiber, errorInfo, expirationTime);
-    enqueueUpdate(rootFiber, update, expirationTime);
+    enqueueUpdate(rootFiber, update);
     scheduleWork(rootFiber, expirationTime);
   }
 }
@@ -1408,35 +1433,52 @@ function retrySuspendedRoot(
 }
 
 function scheduleWorkToRoot(fiber: Fiber, expirationTime): FiberRoot | null {
-  // Walk the parent path to the root and update each node's
-  // expiration time.
-  let node = fiber;
-  do {
-    const alternate = node.alternate;
+  // Update the source fiber's expiration time
+  if (
+    fiber.expirationTime === NoWork ||
+    fiber.expirationTime > expirationTime
+  ) {
+    fiber.expirationTime = expirationTime;
+  }
+  let alternate = fiber.alternate;
+  if (
+    alternate !== null &&
+    (alternate.expirationTime === NoWork ||
+      alternate.expirationTime > expirationTime)
+  ) {
+    alternate.expirationTime = expirationTime;
+  }
+  // Walk the parent path to the root and update the child expiration time.
+  let node = fiber.return;
+  if (node === null && fiber.tag === HostRoot) {
+    return fiber.stateNode;
+  }
+  while (node !== null) {
+    alternate = node.alternate;
     if (
-      node.expirationTime === NoWork ||
-      node.expirationTime > expirationTime
+      node.childExpirationTime === NoWork ||
+      node.childExpirationTime > expirationTime
     ) {
-      node.expirationTime = expirationTime;
+      node.childExpirationTime = expirationTime;
       if (
         alternate !== null &&
-        (alternate.expirationTime === NoWork ||
-          alternate.expirationTime > expirationTime)
+        (alternate.childExpirationTime === NoWork ||
+          alternate.childExpirationTime > expirationTime)
       ) {
-        alternate.expirationTime = expirationTime;
+        alternate.childExpirationTime = expirationTime;
       }
     } else if (
       alternate !== null &&
-      (alternate.expirationTime === NoWork ||
-        alternate.expirationTime > expirationTime)
+      (alternate.childExpirationTime === NoWork ||
+        alternate.childExpirationTime > expirationTime)
     ) {
-      alternate.expirationTime = expirationTime;
+      alternate.childExpirationTime = expirationTime;
     }
     if (node.return === null && node.tag === HostRoot) {
       return node.stateNode;
     }
     node = node.return;
-  } while (node !== null);
+  }
   return null;
 }
 
diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js
index f60e314793..489c669473 100644
--- a/packages/react-reconciler/src/ReactFiberUnwindWork.js
+++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js
@@ -70,7 +70,7 @@ import {
   LOW_PRIORITY_EXPIRATION,
 } from './ReactFiberExpirationTime';
 import {findEarliestOutstandingPriorityLevel} from './ReactFiberPendingPriority';
-import {reconcileChildrenAtExpirationTime} from './ReactFiberBeginWork';
+import {reconcileChildren} from './ReactFiberBeginWork';
 
 function NoopComponent() {
   return null;
@@ -238,7 +238,7 @@ function throwException(
 
             // Unmount the source fiber's children
             const nextChildren = null;
-            reconcileChildrenAtExpirationTime(
+            reconcileChildren(
               sourceFiber.alternate,
               sourceFiber,
               nextChildren,
@@ -310,6 +310,7 @@ function throwException(
           renderDidSuspend(root, absoluteTimeoutMs, renderExpirationTime);
 
           workInProgress.effectTag |= ShouldCapture;
+          workInProgress.expirationTime = renderExpirationTime;
           return;
         }
         // This boundary already captured during this render. Continue to the
@@ -334,12 +335,13 @@ function throwException(
       case HostRoot: {
         const errorInfo = value;
         workInProgress.effectTag |= ShouldCapture;
+        workInProgress.expirationTime = renderExpirationTime;
         const update = createRootErrorUpdate(
           workInProgress,
           errorInfo,
           renderExpirationTime,
         );
-        enqueueCapturedUpdate(workInProgress, update, renderExpirationTime);
+        enqueueCapturedUpdate(workInProgress, update);
         return;
       }
       case ClassComponent:
@@ -356,13 +358,14 @@ function throwException(
               !isAlreadyFailedLegacyErrorBoundary(instance)))
         ) {
           workInProgress.effectTag |= ShouldCapture;
+          workInProgress.expirationTime = renderExpirationTime;
           // Schedule the error boundary to re-render using updated state
           const update = createClassErrorUpdate(
             workInProgress,
             errorInfo,
             renderExpirationTime,
           );
-          enqueueCapturedUpdate(workInProgress, update, renderExpirationTime);
+          enqueueCapturedUpdate(workInProgress, update);
           return;
         }
         break;
diff --git a/packages/react-reconciler/src/ReactUpdateQueue.js b/packages/react-reconciler/src/ReactUpdateQueue.js
index f592d9e54f..22e88ae8cc 100644
--- a/packages/react-reconciler/src/ReactUpdateQueue.js
+++ b/packages/react-reconciler/src/ReactUpdateQueue.js
@@ -117,7 +117,6 @@ export type Update<State> = {
 };
 
 export type UpdateQueue<State> = {
-  expirationTime: ExpirationTime,
   baseState: State,
 
   firstUpdate: Update<State> | null,
@@ -156,7 +155,6 @@ if (__DEV__) {
 
 export function createUpdateQueue<State>(baseState: State): UpdateQueue<State> {
   const queue: UpdateQueue<State> = {
-    expirationTime: NoWork,
     baseState,
     firstUpdate: null,
     lastUpdate: null,
@@ -174,7 +172,6 @@ function cloneUpdateQueue<State>(
   currentQueue: UpdateQueue<State>,
 ): UpdateQueue<State> {
   const queue: UpdateQueue<State> = {
-    expirationTime: currentQueue.expirationTime,
     baseState: currentQueue.baseState,
     firstUpdate: currentQueue.firstUpdate,
     lastUpdate: currentQueue.lastUpdate,
@@ -209,7 +206,6 @@ export function createUpdate(expirationTime: ExpirationTime): Update<*> {
 function appendUpdateToQueue<State>(
   queue: UpdateQueue<State>,
   update: Update<State>,
-  expirationTime: ExpirationTime,
 ) {
   // Append the update to the end of the list.
   if (queue.lastUpdate === null) {
@@ -219,21 +215,9 @@ function appendUpdateToQueue<State>(
     queue.lastUpdate.next = update;
     queue.lastUpdate = update;
   }
-  if (
-    queue.expirationTime === NoWork ||
-    queue.expirationTime > expirationTime
-  ) {
-    // The incoming update has the earliest expiration of any update in the
-    // queue. Update the queue's expiration time.
-    queue.expirationTime = expirationTime;
-  }
 }
 
-export function enqueueUpdate<State>(
-  fiber: Fiber,
-  update: Update<State>,
-  expirationTime: ExpirationTime,
-) {
+export function enqueueUpdate<State>(fiber: Fiber, update: Update<State>) {
   // Update queues are created lazily.
   const alternate = fiber.alternate;
   let queue1;
@@ -271,19 +255,19 @@ export function enqueueUpdate<State>(
   }
   if (queue2 === null || queue1 === queue2) {
     // There's only a single queue.
-    appendUpdateToQueue(queue1, update, expirationTime);
+    appendUpdateToQueue(queue1, update);
   } else {
     // There are two queues. We need to append the update to both queues,
     // while accounting for the persistent structure of the list — we don't
     // want the same update to be added multiple times.
     if (queue1.lastUpdate === null || queue2.lastUpdate === null) {
       // One of the queues is not empty. We must add the update to both queues.
-      appendUpdateToQueue(queue1, update, expirationTime);
-      appendUpdateToQueue(queue2, update, expirationTime);
+      appendUpdateToQueue(queue1, update);
+      appendUpdateToQueue(queue2, update);
     } else {
       // Both queues are non-empty. The last update is the same in both lists,
       // because of structural sharing. So, only append to one of the lists.
-      appendUpdateToQueue(queue1, update, expirationTime);
+      appendUpdateToQueue(queue1, update);
       // But we still need to update the `lastUpdate` pointer of queue2.
       queue2.lastUpdate = update;
     }
@@ -311,7 +295,6 @@ export function enqueueUpdate<State>(
 export function enqueueCapturedUpdate<State>(
   workInProgress: Fiber,
   update: Update<State>,
-  renderExpirationTime: ExpirationTime,
 ) {
   // Captured updates go into a separate list, and only on the work-in-
   // progress queue.
@@ -338,14 +321,6 @@ export function enqueueCapturedUpdate<State>(
     workInProgressQueue.lastCapturedUpdate.next = update;
     workInProgressQueue.lastCapturedUpdate = update;
   }
-  if (
-    workInProgressQueue.expirationTime === NoWork ||
-    workInProgressQueue.expirationTime > renderExpirationTime
-  ) {
-    // The incoming update has the earliest expiration of any update in the
-    // queue. Update the queue's expiration time.
-    workInProgressQueue.expirationTime = renderExpirationTime;
-  }
 }
 
 function ensureWorkInProgressQueueIsAClone<State>(
@@ -438,14 +413,6 @@ export function processUpdateQueue<State>(
 ): void {
   hasForceUpdate = false;
 
-  if (
-    queue.expirationTime === NoWork ||
-    queue.expirationTime > renderExpirationTime
-  ) {
-    // Insufficient priority. Bailout.
-    return;
-  }
-
   queue = ensureWorkInProgressQueueIsAClone(workInProgress, queue);
 
   if (__DEV__) {
@@ -577,8 +544,15 @@ export function processUpdateQueue<State>(
   queue.baseState = newBaseState;
   queue.firstUpdate = newFirstUpdate;
   queue.firstCapturedUpdate = newFirstCapturedUpdate;
-  queue.expirationTime = newExpirationTime;
 
+  // Set the remaining expiration time to be whatever is remaining in the queue.
+  // This should be fine because the only two other things that contribute to
+  // expiration time are props and context. We're already in the middle of the
+  // begin phase by the time we start processing the queue, so we've already
+  // dealt with the props. Context in components that specify
+  // shouldComponentUpdate is tricky; but we'll have to account for
+  // that regardless.
+  workInProgress.expirationTime = newExpirationTime;
   workInProgress.memoizedState = resultState;
 
   if (__DEV__) {
diff --git a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
index 09f9d6ec6f..85cf6b6fbd 100644
--- a/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactNewContext-test.internal.js
@@ -30,1102 +30,1297 @@ describe('ReactNewContext', () => {
   //   return {type: 'div', children, prop: undefined};
   // }
 
+  function Text(props) {
+    ReactNoop.yield(props.text);
+    return <span prop={props.text} />;
+  }
+
   function span(prop) {
     return {type: 'span', children: [], prop};
   }
 
-  it('simple mount and update', () => {
-    const Context = React.createContext(1);
+  // We have several ways of reading from context. sharedContextTests runs
+  // a suite of tests for a given context consumer implementation.
+  sharedContextTests('Context.Consumer', Context => Context.Consumer);
+  sharedContextTests(
+    'Context.unstable_read inside functional component',
+    Context =>
+      function Consumer(props) {
+        const observedBits = props.unstable_observedBits;
+        const contextValue = Context.unstable_read(observedBits);
+        const render = props.children;
+        return render(contextValue);
+      },
+  );
+  sharedContextTests(
+    'Context.unstable_read inside class component',
+    Context =>
+      class Consumer extends React.Component {
+        render() {
+          const observedBits = this.props.unstable_observedBits;
+          const contextValue = Context.unstable_read(observedBits);
+          const render = this.props.children;
+          return render(contextValue);
+        }
+      },
+  );
 
-    function Consumer(props) {
-      return (
-        <Context.Consumer>
-          {value => <span prop={'Result: ' + value} />}
-        </Context.Consumer>
-      );
-    }
+  function sharedContextTests(label, getConsumer) {
+    describe(`reading context with ${label}`, () => {
+      it('simple mount and update', () => {
+        const Context = React.createContext(1);
+        const Consumer = getConsumer(Context);
 
-    const Indirection = React.Fragment;
+        const Indirection = React.Fragment;
 
-    function App(props) {
-      return (
-        <Context.Provider value={props.value}>
-          <Indirection>
-            <Indirection>
-              <Consumer />
-            </Indirection>
-          </Indirection>
-        </Context.Provider>
-      );
-    }
+        function App(props) {
+          return (
+            <Context.Provider value={props.value}>
+              <Indirection>
+                <Indirection>
+                  <Consumer>
+                    {value => <span prop={'Result: ' + value} />}
+                  </Consumer>
+                </Indirection>
+              </Indirection>
+            </Context.Provider>
+          );
+        }
 
-    ReactNoop.render(<App value={2} />);
-    ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([span('Result: 2')]);
+        ReactNoop.render(<App value={2} />);
+        ReactNoop.flush();
+        expect(ReactNoop.getChildren()).toEqual([span('Result: 2')]);
 
-    // Update
-    ReactNoop.render(<App value={3} />);
-    ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([span('Result: 3')]);
-  });
+        // Update
+        ReactNoop.render(<App value={3} />);
+        ReactNoop.flush();
+        expect(ReactNoop.getChildren()).toEqual([span('Result: 3')]);
+      });
 
-  it('propagates through shouldComponentUpdate false', () => {
-    const Context = React.createContext(1);
+      it('propagates through shouldComponentUpdate false', () => {
+        const Context = React.createContext(1);
+        const ContextConsumer = getConsumer(Context);
 
-    function Provider(props) {
-      ReactNoop.yield('Provider');
-      return (
-        <Context.Provider value={props.value}>
-          {props.children}
-        </Context.Provider>
-      );
-    }
-
-    function Consumer(props) {
-      ReactNoop.yield('Consumer');
-      return (
-        <Context.Consumer>
-          {value => {
-            ReactNoop.yield('Consumer render prop');
-            return <span prop={'Result: ' + value} />;
-          }}
-        </Context.Consumer>
-      );
-    }
-
-    class Indirection extends React.Component {
-      shouldComponentUpdate() {
-        return false;
-      }
-      render() {
-        ReactNoop.yield('Indirection');
-        return this.props.children;
-      }
-    }
-
-    function App(props) {
-      ReactNoop.yield('App');
-      return (
-        <Provider value={props.value}>
-          <Indirection>
-            <Indirection>
-              <Consumer />
-            </Indirection>
-          </Indirection>
-        </Provider>
-      );
-    }
-
-    ReactNoop.render(<App value={2} />);
-    expect(ReactNoop.flush()).toEqual([
-      'App',
-      'Provider',
-      'Indirection',
-      'Indirection',
-      'Consumer',
-      'Consumer render prop',
-    ]);
-    expect(ReactNoop.getChildren()).toEqual([span('Result: 2')]);
-
-    // Update
-    ReactNoop.render(<App value={3} />);
-    expect(ReactNoop.flush()).toEqual([
-      'App',
-      'Provider',
-      'Consumer render prop',
-    ]);
-    expect(ReactNoop.getChildren()).toEqual([span('Result: 3')]);
-  });
-
-  it('consumers bail out if context value is the same', () => {
-    const Context = React.createContext(1);
-
-    function Provider(props) {
-      ReactNoop.yield('Provider');
-      return (
-        <Context.Provider value={props.value}>
-          {props.children}
-        </Context.Provider>
-      );
-    }
-
-    function Consumer(props) {
-      ReactNoop.yield('Consumer');
-      return (
-        <Context.Consumer>
-          {value => {
-            ReactNoop.yield('Consumer render prop');
-            return <span prop={'Result: ' + value} />;
-          }}
-        </Context.Consumer>
-      );
-    }
-
-    class Indirection extends React.Component {
-      shouldComponentUpdate() {
-        return false;
-      }
-      render() {
-        ReactNoop.yield('Indirection');
-        return this.props.children;
-      }
-    }
-
-    function App(props) {
-      ReactNoop.yield('App');
-      return (
-        <Provider value={props.value}>
-          <Indirection>
-            <Indirection>
-              <Consumer />
-            </Indirection>
-          </Indirection>
-        </Provider>
-      );
-    }
-
-    ReactNoop.render(<App value={2} />);
-    expect(ReactNoop.flush()).toEqual([
-      'App',
-      'Provider',
-      'Indirection',
-      'Indirection',
-      'Consumer',
-      'Consumer render prop',
-    ]);
-    expect(ReactNoop.getChildren()).toEqual([span('Result: 2')]);
-
-    // Update with the same context value
-    ReactNoop.render(<App value={2} />);
-    expect(ReactNoop.flush()).toEqual([
-      'App',
-      'Provider',
-      // Don't call render prop again
-    ]);
-    expect(ReactNoop.getChildren()).toEqual([span('Result: 2')]);
-  });
-
-  it('nested providers', () => {
-    const Context = React.createContext(1);
-
-    function Provider(props) {
-      return (
-        <Context.Consumer>
-          {contextValue => (
-            // Multiply previous context value by 2, unless prop overrides
-            <Context.Provider value={props.value || contextValue * 2}>
+        function Provider(props) {
+          ReactNoop.yield('Provider');
+          return (
+            <Context.Provider value={props.value}>
               {props.children}
             </Context.Provider>
-          )}
-        </Context.Consumer>
-      );
-    }
+          );
+        }
 
-    function Consumer(props) {
-      return (
-        <Context.Consumer>
-          {value => <span prop={'Result: ' + value} />}
-        </Context.Consumer>
-      );
-    }
+        function Consumer(props) {
+          ReactNoop.yield('Consumer');
+          return (
+            <ContextConsumer>
+              {value => {
+                ReactNoop.yield('Consumer render prop');
+                return <span prop={'Result: ' + value} />;
+              }}
+            </ContextConsumer>
+          );
+        }
 
-    class Indirection extends React.Component {
-      shouldComponentUpdate() {
-        return false;
-      }
-      render() {
-        return this.props.children;
-      }
-    }
+        class Indirection extends React.Component {
+          shouldComponentUpdate() {
+            return false;
+          }
+          render() {
+            ReactNoop.yield('Indirection');
+            return this.props.children;
+          }
+        }
 
-    function App(props) {
-      return (
-        <Provider value={props.value}>
-          <Indirection>
-            <Provider>
+        function App(props) {
+          ReactNoop.yield('App');
+          return (
+            <Provider value={props.value}>
+              <Indirection>
+                <Indirection>
+                  <Consumer />
+                </Indirection>
+              </Indirection>
+            </Provider>
+          );
+        }
+
+        ReactNoop.render(<App value={2} />);
+        expect(ReactNoop.flush()).toEqual([
+          'App',
+          'Provider',
+          'Indirection',
+          'Indirection',
+          'Consumer',
+          'Consumer render prop',
+        ]);
+        expect(ReactNoop.getChildren()).toEqual([span('Result: 2')]);
+
+        // Update
+        ReactNoop.render(<App value={3} />);
+        expect(ReactNoop.flush()).toEqual([
+          'App',
+          'Provider',
+          'Consumer render prop',
+        ]);
+        expect(ReactNoop.getChildren()).toEqual([span('Result: 3')]);
+      });
+
+      it('consumers bail out if context value is the same', () => {
+        const Context = React.createContext(1);
+        const ContextConsumer = getConsumer(Context);
+
+        function Provider(props) {
+          ReactNoop.yield('Provider');
+          return (
+            <Context.Provider value={props.value}>
+              {props.children}
+            </Context.Provider>
+          );
+        }
+
+        function Consumer(props) {
+          ReactNoop.yield('Consumer');
+          return (
+            <ContextConsumer>
+              {value => {
+                ReactNoop.yield('Consumer render prop');
+                return <span prop={'Result: ' + value} />;
+              }}
+            </ContextConsumer>
+          );
+        }
+
+        class Indirection extends React.Component {
+          shouldComponentUpdate() {
+            return false;
+          }
+          render() {
+            ReactNoop.yield('Indirection');
+            return this.props.children;
+          }
+        }
+
+        function App(props) {
+          ReactNoop.yield('App');
+          return (
+            <Provider value={props.value}>
+              <Indirection>
+                <Indirection>
+                  <Consumer />
+                </Indirection>
+              </Indirection>
+            </Provider>
+          );
+        }
+
+        ReactNoop.render(<App value={2} />);
+        expect(ReactNoop.flush()).toEqual([
+          'App',
+          'Provider',
+          'Indirection',
+          'Indirection',
+          'Consumer',
+          'Consumer render prop',
+        ]);
+        expect(ReactNoop.getChildren()).toEqual([span('Result: 2')]);
+
+        // Update with the same context value
+        ReactNoop.render(<App value={2} />);
+        expect(ReactNoop.flush()).toEqual([
+          'App',
+          'Provider',
+          // Don't call render prop again
+        ]);
+        expect(ReactNoop.getChildren()).toEqual([span('Result: 2')]);
+      });
+
+      it('nested providers', () => {
+        const Context = React.createContext(1);
+        const Consumer = getConsumer(Context);
+
+        function Provider(props) {
+          return (
+            <Consumer>
+              {contextValue => (
+                // Multiply previous context value by 2, unless prop overrides
+                <Context.Provider value={props.value || contextValue * 2}>
+                  {props.children}
+                </Context.Provider>
+              )}
+            </Consumer>
+          );
+        }
+
+        class Indirection extends React.Component {
+          shouldComponentUpdate() {
+            return false;
+          }
+          render() {
+            return this.props.children;
+          }
+        }
+
+        function App(props) {
+          return (
+            <Provider value={props.value}>
               <Indirection>
                 <Provider>
                   <Indirection>
-                    <Consumer />
+                    <Provider>
+                      <Indirection>
+                        <Consumer>
+                          {value => <span prop={'Result: ' + value} />}
+                        </Consumer>
+                      </Indirection>
+                    </Provider>
                   </Indirection>
                 </Provider>
               </Indirection>
             </Provider>
-          </Indirection>
-        </Provider>
-      );
-    }
+          );
+        }
 
-    ReactNoop.render(<App value={2} />);
-    ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([span('Result: 8')]);
+        ReactNoop.render(<App value={2} />);
+        ReactNoop.flush();
+        expect(ReactNoop.getChildren()).toEqual([span('Result: 8')]);
 
-    // Update
-    ReactNoop.render(<App value={3} />);
-    ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([span('Result: 12')]);
-  });
+        // Update
+        ReactNoop.render(<App value={3} />);
+        ReactNoop.flush();
+        expect(ReactNoop.getChildren()).toEqual([span('Result: 12')]);
+      });
 
-  it('should provide the correct (default) values to consumers outside of a provider', () => {
-    const FooContext = React.createContext({value: 'foo-initial'});
-    const BarContext = React.createContext({value: 'bar-initial'});
+      it('should provide the correct (default) values to consumers outside of a provider', () => {
+        const FooContext = React.createContext({value: 'foo-initial'});
+        const BarContext = React.createContext({value: 'bar-initial'});
+        const FooConsumer = getConsumer(FooContext);
+        const BarConsumer = getConsumer(BarContext);
 
-    const Verify = ({actual, expected}) => {
-      expect(expected).toBe(actual);
-      return null;
-    };
+        const Verify = ({actual, expected}) => {
+          expect(expected).toBe(actual);
+          return null;
+        };
 
-    ReactNoop.render(
-      <React.Fragment>
-        <BarContext.Provider value={{value: 'bar-updated'}}>
-          <BarContext.Consumer>
-            {({value}) => <Verify actual={value} expected="bar-updated" />}
-          </BarContext.Consumer>
+        ReactNoop.render(
+          <React.Fragment>
+            <BarContext.Provider value={{value: 'bar-updated'}}>
+              <BarConsumer>
+                {({value}) => <Verify actual={value} expected="bar-updated" />}
+              </BarConsumer>
 
-          <FooContext.Provider value={{value: 'foo-updated'}}>
-            <FooContext.Consumer>
-              {({value}) => <Verify actual={value} expected="foo-updated" />}
-            </FooContext.Consumer>
-          </FooContext.Provider>
-        </BarContext.Provider>
+              <FooContext.Provider value={{value: 'foo-updated'}}>
+                <FooConsumer>
+                  {({value}) => (
+                    <Verify actual={value} expected="foo-updated" />
+                  )}
+                </FooConsumer>
+              </FooContext.Provider>
+            </BarContext.Provider>
 
-        <FooContext.Consumer>
-          {({value}) => <Verify actual={value} expected="foo-initial" />}
-        </FooContext.Consumer>
-        <BarContext.Consumer>
-          {({value}) => <Verify actual={value} expected="bar-initial" />}
-        </BarContext.Consumer>
-      </React.Fragment>,
-    );
-    ReactNoop.flush();
-  });
+            <FooConsumer>
+              {({value}) => <Verify actual={value} expected="foo-initial" />}
+            </FooConsumer>
+            <BarConsumer>
+              {({value}) => <Verify actual={value} expected="bar-initial" />}
+            </BarConsumer>
+          </React.Fragment>,
+        );
+        ReactNoop.flush();
+      });
 
-  it('multiple consumers in different branches', () => {
-    const Context = React.createContext(1);
+      it('multiple consumers in different branches', () => {
+        const Context = React.createContext(1);
+        const Consumer = getConsumer(Context);
 
-    function Provider(props) {
-      return (
-        <Context.Consumer>
-          {contextValue => (
-            // Multiply previous context value by 2, unless prop overrides
-            <Context.Provider value={props.value || contextValue * 2}>
+        function Provider(props) {
+          return (
+            <Context.Consumer>
+              {contextValue => (
+                // Multiply previous context value by 2, unless prop overrides
+                <Context.Provider value={props.value || contextValue * 2}>
+                  {props.children}
+                </Context.Provider>
+              )}
+            </Context.Consumer>
+          );
+        }
+
+        class Indirection extends React.Component {
+          shouldComponentUpdate() {
+            return false;
+          }
+          render() {
+            return this.props.children;
+          }
+        }
+
+        function App(props) {
+          return (
+            <Provider value={props.value}>
+              <Indirection>
+                <Indirection>
+                  <Provider>
+                    <Consumer>
+                      {value => <span prop={'Result: ' + value} />}
+                    </Consumer>
+                  </Provider>
+                </Indirection>
+                <Indirection>
+                  <Consumer>
+                    {value => <span prop={'Result: ' + value} />}
+                  </Consumer>
+                </Indirection>
+              </Indirection>
+            </Provider>
+          );
+        }
+
+        ReactNoop.render(<App value={2} />);
+        ReactNoop.flush();
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Result: 4'),
+          span('Result: 2'),
+        ]);
+
+        // Update
+        ReactNoop.render(<App value={3} />);
+        ReactNoop.flush();
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Result: 6'),
+          span('Result: 3'),
+        ]);
+
+        // Another update
+        ReactNoop.render(<App value={4} />);
+        ReactNoop.flush();
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Result: 8'),
+          span('Result: 4'),
+        ]);
+      });
+
+      it('compares context values with Object.is semantics', () => {
+        const Context = React.createContext(1);
+        const ContextConsumer = getConsumer(Context);
+
+        function Provider(props) {
+          ReactNoop.yield('Provider');
+          return (
+            <Context.Provider value={props.value}>
               {props.children}
             </Context.Provider>
-          )}
-        </Context.Consumer>
-      );
-    }
-
-    function Consumer(props) {
-      return (
-        <Context.Consumer>
-          {value => <span prop={'Result: ' + value} />}
-        </Context.Consumer>
-      );
-    }
-
-    class Indirection extends React.Component {
-      shouldComponentUpdate() {
-        return false;
-      }
-      render() {
-        return this.props.children;
-      }
-    }
-
-    function App(props) {
-      return (
-        <Provider value={props.value}>
-          <Indirection>
-            <Indirection>
-              <Provider>
-                <Consumer />
-              </Provider>
-            </Indirection>
-            <Indirection>
-              <Consumer />
-            </Indirection>
-          </Indirection>
-        </Provider>
-      );
-    }
-
-    ReactNoop.render(<App value={2} />);
-    ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      span('Result: 4'),
-      span('Result: 2'),
-    ]);
-
-    // Update
-    ReactNoop.render(<App value={3} />);
-    ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      span('Result: 6'),
-      span('Result: 3'),
-    ]);
-
-    // Another update
-    ReactNoop.render(<App value={4} />);
-    ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      span('Result: 8'),
-      span('Result: 4'),
-    ]);
-  });
-
-  it('compares context values with Object.is semantics', () => {
-    const Context = React.createContext(1);
-
-    function Provider(props) {
-      ReactNoop.yield('Provider');
-      return (
-        <Context.Provider value={props.value}>
-          {props.children}
-        </Context.Provider>
-      );
-    }
-
-    function Consumer(props) {
-      ReactNoop.yield('Consumer');
-      return (
-        <Context.Consumer>
-          {value => {
-            ReactNoop.yield('Consumer render prop');
-            return <span prop={'Result: ' + value} />;
-          }}
-        </Context.Consumer>
-      );
-    }
-
-    class Indirection extends React.Component {
-      shouldComponentUpdate() {
-        return false;
-      }
-      render() {
-        ReactNoop.yield('Indirection');
-        return this.props.children;
-      }
-    }
-
-    function App(props) {
-      ReactNoop.yield('App');
-      return (
-        <Provider value={props.value}>
-          <Indirection>
-            <Indirection>
-              <Consumer />
-            </Indirection>
-          </Indirection>
-        </Provider>
-      );
-    }
-
-    ReactNoop.render(<App value={NaN} />);
-    expect(ReactNoop.flush()).toEqual([
-      'App',
-      'Provider',
-      'Indirection',
-      'Indirection',
-      'Consumer',
-      'Consumer render prop',
-    ]);
-    expect(ReactNoop.getChildren()).toEqual([span('Result: NaN')]);
-
-    // Update
-    ReactNoop.render(<App value={NaN} />);
-    expect(ReactNoop.flush()).toEqual([
-      'App',
-      'Provider',
-      // Consumer should not re-render again
-      // 'Consumer render prop',
-    ]);
-    expect(ReactNoop.getChildren()).toEqual([span('Result: NaN')]);
-  });
-
-  it('context unwinds when interrupted', () => {
-    const Context = React.createContext('Default');
-
-    function Consumer(props) {
-      return (
-        <Context.Consumer>
-          {value => <span prop={'Result: ' + value} />}
-        </Context.Consumer>
-      );
-    }
-
-    function BadRender() {
-      throw new Error('Bad render');
-    }
-
-    class ErrorBoundary extends React.Component {
-      state = {error: null};
-      componentDidCatch(error) {
-        this.setState({error});
-      }
-      render() {
-        if (this.state.error) {
-          return null;
+          );
         }
-        return this.props.children;
-      }
-    }
 
-    function App(props) {
-      return (
-        <React.Fragment>
-          <Context.Provider value="Does not unwind">
-            <ErrorBoundary>
-              <Context.Provider value="Unwinds after BadRender throws">
-                <BadRender />
-              </Context.Provider>
-            </ErrorBoundary>
-            <Consumer />
-          </Context.Provider>
-        </React.Fragment>
-      );
-    }
+        function Consumer(props) {
+          ReactNoop.yield('Consumer');
+          return (
+            <ContextConsumer>
+              {value => {
+                ReactNoop.yield('Consumer render prop');
+                return <span prop={'Result: ' + value} />;
+              }}
+            </ContextConsumer>
+          );
+        }
 
-    ReactNoop.render(<App value="A" />);
-    ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      // The second provider should use the default value.
-      span('Result: Does not unwind'),
-    ]);
-  });
+        class Indirection extends React.Component {
+          shouldComponentUpdate() {
+            return false;
+          }
+          render() {
+            ReactNoop.yield('Indirection');
+            return this.props.children;
+          }
+        }
 
-  it('can skip consumers with bitmask', () => {
-    const Context = React.createContext({foo: 0, bar: 0}, (a, b) => {
-      let result = 0;
-      if (a.foo !== b.foo) {
-        result |= 0b01;
-      }
-      if (a.bar !== b.bar) {
-        result |= 0b10;
-      }
-      return result;
-    });
-
-    function Provider(props) {
-      return (
-        <Context.Provider value={{foo: props.foo, bar: props.bar}}>
-          {props.children}
-        </Context.Provider>
-      );
-    }
-
-    function Foo() {
-      return (
-        <Context.Consumer unstable_observedBits={0b01}>
-          {value => {
-            ReactNoop.yield('Foo');
-            return <span prop={'Foo: ' + value.foo} />;
-          }}
-        </Context.Consumer>
-      );
-    }
-
-    function Bar() {
-      return (
-        <Context.Consumer unstable_observedBits={0b10}>
-          {value => {
-            ReactNoop.yield('Bar');
-            return <span prop={'Bar: ' + value.bar} />;
-          }}
-        </Context.Consumer>
-      );
-    }
-
-    class Indirection extends React.Component {
-      shouldComponentUpdate() {
-        return false;
-      }
-      render() {
-        return this.props.children;
-      }
-    }
-
-    function App(props) {
-      return (
-        <Provider foo={props.foo} bar={props.bar}>
-          <Indirection>
-            <Indirection>
-              <Foo />
-            </Indirection>
-            <Indirection>
-              <Bar />
-            </Indirection>
-          </Indirection>
-        </Provider>
-      );
-    }
-
-    ReactNoop.render(<App foo={1} bar={1} />);
-    expect(ReactNoop.flush()).toEqual(['Foo', 'Bar']);
-    expect(ReactNoop.getChildren()).toEqual([span('Foo: 1'), span('Bar: 1')]);
-
-    // Update only foo
-    ReactNoop.render(<App foo={2} bar={1} />);
-    expect(ReactNoop.flush()).toEqual(['Foo']);
-    expect(ReactNoop.getChildren()).toEqual([span('Foo: 2'), span('Bar: 1')]);
-
-    // Update only bar
-    ReactNoop.render(<App foo={2} bar={2} />);
-    expect(ReactNoop.flush()).toEqual(['Bar']);
-    expect(ReactNoop.getChildren()).toEqual([span('Foo: 2'), span('Bar: 2')]);
-
-    // Update both
-    ReactNoop.render(<App foo={3} bar={3} />);
-    expect(ReactNoop.flush()).toEqual(['Foo', 'Bar']);
-    expect(ReactNoop.getChildren()).toEqual([span('Foo: 3'), span('Bar: 3')]);
-  });
-
-  it('can skip parents with bitmask bailout while updating their children', () => {
-    const Context = React.createContext({foo: 0, bar: 0}, (a, b) => {
-      let result = 0;
-      if (a.foo !== b.foo) {
-        result |= 0b01;
-      }
-      if (a.bar !== b.bar) {
-        result |= 0b10;
-      }
-      return result;
-    });
-
-    function Provider(props) {
-      return (
-        <Context.Provider value={{foo: props.foo, bar: props.bar}}>
-          {props.children}
-        </Context.Provider>
-      );
-    }
-
-    function Foo(props) {
-      return (
-        <Context.Consumer unstable_observedBits={0b01}>
-          {value => {
-            ReactNoop.yield('Foo');
-            return (
-              <React.Fragment>
-                <span prop={'Foo: ' + value.foo} />
-                {props.children && props.children()}
-              </React.Fragment>
-            );
-          }}
-        </Context.Consumer>
-      );
-    }
-
-    function Bar(props) {
-      return (
-        <Context.Consumer unstable_observedBits={0b10}>
-          {value => {
-            ReactNoop.yield('Bar');
-            return (
-              <React.Fragment>
-                <span prop={'Bar: ' + value.bar} />
-                {props.children && props.children()}
-              </React.Fragment>
-            );
-          }}
-        </Context.Consumer>
-      );
-    }
-
-    class Indirection extends React.Component {
-      shouldComponentUpdate() {
-        return false;
-      }
-      render() {
-        return this.props.children;
-      }
-    }
-
-    function App(props) {
-      return (
-        <Provider foo={props.foo} bar={props.bar}>
-          <Indirection>
-            <Foo>
-              {/* Use a render prop so we don't test constant elements. */}
-              {() => (
+        function App(props) {
+          ReactNoop.yield('App');
+          return (
+            <Provider value={props.value}>
+              <Indirection>
                 <Indirection>
-                  <Bar>
-                    {() => (
-                      <Indirection>
-                        <Foo />
-                      </Indirection>
-                    )}
-                  </Bar>
+                  <Consumer />
                 </Indirection>
-              )}
-            </Foo>
-          </Indirection>
-        </Provider>
-      );
-    }
-
-    ReactNoop.render(<App foo={1} bar={1} />);
-    expect(ReactNoop.flush()).toEqual(['Foo', 'Bar', 'Foo']);
-    expect(ReactNoop.getChildren()).toEqual([
-      span('Foo: 1'),
-      span('Bar: 1'),
-      span('Foo: 1'),
-    ]);
-
-    // Update only foo
-    ReactNoop.render(<App foo={2} bar={1} />);
-    expect(ReactNoop.flush()).toEqual(['Foo', 'Foo']);
-    expect(ReactNoop.getChildren()).toEqual([
-      span('Foo: 2'),
-      span('Bar: 1'),
-      span('Foo: 2'),
-    ]);
-
-    // Update only bar
-    ReactNoop.render(<App foo={2} bar={2} />);
-    expect(ReactNoop.flush()).toEqual(['Bar']);
-    expect(ReactNoop.getChildren()).toEqual([
-      span('Foo: 2'),
-      span('Bar: 2'),
-      span('Foo: 2'),
-    ]);
-
-    // Update both
-    ReactNoop.render(<App foo={3} bar={3} />);
-    expect(ReactNoop.flush()).toEqual(['Foo', 'Bar', 'Foo']);
-    expect(ReactNoop.getChildren()).toEqual([
-      span('Foo: 3'),
-      span('Bar: 3'),
-      span('Foo: 3'),
-    ]);
-  });
-
-  it('warns if calculateChangedBits returns larger than a 31-bit integer', () => {
-    const Context = React.createContext(
-      0,
-      (a, b) => Math.pow(2, 32) - 1, // Return 32 bit int
-    );
-
-    function App(props) {
-      return <Context.Provider value={props.value} />;
-    }
-
-    ReactNoop.render(<App value={1} />);
-    ReactNoop.flush();
-
-    // Update
-    ReactNoop.render(<App value={2} />);
-    expect(ReactNoop.flush).toWarnDev(
-      'calculateChangedBits: Expected the return value to be a 31-bit ' +
-        'integer. Instead received: 4294967295',
-    );
-  });
-
-  it('warns if multiple renderers concurrently render the same context', () => {
-    spyOnDev(console, 'error');
-    const Context = React.createContext(0);
-
-    function Foo(props) {
-      ReactNoop.yield('Foo');
-      return null;
-    }
-
-    function App(props) {
-      return (
-        <Context.Provider value={props.value}>
-          <Foo />
-          <Foo />
-        </Context.Provider>
-      );
-    }
-
-    ReactNoop.render(<App value={1} />);
-    // Render past the Provider, but don't commit yet
-    ReactNoop.flushThrough(['Foo']);
-
-    // Get a new copy of ReactNoop
-    jest.resetModules();
-    ReactFeatureFlags = require('shared/ReactFeatureFlags');
-    React = require('react');
-    ReactNoop = require('react-noop-renderer');
-
-    // Render the provider again using a different renderer
-    ReactNoop.render(<App value={1} />);
-    ReactNoop.flush();
-
-    if (__DEV__) {
-      expect(console.error.calls.argsFor(0)[0]).toContain(
-        'Detected multiple renderers concurrently rendering the same ' +
-          'context provider. This is currently unsupported',
-      );
-    }
-  });
-
-  it('warns if consumer child is not a function', () => {
-    spyOnDev(console, 'error');
-    const Context = React.createContext(0);
-    ReactNoop.render(<Context.Consumer />);
-    expect(ReactNoop.flush).toThrow('render is not a function');
-    if (__DEV__) {
-      expect(console.error.calls.argsFor(0)[0]).toContain(
-        'A context consumer was rendered with multiple children, or a child ' +
-          "that isn't a function",
-      );
-    }
-  });
-
-  it("does not re-render if there's an update in a child", () => {
-    const Context = React.createContext(0);
-
-    let child;
-    class Child extends React.Component {
-      state = {step: 0};
-      render() {
-        ReactNoop.yield('Child');
-        return (
-          <span
-            prop={`Context: ${this.props.context}, Step: ${this.state.step}`}
-          />
-        );
-      }
-    }
-
-    function App(props) {
-      return (
-        <Context.Provider value={props.value}>
-          <Context.Consumer>
-            {value => {
-              ReactNoop.yield('Consumer render prop');
-              return <Child ref={inst => (child = inst)} context={value} />;
-            }}
-          </Context.Consumer>
-        </Context.Provider>
-      );
-    }
-
-    // Initial mount
-    ReactNoop.render(<App value={1} />);
-    expect(ReactNoop.flush()).toEqual(['Consumer render prop', 'Child']);
-    expect(ReactNoop.getChildren()).toEqual([span('Context: 1, Step: 0')]);
-
-    child.setState({step: 1});
-    expect(ReactNoop.flush()).toEqual(['Child']);
-    expect(ReactNoop.getChildren()).toEqual([span('Context: 1, Step: 1')]);
-  });
-
-  it('provider bails out if children and value are unchanged (like sCU)', () => {
-    const Context = React.createContext(0);
-
-    function Child() {
-      ReactNoop.yield('Child');
-      return <span prop="Child" />;
-    }
-
-    const children = <Child />;
-
-    function App(props) {
-      ReactNoop.yield('App');
-      return (
-        <Context.Provider value={props.value}>{children}</Context.Provider>
-      );
-    }
-
-    // Initial mount
-    ReactNoop.render(<App value={1} />);
-    expect(ReactNoop.flush()).toEqual(['App', 'Child']);
-    expect(ReactNoop.getChildren()).toEqual([span('Child')]);
-
-    // Update
-    ReactNoop.render(<App value={1} />);
-    expect(ReactNoop.flush()).toEqual([
-      'App',
-      // Child does not re-render
-    ]);
-    expect(ReactNoop.getChildren()).toEqual([span('Child')]);
-  });
-
-  it('provider does not bail out if legacy context changed above', () => {
-    const Context = React.createContext(0);
-
-    function Child() {
-      ReactNoop.yield('Child');
-      return <span prop="Child" />;
-    }
-
-    const children = <Child />;
-
-    class LegacyProvider extends React.Component {
-      static childContextTypes = {
-        legacyValue: () => {},
-      };
-      state = {legacyValue: 1};
-      getChildContext() {
-        return {legacyValue: this.state.legacyValue};
-      }
-      render() {
-        ReactNoop.yield('LegacyProvider');
-        return this.props.children;
-      }
-    }
-
-    class App extends React.Component {
-      state = {value: 1};
-      render() {
-        ReactNoop.yield('App');
-        return (
-          <Context.Provider value={this.state.value}>
-            {this.props.children}
-          </Context.Provider>
-        );
-      }
-    }
-
-    const legacyProviderRef = React.createRef();
-    const appRef = React.createRef();
-
-    // Initial mount
-    ReactNoop.render(
-      <LegacyProvider ref={legacyProviderRef}>
-        <App ref={appRef} value={1}>
-          {children}
-        </App>
-      </LegacyProvider>,
-    );
-    expect(ReactNoop.flush()).toEqual(['LegacyProvider', 'App', 'Child']);
-    expect(ReactNoop.getChildren()).toEqual([span('Child')]);
-
-    // Update App with same value (should bail out)
-    appRef.current.setState({value: 1});
-    expect(ReactNoop.flush()).toEqual(['App']);
-    expect(ReactNoop.getChildren()).toEqual([span('Child')]);
-
-    // Update LegacyProvider (should not bail out)
-    legacyProviderRef.current.setState({value: 1});
-    expect(ReactNoop.flush()).toEqual(['LegacyProvider', 'App', 'Child']);
-    expect(ReactNoop.getChildren()).toEqual([span('Child')]);
-
-    // Update App with same value (should bail out)
-    appRef.current.setState({value: 1});
-    expect(ReactNoop.flush()).toEqual(['App']);
-    expect(ReactNoop.getChildren()).toEqual([span('Child')]);
-  });
-
-  it('consumer bails out if value is unchanged and something above bailed out', () => {
-    const Context = React.createContext(0);
-
-    function renderChildValue(value) {
-      ReactNoop.yield('Consumer');
-      return <span prop={value} />;
-    }
-
-    function ChildWithInlineRenderCallback() {
-      ReactNoop.yield('ChildWithInlineRenderCallback');
-      // Note: we are intentionally passing an inline arrow. Don't refactor.
-      return (
-        <Context.Consumer>{value => renderChildValue(value)}</Context.Consumer>
-      );
-    }
-
-    function ChildWithCachedRenderCallback() {
-      ReactNoop.yield('ChildWithCachedRenderCallback');
-      return <Context.Consumer>{renderChildValue}</Context.Consumer>;
-    }
-
-    class PureIndirection extends React.PureComponent {
-      render() {
-        ReactNoop.yield('PureIndirection');
-        return (
-          <React.Fragment>
-            <ChildWithInlineRenderCallback />
-            <ChildWithCachedRenderCallback />
-          </React.Fragment>
-        );
-      }
-    }
-
-    class App extends React.Component {
-      render() {
-        ReactNoop.yield('App');
-        return (
-          <Context.Provider value={this.props.value}>
-            <PureIndirection />
-          </Context.Provider>
-        );
-      }
-    }
-
-    // Initial mount
-    ReactNoop.render(<App value={1} />);
-    expect(ReactNoop.flush()).toEqual([
-      'App',
-      'PureIndirection',
-      'ChildWithInlineRenderCallback',
-      'Consumer',
-      'ChildWithCachedRenderCallback',
-      'Consumer',
-    ]);
-    expect(ReactNoop.getChildren()).toEqual([span(1), span(1)]);
-
-    // Update (bailout)
-    ReactNoop.render(<App value={1} />);
-    expect(ReactNoop.flush()).toEqual(['App']);
-    expect(ReactNoop.getChildren()).toEqual([span(1), span(1)]);
-
-    // Update (no bailout)
-    ReactNoop.render(<App value={2} />);
-    expect(ReactNoop.flush()).toEqual(['App', 'Consumer', 'Consumer']);
-    expect(ReactNoop.getChildren()).toEqual([span(2), span(2)]);
-  });
-
-  // Context consumer bails out on propagating "deep" updates when `value` hasn't changed.
-  // However, it doesn't bail out from rendering if the component above it re-rendered anyway.
-  // If we bailed out on referential equality, it would be confusing that you
-  // can call this.setState(), but an autobound render callback "blocked" the update.
-  // https://github.com/facebook/react/pull/12470#issuecomment-376917711
-  it('consumer does not bail out if there were no bailouts above it', () => {
-    const Context = React.createContext(0);
-
-    class App extends React.Component {
-      state = {
-        text: 'hello',
-      };
-
-      renderConsumer = context => {
-        ReactNoop.yield('App#renderConsumer');
-        return <span prop={this.state.text} />;
-      };
-
-      render() {
-        ReactNoop.yield('App');
-        return (
-          <Context.Provider value={this.props.value}>
-            <Context.Consumer>{this.renderConsumer}</Context.Consumer>
-          </Context.Provider>
-        );
-      }
-    }
-
-    // Initial mount
-    let inst;
-    ReactNoop.render(<App value={1} ref={ref => (inst = ref)} />);
-    expect(ReactNoop.flush()).toEqual(['App', 'App#renderConsumer']);
-    expect(ReactNoop.getChildren()).toEqual([span('hello')]);
-
-    // Update
-    inst.setState({text: 'goodbye'});
-    expect(ReactNoop.flush()).toEqual(['App', 'App#renderConsumer']);
-    expect(ReactNoop.getChildren()).toEqual([span('goodbye')]);
-  });
-
-  // This is a regression case for https://github.com/facebook/react/issues/12389.
-  it('does not run into an infinite loop', () => {
-    const Context = React.createContext(null);
-
-    class App extends React.Component {
-      renderItem(id) {
-        return (
-          <span key={id}>
-            <Context.Consumer>{() => <span>inner</span>}</Context.Consumer>
-            <span>outer</span>
-          </span>
-        );
-      }
-      renderList() {
-        const list = [1, 2].map(id => this.renderItem(id));
-        if (this.props.reverse) {
-          list.reverse();
+              </Indirection>
+            </Provider>
+          );
         }
-        return list;
+
+        ReactNoop.render(<App value={NaN} />);
+        expect(ReactNoop.flush()).toEqual([
+          'App',
+          'Provider',
+          'Indirection',
+          'Indirection',
+          'Consumer',
+          'Consumer render prop',
+        ]);
+        expect(ReactNoop.getChildren()).toEqual([span('Result: NaN')]);
+
+        // Update
+        ReactNoop.render(<App value={NaN} />);
+        expect(ReactNoop.flush()).toEqual([
+          'App',
+          'Provider',
+          // Consumer should not re-render again
+          // 'Consumer render prop',
+        ]);
+        expect(ReactNoop.getChildren()).toEqual([span('Result: NaN')]);
+      });
+
+      it('context unwinds when interrupted', () => {
+        const Context = React.createContext('Default');
+        const ContextConsumer = getConsumer(Context);
+
+        function Consumer(props) {
+          return (
+            <ContextConsumer>
+              {value => <span prop={'Result: ' + value} />}
+            </ContextConsumer>
+          );
+        }
+
+        function BadRender() {
+          throw new Error('Bad render');
+        }
+
+        class ErrorBoundary extends React.Component {
+          state = {error: null};
+          componentDidCatch(error) {
+            this.setState({error});
+          }
+          render() {
+            if (this.state.error) {
+              return null;
+            }
+            return this.props.children;
+          }
+        }
+
+        function App(props) {
+          return (
+            <React.Fragment>
+              <Context.Provider value="Does not unwind">
+                <ErrorBoundary>
+                  <Context.Provider value="Unwinds after BadRender throws">
+                    <BadRender />
+                  </Context.Provider>
+                </ErrorBoundary>
+                <Consumer />
+              </Context.Provider>
+            </React.Fragment>
+          );
+        }
+
+        ReactNoop.render(<App value="A" />);
+        ReactNoop.flush();
+        expect(ReactNoop.getChildren()).toEqual([
+          // The second provider should use the default value.
+          span('Result: Does not unwind'),
+        ]);
+      });
+
+      it('can skip consumers with bitmask', () => {
+        const Context = React.createContext({foo: 0, bar: 0}, (a, b) => {
+          let result = 0;
+          if (a.foo !== b.foo) {
+            result |= 0b01;
+          }
+          if (a.bar !== b.bar) {
+            result |= 0b10;
+          }
+          return result;
+        });
+        const Consumer = getConsumer(Context);
+
+        function Provider(props) {
+          return (
+            <Context.Provider value={{foo: props.foo, bar: props.bar}}>
+              {props.children}
+            </Context.Provider>
+          );
+        }
+
+        function Foo() {
+          return (
+            <Consumer unstable_observedBits={0b01}>
+              {value => {
+                ReactNoop.yield('Foo');
+                return <span prop={'Foo: ' + value.foo} />;
+              }}
+            </Consumer>
+          );
+        }
+
+        function Bar() {
+          return (
+            <Consumer unstable_observedBits={0b10}>
+              {value => {
+                ReactNoop.yield('Bar');
+                return <span prop={'Bar: ' + value.bar} />;
+              }}
+            </Consumer>
+          );
+        }
+
+        class Indirection extends React.Component {
+          shouldComponentUpdate() {
+            return false;
+          }
+          render() {
+            return this.props.children;
+          }
+        }
+
+        function App(props) {
+          return (
+            <Provider foo={props.foo} bar={props.bar}>
+              <Indirection>
+                <Indirection>
+                  <Foo />
+                </Indirection>
+                <Indirection>
+                  <Bar />
+                </Indirection>
+              </Indirection>
+            </Provider>
+          );
+        }
+
+        ReactNoop.render(<App foo={1} bar={1} />);
+        expect(ReactNoop.flush()).toEqual(['Foo', 'Bar']);
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Foo: 1'),
+          span('Bar: 1'),
+        ]);
+
+        // Update only foo
+        ReactNoop.render(<App foo={2} bar={1} />);
+        expect(ReactNoop.flush()).toEqual(['Foo']);
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Foo: 2'),
+          span('Bar: 1'),
+        ]);
+
+        // Update only bar
+        ReactNoop.render(<App foo={2} bar={2} />);
+        expect(ReactNoop.flush()).toEqual(['Bar']);
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Foo: 2'),
+          span('Bar: 2'),
+        ]);
+
+        // Update both
+        ReactNoop.render(<App foo={3} bar={3} />);
+        expect(ReactNoop.flush()).toEqual(['Foo', 'Bar']);
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Foo: 3'),
+          span('Bar: 3'),
+        ]);
+      });
+
+      it('can skip parents with bitmask bailout while updating their children', () => {
+        const Context = React.createContext({foo: 0, bar: 0}, (a, b) => {
+          let result = 0;
+          if (a.foo !== b.foo) {
+            result |= 0b01;
+          }
+          if (a.bar !== b.bar) {
+            result |= 0b10;
+          }
+          return result;
+        });
+        const Consumer = getConsumer(Context);
+
+        function Provider(props) {
+          return (
+            <Context.Provider value={{foo: props.foo, bar: props.bar}}>
+              {props.children}
+            </Context.Provider>
+          );
+        }
+
+        function Foo(props) {
+          return (
+            <Consumer unstable_observedBits={0b01}>
+              {value => {
+                ReactNoop.yield('Foo');
+                return (
+                  <React.Fragment>
+                    <span prop={'Foo: ' + value.foo} />
+                    {props.children && props.children()}
+                  </React.Fragment>
+                );
+              }}
+            </Consumer>
+          );
+        }
+
+        function Bar(props) {
+          return (
+            <Consumer unstable_observedBits={0b10}>
+              {value => {
+                ReactNoop.yield('Bar');
+                return (
+                  <React.Fragment>
+                    <span prop={'Bar: ' + value.bar} />
+                    {props.children && props.children()}
+                  </React.Fragment>
+                );
+              }}
+            </Consumer>
+          );
+        }
+
+        class Indirection extends React.Component {
+          shouldComponentUpdate() {
+            return false;
+          }
+          render() {
+            return this.props.children;
+          }
+        }
+
+        function App(props) {
+          return (
+            <Provider foo={props.foo} bar={props.bar}>
+              <Indirection>
+                <Foo>
+                  {/* Use a render prop so we don't test constant elements. */}
+                  {() => (
+                    <Indirection>
+                      <Bar>
+                        {() => (
+                          <Indirection>
+                            <Foo />
+                          </Indirection>
+                        )}
+                      </Bar>
+                    </Indirection>
+                  )}
+                </Foo>
+              </Indirection>
+            </Provider>
+          );
+        }
+
+        ReactNoop.render(<App foo={1} bar={1} />);
+        expect(ReactNoop.flush()).toEqual(['Foo', 'Bar', 'Foo']);
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Foo: 1'),
+          span('Bar: 1'),
+          span('Foo: 1'),
+        ]);
+
+        // Update only foo
+        ReactNoop.render(<App foo={2} bar={1} />);
+        expect(ReactNoop.flush()).toEqual(['Foo', 'Foo']);
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Foo: 2'),
+          span('Bar: 1'),
+          span('Foo: 2'),
+        ]);
+
+        // Update only bar
+        ReactNoop.render(<App foo={2} bar={2} />);
+        expect(ReactNoop.flush()).toEqual(['Bar']);
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Foo: 2'),
+          span('Bar: 2'),
+          span('Foo: 2'),
+        ]);
+
+        // Update both
+        ReactNoop.render(<App foo={3} bar={3} />);
+        expect(ReactNoop.flush()).toEqual(['Foo', 'Bar', 'Foo']);
+        expect(ReactNoop.getChildren()).toEqual([
+          span('Foo: 3'),
+          span('Bar: 3'),
+          span('Foo: 3'),
+        ]);
+      });
+
+      it("does not re-render if there's an update in a child", () => {
+        const Context = React.createContext(0);
+        const Consumer = getConsumer(Context);
+
+        let child;
+        class Child extends React.Component {
+          state = {step: 0};
+          render() {
+            ReactNoop.yield('Child');
+            return (
+              <span
+                prop={`Context: ${this.props.context}, Step: ${
+                  this.state.step
+                }`}
+              />
+            );
+          }
+        }
+
+        function App(props) {
+          return (
+            <Context.Provider value={props.value}>
+              <Consumer>
+                {value => {
+                  ReactNoop.yield('Consumer render prop');
+                  return <Child ref={inst => (child = inst)} context={value} />;
+                }}
+              </Consumer>
+            </Context.Provider>
+          );
+        }
+
+        // Initial mount
+        ReactNoop.render(<App value={1} />);
+        expect(ReactNoop.flush()).toEqual(['Consumer render prop', 'Child']);
+        expect(ReactNoop.getChildren()).toEqual([span('Context: 1, Step: 0')]);
+
+        child.setState({step: 1});
+        expect(ReactNoop.flush()).toEqual(['Child']);
+        expect(ReactNoop.getChildren()).toEqual([span('Context: 1, Step: 1')]);
+      });
+
+      it('consumer bails out if value is unchanged and something above bailed out', () => {
+        const Context = React.createContext(0);
+        const Consumer = getConsumer(Context);
+
+        function renderChildValue(value) {
+          ReactNoop.yield('Consumer');
+          return <span prop={value} />;
+        }
+
+        function ChildWithInlineRenderCallback() {
+          ReactNoop.yield('ChildWithInlineRenderCallback');
+          // Note: we are intentionally passing an inline arrow. Don't refactor.
+          return <Consumer>{value => renderChildValue(value)}</Consumer>;
+        }
+
+        function ChildWithCachedRenderCallback() {
+          ReactNoop.yield('ChildWithCachedRenderCallback');
+          return <Consumer>{renderChildValue}</Consumer>;
+        }
+
+        class PureIndirection extends React.PureComponent {
+          render() {
+            ReactNoop.yield('PureIndirection');
+            return (
+              <React.Fragment>
+                <ChildWithInlineRenderCallback />
+                <ChildWithCachedRenderCallback />
+              </React.Fragment>
+            );
+          }
+        }
+
+        class App extends React.Component {
+          render() {
+            ReactNoop.yield('App');
+            return (
+              <Context.Provider value={this.props.value}>
+                <PureIndirection />
+              </Context.Provider>
+            );
+          }
+        }
+
+        // Initial mount
+        ReactNoop.render(<App value={1} />);
+        expect(ReactNoop.flush()).toEqual([
+          'App',
+          'PureIndirection',
+          'ChildWithInlineRenderCallback',
+          'Consumer',
+          'ChildWithCachedRenderCallback',
+          'Consumer',
+        ]);
+        expect(ReactNoop.getChildren()).toEqual([span(1), span(1)]);
+
+        // Update (bailout)
+        ReactNoop.render(<App value={1} />);
+        expect(ReactNoop.flush()).toEqual(['App']);
+        expect(ReactNoop.getChildren()).toEqual([span(1), span(1)]);
+
+        // Update (no bailout)
+        ReactNoop.render(<App value={2} />);
+        expect(ReactNoop.flush()).toEqual(['App', 'Consumer', 'Consumer']);
+        expect(ReactNoop.getChildren()).toEqual([span(2), span(2)]);
+      });
+
+      // Context consumer bails out on propagating "deep" updates when `value` hasn't changed.
+      // However, it doesn't bail out from rendering if the component above it re-rendered anyway.
+      // If we bailed out on referential equality, it would be confusing that you
+      // can call this.setState(), but an autobound render callback "blocked" the update.
+      // https://github.com/facebook/react/pull/12470#issuecomment-376917711
+      it('consumer does not bail out if there were no bailouts above it', () => {
+        const Context = React.createContext(0);
+        const Consumer = getConsumer(Context);
+
+        class App extends React.Component {
+          state = {
+            text: 'hello',
+          };
+
+          renderConsumer = context => {
+            ReactNoop.yield('App#renderConsumer');
+            return <span prop={this.state.text} />;
+          };
+
+          render() {
+            ReactNoop.yield('App');
+            return (
+              <Context.Provider value={this.props.value}>
+                <Consumer>{this.renderConsumer}</Consumer>
+              </Context.Provider>
+            );
+          }
+        }
+
+        // Initial mount
+        let inst;
+        ReactNoop.render(<App value={1} ref={ref => (inst = ref)} />);
+        expect(ReactNoop.flush()).toEqual(['App', 'App#renderConsumer']);
+        expect(ReactNoop.getChildren()).toEqual([span('hello')]);
+
+        // Update
+        inst.setState({text: 'goodbye'});
+        expect(ReactNoop.flush()).toEqual(['App', 'App#renderConsumer']);
+        expect(ReactNoop.getChildren()).toEqual([span('goodbye')]);
+      });
+
+      // This is a regression case for https://github.com/facebook/react/issues/12389.
+      it('does not run into an infinite loop', () => {
+        const Context = React.createContext(null);
+        const Consumer = getConsumer(Context);
+
+        class App extends React.Component {
+          renderItem(id) {
+            return (
+              <span key={id}>
+                <Consumer>{() => <span>inner</span>}</Consumer>
+                <span>outer</span>
+              </span>
+            );
+          }
+          renderList() {
+            const list = [1, 2].map(id => this.renderItem(id));
+            if (this.props.reverse) {
+              list.reverse();
+            }
+            return list;
+          }
+          render() {
+            return (
+              <Context.Provider value={{}}>
+                {this.renderList()}
+              </Context.Provider>
+            );
+          }
+        }
+
+        ReactNoop.render(<App reverse={false} />);
+        ReactNoop.flush();
+        ReactNoop.render(<App reverse={true} />);
+        ReactNoop.flush();
+        ReactNoop.render(<App reverse={false} />);
+        ReactNoop.flush();
+      });
+
+      // This is a regression case for https://github.com/facebook/react/issues/12686
+      it('does not skip some siblings', () => {
+        const Context = React.createContext(0);
+        const ContextConsumer = getConsumer(Context);
+
+        class App extends React.Component {
+          state = {
+            step: 0,
+          };
+
+          render() {
+            ReactNoop.yield('App');
+            return (
+              <Context.Provider value={this.state.step}>
+                <StaticContent />
+                {this.state.step > 0 && <Indirection />}
+              </Context.Provider>
+            );
+          }
+        }
+
+        class StaticContent extends React.PureComponent {
+          render() {
+            return (
+              <React.Fragment>
+                <React.Fragment>
+                  <span prop="static 1" />
+                  <span prop="static 2" />
+                </React.Fragment>
+              </React.Fragment>
+            );
+          }
+        }
+
+        class Indirection extends React.PureComponent {
+          render() {
+            return (
+              <ContextConsumer>
+                {value => {
+                  ReactNoop.yield('Consumer');
+                  return <span prop={value} />;
+                }}
+              </ContextConsumer>
+            );
+          }
+        }
+
+        // Initial mount
+        let inst;
+        ReactNoop.render(<App ref={ref => (inst = ref)} />);
+        expect(ReactNoop.flush()).toEqual(['App']);
+        expect(ReactNoop.getChildren()).toEqual([
+          span('static 1'),
+          span('static 2'),
+        ]);
+        // Update the first time
+        inst.setState({step: 1});
+        expect(ReactNoop.flush()).toEqual(['App', 'Consumer']);
+        expect(ReactNoop.getChildren()).toEqual([
+          span('static 1'),
+          span('static 2'),
+          span(1),
+        ]);
+        // Update the second time
+        inst.setState({step: 2});
+        expect(ReactNoop.flush()).toEqual(['App', 'Consumer']);
+        expect(ReactNoop.getChildren()).toEqual([
+          span('static 1'),
+          span('static 2'),
+          span(2),
+        ]);
+      });
+    });
+  }
+
+  describe('Context.Provider', () => {
+    it('warns if calculateChangedBits returns larger than a 31-bit integer', () => {
+      const Context = React.createContext(
+        0,
+        (a, b) => Math.pow(2, 32) - 1, // Return 32 bit int
+      );
+
+      function App(props) {
+        return <Context.Provider value={props.value} />;
       }
-      render() {
-        return (
-          <Context.Provider value={{}}>{this.renderList()}</Context.Provider>
-        );
+
+      ReactNoop.render(<App value={1} />);
+      ReactNoop.flush();
+
+      // Update
+      ReactNoop.render(<App value={2} />);
+      expect(ReactNoop.flush).toWarnDev(
+        'calculateChangedBits: Expected the return value to be a 31-bit ' +
+          'integer. Instead received: 4294967295',
+      );
+    });
+
+    it('warns if multiple renderers concurrently render the same context', () => {
+      spyOnDev(console, 'error');
+      const Context = React.createContext(0);
+
+      function Foo(props) {
+        ReactNoop.yield('Foo');
+        return null;
       }
-    }
 
-    ReactNoop.render(<App reverse={false} />);
-    ReactNoop.flush();
-    ReactNoop.render(<App reverse={true} />);
-    ReactNoop.flush();
-    ReactNoop.render(<App reverse={false} />);
-    ReactNoop.flush();
-  });
-
-  // This is a regression case for https://github.com/facebook/react/issues/12686
-  it('does not skip some siblings', () => {
-    const Context = React.createContext(0);
-
-    class App extends React.Component {
-      state = {
-        step: 0,
-      };
-
-      render() {
-        ReactNoop.yield('App');
+      function App(props) {
         return (
-          <Context.Provider value={this.state.step}>
-            <StaticContent />
-            {this.state.step > 0 && <Indirection />}
+          <Context.Provider value={props.value}>
+            <Foo />
+            <Foo />
           </Context.Provider>
         );
       }
-    }
 
-    class StaticContent extends React.PureComponent {
-      render() {
-        return (
-          <React.Fragment>
-            <React.Fragment>
-              <span prop="static 1" />
-              <span prop="static 2" />
-            </React.Fragment>
-          </React.Fragment>
+      ReactNoop.render(<App value={1} />);
+      // Render past the Provider, but don't commit yet
+      ReactNoop.flushThrough(['Foo']);
+
+      // Get a new copy of ReactNoop
+      jest.resetModules();
+      ReactFeatureFlags = require('shared/ReactFeatureFlags');
+      React = require('react');
+      ReactNoop = require('react-noop-renderer');
+
+      // Render the provider again using a different renderer
+      ReactNoop.render(<App value={1} />);
+      ReactNoop.flush();
+
+      if (__DEV__) {
+        expect(console.error.calls.argsFor(0)[0]).toContain(
+          'Detected multiple renderers concurrently rendering the same ' +
+            'context provider. This is currently unsupported',
         );
       }
-    }
+    });
 
-    class Indirection extends React.PureComponent {
-      render() {
-        return <Consumer />;
+    it('provider bails out if children and value are unchanged (like sCU)', () => {
+      const Context = React.createContext(0);
+
+      function Child() {
+        ReactNoop.yield('Child');
+        return <span prop="Child" />;
       }
-    }
 
-    function Consumer() {
-      return (
-        <Context.Consumer>
-          {value => {
-            ReactNoop.yield('Consumer');
-            return <span prop={value} />;
-          }}
-        </Context.Consumer>
+      const children = <Child />;
+
+      function App(props) {
+        ReactNoop.yield('App');
+        return (
+          <Context.Provider value={props.value}>{children}</Context.Provider>
+        );
+      }
+
+      // Initial mount
+      ReactNoop.render(<App value={1} />);
+      expect(ReactNoop.flush()).toEqual(['App', 'Child']);
+      expect(ReactNoop.getChildren()).toEqual([span('Child')]);
+
+      // Update
+      ReactNoop.render(<App value={1} />);
+      expect(ReactNoop.flush()).toEqual([
+        'App',
+        // Child does not re-render
+      ]);
+      expect(ReactNoop.getChildren()).toEqual([span('Child')]);
+    });
+
+    it('provider does not bail out if legacy context changed above', () => {
+      const Context = React.createContext(0);
+
+      function Child() {
+        ReactNoop.yield('Child');
+        return <span prop="Child" />;
+      }
+
+      const children = <Child />;
+
+      class LegacyProvider extends React.Component {
+        static childContextTypes = {
+          legacyValue: () => {},
+        };
+        state = {legacyValue: 1};
+        getChildContext() {
+          return {legacyValue: this.state.legacyValue};
+        }
+        render() {
+          ReactNoop.yield('LegacyProvider');
+          return this.props.children;
+        }
+      }
+
+      class App extends React.Component {
+        state = {value: 1};
+        render() {
+          ReactNoop.yield('App');
+          return (
+            <Context.Provider value={this.state.value}>
+              {this.props.children}
+            </Context.Provider>
+          );
+        }
+      }
+
+      const legacyProviderRef = React.createRef();
+      const appRef = React.createRef();
+
+      // Initial mount
+      ReactNoop.render(
+        <LegacyProvider ref={legacyProviderRef}>
+          <App ref={appRef} value={1}>
+            {children}
+          </App>
+        </LegacyProvider>,
       );
-    }
+      expect(ReactNoop.flush()).toEqual(['LegacyProvider', 'App', 'Child']);
+      expect(ReactNoop.getChildren()).toEqual([span('Child')]);
 
-    // Initial mount
-    let inst;
-    ReactNoop.render(<App ref={ref => (inst = ref)} />);
-    expect(ReactNoop.flush()).toEqual(['App']);
-    expect(ReactNoop.getChildren()).toEqual([
-      span('static 1'),
-      span('static 2'),
-    ]);
-    // Update the first time
-    inst.setState({step: 1});
-    expect(ReactNoop.flush()).toEqual(['App', 'Consumer']);
-    expect(ReactNoop.getChildren()).toEqual([
-      span('static 1'),
-      span('static 2'),
-      span(1),
-    ]);
-    // Update the second time
-    inst.setState({step: 2});
-    expect(ReactNoop.flush()).toEqual(['App', 'Consumer']);
-    expect(ReactNoop.getChildren()).toEqual([
-      span('static 1'),
-      span('static 2'),
-      span(2),
-    ]);
+      // Update App with same value (should bail out)
+      appRef.current.setState({value: 1});
+      expect(ReactNoop.flush()).toEqual(['App']);
+      expect(ReactNoop.getChildren()).toEqual([span('Child')]);
+
+      // Update LegacyProvider (should not bail out)
+      legacyProviderRef.current.setState({value: 1});
+      expect(ReactNoop.flush()).toEqual(['LegacyProvider', 'App', 'Child']);
+      expect(ReactNoop.getChildren()).toEqual([span('Child')]);
+
+      // Update App with same value (should bail out)
+      appRef.current.setState({value: 1});
+      expect(ReactNoop.flush()).toEqual(['App']);
+      expect(ReactNoop.getChildren()).toEqual([span('Child')]);
+    });
+  });
+
+  describe('Context.Consumer', () => {
+    it('warns if child is not a function', () => {
+      spyOnDev(console, 'error');
+      const Context = React.createContext(0);
+      ReactNoop.render(<Context.Consumer />);
+      expect(ReactNoop.flush).toThrow('render is not a function');
+      if (__DEV__) {
+        expect(console.error.calls.argsFor(0)[0]).toContain(
+          'A context consumer was rendered with multiple children, or a child ' +
+            "that isn't a function",
+        );
+      }
+    });
+
+    it('can read other contexts inside consumer render prop', () => {
+      const FooContext = React.createContext(0);
+      const BarContext = React.createContext(0);
+
+      function FooAndBar() {
+        return (
+          <FooContext>
+            {foo => {
+              const bar = BarContext.unstable_read();
+              return <Text text={`Foo: ${foo}, Bar: ${bar}`} />;
+            }}
+          </FooContext>
+        );
+      }
+
+      class Indirection extends React.Component {
+        shouldComponentUpdate() {
+          return false;
+        }
+        render() {
+          return this.props.children;
+        }
+      }
+
+      function App(props) {
+        return (
+          <FooContext.Provider value={props.foo}>
+            <BarContext.Provider value={props.bar}>
+              <Indirection>
+                <FooAndBar />
+              </Indirection>
+            </BarContext.Provider>
+          </FooContext.Provider>
+        );
+      }
+
+      ReactNoop.render(<App foo={1} bar={1} />);
+      expect(ReactNoop.flush()).toEqual(['Foo: 1, Bar: 1']);
+      expect(ReactNoop.getChildren()).toEqual([span('Foo: 1, Bar: 1')]);
+
+      // Update foo
+      ReactNoop.render(<App foo={2} bar={1} />);
+      expect(ReactNoop.flush()).toEqual(['Foo: 2, Bar: 1']);
+      expect(ReactNoop.getChildren()).toEqual([span('Foo: 2, Bar: 1')]);
+
+      // Update bar
+      ReactNoop.render(<App foo={2} bar={2} />);
+      expect(ReactNoop.flush()).toEqual(['Foo: 2, Bar: 2']);
+      expect(ReactNoop.getChildren()).toEqual([span('Foo: 2, Bar: 2')]);
+    });
+  });
+
+  describe('unstable_readContext', () => {
+    it('can use the same context multiple times in the same function', () => {
+      const Context = React.createContext({foo: 0, bar: 0, baz: 0}, (a, b) => {
+        let result = 0;
+        if (a.foo !== b.foo) {
+          result |= 0b001;
+        }
+        if (a.bar !== b.bar) {
+          result |= 0b010;
+        }
+        if (a.baz !== b.baz) {
+          result |= 0b100;
+        }
+        return result;
+      });
+
+      function Provider(props) {
+        return (
+          <Context.Provider
+            value={{foo: props.foo, bar: props.bar, baz: props.baz}}>
+            {props.children}
+          </Context.Provider>
+        );
+      }
+
+      function FooAndBar() {
+        const {foo} = Context.unstable_read(0b001);
+        const {bar} = Context.unstable_read(0b010);
+        return <Text text={`Foo: ${foo}, Bar: ${bar}`} />;
+      }
+
+      function Baz() {
+        const {baz} = Context.unstable_read(0b100);
+        return <Text text={'Baz: ' + baz} />;
+      }
+
+      class Indirection extends React.Component {
+        shouldComponentUpdate() {
+          return false;
+        }
+        render() {
+          return this.props.children;
+        }
+      }
+
+      function App(props) {
+        return (
+          <Provider foo={props.foo} bar={props.bar} baz={props.baz}>
+            <Indirection>
+              <Indirection>
+                <FooAndBar />
+              </Indirection>
+              <Indirection>
+                <Baz />
+              </Indirection>
+            </Indirection>
+          </Provider>
+        );
+      }
+
+      ReactNoop.render(<App foo={1} bar={1} baz={1} />);
+      expect(ReactNoop.flush()).toEqual(['Foo: 1, Bar: 1', 'Baz: 1']);
+      expect(ReactNoop.getChildren()).toEqual([
+        span('Foo: 1, Bar: 1'),
+        span('Baz: 1'),
+      ]);
+
+      // Update only foo
+      ReactNoop.render(<App foo={2} bar={1} baz={1} />);
+      expect(ReactNoop.flush()).toEqual(['Foo: 2, Bar: 1']);
+      expect(ReactNoop.getChildren()).toEqual([
+        span('Foo: 2, Bar: 1'),
+        span('Baz: 1'),
+      ]);
+
+      // Update only bar
+      ReactNoop.render(<App foo={2} bar={2} baz={1} />);
+      expect(ReactNoop.flush()).toEqual(['Foo: 2, Bar: 2']);
+      expect(ReactNoop.getChildren()).toEqual([
+        span('Foo: 2, Bar: 2'),
+        span('Baz: 1'),
+      ]);
+
+      // Update only baz
+      ReactNoop.render(<App foo={2} bar={2} baz={2} />);
+      expect(ReactNoop.flush()).toEqual(['Baz: 2']);
+      expect(ReactNoop.getChildren()).toEqual([
+        span('Foo: 2, Bar: 2'),
+        span('Baz: 2'),
+      ]);
+    });
   });
 
   it('unwinds after errors in complete phase', () => {
diff --git a/packages/react/src/ReactContext.js b/packages/react/src/ReactContext.js
index 69461b7a9f..02ea7959af 100644
--- a/packages/react/src/ReactContext.js
+++ b/packages/react/src/ReactContext.js
@@ -11,8 +11,24 @@ import {REACT_PROVIDER_TYPE, REACT_CONTEXT_TYPE} from 'shared/ReactSymbols';
 
 import type {ReactContext} from 'shared/ReactTypes';
 
+import invariant from 'shared/invariant';
 import warningWithoutStack from 'shared/warningWithoutStack';
 
+import ReactCurrentOwner from './ReactCurrentOwner';
+
+export function readContext<T>(
+  context: ReactContext<T>,
+  observedBits: void | number | boolean,
+): T {
+  const dispatcher = ReactCurrentOwner.currentDispatcher;
+  invariant(
+    dispatcher !== null,
+    'Context.unstable_read(): Context can only be read while React is ' +
+      'rendering, e.g. inside the render method or getDerivedStateFromProps.',
+  );
+  return dispatcher.readContext(context, observedBits);
+}
+
 export function createContext<T>(
   defaultValue: T,
   calculateChangedBits: ?(a: T, b: T) => number,
@@ -47,6 +63,7 @@ export function createContext<T>(
     // These are circular
     Provider: (null: any),
     Consumer: (null: any),
+    unstable_read: (null: any),
   };
 
   context.Provider = {
@@ -54,6 +71,7 @@ export function createContext<T>(
     _context: context,
   };
   context.Consumer = context;
+  context.unstable_read = readContext.bind(null, context);
 
   if (__DEV__) {
     context._currentRenderer = null;
diff --git a/packages/react/src/ReactCurrentOwner.js b/packages/react/src/ReactCurrentOwner.js
index 72ed4e2eb8..89cd104ca6 100644
--- a/packages/react/src/ReactCurrentOwner.js
+++ b/packages/react/src/ReactCurrentOwner.js
@@ -8,6 +8,7 @@
  */
 
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
+import typeof {Dispatcher} from 'react-reconciler/src/ReactFiberDispatcher';
 
 /**
  * Keeps track of the current owner.
@@ -21,6 +22,7 @@ const ReactCurrentOwner = {
    * @type {ReactComponent}
    */
   current: (null: null | Fiber),
+  currentDispatcher: (null: null | Dispatcher),
 };
 
 export default ReactCurrentOwner;
diff --git a/packages/shared/ReactTypes.js b/packages/shared/ReactTypes.js
index ac4eed362d..bff9413c82 100644
--- a/packages/shared/ReactTypes.js
+++ b/packages/shared/ReactTypes.js
@@ -79,6 +79,7 @@ export type ReactContext<T> = {
   $$typeof: Symbol | number,
   Consumer: ReactContext<T>,
   Provider: ReactProviderType<T>,
+  unstable_read: () => T,
 
   _calculateChangedBits: ((a: T, b: T) => number) | null,
   _defaultValue: T,

From a32c727f2e24bc2e8b5f532420a52b1bae2f98af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= <sebastian@calyptus.eu>
Date: Sat, 21 Jul 2018 20:13:46 -0700
Subject: [PATCH 250/277] Optimize readContext for Subsequent Reads of All Bits
 (#13248)

This is likely the common case because individual component authors
will casually call read on common contexts like the cache, or cache
provider.

Where as libraries like Relay only call read once per fragment and pass
all observed bits at once.
---
 .../src/ReactFiberNewContext.js               | 63 +++++++++----------
 1 file changed, 29 insertions(+), 34 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberNewContext.js b/packages/react-reconciler/src/ReactFiberNewContext.js
index a267df48bf..91d0b52826 100644
--- a/packages/react-reconciler/src/ReactFiberNewContext.js
+++ b/packages/react-reconciler/src/ReactFiberNewContext.js
@@ -38,14 +38,14 @@ if (__DEV__) {
 
 let currentlyRenderingFiber: Fiber | null = null;
 let lastContextDependency: ContextDependency<mixed> | null = null;
-let lastContext: ReactContext<any> | null = null;
+let lastContextWithAllBitsObserved: ReactContext<any> | null = null;
 
 export function resetContextDependences(): void {
   // This is called right before React yields execution, to ensure `readContext`
   // cannot be called outside the render phase.
   currentlyRenderingFiber = null;
   lastContextDependency = null;
-  lastContext = null;
+  lastContextWithAllBitsObserved = null;
 }
 
 export function pushProvider(providerFiber: Fiber): void {
@@ -221,7 +221,7 @@ export function prepareToReadContext(
 ): boolean {
   currentlyRenderingFiber = workInProgress;
   lastContextDependency = null;
-  lastContext = null;
+  lastContextWithAllBitsObserved = null;
 
   const firstContextDependency = workInProgress.firstContextDependency;
   if (firstContextDependency !== null) {
@@ -264,46 +264,41 @@ export function readContext<T>(
   context: ReactContext<T>,
   observedBits: void | number | boolean,
 ): T {
-  if (typeof observedBits !== 'number') {
-    if (observedBits === false) {
-      // Do not observe updates
-      observedBits = 0;
+  if (lastContextWithAllBitsObserved === context) {
+    // Nothing to do. We already observe everything in this context.
+  } else if (observedBits === false || observedBits === 0) {
+    // Do not observe any updates.
+  } else {
+    let resolvedObservedBits; // Avoid deopting on observable arguments or heterogeneous types.
+    if (
+      typeof observedBits !== 'number' ||
+      observedBits === maxSigned31BitInt
+    ) {
+      // Observe all updates.
+      lastContextWithAllBitsObserved = ((context: any): ReactContext<mixed>);
+      resolvedObservedBits = maxSigned31BitInt;
     } else {
-      // Observe all updates
-      observedBits = maxSigned31BitInt;
+      resolvedObservedBits = observedBits;
     }
-  }
 
-  if (lastContext === null) {
-    invariant(
-      currentlyRenderingFiber !== null,
-      'Context.unstable_read(): Context can only be read while React is ' +
-        'rendering, e.g. inside the render method or getDerivedStateFromProps.',
-    );
-    // This is the first dependency in the list
-    currentlyRenderingFiber.firstContextDependency = lastContextDependency = {
+    let contextItem = {
       context: ((context: any): ReactContext<mixed>),
-      observedBits,
+      observedBits: resolvedObservedBits,
       next: null,
     };
-    lastContext = context;
-  } else {
-    // `lastContextDependency` is always non-null if `lastContext is.
-    const lastDependency: ContextDependency<T> = (lastContextDependency: any);
-    if (lastContext === context) {
-      // Fast path. The previous context has the same type. We can reuse
-      // the same node.
-      lastDependency.observedBits |= observedBits;
+
+    if (lastContextDependency === null) {
+      invariant(
+        currentlyRenderingFiber !== null,
+        'Context.unstable_read(): Context can only be read while React is ' +
+          'rendering, e.g. inside the render method or getDerivedStateFromProps.',
+      );
+      // This is the first dependency in the list
+      currentlyRenderingFiber.firstContextDependency = lastContextDependency = contextItem;
     } else {
       // Append a new context item.
-      lastContextDependency = lastDependency.next = {
-        context: ((context: any): ReactContext<mixed>),
-        observedBits,
-        next: null,
-      };
-      lastContext = context;
+      lastContextDependency = lastContextDependency.next = contextItem;
     }
   }
-
   return isPrimaryRenderer ? context._currentValue : context._currentValue2;
 }

From ca0941fce3a03592530f6111f77cbc9c0daf79af Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Mon, 23 Jul 2018 17:47:40 -0700
Subject: [PATCH 251/277] Add regression test for Placeholder fallbacks with
 lifecycle methods (#13254)

Found by @rhagigi

Co-authored-by: Royi Hagigi <rhagigi@gmail.com>
Co-authored-by: Andrew Clark <acdlite@me.com>
---
 .../__tests__/ReactSuspense-test.internal.js  | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
index 14678d160e..c95e050cfe 100644
--- a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
@@ -1314,6 +1314,37 @@ describe('ReactSuspense', () => {
 
       expect(ReactNoop.getChildren()).toEqual([span('Loading...')]);
     });
+
+    it('does not infinite loop if fallback contains lifecycle method', async () => {
+      class Fallback extends React.Component {
+        state = {
+          name: 'foo',
+        };
+        componentDidMount() {
+          this.setState({
+            name: 'bar',
+          });
+        }
+        render() {
+          return <Text text="Loading..." />;
+        }
+      }
+
+      class Demo extends React.Component {
+        render() {
+          return (
+            <Placeholder fallback={<Fallback />}>
+              <AsyncText text="Hi" ms={100} />
+            </Placeholder>
+          );
+        }
+      }
+
+      ReactNoop.renderLegacySyncRoot(<Demo />);
+      expect(ReactNoop.getChildren()).toEqual([span('Loading...')]);
+      await advanceTimers(100);
+      expect(ReactNoop.getChildren()).toEqual([span('Hi')]);
+    });
   });
 
   it('does not call lifecycles of a suspended component', async () => {

From dbd16c8a9624731a5e4ecadc9eef6c0e2d225d84 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Tue, 24 Jul 2018 14:53:54 -0700
Subject: [PATCH 252/277] Add @flow directive to findDOMNode shim (#13265)

* Add @flow directive to findDOMNode shim
---
 scripts/rollup/shims/facebook-www/findDOMNode.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/rollup/shims/facebook-www/findDOMNode.js b/scripts/rollup/shims/facebook-www/findDOMNode.js
index 679370a79f..a18b799228 100644
--- a/scripts/rollup/shims/facebook-www/findDOMNode.js
+++ b/scripts/rollup/shims/facebook-www/findDOMNode.js
@@ -3,6 +3,9 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
  */
 
 'use strict';

From 0154a79fedef38a824a837c535bc853013dd4588 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Wed, 25 Jul 2018 08:58:18 -0700
Subject: [PATCH 253/277] Remove 'warning' module from the JS scheduler
 (#13264)

* Remove 'warning' module from the JS scheduler

**what is the change?:**
See title

**why make this change?:**
Internally the 'warning' module has some dependencies which we want to
avoid pulling in during the very early stages of initial pageload. It is
creating a cyclical dependency.

And we wanted to remove this dependency anyway, because this module
should be kept small and decoupled.

**test plan:**
- Tested the exact same change internally in Facebook.com
- Ran unit tests
- Tried out the fixture

**issue:**
Internal task T31831021

* check for console existence before calling console.error

* Move DEV check into separate block
---
 .../react-scheduler/src/ReactScheduler.js     | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index bb389ea10f..550d064a9b 100644
--- a/packages/react-scheduler/src/ReactScheduler.js
+++ b/packages/react-scheduler/src/ReactScheduler.js
@@ -42,7 +42,6 @@ type CallbackConfigType = {|
 export type CallbackIdType = CallbackConfigType;
 
 import {canUseDOM} from 'shared/ExecutionEnvironment';
-import warningWithoutStack from 'shared/warningWithoutStack';
 
 // We capture a local reference to any global, in case it gets polyfilled after
 // this module is initially evaluated.
@@ -123,21 +122,23 @@ if (!canUseDOM) {
     localClearTimeout(timeoutId);
   };
 } else {
-  if (typeof localRequestAnimationFrame !== 'function') {
-    warningWithoutStack(
-      false,
-      "This browser doesn't support requestAnimationFrame. " +
-        'Make sure that you load a ' +
-        'polyfill in older browsers. https://fb.me/react-polyfills',
-    );
-  }
-  if (typeof localCancelAnimationFrame !== 'function') {
-    warningWithoutStack(
-      false,
-      "This browser doesn't support cancelAnimationFrame. " +
-        'Make sure that you load a ' +
-        'polyfill in older browsers. https://fb.me/react-polyfills',
-    );
+  if (__DEV__) {
+    if (typeof console !== 'undefined') {
+      if (typeof localRequestAnimationFrame !== 'function') {
+        console.error(
+          "This browser doesn't support requestAnimationFrame. " +
+            'Make sure that you load a ' +
+            'polyfill in older browsers. https://fb.me/react-polyfills',
+        );
+      }
+      if (typeof localCancelAnimationFrame !== 'function') {
+        console.error(
+          "This browser doesn't support cancelAnimationFrame. " +
+            'Make sure that you load a ' +
+            'polyfill in older browsers. https://fb.me/react-polyfills',
+        );
+      }
+    }
   }
 
   let headOfPendingCallbacksLinkedList: CallbackConfigType | null = null;

From bc1ea9cd96c81467c574b134349eafc303835d0e Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Wed, 25 Jul 2018 14:22:27 -0700
Subject: [PATCH 254/277] Handle errors thrown in gDSFP of a module-style
 context provider (#13269)

Context should be pushed before calling any user code, so if it errors
the stack unwinds correctly.
---
 .../src/ReactFiberBeginWork.js                |  9 ++++----
 ...tIncrementalErrorHandling-test.internal.js | 22 +++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 2f64fb6146..dcd402072a 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -618,6 +618,11 @@ function mountIndeterminateComponent(
     // Proceed under the assumption that this is a class instance
     workInProgress.tag = ClassComponent;
 
+    // Push context providers early to prevent context stack mismatches.
+    // During mounting we don't know the child context yet as the instance doesn't exist.
+    // We will invalidate the child context in finishClassComponent() right after rendering.
+    const hasContext = pushLegacyContextProvider(workInProgress);
+
     workInProgress.memoizedState =
       value.state !== null && value.state !== undefined ? value.state : null;
 
@@ -630,10 +635,6 @@ function mountIndeterminateComponent(
       );
     }
 
-    // Push context providers early to prevent context stack mismatches.
-    // During mounting we don't know the child context yet as the instance doesn't exist.
-    // We will invalidate the child context in finishClassComponent() right after rendering.
-    const hasContext = pushLegacyContextProvider(workInProgress);
     adoptClassInstance(workInProgress, value);
     mountClassInstance(workInProgress, renderExpirationTime);
     return finishClassComponent(
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
index fd5b1c8a33..0b2b6551aa 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js
@@ -1469,4 +1469,26 @@ describe('ReactIncrementalErrorHandling', () => {
     ReactNoop.flushDeferredPri();
     expect(ReactNoop.getChildren()).toEqual([span('Caught an error: Hello')]);
   });
+
+  it('handles error thrown inside getDerivedStateFromProps of a module-style context provider', () => {
+    function Provider() {
+      return {
+        getChildContext() {
+          return {foo: 'bar'};
+        },
+        render() {
+          return 'Hi';
+        },
+      };
+    }
+    Provider.childContextTypes = {
+      x: () => {},
+    };
+    Provider.getDerivedStateFromProps = () => {
+      throw new Error('Oops!');
+    };
+
+    ReactNoop.render(<Provider />);
+    expect(() => ReactNoop.flush()).toThrow('Oops!');
+  });
 });

From 840cb1a2683dd7c0f3beafd094081d16b636721e Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 27 Jul 2018 16:50:20 +0200
Subject: [PATCH 255/277] Add an invariant to createRoot() to validate
 containers (#13279)

---
 packages/react-dom/src/__tests__/ReactDOMRoot-test.js | 8 ++++++++
 packages/react-dom/src/client/ReactDOM.js             | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/packages/react-dom/src/__tests__/ReactDOMRoot-test.js b/packages/react-dom/src/__tests__/ReactDOMRoot-test.js
index deded72130..1d3bc40748 100644
--- a/packages/react-dom/src/__tests__/ReactDOMRoot-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMRoot-test.js
@@ -366,4 +366,12 @@ describe('ReactDOMRoot', () => {
     );
     expect(() => batch.commit()).toThrow('Element type is invalid');
   });
+
+  it('throws a good message on invalid containers', () => {
+    expect(() => {
+      ReactDOM.unstable_createRoot(<div>Hi</div>);
+    }).toThrow(
+      'unstable_createRoot(...): Target container is not a DOM element.',
+    );
+  });
 });
diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js
index 55760eaff5..8a179d1e55 100644
--- a/packages/react-dom/src/client/ReactDOM.js
+++ b/packages/react-dom/src/client/ReactDOM.js
@@ -758,6 +758,10 @@ ReactDOM.unstable_createRoot = function createRoot(
   container: DOMContainer,
   options?: RootOptions,
 ): ReactRoot {
+  invariant(
+    isValidContainer(container),
+    'unstable_createRoot(...): Target container is not a DOM element.',
+  );
   const hydrate = options != null && options.hydrate === true;
   return new ReactRoot(container, true, hydrate);
 };

From 2a2ef7e0fd86612404676b15bb3dd9df7ade536e Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Fri, 27 Jul 2018 13:42:17 -0700
Subject: [PATCH 256/277] Remove unnecessary branching from
 updateContextProvider (#13282)

This code had gotten unnecessarily complex after some recent changes.
Cleaned it up a bit.
---
 .../src/ReactFiberBeginWork.js                | 84 ++++---------------
 .../src/ReactFiberNewContext.js               | 41 ++++++++-
 packages/react/src/ReactContext.js            |  3 +-
 packages/shared/ReactTypes.js                 |  1 -
 4 files changed, 54 insertions(+), 75 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index dcd402072a..fb71d18581 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -73,6 +73,7 @@ import {
   propagateContextChange,
   readContext,
   prepareToReadContext,
+  calculateChangedBits,
 } from './ReactFiberNewContext';
 import {
   markActualRenderTimeStarted,
@@ -824,88 +825,34 @@ function updateContextProvider(current, workInProgress, renderExpirationTime) {
     // Initial render
     changedBits = MAX_SIGNED_31_BIT_INT;
   } else {
-    if (oldProps.value === newProps.value) {
+    const oldValue = oldProps.value;
+    changedBits = calculateChangedBits(context, newValue, oldValue);
+    if (changedBits === 0) {
       // No change. Bailout early if children are the same.
       if (
         oldProps.children === newProps.children &&
         !hasLegacyContextChanged()
       ) {
-        workInProgress.stateNode = 0;
-        pushProvider(workInProgress);
+        pushProvider(workInProgress, 0);
         return bailoutOnAlreadyFinishedWork(
           current,
           workInProgress,
           renderExpirationTime,
         );
       }
-      changedBits = 0;
     } else {
-      const oldValue = oldProps.value;
-      // Use Object.is to compare the new context value to the old value.
-      // Inlined Object.is polyfill.
-      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
-      if (
-        (oldValue === newValue &&
-          (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
-        (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
-      ) {
-        // No change. Bailout early if children are the same.
-        if (
-          oldProps.children === newProps.children &&
-          !hasLegacyContextChanged()
-        ) {
-          workInProgress.stateNode = 0;
-          pushProvider(workInProgress);
-          return bailoutOnAlreadyFinishedWork(
-            current,
-            workInProgress,
-            renderExpirationTime,
-          );
-        }
-        changedBits = 0;
-      } else {
-        changedBits =
-          typeof context._calculateChangedBits === 'function'
-            ? context._calculateChangedBits(oldValue, newValue)
-            : MAX_SIGNED_31_BIT_INT;
-        if (__DEV__) {
-          warning(
-            (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
-            'calculateChangedBits: Expected the return value to be a ' +
-              '31-bit integer. Instead received: %s',
-            changedBits,
-          );
-        }
-        changedBits |= 0;
-
-        if (changedBits === 0) {
-          // No change. Bailout early if children are the same.
-          if (
-            oldProps.children === newProps.children &&
-            !hasLegacyContextChanged()
-          ) {
-            workInProgress.stateNode = 0;
-            pushProvider(workInProgress);
-            return bailoutOnAlreadyFinishedWork(
-              current,
-              workInProgress,
-              renderExpirationTime,
-            );
-          }
-        } else {
-          propagateContextChange(
-            workInProgress,
-            context,
-            changedBits,
-            renderExpirationTime,
-          );
-        }
-      }
+      // The context value changed. Search for matching consumers and schedule
+      // them to update.
+      propagateContextChange(
+        workInProgress,
+        context,
+        changedBits,
+        renderExpirationTime,
+      );
     }
   }
 
-  workInProgress.stateNode = changedBits;
-  pushProvider(workInProgress);
+  pushProvider(workInProgress, changedBits);
 
   const newChildren = newProps.children;
   reconcileChildren(current, workInProgress, newChildren, renderExpirationTime);
@@ -1049,8 +996,7 @@ function beginWork(
         );
         break;
       case ContextProvider:
-        workInProgress.stateNode = 0;
-        pushProvider(workInProgress);
+        pushProvider(workInProgress, 0);
         break;
       case Profiler:
         if (enableProfilerTimer) {
diff --git a/packages/react-reconciler/src/ReactFiberNewContext.js b/packages/react-reconciler/src/ReactFiberNewContext.js
index 91d0b52826..e8f8e1b1e2 100644
--- a/packages/react-reconciler/src/ReactFiberNewContext.js
+++ b/packages/react-reconciler/src/ReactFiberNewContext.js
@@ -26,7 +26,9 @@ import {NoWork} from './ReactFiberExpirationTime';
 import {ContextProvider} from 'shared/ReactTypeOfWork';
 
 import invariant from 'shared/invariant';
+import warning from 'shared/warning';
 
+import MAX_SIGNED_31_BIT_INT from './maxSigned31BitInt';
 const valueCursor: StackCursor<mixed> = createCursor(null);
 const changedBitsCursor: StackCursor<number> = createCursor(0);
 
@@ -48,7 +50,7 @@ export function resetContextDependences(): void {
   lastContextWithAllBitsObserved = null;
 }
 
-export function pushProvider(providerFiber: Fiber): void {
+export function pushProvider(providerFiber: Fiber, changedBits: number): void {
   const context: ReactContext<any> = providerFiber.type._context;
 
   if (isPrimaryRenderer) {
@@ -56,7 +58,7 @@ export function pushProvider(providerFiber: Fiber): void {
     push(valueCursor, context._currentValue, providerFiber);
 
     context._currentValue = providerFiber.pendingProps.value;
-    context._changedBits = providerFiber.stateNode;
+    context._changedBits = changedBits;
     if (__DEV__) {
       warningWithoutStack(
         context._currentRenderer === undefined ||
@@ -72,7 +74,7 @@ export function pushProvider(providerFiber: Fiber): void {
     push(valueCursor, context._currentValue2, providerFiber);
 
     context._currentValue2 = providerFiber.pendingProps.value;
-    context._changedBits2 = providerFiber.stateNode;
+    context._changedBits2 = changedBits;
     if (__DEV__) {
       warningWithoutStack(
         context._currentRenderer2 === undefined ||
@@ -103,6 +105,39 @@ export function popProvider(providerFiber: Fiber): void {
   }
 }
 
+export function calculateChangedBits<T>(
+  context: ReactContext<T>,
+  newValue: T,
+  oldValue: T,
+) {
+  // Use Object.is to compare the new context value to the old value. Inlined
+  // Object.is polyfill.
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
+  if (
+    (oldValue === newValue &&
+      (oldValue !== 0 || 1 / oldValue === 1 / (newValue: any))) ||
+    (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
+  ) {
+    // No change
+    return 0;
+  } else {
+    const changedBits =
+      typeof context._calculateChangedBits === 'function'
+        ? context._calculateChangedBits(oldValue, newValue)
+        : MAX_SIGNED_31_BIT_INT;
+
+    if (__DEV__) {
+      warning(
+        (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
+        'calculateChangedBits: Expected the return value to be a ' +
+          '31-bit integer. Instead received: %s',
+        changedBits,
+      );
+    }
+    return changedBits | 0;
+  }
+}
+
 export function propagateContextChange(
   workInProgress: Fiber,
   context: ReactContext<mixed>,
diff --git a/packages/react/src/ReactContext.js b/packages/react/src/ReactContext.js
index 02ea7959af..bdbb55f938 100644
--- a/packages/react/src/ReactContext.js
+++ b/packages/react/src/ReactContext.js
@@ -50,13 +50,12 @@ export function createContext<T>(
   const context: ReactContext<T> = {
     $$typeof: REACT_CONTEXT_TYPE,
     _calculateChangedBits: calculateChangedBits,
-    _defaultValue: defaultValue,
-    _currentValue: defaultValue,
     // As a workaround to support multiple concurrent renderers, we categorize
     // some renderers as primary and others as secondary. We only expect
     // there to be two concurrent renderers at most: React Native (primary) and
     // Fabric (secondary); React DOM (primary) and React ART (secondary).
     // Secondary renderers store their context values on separate fields.
+    _currentValue: defaultValue,
     _currentValue2: defaultValue,
     _changedBits: 0,
     _changedBits2: 0,
diff --git a/packages/shared/ReactTypes.js b/packages/shared/ReactTypes.js
index bff9413c82..c662a285aa 100644
--- a/packages/shared/ReactTypes.js
+++ b/packages/shared/ReactTypes.js
@@ -82,7 +82,6 @@ export type ReactContext<T> = {
   unstable_read: () => T,
 
   _calculateChangedBits: ((a: T, b: T) => number) | null,
-  _defaultValue: T,
 
   _currentValue: T,
   _currentValue2: T,

From 0182a74632b66a226921ca13dcfe359c67e15c6f Mon Sep 17 00:00:00 2001
From: Konstantin Yakushin <y231966mdk@gmail.com>
Date: Wed, 1 Aug 2018 18:16:34 +0300
Subject: [PATCH 257/277] Fix a crash when using dynamic children in <option>
 tag (#13261)

* Make option children a text content by default

fix #11911

* Apply requested changes

- Remove meaningless comments
- revert scripts/rollup/results.json

* remove empty row

* Update comment

* Add a simple unit-test

* [WIP: no flow] Pass through hostContext

* [WIP: no flow] Give better description for test

* Fixes

* Don't pass hostContext through

It ended up being more complicated than I thought.

* Also warn on hydration
---
 .../src/components/fixtures/selects/index.js  | 25 +++++++++++++++
 .../src/__tests__/ReactDOMOption-test.js      |  4 +--
 .../src/__tests__/ReactDOMSelect-test.js      | 32 +++++++++++++++++++
 .../ReactDOMServerIntegrationForms-test.js    | 15 +++++++++
 .../ReactDOMServerIntegrationTestUtils.js     |  2 +-
 .../src/client/ReactDOMFiberOption.js         | 30 +++++++++++++++--
 .../src/client/ReactDOMHostConfig.js          |  1 +
 7 files changed, 102 insertions(+), 7 deletions(-)

diff --git a/fixtures/dom/src/components/fixtures/selects/index.js b/fixtures/dom/src/components/fixtures/selects/index.js
index 5460919cc2..31d7f4436d 100644
--- a/fixtures/dom/src/components/fixtures/selects/index.js
+++ b/fixtures/dom/src/components/fixtures/selects/index.js
@@ -158,6 +158,31 @@ class SelectFixture extends React.Component {
             </form>
           </div>
         </TestCase>
+
+        <TestCase
+          title="An option which contains conditional render fails"
+          relatedIssues="11911">
+          <TestCase.Steps>
+            <li>Select any option</li>
+          </TestCase.Steps>
+          <TestCase.ExpectedResult>
+            Option should be set
+          </TestCase.ExpectedResult>
+
+          <div className="test-fixture">
+            <select value={this.state.value} onChange={this.onChange}>
+              <option value="red">
+                red {this.state.value === 'red' && 'is chosen '} TextNode
+              </option>
+              <option value="blue">
+                blue {this.state.value === 'blue' && 'is chosen '} TextNode
+              </option>
+              <option value="green">
+                green {this.state.value === 'green' && 'is chosen '} TextNode
+              </option>
+            </select>
+          </div>
+        </TestCase>
       </FixtureSet>
     );
   }
diff --git a/packages/react-dom/src/__tests__/ReactDOMOption-test.js b/packages/react-dom/src/__tests__/ReactDOMOption-test.js
index 8cbd0118d2..bd30ae23a1 100644
--- a/packages/react-dom/src/__tests__/ReactDOMOption-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMOption-test.js
@@ -41,9 +41,7 @@ describe('ReactDOMOption', () => {
     expect(() => {
       node = ReactTestUtils.renderIntoDocument(el);
     }).toWarnDev(
-      '<div> cannot appear as a child of <option>.\n' +
-        '    in div (at **)\n' +
-        '    in option (at **)',
+      '<div> cannot appear as a child of <option>.\n' + '    in option (at **)',
     );
     expect(node.innerHTML).toBe('1  2');
     ReactTestUtils.renderIntoDocument(el);
diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index e94cc7895c..04efbec66a 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -545,6 +545,38 @@ describe('ReactDOMSelect', () => {
     expect(node.options[2].selected).toBe(false); // gorilla
   });
 
+  it('should support options with dynamic children', () => {
+    const container = document.createElement('div');
+
+    let node;
+
+    function App({value}) {
+      return (
+        <select value={value} ref={n => (node = n)} onChange={noop}>
+          <option key="monkey" value="monkey">
+            A monkey {value === 'monkey' ? 'is chosen' : null}!
+          </option>
+          <option key="giraffe" value="giraffe">
+            A giraffe {value === 'giraffe' && 'is chosen'}!
+          </option>
+          <option key="gorilla" value="gorilla">
+            A gorilla {value === 'gorilla' && 'is chosen'}!
+          </option>
+        </select>
+      );
+    }
+
+    ReactDOM.render(<App value="monkey" />, container);
+    expect(node.options[0].selected).toBe(true); // monkey
+    expect(node.options[1].selected).toBe(false); // giraffe
+    expect(node.options[2].selected).toBe(false); // gorilla
+
+    ReactDOM.render(<App value="giraffe" />, container);
+    expect(node.options[0].selected).toBe(false); // monkey
+    expect(node.options[1].selected).toBe(true); // giraffe
+    expect(node.options[2].selected).toBe(false); // gorilla
+  });
+
   it('should warn if value is null', () => {
     expect(() =>
       ReactTestUtils.renderIntoDocument(
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js
index bc1db8d569..0f6a0cab49 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js
@@ -413,6 +413,21 @@ describe('ReactDOMServerIntegration', () => {
           expectSelectValue(e, 'bar');
         },
       );
+
+      itRenders('an option with flattened children', async render => {
+        const e = await render(
+          <select readOnly={true} value="bar">
+            <option value="bar">
+              {['Bar', false, 'Foo', <div key="1" />, 'Baz']}
+            </option>
+          </select>,
+          1,
+        );
+        expect(e.getAttribute('value')).toBe(null);
+        expect(e.getAttribute('defaultValue')).toBe(null);
+        expect(e.firstChild.innerHTML).toBe('BarFooBaz');
+        expect(e.firstChild.selected).toBe(true);
+      });
     });
 
     describe('user interaction', function() {
diff --git a/packages/react-dom/src/__tests__/utils/ReactDOMServerIntegrationTestUtils.js b/packages/react-dom/src/__tests__/utils/ReactDOMServerIntegrationTestUtils.js
index a83e1ec181..daf7b49d7f 100644
--- a/packages/react-dom/src/__tests__/utils/ReactDOMServerIntegrationTestUtils.js
+++ b/packages/react-dom/src/__tests__/utils/ReactDOMServerIntegrationTestUtils.js
@@ -58,7 +58,7 @@ module.exports = function(initModules) {
       if (console.error.calls.count() > 0) {
         console.log(`We saw these warnings:`);
         for (let i = 0; i < console.error.calls.count(); i++) {
-          console.log(console.error.calls.argsFor(i)[0]);
+          console.log(...console.error.calls.argsFor(i));
         }
       }
     }
diff --git a/packages/react-dom/src/client/ReactDOMFiberOption.js b/packages/react-dom/src/client/ReactDOMFiberOption.js
index e5c04d2392..1de8f8c693 100644
--- a/packages/react-dom/src/client/ReactDOMFiberOption.js
+++ b/packages/react-dom/src/client/ReactDOMFiberOption.js
@@ -9,6 +9,7 @@
 
 import React from 'react';
 import warning from 'shared/warning';
+import validateDOMNesting from './validateDOMNesting';
 
 let didWarnSelectedSetOnOption = false;
 
@@ -17,8 +18,6 @@ function flattenChildren(children) {
 
   // Flatten children and warn if they aren't strings or numbers;
   // invalid types are ignored.
-  // We can silently skip them because invalid DOM nesting warning
-  // catches these cases in Fiber.
   React.Children.forEach(children, function(child) {
     if (child == null) {
       return;
@@ -26,6 +25,9 @@ function flattenChildren(children) {
     if (typeof child === 'string' || typeof child === 'number') {
       content += child;
     }
+    // Note: we don't warn about invalid children here.
+    // Instead, this is done separately below so that
+    // it happens during the hydration codepath too.
   });
 
   return content;
@@ -36,8 +38,30 @@ function flattenChildren(children) {
  */
 
 export function validateProps(element: Element, props: Object) {
-  // TODO (yungsters): Remove support for `selected` in <option>.
   if (__DEV__) {
+    // Warn about invalid children, mirroring the logic above.
+    if (typeof props.children === 'object' && props.children !== null) {
+      React.Children.forEach(props.children, function(child) {
+        if (child == null) {
+          return;
+        }
+        if (typeof child === 'string' || typeof child === 'number') {
+          return;
+        }
+        // This is not real ancestor info but it's close enough
+        // to produce a useful warning for invalid children.
+        // We don't have access to the real one because the <option>
+        // fiber has already been popped, and threading it through
+        // is needlessly annoying.
+        const ancestorInfo = validateDOMNesting.updatedAncestorInfo(
+          null,
+          'option',
+        );
+        validateDOMNesting(child.type, null, ancestorInfo);
+      });
+    }
+
+    // TODO: Remove support for `selected` in <option>.
     if (props.selected != null && !didWarnSelectedSetOnOption) {
       warning(
         false,
diff --git a/packages/react-dom/src/client/ReactDOMHostConfig.js b/packages/react-dom/src/client/ReactDOMHostConfig.js
index 412f06a9aa..e8f6a5bbde 100644
--- a/packages/react-dom/src/client/ReactDOMHostConfig.js
+++ b/packages/react-dom/src/client/ReactDOMHostConfig.js
@@ -248,6 +248,7 @@ export function prepareUpdate(
 export function shouldSetTextContent(type: string, props: Props): boolean {
   return (
     type === 'textarea' ||
+    type === 'option' ||
     typeof props.children === 'string' ||
     typeof props.children === 'number' ||
     (typeof props.dangerouslySetInnerHTML === 'object' &&

From b381f4141147931f9af8a79555d155b0e496e672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Spie=C3=9F?= <hello@philippspiess.com>
Date: Wed, 1 Aug 2018 18:07:52 +0200
Subject: [PATCH 258/277] Allow Electrons <webview> tag (#13301)

Fixes #13299

Adds Electrons <webview> tag to the attribute whitelist.
---
 packages/react-dom/src/client/ReactDOMFiberComponent.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js
index bad296429e..27876e51b6 100644
--- a/packages/react-dom/src/client/ReactDOMFiberComponent.js
+++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js
@@ -80,6 +80,12 @@ if (__DEV__) {
     time: true,
     // There are working polyfills for <dialog>. Let people use it.
     dialog: true,
+    // Electron ships a custom <webview> tag to display external web content in
+    // an isolated frame and process.
+    // This tag is not present in non Electron environments such as JSDom which
+    // is often used for testing purposes.
+    // @see https://electronjs.org/docs/api/webview-tag
+    webview: true,
   };
 
   validatePropertiesInDevelopment = function(type, props) {

From 28cd494bdfcae0282e596211e982e120f60168f9 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 1 Aug 2018 17:08:03 +0100
Subject: [PATCH 259/277] Refactor validateDOMNesting a bit (#13300)

---
 packages/react-dom/src/client/ReactDOMFiberOption.js |  7 ++-----
 packages/react-dom/src/client/ReactDOMHostConfig.js  |  8 ++------
 packages/react-dom/src/client/validateDOMNesting.js  | 10 ++++------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/packages/react-dom/src/client/ReactDOMFiberOption.js b/packages/react-dom/src/client/ReactDOMFiberOption.js
index 1de8f8c693..5c2c561594 100644
--- a/packages/react-dom/src/client/ReactDOMFiberOption.js
+++ b/packages/react-dom/src/client/ReactDOMFiberOption.js
@@ -9,7 +9,7 @@
 
 import React from 'react';
 import warning from 'shared/warning';
-import validateDOMNesting from './validateDOMNesting';
+import {validateDOMNesting, updatedAncestorInfo} from './validateDOMNesting';
 
 let didWarnSelectedSetOnOption = false;
 
@@ -53,10 +53,7 @@ export function validateProps(element: Element, props: Object) {
         // We don't have access to the real one because the <option>
         // fiber has already been popped, and threading it through
         // is needlessly annoying.
-        const ancestorInfo = validateDOMNesting.updatedAncestorInfo(
-          null,
-          'option',
-        );
+        const ancestorInfo = updatedAncestorInfo(null, 'option');
         validateDOMNesting(child.type, null, ancestorInfo);
       });
     }
diff --git a/packages/react-dom/src/client/ReactDOMHostConfig.js b/packages/react-dom/src/client/ReactDOMHostConfig.js
index e8f6a5bbde..41d7253f4b 100644
--- a/packages/react-dom/src/client/ReactDOMHostConfig.js
+++ b/packages/react-dom/src/client/ReactDOMHostConfig.js
@@ -13,7 +13,7 @@ import * as ReactDOMComponentTree from './ReactDOMComponentTree';
 import * as ReactDOMFiberComponent from './ReactDOMFiberComponent';
 import * as ReactInputSelection from './ReactInputSelection';
 import setTextContent from './setTextContent';
-import validateDOMNesting from './validateDOMNesting';
+import {validateDOMNesting, updatedAncestorInfo} from './validateDOMNesting';
 import * as ReactBrowserEventEmitter from '../events/ReactBrowserEventEmitter';
 import {getChildNamespace} from '../shared/DOMNamespaces';
 import {
@@ -62,7 +62,6 @@ const {
   warnForInsertedHydratedElement,
   warnForInsertedHydratedText,
 } = ReactDOMFiberComponent;
-const {updatedAncestorInfo} = validateDOMNesting;
 const {precacheFiberNode, updateFiberProps} = ReactDOMComponentTree;
 
 let SUPPRESS_HYDRATION_WARNING;
@@ -113,7 +112,7 @@ export function getRootHostContext(
   }
   if (__DEV__) {
     const validatedTag = type.toLowerCase();
-    const ancestorInfo = updatedAncestorInfo(null, validatedTag, null);
+    const ancestorInfo = updatedAncestorInfo(null, validatedTag);
     return {namespace, ancestorInfo};
   }
   return namespace;
@@ -130,7 +129,6 @@ export function getChildHostContext(
     const ancestorInfo = updatedAncestorInfo(
       parentHostContextDev.ancestorInfo,
       type,
-      null,
     );
     return {namespace, ancestorInfo};
   }
@@ -175,7 +173,6 @@ export function createInstance(
       const ownAncestorInfo = updatedAncestorInfo(
         hostContextDev.ancestorInfo,
         type,
-        null,
       );
       validateDOMNesting(null, string, ownAncestorInfo);
     }
@@ -231,7 +228,6 @@ export function prepareUpdate(
       const ownAncestorInfo = updatedAncestorInfo(
         hostContextDev.ancestorInfo,
         type,
-        null,
       );
       validateDOMNesting(null, string, ownAncestorInfo);
     }
diff --git a/packages/react-dom/src/client/validateDOMNesting.js b/packages/react-dom/src/client/validateDOMNesting.js
index a9283bcf7b..a1f89a50dd 100644
--- a/packages/react-dom/src/client/validateDOMNesting.js
+++ b/packages/react-dom/src/client/validateDOMNesting.js
@@ -10,6 +10,7 @@ import warningWithoutStack from 'shared/warningWithoutStack';
 import {getCurrentFiberStackInDev} from 'react-reconciler/src/ReactCurrentFiber';
 
 let validateDOMNesting = () => {};
+let updatedAncestorInfo = () => {};
 
 if (__DEV__) {
   // This validation code was written based on the HTML5 parsing spec:
@@ -158,9 +159,9 @@ if (__DEV__) {
     dlItemTagAutoclosing: null,
   };
 
-  const updatedAncestorInfo = function(oldInfo, tag, instance) {
+  updatedAncestorInfo = function(oldInfo, tag) {
     let ancestorInfo = {...(oldInfo || emptyAncestorInfo)};
-    let info = {tag: tag, instance: instance};
+    let info = {tag};
 
     if (inScopeTags.indexOf(tag) !== -1) {
       ancestorInfo.aTagInScope = null;
@@ -477,9 +478,6 @@ if (__DEV__) {
       );
     }
   };
-
-  // TODO: turn this into a named export
-  validateDOMNesting.updatedAncestorInfo = updatedAncestorInfo;
 }
 
-export default validateDOMNesting;
+export {updatedAncestorInfo, validateDOMNesting};

From c44c2a21614ed2e5d3078dcb24dc7ef086df24be Mon Sep 17 00:00:00 2001
From: Dylan Cutler <DCtheTall@users.noreply.github.com>
Date: Wed, 1 Aug 2018 13:45:08 -0400
Subject: [PATCH 260/277] More helpful message when passing an element to
 createElement() (#13131)

* [#13130] Add a more helpful message when passing an element to createElement()

* better conditional flow

* update after review

* move last condition inside last else clause

* Added test case

* compare 25132typeof to REACT_ELEMENT_TYPE

* runs prettier

* remove unrelated changes

* Tweak the message
---
 packages/react/src/ReactElementValidator.js   |  5 +++++
 .../ReactElementValidator-test.internal.js    | 20 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/packages/react/src/ReactElementValidator.js b/packages/react/src/ReactElementValidator.js
index 543b74d1b1..ba4f87f66f 100644
--- a/packages/react/src/ReactElementValidator.js
+++ b/packages/react/src/ReactElementValidator.js
@@ -19,6 +19,7 @@ import {
   getIteratorFn,
   REACT_FORWARD_REF_TYPE,
   REACT_FRAGMENT_TYPE,
+  REACT_ELEMENT_TYPE,
 } from 'shared/ReactSymbols';
 import checkPropTypes from 'prop-types/checkPropTypes';
 import warning from 'shared/warning';
@@ -286,6 +287,10 @@ export function createElementWithValidation(type, props, children) {
       typeString = 'null';
     } else if (Array.isArray(type)) {
       typeString = 'array';
+    } else if (type !== undefined && type.$$typeof === REACT_ELEMENT_TYPE) {
+      typeString = `<${getComponentName(type.type) || 'Unknown'} />`;
+      info =
+        ' Did you accidentally export a JSX literal instead of a component?';
     } else {
       typeString = typeof type;
     }
diff --git a/packages/react/src/__tests__/ReactElementValidator-test.internal.js b/packages/react/src/__tests__/ReactElementValidator-test.internal.js
index cb9a9eaa04..6f881825f8 100644
--- a/packages/react/src/__tests__/ReactElementValidator-test.internal.js
+++ b/packages/react/src/__tests__/ReactElementValidator-test.internal.js
@@ -229,12 +229,17 @@ describe('ReactElementValidator', () => {
   });
 
   it('gives a helpful error when passing invalid types', () => {
+    function Foo() {}
     expect(() => {
       React.createElement(undefined);
       React.createElement(null);
       React.createElement(true);
       React.createElement({x: 17});
       React.createElement({});
+      React.createElement(React.createElement('div'));
+      React.createElement(React.createElement(Foo));
+      React.createElement(React.createElement(React.createContext().Consumer));
+      React.createElement({$$typeof: 'non-react-thing'});
     }).toWarnDev(
       [
         'Warning: React.createElement: type is invalid -- expected a string ' +
@@ -256,6 +261,21 @@ describe('ReactElementValidator', () => {
           'components) but got: object. You likely forgot to export your ' +
           "component from the file it's defined in, or you might have mixed up " +
           'default and named imports.',
+        'Warning: React.createElement: type is invalid -- expected a string ' +
+          '(for built-in components) or a class/function (for composite ' +
+          'components) but got: <div />. Did you accidentally export a JSX literal ' +
+          'instead of a component?',
+        'Warning: React.createElement: type is invalid -- expected a string ' +
+          '(for built-in components) or a class/function (for composite ' +
+          'components) but got: <Foo />. Did you accidentally export a JSX literal ' +
+          'instead of a component?',
+        'Warning: React.createElement: type is invalid -- expected a string ' +
+          '(for built-in components) or a class/function (for composite ' +
+          'components) but got: <Context.Consumer />. Did you accidentally ' +
+          'export a JSX literal instead of a component?',
+        'Warning: React.createElement: type is invalid -- expected a string ' +
+          '(for built-in components) or a class/function (for composite ' +
+          'components) but got: object.',
       ],
       {withoutStack: true},
     );

From ff41519ec2fea37643ecae7f87f8e15856247faf Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 1 Aug 2018 20:23:10 +0100
Subject: [PATCH 261/277] Sanitize unknown attribute names for SSR (#13302)

---
 .../src/__tests__/ReactDOMComponent-test.js   | 165 ++++++++++++++++--
 .../src/server/DOMMarkupOperations.js         |   3 +-
 2 files changed, 152 insertions(+), 16 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
index 441545fc0a..642c5834c8 100644
--- a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
@@ -554,39 +554,174 @@ describe('ReactDOMComponent', () => {
       expect(stubStyle.color).toEqual('green');
     });
 
-    it('should reject attribute key injection attack on markup', () => {
+    it('should reject attribute key injection attack on markup for regular DOM (SSR)', () => {
       expect(() => {
         for (let i = 0; i < 3; i++) {
-          const container = document.createElement('div');
-          const element = React.createElement(
+          const element1 = React.createElement(
+            'div',
+            {'blah" onclick="beevil" noise="hi': 'selected'},
+            null,
+          );
+          const element2 = React.createElement(
+            'div',
+            {'></div><script>alert("hi")</script>': 'selected'},
+            null,
+          );
+          let result1 = ReactDOMServer.renderToString(element1);
+          let result2 = ReactDOMServer.renderToString(element2);
+          expect(result1.toLowerCase()).not.toContain('onclick');
+          expect(result2.toLowerCase()).not.toContain('script');
+        }
+      }).toWarnDev([
+        'Warning: Invalid attribute name: `blah" onclick="beevil" noise="hi`',
+        'Warning: Invalid attribute name: `></div><script>alert("hi")</script>`',
+      ]);
+    });
+
+    it('should reject attribute key injection attack on markup for custom elements (SSR)', () => {
+      expect(() => {
+        for (let i = 0; i < 3; i++) {
+          const element1 = React.createElement(
             'x-foo-component',
             {'blah" onclick="beevil" noise="hi': 'selected'},
             null,
           );
-          ReactDOM.render(element, container);
+          const element2 = React.createElement(
+            'x-foo-component',
+            {'></x-foo-component><script>alert("hi")</script>': 'selected'},
+            null,
+          );
+          let result1 = ReactDOMServer.renderToString(element1);
+          let result2 = ReactDOMServer.renderToString(element2);
+          expect(result1.toLowerCase()).not.toContain('onclick');
+          expect(result2.toLowerCase()).not.toContain('script');
         }
-      }).toWarnDev(
+      }).toWarnDev([
         'Warning: Invalid attribute name: `blah" onclick="beevil" noise="hi`',
-      );
+        'Warning: Invalid attribute name: `></x-foo-component><script>alert("hi")</script>`',
+      ]);
     });
 
-    it('should reject attribute key injection attack on update', () => {
+    it('should reject attribute key injection attack on mount for regular DOM', () => {
+      expect(() => {
+        for (let i = 0; i < 3; i++) {
+          const container = document.createElement('div');
+          ReactDOM.render(
+            React.createElement(
+              'div',
+              {'blah" onclick="beevil" noise="hi': 'selected'},
+              null,
+            ),
+            container,
+          );
+          expect(container.firstChild.attributes.length).toBe(0);
+          ReactDOM.unmountComponentAtNode(container);
+          ReactDOM.render(
+            React.createElement(
+              'div',
+              {'></div><script>alert("hi")</script>': 'selected'},
+              null,
+            ),
+            container,
+          );
+          expect(container.firstChild.attributes.length).toBe(0);
+        }
+      }).toWarnDev([
+        'Warning: Invalid attribute name: `blah" onclick="beevil" noise="hi`',
+        'Warning: Invalid attribute name: `></div><script>alert("hi")</script>`',
+      ]);
+    });
+
+    it('should reject attribute key injection attack on mount for custom elements', () => {
+      expect(() => {
+        for (let i = 0; i < 3; i++) {
+          const container = document.createElement('div');
+          ReactDOM.render(
+            React.createElement(
+              'x-foo-component',
+              {'blah" onclick="beevil" noise="hi': 'selected'},
+              null,
+            ),
+            container,
+          );
+          expect(container.firstChild.attributes.length).toBe(0);
+          ReactDOM.unmountComponentAtNode(container);
+          ReactDOM.render(
+            React.createElement(
+              'x-foo-component',
+              {'></x-foo-component><script>alert("hi")</script>': 'selected'},
+              null,
+            ),
+            container,
+          );
+          expect(container.firstChild.attributes.length).toBe(0);
+        }
+      }).toWarnDev([
+        'Warning: Invalid attribute name: `blah" onclick="beevil" noise="hi`',
+        'Warning: Invalid attribute name: `></x-foo-component><script>alert("hi")</script>`',
+      ]);
+    });
+
+    it('should reject attribute key injection attack on update for regular DOM', () => {
+      expect(() => {
+        for (let i = 0; i < 3; i++) {
+          const container = document.createElement('div');
+          const beforeUpdate = React.createElement('div', {}, null);
+          ReactDOM.render(beforeUpdate, container);
+          ReactDOM.render(
+            React.createElement(
+              'div',
+              {'blah" onclick="beevil" noise="hi': 'selected'},
+              null,
+            ),
+            container,
+          );
+          expect(container.firstChild.attributes.length).toBe(0);
+          ReactDOM.render(
+            React.createElement(
+              'div',
+              {'></div><script>alert("hi")</script>': 'selected'},
+              null,
+            ),
+            container,
+          );
+          expect(container.firstChild.attributes.length).toBe(0);
+        }
+      }).toWarnDev([
+        'Warning: Invalid attribute name: `blah" onclick="beevil" noise="hi`',
+        'Warning: Invalid attribute name: `></div><script>alert("hi")</script>`',
+      ]);
+    });
+
+    it('should reject attribute key injection attack on update for custom elements', () => {
       expect(() => {
         for (let i = 0; i < 3; i++) {
           const container = document.createElement('div');
           const beforeUpdate = React.createElement('x-foo-component', {}, null);
           ReactDOM.render(beforeUpdate, container);
-
-          const afterUpdate = React.createElement(
-            'x-foo-component',
-            {'blah" onclick="beevil" noise="hi': 'selected'},
-            null,
+          ReactDOM.render(
+            React.createElement(
+              'x-foo-component',
+              {'blah" onclick="beevil" noise="hi': 'selected'},
+              null,
+            ),
+            container,
           );
-          ReactDOM.render(afterUpdate, container);
+          expect(container.firstChild.attributes.length).toBe(0);
+          ReactDOM.render(
+            React.createElement(
+              'x-foo-component',
+              {'></x-foo-component><script>alert("hi")</script>': 'selected'},
+              null,
+            ),
+            container,
+          );
+          expect(container.firstChild.attributes.length).toBe(0);
         }
-      }).toWarnDev(
+      }).toWarnDev([
         'Warning: Invalid attribute name: `blah" onclick="beevil" noise="hi`',
-      );
+        'Warning: Invalid attribute name: `></x-foo-component><script>alert("hi")</script>`',
+      ]);
     });
 
     it('should update arbitrary attributes for tags containing dashes', () => {
diff --git a/packages/react-dom/src/server/DOMMarkupOperations.js b/packages/react-dom/src/server/DOMMarkupOperations.js
index 37eb5de9d4..67d89a1c8a 100644
--- a/packages/react-dom/src/server/DOMMarkupOperations.js
+++ b/packages/react-dom/src/server/DOMMarkupOperations.js
@@ -60,9 +60,10 @@ export function createMarkupForProperty(name: string, value: mixed): string {
     } else {
       return attributeName + '=' + quoteAttributeValueForBrowser(value);
     }
-  } else {
+  } else if (isAttributeNameSafe(name)) {
     return name + '=' + quoteAttributeValueForBrowser(value);
   }
+  return '';
 }
 
 /**

From f60a7f722cfd0083ca43387798dde7cd95b2fe26 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 1 Aug 2018 20:23:19 +0100
Subject: [PATCH 262/277] Fix SSR crash on a hasOwnProperty attribute (#13303)

---
 .../src/__tests__/ReactServerRendering-test.js      | 13 +++++++++++++
 .../react-dom/src/server/ReactPartialRenderer.js    |  3 ++-
 packages/react-dom/src/shared/DOMProperty.js        |  5 +++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactServerRendering-test.js b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
index 9c6c8c29ee..0e605f8c6e 100644
--- a/packages/react-dom/src/__tests__/ReactServerRendering-test.js
+++ b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
@@ -174,6 +174,19 @@ describe('ReactDOMServer', () => {
           (__DEV__ ? '\n    in iframe (at **)' : ''),
       );
     });
+
+    it('should not crash on poisoned hasOwnProperty', () => {
+      let html;
+      expect(
+        () =>
+          (html = ReactDOMServer.renderToString(
+            <div hasOwnProperty="poison">
+              <span unknown="test" />
+            </div>,
+          )),
+      ).toWarnDev(['React does not recognize the `hasOwnProperty` prop']);
+      expect(html).toContain('<span unknown="test">');
+    });
   });
 
   describe('renderToStaticMarkup', () => {
diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index 357eb8eb8e..19bf9c94a7 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -349,6 +349,7 @@ function processContext(type, context) {
   return maskedContext;
 }
 
+const hasOwnProperty = Object.prototype.hasOwnProperty;
 const STYLE = 'style';
 const RESERVED_PROPS = {
   children: null,
@@ -368,7 +369,7 @@ function createOpenTagMarkup(
   let ret = '<' + tagVerbatim;
 
   for (const propKey in props) {
-    if (!props.hasOwnProperty(propKey)) {
+    if (!hasOwnProperty.call(props, propKey)) {
       continue;
     }
     let propValue = props[propKey];
diff --git a/packages/react-dom/src/shared/DOMProperty.js b/packages/react-dom/src/shared/DOMProperty.js
index 31f222b978..23a00b48a5 100644
--- a/packages/react-dom/src/shared/DOMProperty.js
+++ b/packages/react-dom/src/shared/DOMProperty.js
@@ -66,14 +66,15 @@ export const VALID_ATTRIBUTE_NAME_REGEX = new RegExp(
   '^[' + ATTRIBUTE_NAME_START_CHAR + '][' + ATTRIBUTE_NAME_CHAR + ']*$',
 );
 
+const hasOwnProperty = Object.prototype.hasOwnProperty;
 const illegalAttributeNameCache = {};
 const validatedAttributeNameCache = {};
 
 export function isAttributeNameSafe(attributeName: string): boolean {
-  if (validatedAttributeNameCache.hasOwnProperty(attributeName)) {
+  if (hasOwnProperty.call(validatedAttributeNameCache, attributeName)) {
     return true;
   }
-  if (illegalAttributeNameCache.hasOwnProperty(attributeName)) {
+  if (hasOwnProperty.call(illegalAttributeNameCache, attributeName)) {
     return false;
   }
   if (VALID_ATTRIBUTE_NAME_REGEX.test(attributeName)) {

From 0624c719f4c228281a8b0a9145418f739b0bf8ad Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 1 Aug 2018 20:29:05 +0100
Subject: [PATCH 263/277] Add 16.4.2 and other releases to changelog

---
 CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c4808e813..044d628ac0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@
 
 </details>
 
+## 16.4.2 (August 1, 2018)
+
+### React DOM Server
+
+* Fix a [potential XSS vulnerability when the attacker controls an attribute name](https://reactjs.org/blog/2018/08/01/react-v-16-4-2.html) (`CVE-2018-6341`). This fix is available in the latest `react-dom@16.4.2`, as well as in previous affected minor versions: `react-dom@16.0.1`, `react-dom@16.1.2`, `react-dom@16.2.1`, and `react-dom@16.3.3`. ([@gaearon](https://github.com/gaearon) in [#13302](https://github.com/facebook/react/pull/13302))
+
+* Fix a crash in the server renderer when an attribute is called `hasOwnProperty`. This fix is only available in `react-dom@16.4.2`. ([@gaearon](https://github.com/gaearon) in [#13303](https://github.com/facebook/react/pull/13303))
+
 ## 16.4.1 (June 13, 2018)
 
 ### React
@@ -88,6 +96,12 @@
 
 * Add a UMD build. ([@bvaughn](https://github.com/bvaughn) in [#12594](https://github.com/facebook/react/pull/12594))
 
+## 16.3.2 (August 1, 2018)
+
+### React DOM Server
+
+* Fix a [potential XSS vulnerability when the attacker controls an attribute name](https://reactjs.org/blog/2018/08/01/react-v-16-4-2.html) (`CVE-2018-6341`). This fix is available in the latest `react-dom@16.4.2`, as well as in previous affected minor versions: `react-dom@16.0.1`, `react-dom@16.1.2`, `react-dom@16.2.1`, and `react-dom@16.3.3`. ([@gaearon](https://github.com/gaearon) in [#13302](https://github.com/facebook/react/pull/13302))
+
 ## 16.3.1 (April 3, 2018)
 
 ### React
@@ -179,6 +193,12 @@
 
 * Fix a crash on updates. ([@rmhartog](https://github.com/rmhartog) in [#11955](https://github.com/facebook/react/pull/11955))
 
+## 16.2.1 (August 1, 2018)
+
+### React DOM Server
+
+* Fix a [potential XSS vulnerability when the attacker controls an attribute name](https://reactjs.org/blog/2018/08/01/react-v-16-4-2.html) (`CVE-2018-6341`). This fix is available in the latest `react-dom@16.4.2`, as well as in previous affected minor versions: `react-dom@16.0.1`, `react-dom@16.1.2`, `react-dom@16.2.1`, and `react-dom@16.3.3`. ([@gaearon](https://github.com/gaearon) in [#13302](https://github.com/facebook/react/pull/13302))
+
 ## 16.2.0 (November 28, 2017)
 
 ### React
@@ -203,6 +223,12 @@
 
 * Many tests were rewritten against the public API. Big thanks to [everyone who contributed](https://github.com/facebook/react/issues/11299)!
 
+## 16.1.2 (August 1, 2018)
+
+### React DOM Server
+
+* Fix a [potential XSS vulnerability when the attacker controls an attribute name](https://reactjs.org/blog/2018/08/01/react-v-16-4-2.html) (`CVE-2018-6341`). This fix is available in the latest `react-dom@16.4.2`, as well as in previous affected minor versions: `react-dom@16.0.1`, `react-dom@16.1.2`, `react-dom@16.2.1`, and `react-dom@16.3.3`. ([@gaearon](https://github.com/gaearon) in [#13302](https://github.com/facebook/react/pull/13302))
+
 ## 16.1.1 (November 13, 2017)
 
 ### React
@@ -293,6 +319,12 @@ Starting with 16.1.0, we will no longer be publishing new releases on Bower. You
 
 * First release of the [new experimental package](https://github.com/facebook/react/tree/master/packages/react-call-return) for parent-child communication. ([@gaearon](https://github.com/gaearon) in [#11364](https://github.com/facebook/react/pull/11364))
 
+## 16.0.1 (August 1, 2018)
+
+### React DOM Server
+
+* Fix a [potential XSS vulnerability when the attacker controls an attribute name](https://reactjs.org/blog/2018/08/01/react-v-16-4-2.html) (`CVE-2018-6341`). This fix is available in the latest `react-dom@16.4.2`, as well as in previous affected minor versions: `react-dom@16.0.1`, `react-dom@16.1.2`, `react-dom@16.2.1`, and `react-dom@16.3.3`. ([@gaearon](https://github.com/gaearon) in [#13302](https://github.com/facebook/react/pull/13302))
+
 ## 16.0.0 (September 26, 2017)
 
 ### New JS Environment Requirements

From 41f6d8cc7acb13d31b05783b958fa993d67cae68 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 1 Aug 2018 21:12:51 +0100
Subject: [PATCH 264/277] Fix incorrect changelog entry for 16.3.3

---
 CHANGELOG.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 044d628ac0..3e7124572f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -78,6 +78,12 @@
 
 * The [new host config shape](https://github.com/facebook/react/blob/c601f7a64640290af85c9f0e33c78480656b46bc/packages/react-noop-renderer/src/createReactNoop.js#L82-L285) is flat and doesn't use nested objects. ([@gaearon](https://github.com/gaearon) in [#12792](https://github.com/facebook/react/pull/12792))
 
+## 16.3.3 (August 1, 2018)
+
+### React DOM Server
+
+* Fix a [potential XSS vulnerability when the attacker controls an attribute name](https://reactjs.org/blog/2018/08/01/react-v-16-4-2.html) (`CVE-2018-6341`). This fix is available in the latest `react-dom@16.4.2`, as well as in previous affected minor versions: `react-dom@16.0.1`, `react-dom@16.1.2`, `react-dom@16.2.1`, and `react-dom@16.3.3`. ([@gaearon](https://github.com/gaearon) in [#13302](https://github.com/facebook/react/pull/13302))
+
 ## 16.3.2 (April 16, 2018)
 
 ### React
@@ -96,12 +102,6 @@
 
 * Add a UMD build. ([@bvaughn](https://github.com/bvaughn) in [#12594](https://github.com/facebook/react/pull/12594))
 
-## 16.3.2 (August 1, 2018)
-
-### React DOM Server
-
-* Fix a [potential XSS vulnerability when the attacker controls an attribute name](https://reactjs.org/blog/2018/08/01/react-v-16-4-2.html) (`CVE-2018-6341`). This fix is available in the latest `react-dom@16.4.2`, as well as in previous affected minor versions: `react-dom@16.0.1`, `react-dom@16.1.2`, `react-dom@16.2.1`, and `react-dom@16.3.3`. ([@gaearon](https://github.com/gaearon) in [#13302](https://github.com/facebook/react/pull/13302))
-
 ## 16.3.1 (April 3, 2018)
 
 ### React

From 00cd4444e2a8ad3c48188b5c0e3db37842d867f0 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Wed, 1 Aug 2018 14:10:28 -0700
Subject: [PATCH 265/277] [WIP] Add suspense fixtures for IO and CPU demo
 (#13295)

Add suspense fixtures for IO and CPU demo
---
 fixtures/suspense/cpu/.gitignore              |   21 +
 fixtures/suspense/cpu/README.md               |   26 +
 fixtures/suspense/cpu/package.json            |   20 +
 fixtures/suspense/cpu/public/favicon.ico      |  Bin 0 -> 3870 bytes
 fixtures/suspense/cpu/public/index.html       |   40 +
 fixtures/suspense/cpu/public/manifest.json    |   15 +
 fixtures/suspense/cpu/src/Charts.js           |  126 +
 fixtures/suspense/cpu/src/Clock.js            |  105 +
 fixtures/suspense/cpu/src/index.css           |  143 +
 fixtures/suspense/cpu/src/index.js            |  157 +
 fixtures/suspense/cpu/yarn.lock               | 7078 ++++++++++++++++
 fixtures/suspense/io/.gitignore               |   14 +
 fixtures/suspense/io/README.md                |   26 +
 fixtures/suspense/io/package.json             |   41 +
 fixtures/suspense/io/public/favicon.ico       |  Bin 0 -> 24838 bytes
 fixtures/suspense/io/public/img/acdlite.jpeg  |  Bin 0 -> 24301 bytes
 fixtures/suspense/io/public/img/bvaughn.jpeg  |  Bin 0 -> 11417 bytes
 fixtures/suspense/io/public/img/flarnie.jpeg  |  Bin 0 -> 32267 bytes
 fixtures/suspense/io/public/img/gaearon.jpeg  |  Bin 0 -> 42340 bytes
 .../suspense/io/public/img/sebmarkbage.jpeg   |  Bin 0 -> 18137 bytes
 .../suspense/io/public/img/sophiebits.jpeg    |  Bin 0 -> 30625 bytes
 fixtures/suspense/io/public/img/trueadm.jpeg  |  Bin 0 -> 26562 bytes
 fixtures/suspense/io/public/index.html        |   13 +
 fixtures/suspense/io/public/manifest.json     |   15 +
 fixtures/suspense/io/src/api/data.js          |  334 +
 fixtures/suspense/io/src/api/index.js         |   67 +
 fixtures/suspense/io/src/cache.js             |    7 +
 fixtures/suspense/io/src/components/App.js    |   82 +
 .../io/src/components/ContributorListPage.js  |   62 +
 .../suspense/io/src/components/Spinner.css    |   68 +
 .../suspense/io/src/components/Spinner.js     |   48 +
 .../suspense/io/src/components/UserPage.js    |  169 +
 fixtures/suspense/io/src/index.css            |   90 +
 fixtures/suspense/io/src/index.js             |  272 +
 fixtures/suspense/io/yarn.lock                | 7435 +++++++++++++++++
 35 files changed, 16474 insertions(+)
 create mode 100644 fixtures/suspense/cpu/.gitignore
 create mode 100644 fixtures/suspense/cpu/README.md
 create mode 100644 fixtures/suspense/cpu/package.json
 create mode 100644 fixtures/suspense/cpu/public/favicon.ico
 create mode 100644 fixtures/suspense/cpu/public/index.html
 create mode 100644 fixtures/suspense/cpu/public/manifest.json
 create mode 100644 fixtures/suspense/cpu/src/Charts.js
 create mode 100644 fixtures/suspense/cpu/src/Clock.js
 create mode 100644 fixtures/suspense/cpu/src/index.css
 create mode 100644 fixtures/suspense/cpu/src/index.js
 create mode 100644 fixtures/suspense/cpu/yarn.lock
 create mode 100644 fixtures/suspense/io/.gitignore
 create mode 100644 fixtures/suspense/io/README.md
 create mode 100644 fixtures/suspense/io/package.json
 create mode 100755 fixtures/suspense/io/public/favicon.ico
 create mode 100644 fixtures/suspense/io/public/img/acdlite.jpeg
 create mode 100644 fixtures/suspense/io/public/img/bvaughn.jpeg
 create mode 100644 fixtures/suspense/io/public/img/flarnie.jpeg
 create mode 100644 fixtures/suspense/io/public/img/gaearon.jpeg
 create mode 100644 fixtures/suspense/io/public/img/sebmarkbage.jpeg
 create mode 100644 fixtures/suspense/io/public/img/sophiebits.jpeg
 create mode 100644 fixtures/suspense/io/public/img/trueadm.jpeg
 create mode 100644 fixtures/suspense/io/public/index.html
 create mode 100644 fixtures/suspense/io/public/manifest.json
 create mode 100644 fixtures/suspense/io/src/api/data.js
 create mode 100644 fixtures/suspense/io/src/api/index.js
 create mode 100644 fixtures/suspense/io/src/cache.js
 create mode 100644 fixtures/suspense/io/src/components/App.js
 create mode 100644 fixtures/suspense/io/src/components/ContributorListPage.js
 create mode 100644 fixtures/suspense/io/src/components/Spinner.css
 create mode 100644 fixtures/suspense/io/src/components/Spinner.js
 create mode 100644 fixtures/suspense/io/src/components/UserPage.js
 create mode 100644 fixtures/suspense/io/src/index.css
 create mode 100644 fixtures/suspense/io/src/index.js
 create mode 100644 fixtures/suspense/io/yarn.lock

diff --git a/fixtures/suspense/cpu/.gitignore b/fixtures/suspense/cpu/.gitignore
new file mode 100644
index 0000000000..d30f40ef44
--- /dev/null
+++ b/fixtures/suspense/cpu/.gitignore
@@ -0,0 +1,21 @@
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/fixtures/suspense/cpu/README.md b/fixtures/suspense/cpu/README.md
new file mode 100644
index 0000000000..48b802c803
--- /dev/null
+++ b/fixtures/suspense/cpu/README.md
@@ -0,0 +1,26 @@
+# CPU async rendering demo
+
+## What is this fixture?
+
+This is a demo application based on [Dan Abramov's](https://github.com/gaearon) recent [JSConf Iceland talk](https://reactjs.org/blog/2018/03/01/sneak-peek-beyond-react-16.html) about React.
+
+It depends on a local build of React and enables us to easily test async and "suspense" APIs in a more "real world app" like context.
+
+## Can I use this code in production?
+
+No. The APIs being tested here are unstable and some of them have still not been released to NPM. For now, this fixture is only a test harness.
+
+## How do I run this fixture?
+
+```shell
+# 1: Build react from source
+cd /path/to/react
+yarn build -- dom,core,interaction,simple-cache-provider type=NODE
+
+# 2: Install fixture dependencies
+cd ./fixtures/suspense/cpu/
+yarn install
+
+# 3: Run the app
+yarn start
+```
\ No newline at end of file
diff --git a/fixtures/suspense/cpu/package.json b/fixtures/suspense/cpu/package.json
new file mode 100644
index 0000000000..496b5d3906
--- /dev/null
+++ b/fixtures/suspense/cpu/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "cpu-demo",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "glamor": "^2.20.40",
+    "react": "../../../build/node_modules/react",
+    "react-dom": "../../../build/node_modules/react-dom",
+    "react-markdown": "^3.2.0",
+    "react-scripts": "^1.1.4",
+    "simple-cache-provider": "../../../build/node_modules/simple-cache-provider",
+    "victory": "^0.25.6"
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test --env=jsdom",
+    "eject": "react-scripts eject"
+  }
+}
diff --git a/fixtures/suspense/cpu/public/favicon.ico b/fixtures/suspense/cpu/public/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a11777cc471a4344702741ab1c8a588998b1311a
GIT binary patch
literal 3870
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
baj7?x%VD!5Cxk2YbYLNVeiXvvpMCWYo=by@

literal 0
HcmV?d00001

diff --git a/fixtures/suspense/cpu/public/index.html b/fixtures/suspense/cpu/public/index.html
new file mode 100644
index 0000000000..ed0ebafa1b
--- /dev/null
+++ b/fixtures/suspense/cpu/public/index.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="theme-color" content="#000000">
+    <!--
+      manifest.json provides metadata used when your web app is added to the
+      homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
+    -->
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>React App</title>
+  </head>
+  <body>
+    <noscript>
+      You need to enable JavaScript to run this app.
+    </noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>
diff --git a/fixtures/suspense/cpu/public/manifest.json b/fixtures/suspense/cpu/public/manifest.json
new file mode 100644
index 0000000000..ef19ec243e
--- /dev/null
+++ b/fixtures/suspense/cpu/public/manifest.json
@@ -0,0 +1,15 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    }
+  ],
+  "start_url": "./index.html",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
diff --git a/fixtures/suspense/cpu/src/Charts.js b/fixtures/suspense/cpu/src/Charts.js
new file mode 100644
index 0000000000..7c51a14e44
--- /dev/null
+++ b/fixtures/suspense/cpu/src/Charts.js
@@ -0,0 +1,126 @@
+import React, {PureComponent} from 'react';
+import {
+  VictoryArea,
+  VictoryAxis,
+  VictoryChart,
+  VictoryBar,
+  VictoryTheme,
+  VictoryScatter,
+  VictoryStack,
+} from 'victory';
+
+const colors = ['#fff489', '#fa57c1', '#b166cc', '#7572ff', '#69a6f9'];
+
+export default class Charts extends PureComponent {
+  render() {
+    const streamData = this.props.data;
+    return (
+      <div>
+        <div style={{display: 'flex'}}>
+          <VictoryChart
+            theme={VictoryTheme.material}
+            width={400}
+            height={400}
+            style={{
+              parent: {
+                backgroundColor: '#222',
+              },
+            }}>
+            <VictoryAxis
+              style={{
+                axis: {stroke: 'white'},
+                tickLabels: {fill: 'white'},
+              }}
+            />
+            <VictoryAxis
+              style={{
+                axis: {stroke: 'white'},
+                tickLabels: {fill: 'white'},
+              }}
+              dependentAxis
+            />
+            <VictoryScatter
+              data={streamData[0]}
+              size={6}
+              style={{
+                data: {
+                  fill: d => colors[d.x % 5],
+                },
+              }}
+            />
+          </VictoryChart>
+
+          <VictoryChart
+            theme={VictoryTheme.material}
+            width={400}
+            height={400}
+            style={{
+              parent: {
+                backgroundColor: '#222',
+              },
+            }}
+            domainPadding={[20, 20]}>
+            <VictoryAxis
+              style={{
+                axis: {stroke: 'white'},
+                tickLabels: {fill: 'white'},
+              }}
+            />
+            <VictoryAxis
+              style={{
+                axis: {stroke: 'white'},
+                tickLabels: {fill: 'white'},
+              }}
+              dependentAxis
+            />
+            <VictoryBar
+              data={streamData[0]}
+              style={{
+                data: {
+                  fill: d => colors[d.x % 5],
+                  stroke: 'none',
+                  padding: 5,
+                },
+              }}
+            />
+          </VictoryChart>
+        </div>
+        <div
+          style={{
+            display: 'flex',
+            position: 'relative',
+            top: '-50px',
+          }}>
+          <VictoryChart
+            theme={VictoryTheme.material}
+            width={800}
+            height={350}
+            style={{
+              parent: {
+                backgroundColor: '#222',
+              },
+            }}>
+            <VictoryAxis
+              style={{
+                axis: {stroke: 'white'},
+                tickLabels: {fill: 'white'},
+              }}
+            />
+            <VictoryAxis
+              style={{
+                axis: {stroke: 'white'},
+                tickLabels: {fill: 'white'},
+              }}
+              dependentAxis
+            />
+            <VictoryStack>
+              {streamData.map((data, i) => (
+                <VictoryArea key={i} data={data} colorScale={colors} />
+              ))}
+            </VictoryStack>
+          </VictoryChart>
+        </div>
+      </div>
+    );
+  }
+}
diff --git a/fixtures/suspense/cpu/src/Clock.js b/fixtures/suspense/cpu/src/Clock.js
new file mode 100644
index 0000000000..102bf9a332
--- /dev/null
+++ b/fixtures/suspense/cpu/src/Clock.js
@@ -0,0 +1,105 @@
+import React, {createRef, PureComponent} from 'react';
+
+const SPEED = 0.003 / Math.PI;
+const FRAMES = 10;
+
+export default class Clock extends PureComponent {
+  faceRef = createRef();
+  arcGroupRef = createRef();
+  clockHandRef = createRef();
+  frame = null;
+  hitCounter = 0;
+  rotation = 0;
+  t0 = Date.now();
+  arcs = [];
+
+  animate = () => {
+    const now = Date.now();
+    const td = now - this.t0;
+    this.rotation = (this.rotation + SPEED * td) % (2 * Math.PI);
+    this.t0 = now;
+
+    this.arcs.push({rotation: this.rotation, td});
+
+    let lx, ly, tx, ty;
+    if (this.arcs.length > FRAMES) {
+      this.arcs.forEach(({rotation, td}, i) => {
+        lx = tx;
+        ly = ty;
+        const r = 145;
+        tx = 155 + r * Math.cos(rotation);
+        ty = 155 + r * Math.sin(rotation);
+        const bigArc = SPEED * td < Math.PI ? '0' : '1';
+        const path = `M${tx} ${ty}A${r} ${r} 0 ${bigArc} 0 ${lx} ${ly}L155 155`;
+        const hue = 120 - Math.min(120, td / 4);
+        const colour = `hsl(${hue}, 100%, ${60 - i * (30 / FRAMES)}%)`;
+        if (i !== 0) {
+          const arcEl = this.arcGroupRef.current.children[i - 1];
+          arcEl.setAttribute('d', path);
+          arcEl.setAttribute('fill', colour);
+        }
+      });
+      this.clockHandRef.current.setAttribute('d', `M155 155L${tx} ${ty}`);
+      this.arcs.shift();
+    }
+
+    if (this.hitCounter > 0) {
+      this.faceRef.current.setAttribute(
+        'fill',
+        `hsla(0, 0%, ${this.hitCounter}%, 0.95)`
+      );
+      this.hitCounter -= 1;
+    } else {
+      this.hitCounter = 0;
+      this.faceRef.current.setAttribute('fill', 'hsla(0, 0%, 5%, 0.95)');
+    }
+
+    this.frame = requestAnimationFrame(this.animate);
+  };
+
+  componentDidMount() {
+    this.frame = requestAnimationFrame(this.animate);
+    if (this.faceRef.current) {
+      this.faceRef.current.addEventListener('click', this.handleClick);
+    }
+  }
+
+  componentDidUpdate() {
+    console.log('componentDidUpdate()', this.faceRef.current);
+  }
+
+  componentWillUnmount() {
+    this.faceRef.current.removeEventListener('click', this.handleClick);
+    if (this.frame) {
+      cancelAnimationFrame(this.frame);
+    }
+  }
+
+  handleClick = e => {
+    e.stopPropagation();
+    this.hitCounter = 50;
+  };
+
+  render() {
+    const paths = new Array(FRAMES);
+    for (let i = 0; i < FRAMES; i++) {
+      paths.push(<path className="arcHand" key={i} />);
+    }
+    return (
+      <div className="stutterer">
+        <svg height="310" width="310">
+          <circle
+            className="clockFace"
+            onClick={this.handleClick}
+            cx={155}
+            cy={155}
+            r={150}
+            ref={this.faceRef}
+          />
+          <g ref={this.arcGroupRef}>{paths}</g>
+          <path className="clockHand" ref={this.clockHandRef} />
+        </svg>
+      </div>
+    );
+  }
+}
diff --git a/fixtures/suspense/cpu/src/index.css b/fixtures/suspense/cpu/src/index.css
new file mode 100644
index 0000000000..2d924fda93
--- /dev/null
+++ b/fixtures/suspense/cpu/src/index.css
@@ -0,0 +1,143 @@
+html,
+body {
+  padding: 0px;
+  margin: 0px;
+  user-select: none;
+  font-family: Karla, Helvetica Neue, Helvetica, sans-serif;
+  background: rgb(34, 34, 34);
+  color: white;
+  overflow: hidden;
+}
+
+.VictoryContainer {
+  opacity: 0.8;
+}
+
+* {
+  box-sizing: border-box;
+}
+
+#root {
+  height: 100vh;
+}
+
+.container {
+  width: 100%;
+  max-width: 960px;
+  margin: auto;
+  padding: 10px;
+}
+
+.rendering {
+  margin-top: 20px;
+  margin-bottom: 20px;
+  zoom: 1.8;
+}
+
+label {
+  zoom: 1;
+  margin-right: 50px;
+  font-size: 30px;
+}
+
+label.selected {
+  font-weight: bold;  
+}
+
+label:nth-child(1).selected {
+  color: rgb(253, 25, 153);
+}
+
+label:nth-child(2).selected {
+  color: rgb(255, 240, 1);
+}
+
+label:nth-child(3).selected {
+  color: #61dafb;
+}
+
+.chart {
+  width: 100%;
+  height: 100%;
+}
+
+.input {
+  padding: 16px;
+  font-size: 30px;
+  width: 100%;
+  display: block;
+}
+.input.sync {
+  outline-color: rgba(253, 25, 153, 0.1);
+}
+.input.debounced {
+  outline-color: rgba(255, 240, 1, 0.1);
+}
+.input.async {
+  outline-color: rgba(97, 218, 251, 0.1);
+}
+
+
+label {
+  font-size: 20px;
+}
+
+label label {
+  display: 'inline-block';
+  margin-left: 20px;
+}
+
+.row {
+  flex: 1;
+  display: flex;
+  margin-top: 20px;
+  min-height: 100%;
+}
+
+.column {
+  flex: 1;
+}
+
+.demo {
+  position: relative;
+  min-height: 100vh;
+}
+
+.stutterer {
+  transform: scale(1.5);
+  height: 310px;
+  width: 310px;
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: -256px;
+  bottom: 0;
+  margin: auto;
+  box-shadow: 0 0 10px 10px rgba(0, 0, 0, 0.2);
+  border-radius: 200px;
+}
+
+.clockHand {
+  stroke: white;
+  stroke-width: 10px;
+  stroke-linecap: round;
+}
+
+.clockFace {
+  stroke: white;
+  stroke-width: 10px;
+}
+
+.arcHand {
+}
+
+.innerLine {
+  border-radius: 6px;
+  position: absolute;
+  height: 149px;
+  left: 47.5%;
+  top: 0%;
+  width: 5%;
+  background-color: red;
+  transform-origin: bottom center;
+}
diff --git a/fixtures/suspense/cpu/src/index.js b/fixtures/suspense/cpu/src/index.js
new file mode 100644
index 0000000000..2c903e0a39
--- /dev/null
+++ b/fixtures/suspense/cpu/src/index.js
@@ -0,0 +1,157 @@
+import React, {Component, PureComponent, unstable_AsyncMode} from 'react';
+import {flushSync, render, unstable_deferredUpdates} from 'react-dom';
+import _ from 'lodash';
+import Charts from './Charts';
+import Clock from './Clock';
+import './index.css';
+
+let cachedData = new Map();
+
+class App extends PureComponent {
+  state = {
+    value: '',
+    strategy: 'sync',
+    showDemo: true,
+    showClock: false,
+  };
+
+  // Random data for the chart
+  getStreamData(input) {
+    if (cachedData.has(input)) {
+      return cachedData.get(input);
+    }
+    const multiplier = input.length !== 0 ? input.length : 1;
+    const complexity =
+      (parseInt(window.location.search.substring(1), 10) / 100) * 25 || 25;
+    const data = _.range(5).map(t =>
+      _.range(complexity * multiplier).map((j, i) => {
+        return {
+          x: j,
+          y: (t + 1) * _.random(0, 255),
+        };
+      })
+    );
+    cachedData.set(input, data);
+    return data;
+  }
+
+  componentDidMount() {
+    window.addEventListener('keydown', e => {
+      if (e.key.toLowerCase() === '?') {
+        e.preventDefault();
+        this.setState(state => ({
+          showClock: !state.showClock,
+        }));
+      }
+    });
+  }
+
+  handleChartClick = e => {
+    if (this.state.showDemo) {
+      if (e.shiftKey) {
+        this.setState({showDemo: false});
+      }
+      return;
+    }
+    if (this.state.strategy !== 'async') {
+      this.setState(state => ({
+        showDemo: !state.showDemo,
+      }));
+      return;
+    }
+    if (this._ignoreClick) {
+      return;
+    }
+    this._ignoreClick = true;
+
+    unstable_deferredUpdates(() => {
+      this.setState({showDemo: true}, () => {
+        this._ignoreClick = false;
+      });
+    });
+  };
+
+  debouncedHandleChange = _.debounce(value => {
+    if (this.state.strategy === 'debounced') {
+      flushSync(() => {
+        this.setState({value: value});
+      });
+    }
+  }, 1000);
+
+  renderOption(strategy, label, enabled) {
+    const {strategy: currentStrategy} = this.state;
+    return (
+      <label
+        className={strategy === currentStrategy ? 'selected' : null}
+        style={{opacity: enabled ? 1 : 0.5}}>
+        <input
+          type="radio"
+          disabled={!enabled}
+          checked={strategy === currentStrategy}
+          onChange={() => this.setState({strategy})}
+        />
+        {label}
+      </label>
+    );
+  }
+
+  handleChange = e => {
+    const value = e.target.value;
+    const {strategy} = this.state;
+    switch (strategy) {
+      case 'sync':
+        this.setState({value});
+        break;
+      case 'debounced':
+        this.debouncedHandleChange(value);
+        break;
+      case 'async':
+        unstable_deferredUpdates(() => {
+          this.setState({value});
+        });
+        break;
+      default:
+        break;
+    }
+  };
+
+  render() {
+    const Wrapper =
+      this.state.strategy === 'async' ? unstable_AsyncMode : 'div';
+    const {showClock} = this.state;
+    const data = this.getStreamData(this.state.value);
+    return (
+      <div className="container">
+        <div className="rendering">
+          {this.renderOption('sync', 'Synchronous', true)}
+          {this.renderOption('debounced', 'Debounced', true)}
+          {this.renderOption(
+            'async',
+            'Asynchronous',
+            false
+          ) /* TODO Fix async demo and re-enable */}
+        </div>
+        <input
+          className={'input ' + this.state.strategy}
+          placeholder="longer input → more components and DOM nodes"
+          defaultValue={this.state.input}
+          onChange={this.handleChange}
+        />
+        <Wrapper>
+          <div className="demo" onClick={this.handleChartClick}>
+            {this.state.showDemo && (
+              <Charts data={data} onClick={this.handleChartClick} />
+            )}
+            <div style={{display: showClock ? 'block' : 'none'}}>
+              <Clock />
+            </div>
+          </div>
+        </Wrapper>
+      </div>
+    );
+  }
+}
+
+const container = document.getElementById('root');
+render(<App />, container);
diff --git a/fixtures/suspense/cpu/yarn.lock b/fixtures/suspense/cpu/yarn.lock
new file mode 100644
index 0000000000..e4e1486b53
--- /dev/null
+++ b/fixtures/suspense/cpu/yarn.lock
@@ -0,0 +1,7078 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+abab@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
+
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+
+accepts@~1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
+  dependencies:
+    mime-types "~2.1.16"
+    negotiator "0.6.1"
+
+acorn-dynamic-import@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
+  dependencies:
+    acorn "^4.0.3"
+
+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 "^4.0.4"
+
+acorn-jsx@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+  dependencies:
+    acorn "^3.0.4"
+
+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:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+
+acorn@^5.0.0, acorn@^5.2.1:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
+
+address@1.0.3, address@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
+
+ajv-keywords@^2.0.0, ajv-keywords@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
+
+ajv@^4.9.1:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+  dependencies:
+    co "^4.6.0"
+    json-stable-stringify "^1.0.1"
+
+ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.0, ajv@^5.2.3:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
+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"
+
+alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+
+ansi-align@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-1.1.0.tgz#2f0c1658829739add5ebb15e6b0c6e3423f016ba"
+  dependencies:
+    string-width "^1.0.1"
+
+ansi-escapes@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+
+ansi-escapes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
+
+ansi-html@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+
+ansi-regex@^2.0.0, ansi-regex@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+ansi-styles@^3.0.0, ansi-styles@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
+  dependencies:
+    color-convert "^1.9.0"
+
+anymatch@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+  dependencies:
+    micromatch "^2.1.5"
+    normalize-path "^2.0.0"
+
+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.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+aria-query@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-0.7.0.tgz#4af10a1e61573ddea0cf3b99b51c52c05b424d24"
+  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"
+  dependencies:
+    arr-flatten "^1.0.1"
+
+arr-flatten@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+
+array-filter@~0.0.0:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
+
+array-find-index@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+
+array-flatten@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
+
+array-includes@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.7.0"
+
+array-map@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
+
+array-reduce@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+
+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, arrify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+
+asn1.js@^4.0.0:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.2.tgz#8117ef4f7ed87cd8f89044b5bff97ac243a16c9a"
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+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"
+
+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.4.0, async@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+
+async@^2.1.2, async@^2.1.4, async@^2.4.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
+  dependencies:
+    lodash "^4.14.0"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+autoprefixer@7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.6.tgz#fb933039f74af74a83e71225ce78d9fd58ba84d7"
+  dependencies:
+    browserslist "^2.5.1"
+    caniuse-lite "^1.0.30000748"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^6.0.13"
+    postcss-value-parser "^3.2.3"
+
+autoprefixer@^6.3.1:
+  version "6.7.7"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+  dependencies:
+    browserslist "^1.7.6"
+    caniuse-db "^1.0.30000634"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^5.2.16"
+    postcss-value-parser "^3.2.3"
+
+aws-sign2@~0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+
+aws4@^1.2.1, aws4@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+
+axobject-query@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-0.1.0.tgz#62f59dbc59c9f9242759ca349960e7a2fe3c36c0"
+  dependencies:
+    ast-types-flow "0.0.7"
+
+babel-code-frame@6.26.0, babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-core@6.26.0, babel-core@^6.0.0, babel-core@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.0"
+    debug "^2.6.8"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.7"
+    slash "^1.0.0"
+    source-map "^0.5.6"
+
+babel-eslint@7.2.3:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827"
+  dependencies:
+    babel-code-frame "^6.22.0"
+    babel-traverse "^6.23.1"
+    babel-types "^6.23.0"
+    babylon "^6.17.0"
+
+babel-generator@^6.18.0, babel-generator@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.6"
+    trim-right "^1.0.1"
+
+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+  dependencies:
+    babel-helper-explode-assignable-expression "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-builder-react-jsx@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    esutils "^2.0.2"
+
+babel-helper-call-delegate@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-define-map@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-explode-assignable-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+  dependencies:
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-get-function-arity@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-hoist-variables@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-optimise-call-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-regex@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-remap-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-replace-supers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+  dependencies:
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-jest@20.0.3, babel-jest@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-20.0.3.tgz#e4a03b13dc10389e140fc645d09ffc4ced301671"
+  dependencies:
+    babel-core "^6.0.0"
+    babel-plugin-istanbul "^4.0.0"
+    babel-preset-jest "^20.0.3"
+
+babel-loader@7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.2.tgz#f6cbe122710f1aa2af4d881c6d5b54358ca24126"
+  dependencies:
+    find-cache-dir "^1.0.0"
+    loader-utils "^1.0.2"
+    mkdirp "^0.5.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-dynamic-import-node@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-1.1.0.tgz#bd1d88ac7aaf98df4917c384373b04d971a2b37a"
+  dependencies:
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babel-template "^6.26.0"
+    babel-types "^6.26.0"
+
+babel-plugin-istanbul@^4.0.0:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.5.tgz#6760cdd977f411d3e175bb064f2bc327d99b2b6e"
+  dependencies:
+    find-up "^2.1.0"
+    istanbul-lib-instrument "^1.7.5"
+    test-exclude "^4.1.1"
+
+babel-plugin-jest-hoist@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-20.0.3.tgz#afedc853bd3f8dc3548ea671fbe69d03cc2c1767"
+
+babel-plugin-syntax-async-functions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+
+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-dynamic-import@6.18.0, babel-plugin-syntax-dynamic-import@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
+
+babel-plugin-syntax-exponentiation-operator@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+
+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-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.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.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-class-properties@6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-plugin-syntax-class-properties "^6.8.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+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.23.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-plugin-transform-es2015-classes@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+  dependencies:
+    babel-helper-define-map "^6.24.1"
+    babel-helper-function-name "^6.24.1"
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-helper-replace-supers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-computed-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-destructuring@6.23.0, babel-plugin-transform-es2015-destructuring@^6.23.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.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-for-of@^6.23.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.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+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.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
+  dependencies:
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-types "^6.26.0"
+
+babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-umd@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
+  dependencies:
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-object-super@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+  dependencies:
+    babel-helper-replace-supers "^6.24.1"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-parameters@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+  dependencies:
+    babel-helper-call-delegate "^6.24.1"
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+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.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+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.23.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.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    regexpu-core "^2.0.0"
+
+babel-plugin-transform-exponentiation-operator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+  dependencies:
+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
+    babel-plugin-syntax-exponentiation-operator "^6.8.0"
+    babel-runtime "^6.22.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-object-rest-spread@6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.8.0"
+    babel-runtime "^6.26.0"
+
+babel-plugin-transform-react-constant-elements@6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-constant-elements/-/babel-plugin-transform-react-constant-elements-6.23.0.tgz#2f119bf4d2cdd45eb9baaae574053c604f6147dd"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-react-display-name@^6.23.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+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.22.0"
+
+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.22.0"
+
+babel-plugin-transform-react-jsx@6.24.1, babel-plugin-transform-react-jsx@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3"
+  dependencies:
+    babel-helper-builder-react-jsx "^6.24.1"
+    babel-plugin-syntax-jsx "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-regenerator@6.26.0, babel-plugin-transform-regenerator@^6.22.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
+  dependencies:
+    regenerator-transform "^0.10.0"
+
+babel-plugin-transform-runtime@6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-strict-mode@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-preset-env@1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48"
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-to-generator "^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.23.0"
+    babel-plugin-transform-es2015-classes "^6.23.0"
+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-destructuring "^6.23.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-for-of "^6.23.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.23.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-umd "^6.23.0"
+    babel-plugin-transform-es2015-object-super "^6.22.0"
+    babel-plugin-transform-es2015-parameters "^6.23.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.23.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
+    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-regenerator "^6.22.0"
+    browserslist "^2.1.2"
+    invariant "^2.2.2"
+    semver "^5.3.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@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-20.0.3.tgz#cbacaadecb5d689ca1e1de1360ebfc66862c178a"
+  dependencies:
+    babel-plugin-jest-hoist "^20.0.3"
+
+babel-preset-react-app@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-3.1.2.tgz#49ba3681b917c4e5c73a5249d3ef4c48fae064e2"
+  dependencies:
+    babel-plugin-dynamic-import-node "1.1.0"
+    babel-plugin-syntax-dynamic-import "6.18.0"
+    babel-plugin-transform-class-properties "6.24.1"
+    babel-plugin-transform-es2015-destructuring "6.23.0"
+    babel-plugin-transform-object-rest-spread "6.26.0"
+    babel-plugin-transform-react-constant-elements "6.23.0"
+    babel-plugin-transform-react-jsx "6.24.1"
+    babel-plugin-transform-react-jsx-self "6.22.0"
+    babel-plugin-transform-react-jsx-source "6.22.0"
+    babel-plugin-transform-regenerator "6.26.0"
+    babel-plugin-transform-runtime "6.23.0"
+    babel-preset-env "1.6.1"
+    babel-preset-react "6.24.1"
+
+babel-preset-react@6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380"
+  dependencies:
+    babel-plugin-syntax-jsx "^6.3.13"
+    babel-plugin-transform-react-display-name "^6.23.0"
+    babel-plugin-transform-react-jsx "^6.24.1"
+    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.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  dependencies:
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.17.4"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.15"
+
+babel-runtime@6.26.0, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
+babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
+babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
+babylon@^6.17.0, babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+
+bail@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.2.tgz#f7d6c1731630a9f9f0d4d35ed1f962e2074a1764"
+
+balanced-match@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
+base64-js@^1.0.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
+
+batch@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+
+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.2.0"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+
+binary-extensions@^1.0.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
+
+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"
+
+bluebird@^3.4.7:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+
+body-parser@1.18.2:
+  version "1.18.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
+  dependencies:
+    bytes "3.0.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.1"
+    http-errors "~1.6.2"
+    iconv-lite "0.4.19"
+    on-finished "~2.3.0"
+    qs "6.5.1"
+    raw-body "2.3.2"
+    type-is "~1.6.15"
+
+bonjour@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+  dependencies:
+    array-flatten "^2.1.0"
+    deep-equal "^1.0.1"
+    dns-equal "^1.0.0"
+    dns-txt "^2.0.2"
+    multicast-dns "^6.0.1"
+    multicast-dns-service-types "^1.1.0"
+
+boolbase@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+
+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"
+
+boom@4.x.x:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
+  dependencies:
+    hoek "4.x.x"
+
+boom@5.x.x:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
+  dependencies:
+    hoek "4.x.x"
+
+bowser@^1.7.3:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.9.1.tgz#f86ef2132e8cb10b3eb6ea5af018758c587020db"
+
+boxen@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-0.6.0.tgz#8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6"
+  dependencies:
+    ansi-align "^1.1.0"
+    camelcase "^2.1.0"
+    chalk "^1.1.1"
+    cli-boxes "^1.0.0"
+    filled-array "^1.0.0"
+    object-assign "^4.0.1"
+    repeating "^2.0.0"
+    string-width "^1.0.1"
+    widest-line "^1.0.0"
+
+brace-expansion@^1.0.0, brace-expansion@^1.1.7:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
+  dependencies:
+    balanced-match "^1.0.0"
+    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"
+
+brorand@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+
+browser-resolve@^1.11.2:
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
+  dependencies:
+    resolve "1.1.7"
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+
+browserify-rsa@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  dependencies:
+    bn.js "^4.1.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  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"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.2"
+    elliptic "^6.0.0"
+    inherits "^2.0.1"
+    parse-asn1 "^5.0.0"
+
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  dependencies:
+    pako "~1.0.5"
+
+browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
+  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"
+
+browserslist@^2.1.2, browserslist@^2.5.1:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.0.tgz#50350d6873a82ebe0f3ae5483658c571ae5f9d7d"
+  dependencies:
+    caniuse-lite "^1.0.30000784"
+    electron-to-chromium "^1.3.30"
+
+bser@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-1.0.2.tgz#381116970b2a6deea5646dd15dd7278444b56169"
+  dependencies:
+    node-int64 "^0.4.0"
+
+bser@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
+  dependencies:
+    node-int64 "^0.4.0"
+
+buffer-indexof@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+
+buffer@^4.3.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-modules@^1.0.0, builtin-modules@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+
+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"
+
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+
+caller-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  dependencies:
+    callsites "^0.2.0"
+
+callsites@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+
+camel-case@3.0.x:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
+  dependencies:
+    no-case "^2.2.0"
+    upper-case "^1.1.1"
+
+camelcase-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  dependencies:
+    camelcase "^2.0.0"
+    map-obj "^1.0.0"
+
+camelcase@^1.0.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+
+camelcase@^2.0.0, camelcase@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+
+camelcase@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+
+camelcase@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+
+caniuse-api@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
+  dependencies:
+    browserslist "^1.3.6"
+    caniuse-db "^1.0.30000529"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
+  version "1.0.30000789"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000789.tgz#5cf3fec75480041ab162ca06413153141e234325"
+
+caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000784:
+  version "1.0.30000789"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000789.tgz#2e3d937b267133f63635ef7f441fac66360fc889"
+
+capture-stack-trace@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
+
+case-sensitive-paths-webpack-plugin@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.1.1.tgz#3d29ced8c1f124bf6f53846fb3f5894731fdc909"
+
+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.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+  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"
+
+chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
+character-entities-legacy@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz#f40779df1a101872bb510a3d295e1fccf147202f"
+
+character-entities@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.1.tgz#f76871be5ef66ddb7f8f8e3478ecc374c27d6dca"
+
+character-reference-invalid@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz#942835f750e4ec61a308e60c2ef8cc1011202efc"
+
+chardet@^0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
+
+chokidar@^1.6.0, chokidar@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+  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"
+
+chownr@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+
+ci-info@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.2.tgz#03561259db48d0474c8bdc90f5b47b068b6bbfb4"
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+circular-json@^0.3.1:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
+
+clap@^1.0.9:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
+  dependencies:
+    chalk "^1.1.3"
+
+clean-css@4.1.x:
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.9.tgz#35cee8ae7687a49b98034f70de00c4edd3826301"
+  dependencies:
+    source-map "0.5.x"
+
+cli-boxes@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-width@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+
+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"
+
+cliui@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
+clone@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
+coa@~1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
+  dependencies:
+    q "^1.1.2"
+
+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"
+
+collapse-white-space@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.3.tgz#4b906f670e5a963a87b76b0e1689643341b6023c"
+
+color-convert@^1.3.0, color-convert@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
+  dependencies:
+    color-name "^1.1.1"
+
+color-name@^1.0.0, color-name@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+
+color-string@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
+  dependencies:
+    color-name "^1.0.0"
+
+color@^0.11.0:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+  dependencies:
+    clone "^1.0.2"
+    color-convert "^1.3.0"
+    color-string "^0.3.0"
+
+colormin@^1.0.5:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
+  dependencies:
+    color "^0.11.0"
+    css-color-names "0.0.4"
+    has "^1.0.1"
+
+colors@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+
+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"
+
+commander@2.12.x, commander@~2.12.1:
+  version "2.12.2"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+
+compressible@~2.0.11:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.12.tgz#c59a5c99db76767e9876500e271ef63b3493bd66"
+  dependencies:
+    mime-db ">= 1.30.0 < 2"
+
+compression@^1.5.2:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.1.tgz#eff2603efc2e22cf86f35d2eb93589f9875373db"
+  dependencies:
+    accepts "~1.3.4"
+    bytes "3.0.0"
+    compressible "~2.0.11"
+    debug "2.6.9"
+    on-headers "~1.0.1"
+    safe-buffer "5.1.1"
+    vary "~1.1.2"
+
+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.6.0:
+  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"
+
+configstore@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-2.1.0.tgz#737a3a7036e9886102aa6099e47bb33ab1aba1a1"
+  dependencies:
+    dot-prop "^3.0.0"
+    graceful-fs "^4.1.2"
+    mkdirp "^0.5.0"
+    object-assign "^4.0.1"
+    os-tmpdir "^1.0.0"
+    osenv "^0.1.0"
+    uuid "^2.0.1"
+    write-file-atomic "^1.1.2"
+    xdg-basedir "^2.0.0"
+
+connect-history-api-fallback@^1.3.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
+
+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"
+
+contains-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+
+content-disposition@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+
+content-type-parser@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7"
+
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+
+convert-source-map@^1.4.0, convert-source-map@^1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
+
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+
+cookie@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+
+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, core-js@^2.5.0:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
+
+core-util-is@1.0.2, 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"
+
+cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892"
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.4.3"
+    minimist "^1.2.0"
+    object-assign "^4.1.0"
+    os-homedir "^1.0.1"
+    parse-json "^2.2.0"
+    require-from-string "^1.1.0"
+
+create-ecdh@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.0.0"
+
+create-error-class@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
+  dependencies:
+    capture-stack-trace "^1.0.0"
+
+create-hash@^1.1.0, create-hash@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06"
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+cross-spawn@5.1.0, cross-spawn@^5.0.1, cross-spawn@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  dependencies:
+    lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+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"
+
+cryptiles@3.x.x:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
+  dependencies:
+    boom "5.x.x"
+
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
+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-in-js-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-2.0.0.tgz#5af1dd70f4b06b331f48d22a3d86e0786c0b9435"
+  dependencies:
+    hyphenate-style-name "^1.0.2"
+
+css-loader@0.28.7:
+  version "0.28.7"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b"
+  dependencies:
+    babel-code-frame "^6.11.0"
+    css-selector-tokenizer "^0.7.0"
+    cssnano ">=2.6.1 <4"
+    icss-utils "^2.1.0"
+    loader-utils "^1.0.2"
+    lodash.camelcase "^4.3.0"
+    object-assign "^4.0.1"
+    postcss "^5.0.6"
+    postcss-modules-extract-imports "^1.0.0"
+    postcss-modules-local-by-default "^1.0.1"
+    postcss-modules-scope "^1.0.0"
+    postcss-modules-values "^1.1.0"
+    postcss-value-parser "^3.3.0"
+    source-list-map "^2.0.0"
+
+css-select@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  dependencies:
+    boolbase "~1.0.0"
+    css-what "2.1"
+    domutils "1.5.1"
+    nth-check "~1.0.1"
+
+css-selector-tokenizer@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
+  dependencies:
+    cssesc "^0.1.0"
+    fastparse "^1.1.1"
+    regexpu-core "^1.0.0"
+
+css-what@2.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
+
+cssesc@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+
+"cssnano@>=2.6.1 <4":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
+  dependencies:
+    autoprefixer "^6.3.1"
+    decamelize "^1.1.2"
+    defined "^1.0.0"
+    has "^1.0.1"
+    object-assign "^4.0.1"
+    postcss "^5.0.14"
+    postcss-calc "^5.2.0"
+    postcss-colormin "^2.1.8"
+    postcss-convert-values "^2.3.4"
+    postcss-discard-comments "^2.0.4"
+    postcss-discard-duplicates "^2.0.1"
+    postcss-discard-empty "^2.0.1"
+    postcss-discard-overridden "^0.1.1"
+    postcss-discard-unused "^2.2.1"
+    postcss-filter-plugins "^2.0.0"
+    postcss-merge-idents "^2.1.5"
+    postcss-merge-longhand "^2.0.1"
+    postcss-merge-rules "^2.0.3"
+    postcss-minify-font-values "^1.0.2"
+    postcss-minify-gradients "^1.0.1"
+    postcss-minify-params "^1.0.4"
+    postcss-minify-selectors "^2.0.4"
+    postcss-normalize-charset "^1.1.0"
+    postcss-normalize-url "^3.0.7"
+    postcss-ordered-values "^2.1.0"
+    postcss-reduce-idents "^2.2.2"
+    postcss-reduce-initial "^1.0.0"
+    postcss-reduce-transforms "^1.0.3"
+    postcss-svgo "^2.1.1"
+    postcss-unique-selectors "^2.0.2"
+    postcss-value-parser "^3.2.3"
+    postcss-zindex "^2.0.1"
+
+csso@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
+  dependencies:
+    clap "^1.0.9"
+    source-map "^0.5.3"
+
+cssom@0.3.x, "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:
+    cssom "0.3.x"
+
+currently-unhandled@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  dependencies:
+    array-find-index "^1.0.1"
+
+d3-array@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.1.tgz#d1ca33de2f6ac31efadb8e050a021d7e2396d5dc"
+
+d3-collection@1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.4.tgz#342dfd12837c90974f33f1cc0a785aea570dcdc2"
+
+d3-color@1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.0.3.tgz#bc7643fca8e53a8347e2fbdaffa236796b58509b"
+
+d3-ease@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.3.tgz#68bfbc349338a380c44d8acc4fbc3304aa2d8c0e"
+
+d3-format@1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.2.2.tgz#1a39c479c8a57fe5051b2e67a3bee27061a74e7a"
+
+d3-interpolate@1, d3-interpolate@^1.1.1:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.1.6.tgz#2cf395ae2381804df08aa1bf766b7f97b5f68fb6"
+  dependencies:
+    d3-color "1"
+
+d3-path@1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.5.tgz#241eb1849bd9e9e8021c0d0a799f8a0e8e441764"
+
+d3-scale@^1.0.0:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-1.0.7.tgz#fa90324b3ea8a776422bd0472afab0b252a0945d"
+  dependencies:
+    d3-array "^1.2.0"
+    d3-collection "1"
+    d3-color "1"
+    d3-format "1"
+    d3-interpolate "1"
+    d3-time "1"
+    d3-time-format "2"
+
+d3-shape@^1.0.0, d3-shape@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.0.tgz#45d01538f064bafd05ea3d6d2cb748fd8c41f777"
+  dependencies:
+    d3-path "1"
+
+d3-time-format@2:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.1.1.tgz#85b7cdfbc9ffca187f14d3c456ffda268081bb31"
+  dependencies:
+    d3-time "1"
+
+d3-time@1:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.8.tgz#dbd2d6007bf416fe67a76d17947b784bffea1e84"
+
+d3-timer@^1.0.0:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.7.tgz#df9650ca587f6c96607ff4e60cc38229e8dd8531"
+
+d3-voronoi@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.2.tgz#1687667e8f13a2d158c80c1480c5a29cb0d8973c"
+
+d@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  dependencies:
+    es5-ext "^0.10.9"
+
+damerau-levenshtein@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
+
+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.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.0.1, debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
+decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+
+deep-equal@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+
+deep-extend@~0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
+
+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"
+
+define-properties@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
+  dependencies:
+    foreach "^2.0.5"
+    object-keys "^1.0.8"
+
+defined@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+
+del@^2.0.2, del@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  dependencies:
+    globby "^5.0.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    rimraf "^2.2.8"
+
+del@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  dependencies:
+    globby "^6.1.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    p-map "^1.1.1"
+    pify "^3.0.0"
+    rimraf "^2.2.8"
+
+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"
+
+depd@1.1.1, depd@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
+
+des.js@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+
+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"
+
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+
+detect-node@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
+
+detect-port-alt@1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275"
+  dependencies:
+    address "^1.0.1"
+    debug "^2.6.0"
+
+diff@^3.2.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
+
+diffie-hellman@^5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+dns-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+
+dns-packet@^1.0.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.2.2.tgz#a8a26bec7646438963fc86e06f8f8b16d6c8bf7a"
+  dependencies:
+    ip "^1.1.0"
+    safe-buffer "^5.0.1"
+
+dns-txt@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+  dependencies:
+    buffer-indexof "^1.0.0"
+
+doctrine@1.5.0:
+  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"
+
+doctrine@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  dependencies:
+    esutils "^2.0.2"
+
+dom-converter@~0.1:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
+  dependencies:
+    utila "~0.3"
+
+dom-serializer@0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+  dependencies:
+    domelementtype "~1.1.1"
+    entities "~1.1.1"
+
+dom-urls@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/dom-urls/-/dom-urls-1.1.0.tgz#001ddf81628cd1e706125c7176f53ccec55d918e"
+  dependencies:
+    urijs "^1.16.1"
+
+domain-browser@^1.1.1:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
+
+domelementtype@1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+
+domelementtype@~1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+
+domhandler@2.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
+  dependencies:
+    domelementtype "1"
+
+domutils@1.1:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
+  dependencies:
+    domelementtype "1"
+
+domutils@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+dot-prop@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
+  dependencies:
+    is-obj "^1.0.0"
+
+dotenv-expand@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275"
+
+dotenv@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
+
+duplexer2@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+  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"
+
+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"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+
+electron-releases@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e"
+
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
+  version "1.3.30"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80"
+  dependencies:
+    electron-releases "^2.1.0"
+
+elliptic@^6.0.0:
+  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"
+
+emoji-regex@^6.1.0:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.5.1.tgz#9baea929b155565c11ea41c6626eaa65cef992c2"
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+
+encodeurl@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
+
+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@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.4.0"
+    object-assign "^4.0.1"
+    tapable "^0.2.7"
+
+entities@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+
+errno@^0.1.3, errno@^0.1.4:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.6.tgz#c386ce8a6283f14fc09563b71560908c9bf53026"
+  dependencies:
+    prr "~1.0.1"
+
+error-ex@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+  dependencies:
+    is-arrayish "^0.2.1"
+
+es-abstract@^1.7.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
+  dependencies:
+    es-to-primitive "^1.1.1"
+    function-bind "^1.1.1"
+    has "^1.0.1"
+    is-callable "^1.1.3"
+    is-regex "^1.0.4"
+
+es-to-primitive@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
+  dependencies:
+    is-callable "^1.1.1"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.1"
+
+es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
+  version "0.10.37"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3"
+  dependencies:
+    es6-iterator "~2.0.1"
+    es6-symbol "~3.1.1"
+
+es6-iterator@^2.0.1, es6-iterator@~2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
+es6-map@^0.1.3:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+  dependencies:
+    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-promise@^4.0.5:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.2.tgz#f722d7769af88bd33bc13ec6605e1f92966b82d9"
+
+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 "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-symbol "3.1.1"
+    event-emitter "~0.3.5"
+
+es6-symbol@3.1.1, es6-symbol@^3.1.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 "1"
+    es5-ext "~0.10.14"
+
+es6-weak-map@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.14"
+    es6-iterator "^2.0.1"
+    es6-symbol "^3.1.1"
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+escodegen@^1.6.1:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.5.6"
+
+escope@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
+  dependencies:
+    es6-map "^0.1.3"
+    es6-weak-map "^2.0.1"
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-config-react-app@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-2.1.0.tgz#23c909f71cbaff76b945b831d2d814b8bde169eb"
+
+eslint-import-resolver-node@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
+  dependencies:
+    debug "^2.6.9"
+    resolve "^1.5.0"
+
+eslint-loader@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-1.9.0.tgz#7e1be9feddca328d3dcfaef1ad49d5beffe83a13"
+  dependencies:
+    loader-fs-cache "^1.0.0"
+    loader-utils "^1.0.2"
+    object-assign "^4.0.1"
+    object-hash "^1.1.4"
+    rimraf "^2.6.1"
+
+eslint-module-utils@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz#abaec824177613b8a95b299639e1b6facf473449"
+  dependencies:
+    debug "^2.6.8"
+    pkg-dir "^1.0.0"
+
+eslint-plugin-flowtype@2.39.1:
+  version "2.39.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.39.1.tgz#b5624622a0388bcd969f4351131232dcb9649cd5"
+  dependencies:
+    lodash "^4.15.0"
+
+eslint-plugin-import@2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.8.0.tgz#fa1b6ef31fcb3c501c09859c1b86f1fc5b986894"
+  dependencies:
+    builtin-modules "^1.1.1"
+    contains-path "^0.1.0"
+    debug "^2.6.8"
+    doctrine "1.5.0"
+    eslint-import-resolver-node "^0.3.1"
+    eslint-module-utils "^2.1.1"
+    has "^1.0.1"
+    lodash.cond "^4.3.0"
+    minimatch "^3.0.3"
+    read-pkg-up "^2.0.0"
+
+eslint-plugin-jsx-a11y@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-5.1.1.tgz#5c96bb5186ca14e94db1095ff59b3e2bd94069b1"
+  dependencies:
+    aria-query "^0.7.0"
+    array-includes "^3.0.3"
+    ast-types-flow "0.0.7"
+    axobject-query "^0.1.0"
+    damerau-levenshtein "^1.0.0"
+    emoji-regex "^6.1.0"
+    jsx-ast-utils "^1.4.0"
+
+eslint-plugin-react@7.4.0:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.4.0.tgz#300a95861b9729c087d362dd64abcc351a74364a"
+  dependencies:
+    doctrine "^2.0.0"
+    has "^1.0.1"
+    jsx-ast-utils "^2.0.0"
+    prop-types "^15.5.10"
+
+eslint-scope@^3.7.1:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint@4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.10.0.tgz#f25d0d7955c81968c2309aa5c9a229e045176bb7"
+  dependencies:
+    ajv "^5.2.0"
+    babel-code-frame "^6.22.0"
+    chalk "^2.1.0"
+    concat-stream "^1.6.0"
+    cross-spawn "^5.1.0"
+    debug "^3.0.1"
+    doctrine "^2.0.0"
+    eslint-scope "^3.7.1"
+    espree "^3.5.1"
+    esquery "^1.0.0"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    functional-red-black-tree "^1.0.1"
+    glob "^7.1.2"
+    globals "^9.17.0"
+    ignore "^3.3.3"
+    imurmurhash "^0.1.4"
+    inquirer "^3.0.6"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.9.1"
+    json-stable-stringify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.4"
+    minimatch "^3.0.2"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.2"
+    pluralize "^7.0.0"
+    progress "^2.0.0"
+    require-uncached "^1.0.3"
+    semver "^5.3.0"
+    strip-ansi "^4.0.0"
+    strip-json-comments "~2.0.1"
+    table "^4.0.1"
+    text-table "~0.2.0"
+
+espree@^3.5.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca"
+  dependencies:
+    acorn "^5.2.1"
+    acorn-jsx "^3.0.0"
+
+esprima@^2.6.0:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+
+esprima@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
+esprima@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+
+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.2.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
+  dependencies:
+    estraverse "^4.1.0"
+    object-assign "^4.0.1"
+
+estraverse@^4.0.0, estraverse@^4.1.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"
+
+esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+
+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 "1"
+    es5-ext "~0.10.14"
+
+eventemitter3@1.x.x:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
+
+events@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+
+eventsource@0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
+  dependencies:
+    original ">=0.0.5"
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
+exec-sh@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.1.tgz#163b98a6e89e6b65b47c2a28d215bc1f63989c38"
+  dependencies:
+    merge "^1.1.3"
+
+execa@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+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"
+
+expand-tilde@^2.0.0, expand-tilde@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  dependencies:
+    homedir-polyfill "^1.0.1"
+
+express@^4.13.3:
+  version "4.16.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"
+  dependencies:
+    accepts "~1.3.4"
+    array-flatten "1.1.1"
+    body-parser "1.18.2"
+    content-disposition "0.5.2"
+    content-type "~1.0.4"
+    cookie "0.3.1"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.1"
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "1.1.0"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.2"
+    qs "6.5.1"
+    range-parser "~1.2.0"
+    safe-buffer "5.1.1"
+    send "0.16.1"
+    serve-static "1.13.1"
+    setprototypeof "1.1.0"
+    statuses "~1.3.1"
+    type-is "~1.6.15"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
+extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+
+external-editor@^2.0.4:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
+  dependencies:
+    chardet "^0.4.0"
+    iconv-lite "^0.4.17"
+    tmp "^0.0.33"
+
+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"
+
+extract-text-webpack-plugin@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
+  dependencies:
+    async "^2.4.1"
+    loader-utils "^1.1.0"
+    schema-utils "^0.3.0"
+    webpack-sources "^1.0.1"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
+fast-deep-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+
+fastparse@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+
+faye-websocket@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+faye-websocket@~0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+fb-watchman@^1.8.0:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-1.9.2.tgz#a24cf47827f82d38fb59a69ad70b76e3b6ae7383"
+  dependencies:
+    bser "1.0.2"
+
+fb-watchman@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
+  dependencies:
+    bser "^2.0.0"
+
+fbjs@^0.8.12, fbjs@^0.8.16:
+  version "0.8.16"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
+  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"
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-entry-cache@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  dependencies:
+    flat-cache "^1.2.1"
+    object-assign "^4.0.1"
+
+file-loader@1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.5.tgz#91c25b6b6fbe56dae99f10a425fd64933b5c9daa"
+  dependencies:
+    loader-utils "^1.0.2"
+    schema-utils "^0.3.0"
+
+filename-regex@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+
+fileset@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  dependencies:
+    glob "^7.0.3"
+    minimatch "^3.0.3"
+
+filesize@3.5.11:
+  version "3.5.11"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.11.tgz#1919326749433bb3cf77368bd158caabcc19e9ee"
+
+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"
+
+filled-array@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/filled-array/-/filled-array-1.1.0.tgz#c3c4f6c663b923459a9aa29912d2d031f1507f84"
+
+finalhandler@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    statuses "~1.3.1"
+    unpipe "~1.0.0"
+
+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-cache-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^1.0.0"
+    pkg-dir "^2.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"
+
+find-up@^2.0.0, find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  dependencies:
+    locate-path "^2.0.0"
+
+flat-cache@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
+  dependencies:
+    circular-json "^0.3.1"
+    del "^2.0.2"
+    graceful-fs "^4.1.2"
+    write "^0.2.1"
+
+flatten@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+
+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"
+
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+
+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.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+form-data@~2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+forwarded@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+
+fs-extra@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^3.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^0.30.0:
+  version "0.30.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+    klaw "^1.0.0"
+    path-is-absolute "^1.0.0"
+    rimraf "^2.2.8"
+
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  dependencies:
+    minipass "^2.2.1"
+
+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.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
+  dependencies:
+    nan "^2.3.0"
+    node-pre-gyp "^0.6.39"
+
+fsevents@^1.1.3:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
+  dependencies:
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
+
+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"
+
+function-bind@^1.0.2, function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  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"
+
+get-caller-file@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+
+get-stdin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+
+get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  dependencies:
+    assert-plus "^1.0.0"
+
+glamor@^2.20.40:
+  version "2.20.40"
+  resolved "https://registry.yarnpkg.com/glamor/-/glamor-2.20.40.tgz#f606660357b7cf18dface731ad1a2cfa93817f05"
+  dependencies:
+    fbjs "^0.8.12"
+    inline-style-prefixer "^3.0.6"
+    object-assign "^4.1.1"
+    prop-types "^15.5.10"
+    through "^2.3.8"
+
+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.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global-modules@1.0.0, global-modules@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  dependencies:
+    global-prefix "^1.0.1"
+    is-windows "^1.0.1"
+    resolve-dir "^1.0.0"
+
+global-prefix@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  dependencies:
+    expand-tilde "^2.0.2"
+    homedir-polyfill "^1.0.1"
+    ini "^1.3.4"
+    is-windows "^1.0.1"
+    which "^1.2.14"
+
+globals@^9.17.0, globals@^9.18.0:
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+
+globby@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  dependencies:
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+got@^5.0.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/got/-/got-5.7.1.tgz#5f81635a61e4a6589f180569ea4e381680a51f35"
+  dependencies:
+    create-error-class "^3.0.1"
+    duplexer2 "^0.1.4"
+    is-redirect "^1.0.0"
+    is-retry-allowed "^1.0.0"
+    is-stream "^1.0.0"
+    lowercase-keys "^1.0.0"
+    node-status-codes "^1.0.0"
+    object-assign "^4.0.1"
+    parse-json "^2.1.0"
+    pinkie-promise "^2.0.0"
+    read-all-stream "^3.0.0"
+    readable-stream "^2.0.5"
+    timed-out "^3.0.0"
+    unzip-response "^1.0.2"
+    url-parse-lax "^1.0.0"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+growly@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+
+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"
+
+handle-thing@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
+
+handlebars@^4.0.3:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
+  dependencies:
+    async "^1.4.0"
+    optimist "^0.6.1"
+    source-map "^0.4.4"
+  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-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+
+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"
+
+har-validator@~5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  dependencies:
+    ajv "^5.1.0"
+    har-schema "^2.0.0"
+
+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-flag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+
+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.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+  dependencies:
+    function-bind "^1.0.2"
+
+hash-base@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
+  dependencies:
+    inherits "^2.0.1"
+
+hash-base@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.0"
+
+hawk@3.1.3, 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"
+
+hawk@~6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
+  dependencies:
+    boom "4.x.x"
+    cryptiles "3.x.x"
+    hoek "4.x.x"
+    sntp "2.x.x"
+
+he@1.1.x:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+
+hmac-drbg@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  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"
+
+hoek@4.x.x:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
+
+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"
+
+homedir-polyfill@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
+  dependencies:
+    parse-passwd "^1.0.0"
+
+hosted-git-info@^2.1.4:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
+
+hpack.js@^2.1.6:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+  dependencies:
+    inherits "^2.0.1"
+    obuf "^1.0.0"
+    readable-stream "^2.0.1"
+    wbuf "^1.1.0"
+
+html-comment-regex@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
+
+html-encoding-sniffer@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  dependencies:
+    whatwg-encoding "^1.0.1"
+
+html-entities@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
+
+html-minifier@^3.2.3:
+  version "3.5.8"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.8.tgz#5ccdb1f73a0d654e6090147511f6e6b2ee312700"
+  dependencies:
+    camel-case "3.0.x"
+    clean-css "4.1.x"
+    commander "2.12.x"
+    he "1.1.x"
+    ncname "1.0.x"
+    param-case "2.1.x"
+    relateurl "0.2.x"
+    uglify-js "3.3.x"
+
+html-webpack-plugin@2.29.0:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.29.0.tgz#e987f421853d3b6938c8c4c8171842e5fd17af23"
+  dependencies:
+    bluebird "^3.4.7"
+    html-minifier "^3.2.3"
+    loader-utils "^0.2.16"
+    lodash "^4.17.3"
+    pretty-error "^2.0.2"
+    toposort "^1.0.0"
+
+htmlparser2@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
+  dependencies:
+    domelementtype "1"
+    domhandler "2.1"
+    domutils "1.1"
+    readable-stream "1.0"
+
+http-deceiver@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
+
+http-errors@1.6.2, http-errors@~1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
+  dependencies:
+    depd "1.1.1"
+    inherits "2.0.3"
+    setprototypeof "1.0.3"
+    statuses ">= 1.3.1 < 2"
+
+http-parser-js@>=0.4.0:
+  version "0.4.9"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.9.tgz#ea1a04fb64adff0242e9974f297dd4c3cad271e1"
+
+http-proxy-middleware@~0.17.4:
+  version "0.17.4"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833"
+  dependencies:
+    http-proxy "^1.16.2"
+    is-glob "^3.1.0"
+    lodash "^4.17.2"
+    micromatch "^2.3.11"
+
+http-proxy@^1.16.2:
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
+  dependencies:
+    eventemitter3 "1.x.x"
+    requires-port "1.x.x"
+
+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"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+
+hyphenate-style-name@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b"
+
+iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@~0.4.13:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
+
+iconv-lite@^0.4.4:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+icss-replace-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+
+icss-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
+  dependencies:
+    postcss "^6.0.1"
+
+ieee754@^1.1.4:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
+
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  dependencies:
+    minimatch "^3.0.4"
+
+ignore@^3.3.3:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
+
+import-local@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-0.1.1.tgz#b1179572aacdc11c6a91009fb430dbcab5f668a8"
+  dependencies:
+    pkg-dir "^2.0.0"
+    resolve-cwd "^2.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+
+indent-string@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  dependencies:
+    repeating "^2.0.0"
+
+indexes-of@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+
+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.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+  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.4, ini@~1.3.0:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+
+inline-style-prefixer@^3.0.6:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-3.0.8.tgz#8551b8e5b4d573244e66a34b04f7d32076a2b534"
+  dependencies:
+    bowser "^1.7.3"
+    css-in-js-utils "^2.0.0"
+
+inquirer@3.3.0, inquirer@^3.0.6:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.0.4"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rx-lite "^4.0.8"
+    rx-lite-aggregates "^4.0.8"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
+internal-ip@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
+  dependencies:
+    meow "^3.3.0"
+
+interpret@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+
+invariant@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+  dependencies:
+    loose-envify "^1.0.0"
+
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+
+ip@^1.1.0, ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+
+ipaddr.js@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
+
+is-absolute-url@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
+
+is-alphabetical@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.1.tgz#c77079cc91d4efac775be1034bf2d243f95e6f08"
+
+is-alphanumerical@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz#dfb4aa4d1085e33bdb61c2dee9c80e9c6c19f53b"
+  dependencies:
+    is-alphabetical "^1.0.0"
+    is-decimal "^1.0.0"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+
+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.1.4, is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+
+is-builtin-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  dependencies:
+    builtin-modules "^1.0.0"
+
+is-callable@^1.1.1, is-callable@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+
+is-ci@^1.0.10:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
+  dependencies:
+    ci-info "^1.0.0"
+
+is-date-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+
+is-decimal@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.1.tgz#f5fb6a94996ad9e8e3761fbfbd091f1fca8c4e82"
+
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+
+is-dotfile@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+
+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-extglob@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+
+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-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+
+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-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-hexadecimal@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz#6e084bbc92061fbb0971ec58b6ce6d404e24da69"
+
+is-npm@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
+
+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-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  dependencies:
+    path-is-inside "^1.0.1"
+
+is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+
+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-promise@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+
+is-redirect@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
+
+is-regex@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  dependencies:
+    has "^1.0.1"
+
+is-resolvable@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.1.tgz#acca1cd36dbe44b974b924321555a70ba03b1cf4"
+
+is-retry-allowed@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
+
+is-root@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-root/-/is-root-1.0.0.tgz#07b6c233bc394cd9d02ba15c966bd6660d6342d5"
+
+is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+
+is-svg@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
+  dependencies:
+    html-comment-regex "^1.1.0"
+
+is-symbol@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+
+is-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+
+is-whitespace-character@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.1.tgz#9ae0176f3282b65457a1992cdb084f8a5f833e3b"
+
+is-windows@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
+
+is-word-character@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.1.tgz#5a03fa1ea91ace8a6eb0c7cd770eb86d65c8befb"
+
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+
+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@^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"
+  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"
+
+istanbul-api@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.2.1.tgz#0c60a0515eb11c7d65c6b50bba2c6e999acd8620"
+  dependencies:
+    async "^2.1.4"
+    fileset "^2.0.2"
+    istanbul-lib-coverage "^1.1.1"
+    istanbul-lib-hook "^1.1.0"
+    istanbul-lib-instrument "^1.9.1"
+    istanbul-lib-report "^1.1.2"
+    istanbul-lib-source-maps "^1.2.2"
+    istanbul-reports "^1.1.3"
+    js-yaml "^3.7.0"
+    mkdirp "^0.5.1"
+    once "^1.4.0"
+
+istanbul-lib-coverage@^1.0.1, istanbul-lib-coverage@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
+
+istanbul-lib-hook@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b"
+  dependencies:
+    append-transform "^0.4.0"
+
+istanbul-lib-instrument@^1.4.2, istanbul-lib-instrument@^1.7.5, istanbul-lib-instrument@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz#250b30b3531e5d3251299fdd64b0b2c9db6b558e"
+  dependencies:
+    babel-generator "^6.18.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.18.0"
+    babel-types "^6.18.0"
+    babylon "^6.18.0"
+    istanbul-lib-coverage "^1.1.1"
+    semver "^5.3.0"
+
+istanbul-lib-report@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz#922be27c13b9511b979bd1587359f69798c1d425"
+  dependencies:
+    istanbul-lib-coverage "^1.1.1"
+    mkdirp "^0.5.1"
+    path-parse "^1.0.5"
+    supports-color "^3.1.2"
+
+istanbul-lib-source-maps@^1.1.0, istanbul-lib-source-maps@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz#750578602435f28a0c04ee6d7d9e0f2960e62c1c"
+  dependencies:
+    debug "^3.1.0"
+    istanbul-lib-coverage "^1.1.1"
+    mkdirp "^0.5.1"
+    rimraf "^2.6.1"
+    source-map "^0.5.3"
+
+istanbul-reports@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.3.tgz#3b9e1e8defb6d18b1d425da8e8b32c5a163f2d10"
+  dependencies:
+    handlebars "^4.0.3"
+
+jest-changed-files@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-20.0.3.tgz#9394d5cc65c438406149bef1bf4d52b68e03e3f8"
+
+jest-cli@^20.0.4:
+  version "20.0.4"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-20.0.4.tgz#e532b19d88ae5bc6c417e8b0593a6fe954b1dc93"
+  dependencies:
+    ansi-escapes "^1.4.0"
+    callsites "^2.0.0"
+    chalk "^1.1.3"
+    graceful-fs "^4.1.11"
+    is-ci "^1.0.10"
+    istanbul-api "^1.1.1"
+    istanbul-lib-coverage "^1.0.1"
+    istanbul-lib-instrument "^1.4.2"
+    istanbul-lib-source-maps "^1.1.0"
+    jest-changed-files "^20.0.3"
+    jest-config "^20.0.4"
+    jest-docblock "^20.0.3"
+    jest-environment-jsdom "^20.0.3"
+    jest-haste-map "^20.0.4"
+    jest-jasmine2 "^20.0.4"
+    jest-message-util "^20.0.3"
+    jest-regex-util "^20.0.3"
+    jest-resolve-dependencies "^20.0.3"
+    jest-runtime "^20.0.4"
+    jest-snapshot "^20.0.3"
+    jest-util "^20.0.3"
+    micromatch "^2.3.11"
+    node-notifier "^5.0.2"
+    pify "^2.3.0"
+    slash "^1.0.0"
+    string-length "^1.0.1"
+    throat "^3.0.0"
+    which "^1.2.12"
+    worker-farm "^1.3.1"
+    yargs "^7.0.2"
+
+jest-config@^20.0.4:
+  version "20.0.4"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-20.0.4.tgz#e37930ab2217c913605eff13e7bd763ec48faeea"
+  dependencies:
+    chalk "^1.1.3"
+    glob "^7.1.1"
+    jest-environment-jsdom "^20.0.3"
+    jest-environment-node "^20.0.3"
+    jest-jasmine2 "^20.0.4"
+    jest-matcher-utils "^20.0.3"
+    jest-regex-util "^20.0.3"
+    jest-resolve "^20.0.4"
+    jest-validate "^20.0.3"
+    pretty-format "^20.0.3"
+
+jest-diff@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-20.0.3.tgz#81f288fd9e675f0fb23c75f1c2b19445fe586617"
+  dependencies:
+    chalk "^1.1.3"
+    diff "^3.2.0"
+    jest-matcher-utils "^20.0.3"
+    pretty-format "^20.0.3"
+
+jest-docblock@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712"
+
+jest-environment-jsdom@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-20.0.3.tgz#048a8ac12ee225f7190417713834bb999787de99"
+  dependencies:
+    jest-mock "^20.0.3"
+    jest-util "^20.0.3"
+    jsdom "^9.12.0"
+
+jest-environment-node@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-20.0.3.tgz#d488bc4612af2c246e986e8ae7671a099163d403"
+  dependencies:
+    jest-mock "^20.0.3"
+    jest-util "^20.0.3"
+
+jest-haste-map@^20.0.4:
+  version "20.0.5"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-20.0.5.tgz#abad74efb1a005974a7b6517e11010709cab9112"
+  dependencies:
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.1.11"
+    jest-docblock "^20.0.3"
+    micromatch "^2.3.11"
+    sane "~1.6.0"
+    worker-farm "^1.3.1"
+
+jest-jasmine2@^20.0.4:
+  version "20.0.4"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-20.0.4.tgz#fcc5b1411780d911d042902ef1859e852e60d5e1"
+  dependencies:
+    chalk "^1.1.3"
+    graceful-fs "^4.1.11"
+    jest-diff "^20.0.3"
+    jest-matcher-utils "^20.0.3"
+    jest-matchers "^20.0.3"
+    jest-message-util "^20.0.3"
+    jest-snapshot "^20.0.3"
+    once "^1.4.0"
+    p-map "^1.1.1"
+
+jest-matcher-utils@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-20.0.3.tgz#b3a6b8e37ca577803b0832a98b164f44b7815612"
+  dependencies:
+    chalk "^1.1.3"
+    pretty-format "^20.0.3"
+
+jest-matchers@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-20.0.3.tgz#ca69db1c32db5a6f707fa5e0401abb55700dfd60"
+  dependencies:
+    jest-diff "^20.0.3"
+    jest-matcher-utils "^20.0.3"
+    jest-message-util "^20.0.3"
+    jest-regex-util "^20.0.3"
+
+jest-message-util@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-20.0.3.tgz#6aec2844306fcb0e6e74d5796c1006d96fdd831c"
+  dependencies:
+    chalk "^1.1.3"
+    micromatch "^2.3.11"
+    slash "^1.0.0"
+
+jest-mock@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-20.0.3.tgz#8bc070e90414aa155c11a8d64c869a0d5c71da59"
+
+jest-regex-util@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-20.0.3.tgz#85bbab5d133e44625b19faf8c6aa5122d085d762"
+
+jest-resolve-dependencies@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-20.0.3.tgz#6e14a7b717af0f2cb3667c549de40af017b1723a"
+  dependencies:
+    jest-regex-util "^20.0.3"
+
+jest-resolve@^20.0.4:
+  version "20.0.4"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-20.0.4.tgz#9448b3e8b6bafc15479444c6499045b7ffe597a5"
+  dependencies:
+    browser-resolve "^1.11.2"
+    is-builtin-module "^1.0.0"
+    resolve "^1.3.2"
+
+jest-runtime@^20.0.4:
+  version "20.0.4"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-20.0.4.tgz#a2c802219c4203f754df1404e490186169d124d8"
+  dependencies:
+    babel-core "^6.0.0"
+    babel-jest "^20.0.3"
+    babel-plugin-istanbul "^4.0.0"
+    chalk "^1.1.3"
+    convert-source-map "^1.4.0"
+    graceful-fs "^4.1.11"
+    jest-config "^20.0.4"
+    jest-haste-map "^20.0.4"
+    jest-regex-util "^20.0.3"
+    jest-resolve "^20.0.4"
+    jest-util "^20.0.3"
+    json-stable-stringify "^1.0.1"
+    micromatch "^2.3.11"
+    strip-bom "3.0.0"
+    yargs "^7.0.2"
+
+jest-snapshot@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-20.0.3.tgz#5b847e1adb1a4d90852a7f9f125086e187c76566"
+  dependencies:
+    chalk "^1.1.3"
+    jest-diff "^20.0.3"
+    jest-matcher-utils "^20.0.3"
+    jest-util "^20.0.3"
+    natural-compare "^1.4.0"
+    pretty-format "^20.0.3"
+
+jest-util@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-20.0.3.tgz#0c07f7d80d82f4e5a67c6f8b9c3fe7f65cfd32ad"
+  dependencies:
+    chalk "^1.1.3"
+    graceful-fs "^4.1.11"
+    jest-message-util "^20.0.3"
+    jest-mock "^20.0.3"
+    jest-validate "^20.0.3"
+    leven "^2.1.0"
+    mkdirp "^0.5.1"
+
+jest-validate@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-20.0.3.tgz#d0cfd1de4f579f298484925c280f8f1d94ec3cab"
+  dependencies:
+    chalk "^1.1.3"
+    jest-matcher-utils "^20.0.3"
+    leven "^2.1.0"
+    pretty-format "^20.0.3"
+
+jest@20.0.4:
+  version "20.0.4"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-20.0.4.tgz#3dd260c2989d6dad678b1e9cc4d91944f6d602ac"
+  dependencies:
+    jest-cli "^20.0.4"
+
+js-base64@^2.1.9:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa"
+
+js-tokens@^3.0.0, js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+
+js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.9.1:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+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"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+
+jsdom@^9.12.0:
+  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"
+    acorn-globals "^3.1.0"
+    array-equal "^1.0.0"
+    content-type-parser "^1.0.1"
+    cssom ">= 0.3.2 < 0.4.0"
+    cssstyle ">= 0.2.37 < 0.3.0"
+    escodegen "^1.6.1"
+    html-encoding-sniffer "^1.0.1"
+    nwmatcher ">= 1.3.9 < 2.0.0"
+    parse5 "^1.5.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.3.0"
+    xml-name-validator "^2.0.1"
+
+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-loader@^0.5.4:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
+
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+
+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"
+
+json3@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+
+json5@^0.5.0, json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+
+jsonfile@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonfile@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+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.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+jsx-ast-utils@^1.4.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
+
+jsx-ast-utils@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
+  dependencies:
+    array-includes "^3.0.3"
+
+killable@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b"
+
+kind-of@^3.0.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  dependencies:
+    is-buffer "^1.1.5"
+
+klaw@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
+  optionalDependencies:
+    graceful-fs "^4.1.9"
+
+latest-version@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-2.0.0.tgz#56f8d6139620847b8017f8f1f4d78e211324168b"
+  dependencies:
+    package-json "^2.0.0"
+
+lazy-cache@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+
+lazy-req@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/lazy-req/-/lazy-req-1.1.0.tgz#bdaebead30f8d824039ce0ce149d4daa07ba1fac"
+
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  dependencies:
+    invert-kv "^1.0.0"
+
+leven@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+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"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
+load-json-file@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    strip-bom "^3.0.0"
+
+loader-fs-cache@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.1.tgz#56e0bf08bd9708b26a765b68509840c8dec9fdbc"
+  dependencies:
+    find-cache-dir "^0.1.1"
+    mkdirp "0.5.1"
+
+loader-runner@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
+
+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"
+
+loader-utils@^1.0.2, loader-utils@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
+lodash._reinterpolate@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+
+lodash.cond@^4.3.0:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
+
+lodash.defaults@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+
+lodash.template@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+
+lodash.uniq@^4.5.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.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+
+loglevel@^1.4.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.0.tgz#ae0caa561111498c5ba13723d6fb631d24003934"
+
+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.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  dependencies:
+    js-tokens "^3.0.0"
+
+loud-rejection@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  dependencies:
+    currently-unhandled "^0.4.1"
+    signal-exit "^3.0.0"
+
+lower-case@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+
+lowercase-keys@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+
+lru-cache@^4.0.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+macaddress@^0.2.8:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
+
+make-dir@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
+  dependencies:
+    pify "^3.0.0"
+
+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-obj@^1.0.0, map-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+
+markdown-escapes@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.1.tgz#1994df2d3af4811de59a6714934c2b2292734518"
+
+math-expression-evaluator@^1.2.14:
+  version "1.2.17"
+  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
+
+md5.js@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+
+mem@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  dependencies:
+    mimic-fn "^1.0.0"
+
+memory-fs@^0.4.0, memory-fs@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+meow@^3.3.0, meow@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  dependencies:
+    camelcase-keys "^2.0.0"
+    decamelize "^1.1.2"
+    loud-rejection "^1.0.0"
+    map-obj "^1.0.1"
+    minimist "^1.1.3"
+    normalize-package-data "^2.3.4"
+    object-assign "^4.0.1"
+    read-pkg-up "^1.0.1"
+    redent "^1.0.0"
+    trim-newlines "^1.0.0"
+
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+
+merge@^1.1.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+
+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:
+    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"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+"mime-db@>= 1.30.0 < 2":
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.32.0.tgz#485b3848b01a3cda5f968b4882c0771e58e09414"
+
+mime-db@~1.30.0:
+  version "1.30.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
+
+mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.7:
+  version "2.1.17"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
+  dependencies:
+    mime-db "~1.30.0"
+
+mime@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+
+mime@^1.4.1, mime@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+
+mimic-fn@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
+
+minimalistic-assert@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
+
+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@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.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
+minipass@^2.2.1, minipass@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  dependencies:
+    minipass "^2.2.1"
+
+mkdirp@0.5.1, mkdirp@0.5.x, "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:
+    minimist "0.0.8"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+multicast-dns-service-types@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+
+multicast-dns@^6.0.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.1.tgz#c5035defa9219d30640558a49298067352098060"
+  dependencies:
+    dns-packet "^1.0.1"
+    thunky "^0.1.0"
+
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+
+nan@^2.3.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
+
+nan@^2.9.2:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+
+ncname@1.0.x:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ncname/-/ncname-1.0.0.tgz#5b57ad18b1ca092864ef62b0b1ed8194f383b71c"
+  dependencies:
+    xml-char-classes "^1.0.0"
+
+needle@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
+negotiator@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+
+no-case@^2.2.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
+  dependencies:
+    lower-case "^1.1.1"
+
+node-fetch@^1.0.1:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
+  dependencies:
+    encoding "^0.1.11"
+    is-stream "^1.0.1"
+
+node-forge@0.6.33:
+  version "0.6.33"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz#463811879f573d45155ad6a9f43dc296e8e85ebc"
+
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+
+node-libs-browser@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^1.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.0"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.10.3"
+    vm-browserify "0.0.4"
+
+node-notifier@^5.0.2:
+  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"
+    shellwords "^0.1.0"
+    which "^1.2.12"
+
+node-pre-gyp@^0.10.0:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
+node-pre-gyp@^0.6.39:
+  version "0.6.39"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
+  dependencies:
+    detect-libc "^1.0.2"
+    hawk "3.1.3"
+    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"
+
+node-status-codes@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"
+
+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, normalize-package-data@^2.3.4:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    is-builtin-module "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^2.0.0, 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"
+
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+
+normalize-url@^1.4.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  dependencies:
+    object-assign "^4.0.1"
+    prepend-http "^1.0.0"
+    query-string "^4.1.0"
+    sort-keys "^1.0.0"
+
+npm-bundled@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
+
+npm-packlist@^1.1.6:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  dependencies:
+    path-key "^2.0.0"
+
+npmlog@^4.0.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+nth-check@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
+  dependencies:
+    boolbase "~1.0.0"
+
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+
+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"
+
+"nwmatcher@>= 1.3.9 < 2.0.0":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
+
+oauth-sign@~0.8.1, oauth-sign@~0.8.2:
+  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.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-hash@^1.1.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.2.0.tgz#e96af0e96981996a1d47f88ead8f74f1ebc4422b"
+
+object-keys@^1.0.8:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
+
+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"
+
+obuf@^1.0.0, obuf@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.1.tgz#104124b6c602c6796881a042541d36db43a5264e"
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  dependencies:
+    ee-first "1.1.1"
+
+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.3.0, 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"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  dependencies:
+    mimic-fn "^1.0.0"
+
+opn@5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.2.0.tgz#71fdf934d6827d676cecbea1531f95d354641225"
+  dependencies:
+    is-wsl "^1.1.0"
+
+opn@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.1.0.tgz#72ce2306a17dbea58ff1041853352b4a8fc77519"
+  dependencies:
+    is-wsl "^1.1.0"
+
+optimist@^0.6.1:
+  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"
+
+optionator@^0.8.1, optionator@^0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
+original@>=0.0.5:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/original/-/original-1.0.0.tgz#9147f93fa1696d04be61e01bd50baeaca656bd3b"
+  dependencies:
+    url-parse "1.0.x"
+
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+
+os-homedir@^1.0.0, os-homedir@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+
+os-locale@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  dependencies:
+    lcid "^1.0.0"
+
+os-locale@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  dependencies:
+    execa "^0.7.0"
+    lcid "^1.0.0"
+    mem "^1.1.0"
+
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+
+osenv@^0.1.0, 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"
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+
+p-limit@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
+  dependencies:
+    p-try "^1.0.0"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  dependencies:
+    p-limit "^1.1.0"
+
+p-map@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+
+package-json@^2.0.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-2.4.0.tgz#0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"
+  dependencies:
+    got "^5.0.0"
+    registry-auth-token "^3.0.1"
+    registry-url "^3.0.3"
+    semver "^5.1.0"
+
+pako@~1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+
+param-case@2.1.x:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
+  dependencies:
+    no-case "^2.2.0"
+
+parse-asn1@^5.0.0:
+  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"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+
+parse-entities@^1.0.2:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.1.1.tgz#8112d88471319f27abae4d64964b122fe4e1b890"
+  dependencies:
+    character-entities "^1.0.0"
+    character-entities-legacy "^1.0.0"
+    character-reference-invalid "^1.0.0"
+    is-alphanumerical "^1.0.0"
+    is-decimal "^1.0.0"
+    is-hexadecimal "^1.0.0"
+
+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"
+
+parse-json@^2.1.0, parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  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"
+
+parseurl@~1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+
+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-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+
+path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+
+path-key@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+
+path-parse@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+
+path-to-regexp@^1.0.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+  dependencies:
+    isarray "0.0.1"
+
+path-type@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+path-type@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  dependencies:
+    pify "^2.0.0"
+
+pbkdf2@^3.0.3:
+  version "3.0.14"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade"
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+performance-now@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+
+pify@^2.0.0, pify@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+
+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"
+
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  dependencies:
+    find-up "^2.1.0"
+
+pluralize@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+
+portfinder@^1.0.9:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
+  dependencies:
+    async "^1.5.2"
+    debug "^2.2.0"
+    mkdirp "0.5.x"
+
+postcss-calc@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
+  dependencies:
+    postcss "^5.0.2"
+    postcss-message-helpers "^2.0.0"
+    reduce-css-calc "^1.2.6"
+
+postcss-colormin@^2.1.8:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
+  dependencies:
+    colormin "^1.0.5"
+    postcss "^5.0.13"
+    postcss-value-parser "^3.2.3"
+
+postcss-convert-values@^2.3.4:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
+  dependencies:
+    postcss "^5.0.11"
+    postcss-value-parser "^3.1.2"
+
+postcss-discard-comments@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-duplicates@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-discard-empty@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-overridden@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
+  dependencies:
+    postcss "^5.0.16"
+
+postcss-discard-unused@^2.2.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
+  dependencies:
+    postcss "^5.0.14"
+    uniqs "^2.0.0"
+
+postcss-filter-plugins@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
+  dependencies:
+    postcss "^5.0.4"
+    uniqid "^4.0.0"
+
+postcss-flexbugs-fixes@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-3.2.0.tgz#9b8b932c53f9cf13ba0f61875303e447c33dcc51"
+  dependencies:
+    postcss "^6.0.1"
+
+postcss-load-config@^1.2.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.2.0"
+    postcss-load-plugins "^2.3.0"
+
+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.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@2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.8.tgz#8c67ddb029407dfafe684a406cfc16bad2ce0814"
+  dependencies:
+    loader-utils "^1.1.0"
+    postcss "^6.0.0"
+    postcss-load-config "^1.2.0"
+    schema-utils "^0.3.0"
+
+postcss-merge-idents@^2.1.5:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.10"
+    postcss-value-parser "^3.1.1"
+
+postcss-merge-longhand@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-merge-rules@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
+  dependencies:
+    browserslist "^1.5.2"
+    caniuse-api "^1.5.2"
+    postcss "^5.0.4"
+    postcss-selector-parser "^2.2.2"
+    vendors "^1.0.0"
+
+postcss-message-helpers@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
+
+postcss-minify-font-values@^1.0.2:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
+  dependencies:
+    object-assign "^4.0.1"
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-minify-gradients@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
+  dependencies:
+    postcss "^5.0.12"
+    postcss-value-parser "^3.3.0"
+
+postcss-minify-params@^1.0.4:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.2"
+    postcss-value-parser "^3.0.2"
+    uniqs "^2.0.0"
+
+postcss-minify-selectors@^2.0.4:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
+  dependencies:
+    alphanum-sort "^1.0.2"
+    has "^1.0.1"
+    postcss "^5.0.14"
+    postcss-selector-parser "^2.0.0"
+
+postcss-modules-extract-imports@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb"
+  dependencies:
+    postcss "^6.0.1"
+
+postcss-modules-local-by-default@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
+  dependencies:
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
+
+postcss-modules-scope@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
+  dependencies:
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
+
+postcss-modules-values@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
+  dependencies:
+    icss-replace-symbols "^1.1.0"
+    postcss "^6.0.1"
+
+postcss-normalize-charset@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
+  dependencies:
+    postcss "^5.0.5"
+
+postcss-normalize-url@^3.0.7:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
+  dependencies:
+    is-absolute-url "^2.0.0"
+    normalize-url "^1.4.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+
+postcss-ordered-values@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.1"
+
+postcss-reduce-idents@^2.2.2:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-reduce-initial@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-reduce-transforms@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.8"
+    postcss-value-parser "^3.0.1"
+
+postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+  dependencies:
+    flatten "^1.0.2"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
+postcss-svgo@^2.1.1:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
+  dependencies:
+    is-svg "^2.0.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+    svgo "^0.7.0"
+
+postcss-unique-selectors@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.4"
+    uniqs "^2.0.0"
+
+postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+
+postcss-zindex@^2.0.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
+  dependencies:
+    has "^1.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, postcss@^5.2.16:
+  version "5.2.18"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
+  dependencies:
+    chalk "^1.1.3"
+    js-base64 "^2.1.9"
+    source-map "^0.5.6"
+    supports-color "^3.2.3"
+
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.13:
+  version "6.0.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146"
+  dependencies:
+    chalk "^2.3.0"
+    source-map "^0.6.1"
+    supports-color "^5.1.0"
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+
+prepend-http@^1.0.0, prepend-http@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+
+preserve@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+
+pretty-bytes@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
+
+pretty-error@^2.0.2:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
+  dependencies:
+    renderkid "^2.0.1"
+    utila "~0.4"
+
+pretty-format@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-20.0.3.tgz#020e350a560a1fe1a98dc3beb6ccffb386de8b14"
+  dependencies:
+    ansi-regex "^2.1.1"
+    ansi-styles "^3.0.0"
+
+private@^0.1.6, private@^0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+
+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.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+
+progress@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
+
+promise@8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-8.0.1.tgz#e45d68b00a17647b6da711bf85ed6ed47208f450"
+  dependencies:
+    asap "~2.0.3"
+
+promise@^7.1.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  dependencies:
+    asap "~2.0.3"
+
+prop-types@^15.5.10, prop-types@^15.6.0:
+  version "15.6.0"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
+prop-types@^15.6.2:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
+  dependencies:
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
+proxy-addr@~2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.5.2"
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+
+public-encrypt@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+
+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"
+
+q@^1.1.2:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+
+qs@6.5.1, qs@~6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+
+qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+
+query-string@^4.1.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  dependencies:
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+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"
+
+querystringify@0.0.x:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c"
+
+querystringify@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
+
+raf@3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
+  dependencies:
+    performance-now "^2.1.0"
+
+randomatic@^1.1.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62"
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+range-parser@^1.0.3, range-parser@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+
+raw-body@2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
+  dependencies:
+    bytes "3.0.0"
+    http-errors "1.6.2"
+    iconv-lite "0.4.19"
+    unpipe "1.0.0"
+
+rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.3.tgz#51575a900f8dd68381c710b4712c2154c3e2035b"
+  dependencies:
+    deep-extend "~0.4.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+react-dev-utils@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-5.0.1.tgz#1f396e161fe44b595db1b186a40067289bf06613"
+  dependencies:
+    address "1.0.3"
+    babel-code-frame "6.26.0"
+    chalk "1.1.3"
+    cross-spawn "5.1.0"
+    detect-port-alt "1.1.6"
+    escape-string-regexp "1.0.5"
+    filesize "3.5.11"
+    global-modules "1.0.0"
+    gzip-size "3.0.0"
+    inquirer "3.3.0"
+    is-root "1.0.0"
+    opn "5.2.0"
+    react-error-overlay "^4.0.0"
+    recursive-readdir "2.2.1"
+    shell-quote "1.6.1"
+    sockjs-client "1.1.4"
+    strip-ansi "3.0.1"
+    text-table "0.2.0"
+
+react-dom@../../../build/node_modules/react-dom:
+  version "16.4.1"
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+
+react-error-overlay@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-4.0.0.tgz#d198408a85b4070937a98667f500c832f86bd5d4"
+
+react-markdown@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-3.2.0.tgz#0fec0629dda35887518559ea9e2cca3e761e24dc"
+  dependencies:
+    prop-types "^15.6.0"
+    remark-parse "^4.0.0"
+    unified "^6.1.5"
+    unist-util-visit "^1.1.3"
+    xtend "^4.0.1"
+
+react-scripts@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-1.1.4.tgz#d5c230e707918d6dd2d06f303b10f5222d017c88"
+  dependencies:
+    autoprefixer "7.1.6"
+    babel-core "6.26.0"
+    babel-eslint "7.2.3"
+    babel-jest "20.0.3"
+    babel-loader "7.1.2"
+    babel-preset-react-app "^3.1.1"
+    babel-runtime "6.26.0"
+    case-sensitive-paths-webpack-plugin "2.1.1"
+    chalk "1.1.3"
+    css-loader "0.28.7"
+    dotenv "4.0.0"
+    dotenv-expand "4.2.0"
+    eslint "4.10.0"
+    eslint-config-react-app "^2.1.0"
+    eslint-loader "1.9.0"
+    eslint-plugin-flowtype "2.39.1"
+    eslint-plugin-import "2.8.0"
+    eslint-plugin-jsx-a11y "5.1.1"
+    eslint-plugin-react "7.4.0"
+    extract-text-webpack-plugin "3.0.2"
+    file-loader "1.1.5"
+    fs-extra "3.0.1"
+    html-webpack-plugin "2.29.0"
+    jest "20.0.4"
+    object-assign "4.1.1"
+    postcss-flexbugs-fixes "3.2.0"
+    postcss-loader "2.0.8"
+    promise "8.0.1"
+    raf "3.4.0"
+    react-dev-utils "^5.0.1"
+    resolve "1.6.0"
+    style-loader "0.19.0"
+    sw-precache-webpack-plugin "0.11.4"
+    url-loader "0.6.2"
+    webpack "3.8.1"
+    webpack-dev-server "2.9.4"
+    webpack-manifest-plugin "1.3.2"
+    whatwg-fetch "2.0.3"
+  optionalDependencies:
+    fsevents "^1.1.3"
+
+react@../../../build/node_modules/react:
+  version "16.4.1"
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+
+read-all-stream@^3.0.0:
+  version "3.1.0"
+  resolved "http://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa"
+  dependencies:
+    pinkie-promise "^2.0.0"
+    readable-stream "^2.0.0"
+
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
+read-pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^2.0.0"
+
+read-pkg@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
+read-pkg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  dependencies:
+    load-json-file "^2.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^2.0.0"
+
+readable-stream@1.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@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9, readable-stream@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.0.3"
+    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"
+
+recursive-readdir@2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.1.tgz#90ef231d0778c5ce093c9a48d74e5c5422d13a99"
+  dependencies:
+    minimatch "3.0.3"
+
+redent@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  dependencies:
+    indent-string "^2.1.0"
+    strip-indent "^1.0.1"
+
+reduce-css-calc@^1.2.6:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
+  dependencies:
+    balanced-match "^0.4.2"
+    math-expression-evaluator "^1.2.14"
+    reduce-function-call "^1.0.1"
+
+reduce-function-call@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
+  dependencies:
+    balanced-match "^0.4.2"
+
+regenerate@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
+
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+
+regenerator-transform@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
+  dependencies:
+    babel-runtime "^6.18.0"
+    babel-types "^6.19.0"
+    private "^0.1.6"
+
+regex-cache@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  dependencies:
+    is-equal-shallow "^0.1.3"
+
+regexpu-core@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+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"
+
+registry-auth-token@^3.0.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.1.tgz#fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"
+  dependencies:
+    rc "^1.1.6"
+    safe-buffer "^5.0.1"
+
+registry-url@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
+  dependencies:
+    rc "^1.0.1"
+
+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"
+
+relateurl@0.2.x:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
+
+remark-parse@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-4.0.0.tgz#99f1f049afac80382366e2e0d0bd55429dd45d8b"
+  dependencies:
+    collapse-white-space "^1.0.2"
+    is-alphabetical "^1.0.0"
+    is-decimal "^1.0.0"
+    is-whitespace-character "^1.0.0"
+    is-word-character "^1.0.0"
+    markdown-escapes "^1.0.0"
+    parse-entities "^1.0.2"
+    repeat-string "^1.5.4"
+    state-toggle "^1.0.0"
+    trim "0.0.1"
+    trim-trailing-lines "^1.0.0"
+    unherit "^1.0.4"
+    unist-util-remove-position "^1.0.0"
+    vfile-location "^2.0.0"
+    xtend "^4.0.1"
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+
+renderkid@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.1.tgz#898cabfc8bede4b7b91135a3ffd323e58c0db319"
+  dependencies:
+    css-select "^1.1.0"
+    dom-converter "~0.1"
+    htmlparser2 "~3.3.0"
+    strip-ansi "^3.0.0"
+    utila "~0.3"
+
+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, repeat-string@^1.5.4:
+  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"
+
+replace-ext@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
+
+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"
+
+request@^2.79.0:
+  version "2.83.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+
+require-from-string@^1.1.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+
+require-uncached@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  dependencies:
+    caller-path "^0.1.0"
+    resolve-from "^1.0.0"
+
+requires-port@1.0.x, requires-port@1.x.x, requires-port@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  dependencies:
+    resolve-from "^3.0.0"
+
+resolve-dir@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  dependencies:
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
+
+resolve-from@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+
+resolve@1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+
+resolve@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c"
+  dependencies:
+    path-parse "^1.0.5"
+
+resolve@^1.3.2, resolve@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
+  dependencies:
+    path-parse "^1.0.5"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+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.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  dependencies:
+    glob "^7.0.5"
+
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
+  dependencies:
+    hash-base "^2.0.0"
+    inherits "^2.0.1"
+
+run-async@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  dependencies:
+    is-promise "^2.1.0"
+
+rx-lite-aggregates@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
+  dependencies:
+    rx-lite "*"
+
+rx-lite@*, rx-lite@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
+
+safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+
+safe-buffer@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+
+"safer-buffer@>= 2.1.2 < 3":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+
+sane@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-1.6.0.tgz#9610c452307a135d29c1fdfe2547034180c46775"
+  dependencies:
+    anymatch "^1.3.0"
+    exec-sh "^0.2.0"
+    fb-watchman "^1.8.0"
+    minimatch "^3.0.2"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+    watch "~0.10.0"
+
+sax@^1.2.1, sax@^1.2.4, sax@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+
+schema-utils@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+  dependencies:
+    ajv "^5.0.0"
+
+select-hose@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+
+selfsigned@^1.9.1:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.1.tgz#bf8cb7b83256c4551e31347c6311778db99eec52"
+  dependencies:
+    node-forge "0.6.33"
+
+semver-diff@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
+  dependencies:
+    semver "^5.0.3"
+
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
+
+send@0.16.1:
+  version "0.16.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.1"
+    destroy "~1.0.4"
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.6.2"
+    mime "1.4.1"
+    ms "2.0.0"
+    on-finished "~2.3.0"
+    range-parser "~1.2.0"
+    statuses "~1.3.1"
+
+serve-index@^1.7.2:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  dependencies:
+    accepts "~1.3.4"
+    batch "0.6.1"
+    debug "2.6.9"
+    escape-html "~1.0.3"
+    http-errors "~1.6.2"
+    mime-types "~2.1.17"
+    parseurl "~1.3.2"
+
+serve-static@1.13.1:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
+  dependencies:
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    parseurl "~1.3.2"
+    send "0.16.1"
+
+serviceworker-cache-polyfill@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serviceworker-cache-polyfill/-/serviceworker-cache-polyfill-4.0.0.tgz#de19ee73bef21ab3c0740a37b33db62464babdeb"
+
+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"
+
+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"
+
+setprototypeof@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.9"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.9.tgz#98f64880474b74f4a38b8da9d3c0f2d104633e7d"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+
+shell-quote@1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
+  dependencies:
+    array-filter "~0.0.0"
+    array-map "~0.0.0"
+    array-reduce "~0.0.0"
+    jsonify "~0.0.0"
+
+shellwords@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+
+simple-cache-provider@../../../build/node_modules/simple-cache-provider:
+  version "0.7.0"
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+
+slice-ansi@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+
+slide@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+
+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"
+
+sntp@2.x.x:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
+  dependencies:
+    hoek "4.x.x"
+
+sockjs-client@1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.4.tgz#5babe386b775e4cf14e7520911452654016c8b12"
+  dependencies:
+    debug "^2.6.6"
+    eventsource "0.1.6"
+    faye-websocket "~0.11.0"
+    inherits "^2.0.1"
+    json3 "^3.3.2"
+    url-parse "^1.1.8"
+
+sockjs@0.3.18:
+  version "0.3.18"
+  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.18.tgz#d9b289316ca7df77595ef299e075f0f937eb4207"
+  dependencies:
+    faye-websocket "^0.10.0"
+    uuid "^2.0.2"
+
+sort-keys@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+source-list-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+
+source-map-support@^0.4.15:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  dependencies:
+    source-map "^0.5.6"
+
+source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
+source-map@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@^0.6.1, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
+spdx-correct@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+  dependencies:
+    spdx-license-ids "^1.0.2"
+
+spdx-expression-parse@~1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+
+spdx-license-ids@^1.0.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+
+spdy-transport@^2.0.18:
+  version "2.0.20"
+  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.0.20.tgz#735e72054c486b2354fe89e702256004a39ace4d"
+  dependencies:
+    debug "^2.6.8"
+    detect-node "^2.0.3"
+    hpack.js "^2.1.6"
+    obuf "^1.1.1"
+    readable-stream "^2.2.9"
+    safe-buffer "^5.0.1"
+    wbuf "^1.7.2"
+
+spdy@^3.4.1:
+  version "3.4.7"
+  resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc"
+  dependencies:
+    debug "^2.6.8"
+    handle-thing "^1.2.5"
+    http-deceiver "^1.2.7"
+    safe-buffer "^5.0.1"
+    select-hose "^2.0.0"
+    spdy-transport "^2.0.18"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+sshpk@^1.7.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
+  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"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
+state-toggle@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.0.tgz#d20f9a616bb4f0c3b98b91922d25b640aa2bc425"
+
+"statuses@>= 1.3.1 < 2":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+
+statuses@~1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+
+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.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad"
+  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"
+
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+
+string-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
+  dependencies:
+    strip-ansi "^3.0.0"
+
+string-width@^1.0.1, string-width@^1.0.2:
+  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-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string_decoder@^1.0.0, string_decoder@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+  dependencies:
+    safe-buffer "~5.1.0"
+
+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, stringstream@~0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+
+strip-ansi@3.0.1, 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-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
+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@^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-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+
+strip-indent@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  dependencies:
+    get-stdin "^4.0.1"
+
+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.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.0.tgz#7258e788f0fee6a42d710eaf7d6c2412a4c50759"
+  dependencies:
+    loader-utils "^1.0.2"
+    schema-utils "^0.3.0"
+
+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.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:
+    has-flag "^1.0.0"
+
+supports-color@^4.0.0, supports-color@^4.2.1:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
+  dependencies:
+    has-flag "^2.0.0"
+
+supports-color@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
+  dependencies:
+    has-flag "^2.0.0"
+
+svgo@^0.7.0:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+  dependencies:
+    coa "~1.0.1"
+    colors "~1.1.2"
+    csso "~2.3.1"
+    js-yaml "~3.7.0"
+    mkdirp "~0.5.1"
+    sax "~1.2.1"
+    whet.extend "~0.9.9"
+
+sw-precache-webpack-plugin@0.11.4:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/sw-precache-webpack-plugin/-/sw-precache-webpack-plugin-0.11.4.tgz#a695017e54eed575551493a519dc1da8da2dc5e0"
+  dependencies:
+    del "^2.2.2"
+    sw-precache "^5.1.1"
+    uglify-js "^3.0.13"
+
+sw-precache@^5.1.1:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/sw-precache/-/sw-precache-5.2.0.tgz#eb6225ce580ceaae148194578a0ad01ab7ea199c"
+  dependencies:
+    dom-urls "^1.1.0"
+    es6-promise "^4.0.5"
+    glob "^7.1.1"
+    lodash.defaults "^4.2.0"
+    lodash.template "^4.4.0"
+    meow "^3.7.0"
+    mkdirp "^0.5.1"
+    pretty-bytes "^4.0.2"
+    sw-toolbox "^3.4.0"
+    update-notifier "^1.0.3"
+
+sw-toolbox@^3.4.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/sw-toolbox/-/sw-toolbox-3.6.0.tgz#26df1d1c70348658e4dea2884319149b7b3183b5"
+  dependencies:
+    path-to-regexp "^1.0.1"
+    serviceworker-cache-polyfill "^4.0.0"
+
+symbol-tree@^3.2.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+
+table@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
+  dependencies:
+    ajv "^5.2.3"
+    ajv-keywords "^2.1.0"
+    chalk "^2.1.0"
+    lodash "^4.17.4"
+    slice-ansi "1.0.0"
+    string-width "^2.1.1"
+
+tapable@^0.2.7:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
+
+tar-pack@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
+  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"
+
+tar@^4:
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd"
+  dependencies:
+    chownr "^1.0.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.3"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
+test-exclude@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.1.1.tgz#4d84964b0966b0087ecc334a2ce002d3d9341e26"
+  dependencies:
+    arrify "^1.0.1"
+    micromatch "^2.3.11"
+    object-assign "^4.1.0"
+    read-pkg-up "^1.0.1"
+    require-main-filename "^1.0.1"
+
+text-table@0.2.0, text-table@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+
+throat@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-3.2.0.tgz#50cb0670edbc40237b9e347d7e1f88e4620af836"
+
+through@^2.3.6, through@^2.3.8:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
+thunky@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/thunky/-/thunky-0.1.0.tgz#bf30146824e2b6e67b0f2d7a4ac8beb26908684e"
+
+time-stamp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
+
+timed-out@^3.0.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217"
+
+timers-browserify@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.4.tgz#96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6"
+  dependencies:
+    setimmediate "^1.0.4"
+
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+tmpl@1.0.x:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+
+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.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+
+toposort@^1.0.0:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.6.tgz#c31748e55d210effc00fdcdc7d6e68d7d7bb9cec"
+
+tough-cookie@^2.3.2, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
+  dependencies:
+    punycode "^1.4.1"
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+
+trim-newlines@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+
+trim-trailing-lines@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz#7aefbb7808df9d669f6da2e438cac8c46ada7684"
+
+trim@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
+
+trough@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.1.tgz#a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86"
+
+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"
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-is@~1.6.15:
+  version "1.6.15"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.15"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+
+ua-parser-js@^0.7.9:
+  version "0.7.17"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
+
+uglify-js@3.3.x, uglify-js@^3.0.13:
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.5.tgz#4c4143dfe08e8825746675cc49a6874a933b543e"
+  dependencies:
+    commander "~2.12.1"
+    source-map "~0.6.1"
+
+uglify-js@^2.6, uglify-js@^2.8.29:
+  version "2.8.29"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  dependencies:
+    source-map "~0.5.1"
+    yargs "~3.10.0"
+  optionalDependencies:
+    uglify-to-browserify "~1.0.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"
+
+uglifyjs-webpack-plugin@^0.4.6:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
+  dependencies:
+    source-map "^0.5.6"
+    uglify-js "^2.8.29"
+    webpack-sources "^1.0.1"
+
+uid-number@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+
+unherit@^1.0.4:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.0.tgz#6b9aaedfbf73df1756ad9e316dd981885840cd7d"
+  dependencies:
+    inherits "^2.0.1"
+    xtend "^4.0.1"
+
+unified@^6.1.5:
+  version "6.1.6"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-6.1.6.tgz#5ea7f807a0898f1f8acdeefe5f25faa010cc42b1"
+  dependencies:
+    bail "^1.0.0"
+    extend "^3.0.0"
+    is-plain-obj "^1.1.0"
+    trough "^1.0.0"
+    vfile "^2.0.0"
+    x-is-function "^1.0.4"
+    x-is-string "^0.1.0"
+
+uniq@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+
+uniqid@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
+  dependencies:
+    macaddress "^0.2.8"
+
+uniqs@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
+
+unist-util-is@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.1.tgz#0c312629e3f960c66e931e812d3d80e77010947b"
+
+unist-util-remove-position@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz#5a85c1555fc1ba0c101b86707d15e50fa4c871bb"
+  dependencies:
+    unist-util-visit "^1.1.0"
+
+unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.1.tgz#3ccbdc53679eed6ecf3777dd7f5e3229c1b6aa3c"
+
+unist-util-visit@^1.1.0, unist-util-visit@^1.1.3:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.3.0.tgz#41ca7c82981fd1ce6c762aac397fc24e35711444"
+  dependencies:
+    unist-util-is "^2.1.1"
+
+universalify@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
+
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+
+unzip-response@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
+
+update-notifier@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-1.0.3.tgz#8f92c515482bd6831b7c93013e70f87552c7cf5a"
+  dependencies:
+    boxen "^0.6.0"
+    chalk "^1.0.0"
+    configstore "^2.0.0"
+    is-npm "^1.0.0"
+    latest-version "^2.0.0"
+    lazy-req "^1.1.0"
+    semver-diff "^2.0.0"
+    xdg-basedir "^2.0.0"
+
+upper-case@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+
+urijs@^1.16.1:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.0.tgz#d8aa284d0e7469703a6988ad045c4cbfdf08ada0"
+
+url-loader@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7"
+  dependencies:
+    loader-utils "^1.0.2"
+    mime "^1.4.1"
+    schema-utils "^0.3.0"
+
+url-parse-lax@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
+  dependencies:
+    prepend-http "^1.0.1"
+
+url-parse@1.0.x:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b"
+  dependencies:
+    querystringify "0.0.x"
+    requires-port "1.0.x"
+
+url-parse@^1.1.8:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.2.0.tgz#3a19e8aaa6d023ddd27dcc44cb4fc8f7fec23986"
+  dependencies:
+    querystringify "~1.0.0"
+    requires-port "~1.0.0"
+
+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"
+
+utila@~0.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
+
+utila@~0.4:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+
+uuid@^2.0.1, uuid@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
+
+uuid@^3.0.0, uuid@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  dependencies:
+    spdx-correct "~1.0.0"
+    spdx-expression-parse "~1.0.0"
+
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+
+vendors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+vfile-location@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.2.tgz#d3675c59c877498e492b4756ff65e4af1a752255"
+
+vfile-message@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.0.0.tgz#a6adb0474ea400fa25d929f1d673abea6a17e359"
+  dependencies:
+    unist-util-stringify-position "^1.1.1"
+
+vfile@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz#e62d8e72b20e83c324bc6c67278ee272488bf84a"
+  dependencies:
+    is-buffer "^1.1.4"
+    replace-ext "1.0.0"
+    unist-util-stringify-position "^1.0.0"
+    vfile-message "^1.0.0"
+
+victory-chart@^25.1.1:
+  version "25.1.1"
+  resolved "https://registry.yarnpkg.com/victory-chart/-/victory-chart-25.1.1.tgz#5b5d9bde802eea774f1105af6fb723d478717532"
+  dependencies:
+    d3-voronoi "^1.1.2"
+    lodash "^4.17.4"
+    victory-core "^21.0.4"
+
+victory-core@^21.0.2, victory-core@^21.0.4:
+  version "21.0.4"
+  resolved "https://registry.yarnpkg.com/victory-core/-/victory-core-21.0.4.tgz#5ac6d495a43e5d95249c56973290b182ec607b4a"
+  dependencies:
+    d3-ease "^1.0.0"
+    d3-interpolate "^1.1.1"
+    d3-scale "^1.0.0"
+    d3-shape "^1.2.0"
+    d3-timer "^1.0.0"
+    lodash "^4.17.4"
+
+victory-pie@^14.0.1:
+  version "14.0.1"
+  resolved "https://registry.yarnpkg.com/victory-pie/-/victory-pie-14.0.1.tgz#53dff9e81696253c3da00f347d908d3ac1241c66"
+  dependencies:
+    d3-shape "^1.0.0"
+    lodash "^4.17.4"
+    victory-core "^21.0.2"
+
+victory@^0.25.6:
+  version "0.25.6"
+  resolved "https://registry.yarnpkg.com/victory/-/victory-0.25.6.tgz#3b5b0a1d2a773caf75cc916e6ace9ad3d7d75024"
+  dependencies:
+    victory-chart "^25.1.1"
+    victory-core "^21.0.4"
+    victory-pie "^14.0.1"
+
+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"
+
+walker@~1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  dependencies:
+    makeerror "1.0.x"
+
+watch@~0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/watch/-/watch-0.10.0.tgz#77798b2da0f9910d595f1ace5b0c2258521f21dc"
+
+watchpack@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
+  dependencies:
+    async "^2.1.2"
+    chokidar "^1.7.0"
+    graceful-fs "^4.1.2"
+
+wbuf@^1.1.0, wbuf@^1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.2.tgz#d697b99f1f59512df2751be42769c1580b5801fe"
+  dependencies:
+    minimalistic-assert "^1.0.0"
+
+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.2"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+
+webpack-dev-middleware@^1.11.0:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
+  dependencies:
+    memory-fs "~0.4.1"
+    mime "^1.5.0"
+    path-is-absolute "^1.0.0"
+    range-parser "^1.0.3"
+    time-stamp "^2.0.0"
+
+webpack-dev-server@2.9.4:
+  version "2.9.4"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.4.tgz#7883e61759c6a4b33e9b19ec4037bd4ab61428d1"
+  dependencies:
+    ansi-html "0.0.7"
+    array-includes "^3.0.3"
+    bonjour "^3.5.0"
+    chokidar "^1.6.0"
+    compression "^1.5.2"
+    connect-history-api-fallback "^1.3.0"
+    debug "^3.1.0"
+    del "^3.0.0"
+    express "^4.13.3"
+    html-entities "^1.2.0"
+    http-proxy-middleware "~0.17.4"
+    import-local "^0.1.1"
+    internal-ip "1.2.0"
+    ip "^1.1.5"
+    killable "^1.0.0"
+    loglevel "^1.4.1"
+    opn "^5.1.0"
+    portfinder "^1.0.9"
+    selfsigned "^1.9.1"
+    serve-index "^1.7.2"
+    sockjs "0.3.18"
+    sockjs-client "1.1.4"
+    spdy "^3.4.1"
+    strip-ansi "^3.0.1"
+    supports-color "^4.2.1"
+    webpack-dev-middleware "^1.11.0"
+    yargs "^6.6.0"
+
+webpack-manifest-plugin@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-1.3.2.tgz#5ea8ee5756359ddc1d98814324fe43496349a7d4"
+  dependencies:
+    fs-extra "^0.30.0"
+    lodash ">=3.5 <5"
+
+webpack-sources@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack@3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.8.1.tgz#b16968a81100abe61608b0153c9159ef8bb2bd83"
+  dependencies:
+    acorn "^5.0.0"
+    acorn-dynamic-import "^2.0.0"
+    ajv "^5.1.5"
+    ajv-keywords "^2.0.0"
+    async "^2.1.2"
+    enhanced-resolve "^3.4.0"
+    escope "^3.6.0"
+    interpret "^1.0.0"
+    json-loader "^0.5.4"
+    json5 "^0.5.1"
+    loader-runner "^2.3.0"
+    loader-utils "^1.1.0"
+    memory-fs "~0.4.1"
+    mkdirp "~0.5.0"
+    node-libs-browser "^2.0.0"
+    source-map "^0.5.3"
+    supports-color "^4.2.1"
+    tapable "^0.2.7"
+    uglifyjs-webpack-plugin "^0.4.6"
+    watchpack "^1.4.0"
+    webpack-sources "^1.0.1"
+    yargs "^8.0.2"
+
+websocket-driver@>=0.5.1:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
+  dependencies:
+    http-parser-js ">=0.4.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+
+whatwg-encoding@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"
+  dependencies:
+    iconv-lite "0.4.19"
+
+whatwg-fetch@2.0.3, whatwg-fetch@>=0.10.0:
+  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.8.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+whet.extend@~0.9.9:
+  version "0.9.9"
+  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
+
+which-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+
+which@^1.2.12, which@^1.2.14, which@^1.2.9:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
+  dependencies:
+    string-width "^1.0.2"
+
+widest-line@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-1.0.0.tgz#0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"
+  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"
+
+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.5.2"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.2.tgz#32b312e5dc3d5d45d79ef44acc2587491cd729ae"
+  dependencies:
+    errno "^0.1.4"
+    xtend "^4.0.1"
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+write-file-atomic@^1.1.2:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    slide "^1.1.5"
+
+write@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  dependencies:
+    mkdirp "^0.5.1"
+
+x-is-function@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/x-is-function/-/x-is-function-1.0.4.tgz#5d294dc3d268cbdd062580e0c5df77a391d1fa1e"
+
+x-is-string@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
+
+xdg-basedir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-2.0.0.tgz#edbc903cc385fc04523d966a335504b5504d1bd2"
+  dependencies:
+    os-homedir "^1.0.0"
+
+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:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+
+xtend@^4.0.0, xtend@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+
+y18n@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+
+yargs-parser@^4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
+  dependencies:
+    camelcase "^3.0.0"
+
+yargs-parser@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  dependencies:
+    camelcase "^3.0.0"
+
+yargs-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  dependencies:
+    camelcase "^4.1.0"
+
+yargs@^6.6.0:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^4.2.0"
+
+yargs@^7.0.2:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^5.0.0"
+
+yargs@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
+  dependencies:
+    camelcase "^4.1.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    read-pkg-up "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^7.0.0"
+
+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/suspense/io/.gitignore b/fixtures/suspense/io/.gitignore
new file mode 100644
index 0000000000..18d819cff2
--- /dev/null
+++ b/fixtures/suspense/io/.gitignore
@@ -0,0 +1,14 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# dependencies
+node_modules
+
+# testing
+coverage
+
+# production
+build
+
+# misc
+.DS_Store
+npm-debug.log
\ No newline at end of file
diff --git a/fixtures/suspense/io/README.md b/fixtures/suspense/io/README.md
new file mode 100644
index 0000000000..3a2c911542
--- /dev/null
+++ b/fixtures/suspense/io/README.md
@@ -0,0 +1,26 @@
+# IO "suspense" demo
+
+## What is this fixture?
+
+This is a demo application based on [Dan Abramov's](https://github.com/gaearon) recent [JSConf Iceland talk](https://reactjs.org/blog/2018/03/01/sneak-peek-beyond-react-16.html) about React.
+
+It depends on a local build of React and enables us to easily test async and "suspense" APIs in a more "real world app" like context.
+
+## Can I use this code in production?
+
+No. The APIs being tested here are unstable and some of them have still not been released to NPM. For now, this fixture is only a test harness.
+
+## How do I run this fixture?
+
+```shell
+# 1: Build react from source
+cd /path/to/react
+yarn build -- dom,core,interaction,simple-cache-provider type=NODE
+
+# 2: Install fixture dependencies
+cd ./fixtures/suspense/io/
+yarn install
+
+# 3: Run the app
+yarn start
+```
\ No newline at end of file
diff --git a/fixtures/suspense/io/package.json b/fixtures/suspense/io/package.json
new file mode 100644
index 0000000000..503b1e4d5a
--- /dev/null
+++ b/fixtures/suspense/io/package.json
@@ -0,0 +1,41 @@
+{
+  "name": "io-demo",
+  "version": "0.1.0",
+  "private": true,
+  "homepage": ".",
+  "devDependencies": {
+    "gh-pages": "^1.1.0",
+    "react-scripts": "^1.1.4"
+  },
+  "dependencies": {
+    "clipboard": "^1.7.1",
+    "github-fork-ribbon-css": "^0.2.1",
+    "react": "../../../build/node_modules/react",
+    "react-dom": "../../../build/node_modules/react-dom",
+    "react-draggable": "^3.0.5",
+    "simple-cache-provider": "../../../build/node_modules/simple-cache-provider"
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test --env=jsdom",
+    "eject": "react-scripts eject",
+    "deploy": "gh-pages -d build"
+  },
+  "eslintConfig": {
+    "extends": "./node_modules/react-scripts/config/eslint.js"
+  },
+  "browserslist": {
+    "development": [
+      "last 2 chrome versions",
+      "last 2 firefox versions",
+      "last 2 edge versions"
+    ],
+    "production": [
+      ">1%",
+      "last 4 versions",
+      "Firefox ESR",
+      "not ie < 11"
+    ]
+  }
+}
diff --git a/fixtures/suspense/io/public/favicon.ico b/fixtures/suspense/io/public/favicon.ico
new file mode 100755
index 0000000000000000000000000000000000000000..a092e53206f587ec27d904b6bb31bb7db2d60fbf
GIT binary patch
literal 24838
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
W&6;~POR-e++CyT@Yq8|q-~R(RgObkx

literal 0
HcmV?d00001

diff --git a/fixtures/suspense/io/public/img/acdlite.jpeg b/fixtures/suspense/io/public/img/acdlite.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..b425cc7e2cdf9710f82dbd728eca94a6a0a1b663
GIT binary patch
literal 24301
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
F|JmPQ(ux28

literal 0
HcmV?d00001

diff --git a/fixtures/suspense/io/public/img/bvaughn.jpeg b/fixtures/suspense/io/public/img/bvaughn.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..86a805f7e43df6c3f1088bfff73c21597d9fffa4
GIT binary patch
literal 11417
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

literal 0
HcmV?d00001

diff --git a/fixtures/suspense/io/public/img/flarnie.jpeg b/fixtures/suspense/io/public/img/flarnie.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..5454c3760ea7db43bcb521e50b218210cfbf967f
GIT binary patch
literal 32267
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
W{`GM_3ngx6QP7I)>j|w*5&zjLht8P*

literal 0
HcmV?d00001

diff --git a/fixtures/suspense/io/public/img/gaearon.jpeg b/fixtures/suspense/io/public/img/gaearon.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..dfa2383771b7c46da545c80aa931b2d1bd08f589
GIT binary patch
literal 42340
zcmbTdXH*kk_%%8qKma2hNhA<3C{?5h2`v<*_pYMSn}P%s1f+{7hF(MnMJb_3Qv@QY
zGzlQ>2S`VP0YZ`9tC#=#-u15g@!or8&3u_zGqcZ}InVR#z0beVe-prSfQgY2!pOh`
zfk2p<nOLCQ=b`7$LE)TSY~1`8kplb|5ePwHDG|X-k|+d1R8dS)T1H-89w~xRMa!y4
z$;r!tn3<WO=b*6j=V7u!2qD@3&+T6mz`+FS26cl$mjF5r5SRn>uMPAb06+|&|J8v1
zyMgGy^bCv;CT5m%>;N4I45p(8GceH8pIsSpb`GHDVBi#z(O~2<bAVjJamz*|y<<XY
zRyXsQ|F<qI=ja>B%yNMj2ETauiioI~xcqemMKnf9>&8uO9bG+r3rj0&8{1pAot#}<
z-P}Dq{T@H@4|p0F6!kp%Ma;`rvB@c^Y3Xk=-e$hfFDNV`7MGNM{8aO~wyvJ^rKPp)
zM?1Nrvuj{*=-2Sb=-BwoAL{JfJZ)idX=8J1duMlV|KJb=fd4m~v*Z5;^#8!aafXME
zo*qmO`5!zWx`4AC%t6l}B*Vz5VFq!)ab1#)VB*$HdRN`djFK~7=W+D?kL7}}{LJNz
z|AF+s5dFUc6#4%P(f<MTfAIVp2cTfk*#`r209atB2mtPjE3tYAXy(HOg9gJpT1u#S
ziv$Y;SB)m0#?>Xi<$GcaAo?OCM3tNMbi06m%2s+6n=WSh3E|6#!JH_WAJ(aC3`cPA
z2(4=$+po~mnNZ2g`Wyu*k0X!|+<;j&!^1tI?*RY17mT34CIeYtQ8QV2N92fqz;d4b
z!8rfV_dCr9u6=X5i?U2Cas+Us&R4XHu>t2Sg-gS!D*Rms28FHE2Yf{Ay+|DtDsecg
zKD#`;wc53r`%kGYdklJ!U@k4WPY=a~W3V&o=Y_1sI_^E~4V0(1fw8jCR*TTb9{!t+
zP*AuI?9fz`;C;8ruQ#kSkFg3H7;dVR%#0>VyCysUg1s>CyeqeCLCw_pwdEewRB`sF
zd*I5sflMyGEmofn)fb}BwpkhS-u`i^2Aj}S)>Ht&TvSqffURCtE$XYeCJEV9YAUn9
ze0OqdO}kqR16cMpfF916s36>qJsA)B-*Q(k(b4E$xifh}b)peTO{mI!3oFZ;)!KS+
zK^%EFC!DbEhu_SPb#^z@@%4S$q^dJC#4Rs_zDvaZ#YgN96$XDp(<-^!k<*U6MeG|U
zXhXLmA8x2)IERKJLzR-f-)UgsB+pC8)xmh&{-E)*jTcQ5gZv)L(MK@}rVN7o1Xk(%
zUoVX08Jor%-QYcF0StYj92tEgRtn<#0$LCY&!b|{JAL}B`iV*cCmz7n5!m(*(I!|s
zu*4_|Vrn5cC1_<DIwL4mG^h`RYOFSja2w8Q)|4$^B?fHeF{YgSMLkCR1B|z`zS)D!
zWje)`PM?TckKuP|uyzlY6%3lJ(Zm>j>0IMU6D8OiQ)vJ6e0wl!)S*QOJ=Y6R&;?{y
zCIRI)m@F;#4;ap4Toupm^P2dc)Xp}iiGIlX5BNP%cQEkAkj_M+X<}l*L!H&fs*YoU
zC1Oz>>PQ#YYZsNs?UuBt;s4uTm#uVNI%KgKCaRof^|Tp97v3aA;e$lP{{v3H*h|L*
zK-=(8s!CYydf`?8oraaeq;tZeMxvm#U<{4LH~2Ba-W1URPG<ZIG<<|C>N4DIc-bqB
zYibwMGu1pMA%o+GBK#9F7=`Lb6**S*^3op80%J=ym^_9_yU4uM<>ap(y7sI#-X8du
z<TQ(&W$mVJUzi*4Y^dp;9xZ7afzv%Qxm-_PC*Z?w`#0T*HaD?YF?8(!oLByuoa@`l
zgH$ZCnjm%nXsl6wmw5d|r&{^`0MGOuPdnfKH@j0S!6mDRam;l5cYWZcw>|gD7SPMP
z?`Q5?s->n*NtQh?W+e#aWZofDHLT+54dnzF(TDwD|0<2GL}JlQ?r`Sl&34`*K)Y|z
zy!tXsv0I1uGZrsxYYe)tsiP9mR|udGTFLcj>Xl@=3xew6dcyN*t+3ctei_1SZtGW$
zGFX}}l(a-XFa>`*c9KZSfgp3`-_mKSndKb)0}3T?ZQ6+M^KYeSBjngfIpLrNB<*(u
z$E7QX<Gh4a2I1Uy+XYXa*Y#E=we!S77Ijw5RX({Ps3km7V+2M$K5r%OiG-Gj6fa>f
zt-i`f1CdOyhlxs*^$-$K!AG6t+pKHSON+Sg*VI*w1bMMyl6nHMqu^0f|F?|4grjG9
zDJ(aiRd$b}7JJ~<50lZStD+!TgNPb0vh~__Ap+eB-RoG<&wC{3?AIypl=3+Sks}I%
zR}<`0+ClA*?V?%A`Dpb+Y3|KXJ0A0<e*mw(dcL>L&pxXHx|xk+b&*;hQF>qC+)Dpx
zD)cbfuSr$R*H^t2O8qPi#qahB0)D!BhCZ?;=-Ja$;OWt%|8_n-A)cAS!0!Rb&R%d-
z-(Ae~5swliJU%e?yfO-t&+=7HX*x}vbu{@+@xNz6wS3;GD93KBu9EvkB`i)CB+1GO
z(OBLo)}9)J2nOZsNRZkURy$VO!_*{nliSj|B1k$_{5_g_qO;DlZ|LI&^NtP(n0}k?
z?SL%VvzVXx^a*EByo3fx?LLZy(U|E<X1+`~0+f)E(n&;xu7!4=M*RbRY07NA_`|2N
z!dUQLQ1-yuM;rG&?;pUDyXFJ{m{}*RmZ4;GmCSr-)Ora^zWq0_8wN!<G6&(A>sjz!
z>NL-Up@EHhH*CbRL7f~clPP*WRUr^ant&Yk0~$cO#mIheh!~Gf5iIzk|0=6C8*X~h
zh#u5om(!pvV+alhU2RZ}VT>ESKLb}~kb0_e61b?-6Ygut=3N7DG<T3oz=s1D$b7IP
z4h<%mw1XfD>uF82P3TI)%T+S$I2xeOLtoBF%FeGkeN0k$=tx3Z9QHF!Y*M`g`2+LP
zYz|`M(S6*&>r1uk;Ab%&WDzWFAmQp=OSD6;KMk2J&-6NF?p>dwUv43vv*7u>>Z3^-
zk~R>|8-C8s6MXCx877eW)=gRK!p$XZ40d*V`Nx%xS(MOA1UKqz0`s}3eK!gg7h`zT
z556E`vG>bV;B|5sc)Xy`oaz}d0+BCE42ONYZ{B3;6U6TS4`4#DZR9Z^C4Ad95@Alr
z-h5a0W>*yb4nS}v09MU>zPQA|6AuH1P|#F!pP3=!bBK@dHLR#bByPEf58g`WpJ0`O
zCa$aP>Z!0QnQDydI!@ZtNsEH;w&CFSY!<^w+7yy_*f_j3Y^S8FyH(9zT#1r$I2fyD
zTkB&CARNOlwf9@GQzy#B;%=*K#dozHV~7Wy0N6L0T6vpE*gpKub{=DPgKr)}AVy>-
zPyEe8DGUU6?{ug!T)JR|0;Ra-1h~zkP=w+FdPC#hgI)~fA8>7$U}jc3S2f)_A~Ma5
zl>4bHZTnbo>tLW#@C|cPyIcdmoH|Pv(3);BDx@5it(e5egBBsgiy2Rgrn$&ai_sm2
zhvvr<EJT16-I2$r*K%Cm5Pt^--gtjClHD>gtg-PQAg+BaTF9y$LsJ=SHxzczJG5uZ
zTQg*$#y$JS6E=p5I^N2(jjXWz3)!!orEbVqw{hsPyi3@KK9TjX@wr+P$vnH#8}cc4
zD;B_uj?c;xa`I*eZ6$KE;V-E|#$vO|5?-!mIX&b#ef0zYXncI`A23otAI%MQj#_~H
z1Ma<<H@79B`r}1W50ELWxL#vXnKjdf0K`_i7$A`x%lk+rsSmtK3}ZiPJOt2%zzWKb
zPI;HRe`YlB=_3ompYZcdBtB+AzxdG9=i#{ecv`$z+oqNbd?hOOCI-{=Nb_PiFUIUe
zhd`s*UTR8I-+g_}g4{2D39FGeg{*{;U*lus0ScSxaR^XoHA_vn*Ph6Td6<Y*au@n&
zVthbd&tq^T_EV<|rGl;jIrTL8jCNl4CK$p`T^JG9<dnB;2zgfDB+%r<-ILFkoggx5
z@hN5S+-NdmSh@U{k5G29iu2aKYsM=dU3$^6$=n4oRxmPSHvTycwP-jw_r{-589B3C
zgyE>&s`i`8O4$#xsJHc5(wN9K1Q`j-a&_)G7=dh`wFTqP@{X>$H|b!H1<P>Y@M02P
zv(3B9NnmJUf;l3d)Q(L%w-xj(Uv0YZk{rXqdj9m;<fCgZJCIz`tCRx}5087v{K{;F
z+N{oV?Mf9gv1uCOxURjvAbRQSPpl+~ey7a4ZP{Zg0Vuk}4QWSa*jmD-$K)rM7|Ia9
zHR>cEYYecqszqhmm}<l5R3SSB_iRK2qU3@6VicHP?fzD*QImq=g-0EysT9mA+gC-j
zS<Mc%#Xss`5KxYt(>AGtzq>SAZ&pPUapw=&(h~KDA>w1+aTlb)tUzJefc!dSs&6oA
z-+Z;xskx~cMlly?TGwlW^;|buGai0+4IGu=x2DdPSPk|I^h661&PJ`rxe<b!^4Bo^
zoA!Na+QI^}_z*OaL&)n#Q|Cb>O=Kby&`Hbi!qbbyP5A1}80ik;ByYW(byGnSJyRQ?
z^M=9Zfdr=>bKR9503|CvS0x*C(R#VzL3OWY$@0EyWVg&w6@)aO0ZeLirJM|otmiR<
z5G&^sRo#_0rXZCi1$?Q+QxVgo9_W74Z(uQ9zRAWSvaPbRryuFbQtOvStwf##!NMEy
zC2Qj;p#W1}tt^lSp-t9(mU9$?u=b2{H4)kGAbqNqTC;1|8c26g#h1b_c9rAt!2<5$
z{v358{JMWqurea^eGkKK!y<jyB>L?BXEgFfDBB_zjW`mC5Zn#~Nj2tUrbO!4%V?ad
zzW~N<_ud3#5|ch>5UNqNVm`JNuoW;1sQ0F*$y6;^!34t}`W8(DOnNO#5YU|OX@VRX
zQrdp~UJDG@$E;C}#s2_jf}d`v)p%R7iN@eRpxi{cYdr$s#~Cus+udPcY7D)9KPcFH
ztVW?5Pv^_@UcHBzWt3l$4qf2;o=y=ca7qq!+V|6?hd(i8;lwPS6(WVt(|_wnGsFWA
zH;flzZ^abR4T#6Z2--iHr372hT?eI>mNW?xxDrmk>VM!-XTh#z#wyrYo6^#0Rn)=Z
zLN`;N?$=~}brn#gnkE~1#mJfA)J5AAeGtR#ygDg79>lH-`v+Xa*`u#bq)ZFcgrho5
z>7646ANc7SABQf!THN9w4=2I(p9DbaJCDVl&Y-O5S=FbS@<6iuF+JOVJ<joX6*fEi
zEs}@Ri~|_lmKU@kR9z;BXBxPw-5sRfp~}>UrkHb%^6>&s76&IX?^dV_S?rw1=<2!%
zM(P+_{sV3U=OWwi;f!Eu%3x|T@q9QVBcqriopinkf=geq3X&#}3dF?c&+WM8hle^u
zObDCKLS6iJ^444DXoJ|UaE@>UCHL9mV~;#J!2d5jD=}q<=ydHT1Nq_3u?H;sZC{rO
z20<M}^aDiumZ+TOJ0-hCBru>hf^0L^86YS;22TL^LFe-|Of9sNN#{Y}e2v#s{h`xZ
zh;qM~CZ<VSt!81Ul#*u=Pvyq@Rw$&zt9j?f1OWg`9=og(PSalO{3hTV>Rpq8wz9K_
zA~QH*twgJ-aGHuaC^o9sb)2LYQ#oW=-#2ZR;53lm>vEYDH&JrD^mU%-<p8ArxoO!a
zoD(MQB&kN<S$8m$-Ps=UAbu!R(0zA6G+s;Y8rU%>aOIZVGks8ohQntaEtGT0a>Q`C
zMGDV<3k|&kx}B<wN~RwW_VH}yCbzfhRi14jb9DR90{Upzozp|aDZKpV1|C{Mnik&l
zkA(bD?q4*NivQk?_L}N5+$BD_T>GrG`Yfets~)*}MbrMvEj_G~^g#@%q~iKh6q8|T
zLoZ!N&|z@cVX5SBxM%k9CZjeQou91a#vi*bUSN}WceYtct`aSYK4!oaZ90Md=lMID
z1csnlPFSH-DL^GB4EpEIWjiXQ9)6JU*-!DeRPCph&n*}F1Ql?7c|1vq3Gc0K@IGO$
zVrNfz-WMu<yt2r@yQ$ZOuQScxE=rsU0H^eWhU-PYq4H&*)#2J83w-EPp3feCCd76>
ze%Yl@R&?w4>tRhDUf@m|WJ~35W5>*bjkYkRW%X3df_OpDb1wU`6?7+r@4I-0oi>@#
zJb$P{??cxWyOlZMk#R<z^ifk(&U2`Rg}u3xy^ckMmfO+Wy>@qY;v6V&xmOhKN+||t
zSCS0kp$^*011lnj{W77uf2DN%ucW4QKmnC?Q80`8@<_R$pf9iRKY+bRNFNUXf|~(m
z)8J&RzB@yei7^q5?S13@^uRwyA!i$CAgpsEc6&vE0O4T&A_iB!TdDRtRz$pWrOC1`
zL`;<tH_5vF2$8G<&XF-v`3LO8Y!<+!G-aF?`!Cv~Bo2aGq^SKDD5u;)4`)(9VGZhr
zVj<sUj(U1cs<!jz?LVy4At*_Q8^<M3bF#mp6Mm)Lgf@_=>mrn`i%4Wc?-3Q4;Pz!X
zH2Axh2Ns=v-;+nF6Dou3c$iSrl5}3Ok(jb&8k7&#m6EWvZ%*n;A{pyA9a`K;ogpFI
z%7JTum?Uokbva?#F#fW`cS-%I8t<k<>aoXxkSqq><XsTTJ-RWQ&PvAqMxz#F)PX;o
z0-DmHiz=~Ch1B_`&<niRFP2H#7vpmZYAIpmD(k$G6l#twZQ}=^&*vio0S`Sn5z9vr
zg?G)u#T2rmL|K(zG;!lw1zCwpeuqQhbC+X;0~S1BC?Aub3p(3{)_=8-A+2<8q;xQd
zZPj8>ETjGmA7tNH#u#u;?1hjz3e5GUYV0@p1p6&X^a?tqduIg@UgPr1d#V};b8s~y
zH=`;Wn65zFR4P#LtgLzzWIr`o%<s$W$#~6jT>T;5IVgA_T2&7+3B7o){_1=%>(KeO
zwa%uU`=_KLp?vs(UdM8~J3>KEB`lzjt#PydYCqzl2ZWwePqjxVLLxT<S>)l9=aMz;
z9hi54{>louKPPI@;1~@=EhvR*M}R_S6;-PZeH$+%z!pvDQw9@oBNM;hJN;*tcBdZ2
z4ODM3qmq?e32K(!Y{rZp4PP~j!D~^S$Kpl#rQ?gk=6CPim6X0Tmt)K}$iD#hvgK+2
z9X3wIQmu-H9$t04iu2<Z3ZoTdoQA~(e%<@Q^W|;cfE6GAMLo5>db@<JMZ5CuI-9yH
z4<>&$Zcf>{4IWFpmlxiX^SjHY{VNo;kbYH^v$6ZBPP{BnNGEonUe(~oUR@nS!Hwjx
zUQ1-I#Lmk8<I?rpT@&SwH<IouwrBamo=`&M4y?GV&((;hX%?mhMVtl?uNQI~WXTr{
z&J3+Q{}M7dt|se*hjgw*1|G}VO}<vk_RTj99KV3Q+7>3OID|`}-Oe=X8>^tk#S7Jk
zNhbSP4b37e1+Bm3dww+B9gLWpJZ=a-svL`089AP>nfp|Ib=u;**Cd@I6RvlE<N@+o
zK-q4c?@urM1yT$~9G#|vMvY8N{4Q}%&Uzhqb>elILo{qvZEZx52OF&qO@GsgyPzoX
zTxEUiApcP%?6@@b#+c`W&b%byy0>Ypa61IYq}z~{$7jr{?FCZe7f#qGZ+d~4v*7xR
zs_T3+T3r*KrqS1>o`ltGAuSt3?)_Jw&V}-7UhtI;gIdQkmn9YqDorWh9`btR)h$Nq
zU){1nxvOd*r?9=1%csH(UsGS?cGjr`nhM<6C<Q&s5~XOH`hXSv&WNTTW*+aOPc8Kj
zxaHVRi?}t%$?Vv{dv>5&rsulYSIw@T<-!3e-m>zuPXzh%4+dR-QS~w;i|sa^Hy4%9
z#?XSVB!<;AKe)qzOP1`=*u4CZ71q)A4^XmisDB<Qn3yyIAU6t?X0%&xX@U?A3CL_c
zfp>_5u?v60Kzw%uet(a6muI-}IDzXYw>$o?w9Mz~q`UFCRE*<4z_xTThdWY3fK0f!
zNmWX-04HnA2-A4H2M&HEI6{<lAWIVP0sNPX+Fk-<9)Hd~_*yT)mDC&R^=+q;D=;oK
zwdUy#<ocg<n}~1oW`~r=)PXN?sJ0c)XJsYAV<TZATW2ZBY&I`{T)upt!96CptLpmG
zqEt!NKe)vl<_}pR#&EM+mv6EE0}!s2WNc>PuXcrPVcha!kE5A=$fOV3eJ2w{<kOB~
zs=WrF04(WnH+=in<d+HHE+_b?r8;wTz*mf>bJNsCs;<WRsH_Te1{W`H&nL39`8UIV
zNWZ|qTXOaN5bMTrOGYq2Q8|>5OOywQ^G%(o|8#cp`EJGkQFNL^#i}z-r!jZz{1BhT
zg)<54A1{FT^7u5iJKtr&$Pm>R9`HB(8Z@v7{vTjrP)~72W^5!4XE2$lvuX9}79??3
znI&S@j3>4r&C`PbA=I(}!!P^$`F5VxW&3KL)?(Pgc})BzbQk4`_xCiJ^(GnDmYnGN
z9@Pkr9L?|MqrGaW09SZEy};z=^oghEo6SvTzh1efLi9~w)e+Z(xw=yb{KY_E<a;ve
zP^dm2eP^>ErCX9Ii8o#YBfrt@;sj2xh|q5awPLPLZs<bP0ss<nw=aR{X(;bpg|9~U
z34#s=^=m1lYsWVZ3Y^Xe76rd3{6>1;Rsom;AN9&nf{;Ucx7F-wlrLfrFPy~KmHD0Y
zhlwjn`EY|52O?g6D0l;UB^ZP^)lX+|3YmV)Puw|6X#0D+CSOPfzv#t+^wl2nm}=`y
zlI%?BK%Zu<#HWn?VgY&($w!%|P<aGn(Px22gt*)Bh<}*!i<CQF3|}AX9mqf+1j5o}
zc3*&o8g^i3Rf3O1)Ms5Vo-#Y&ZLindxtL=@jn(8d^wDcVZ1-HhtN+5r>U_U|UxH^q
zhSsyu^AX9xp{e1YI)0L!>WkzK`ei^(47nn|>N^X8a9z8oUs2|tyaW>)UbSR@AI_gF
z+q&S@cJkLJ>>}_6uHv?FHZq-{E9YO_*G3F}%uA`cuolsCQzZ^&1uYX=C~(8x1}Xy{
zr>7^INW6R(E4!%-r8gTI3E%(Jc01<v&NbCbgvAa1#1`Ype?ZM7h3jr#n^E9x_Zs=E
zS#<J3yIjuGd*2f%5{ZLX9U5Y9y-SsT?OP)YW%t3g<AyfwJ{J192Dc38Z~YkkK3z`r
z+bDChDJAJZ;QZs^0%g4iaxT=n%Oa(;%DP9rY1^ZY4fMyuZ<zOhIoo1vk?(m^_qmV5
zLN=Ep+nwm~-WEwGSpDVOZ!Zo&>TJDH*rftJs~B?=vu#0SFOl@wc8#vM+tHi~E|pdZ
zyVgY{Szdf*AHb3LJsw+bqIUb>ml7FfaX0|)T)J?cr}llc&+wabS3<NZ?+?_T{<oWb
zX?(7EOQ9lo6OFAnZ}n^LzT92&(aA&^*f!+YqyKbG&o)8%M&K@*c3_RqnfFST7eJ+3
z(a(!9lO6F)*g}t`jq*m>j1KV<*!_n*mrBMdo^7-ba;Igd*WGMWLNiv`Y=@Ao=T5}F
zb}ra2)rok=NUf#orprQ(ByIiy8b4g0KDlR5EofJ#k;7mR{Oy4kr!=G4<SA0Zwe}e6
zvHO6IJZI56PmLH#8D%l|w?<fvU7q~z`a(O?Y?Cef%j_=o&_*J#SiYO?9g{JSEaq4|
z#KM#}Kv{6o$=n}2l=C<ATW-wo10&4U_q^uW1635{%r^Nevn?Nq-t=>$@?_-xtXuSl
z<<|#qUuvRP1ItFXQo>n5*nrCZ;9pz<zi4Nr%<R#|X<(U9n!u(H_9;qY0tGKR*Ct8q
zWYKv{y)Kr}hrP67XfOAqNHr=V9gSS^apwq~wr~aH<or8lf34L@6gxEE!xI@omNOri
ztJ(XgdKv^Dcuhh;BPSL0hXd{&*@fwO2u_9cd-YV*;+^z8W^u_VXnuuKNrk{~dmPU5
zM=d^e6<z+o>*o6;7{}++<;szFJ0IrwGR17y9#4?2c6CCF(0dL|SW#?0vhc~F>jy`U
zn@TlF`ujGg%TJc4ha0<kciJyrF^|_`+Zt~$5`XebavYt?4D%Ap{i1{U2dJg}u)g4C
z=<+y-+wGYX++{Hne*Dq*!<cG}e)oXet#Wm@OO{s@cj&{CZhKB795!Cti}U*!<EF}r
zE#zn9-NqC+ZEX=k7~rPHlh7l_a9%;D%a%Jd#6WgI8oC3%rdJ0;!*;;10^wqSwGp~^
z><)Ca6r->9a~Q*b_lf@NxE|@MUPb60uzi?mcU&MzV2v${Na#vD7v9FsOfI3AQz-mn
z+vrovc83~o*f#fSzVIi%fp9w8Dsa>S6Lnf}!_a-iA08#TWOtmup=zYku2=y9SHX@K
zd<}qi%*(xJ)aDiOYH*@-@ZpiUuCseW7l)P~$v5n9yE4)2rA4pCiXKWajr0cB$A55W
zD(J!z?ky7UgFD<Suy!@Kqtj8gsjOO#wT800Sk~PwZH(C8CSL1`OA2Si)nx*X)z09E
z)6Utm+`pu)lwj}n4Q9@k4#;w;`Y?uZdVCZL5N4{Lz@cIpjgs%rn&G$7gmc?79bLvD
z7L!pChXX0OU$RI`zSzU<dSEWpX%HnJZi&c#XN-LbW$^|V!Nh3v;W&d{lTNb6n!e?%
zHwsMp0Vs+S*2{7rh66LB-md6na+lKfP9C?E+Wj|(`FvSzUxP@9QOQ;)oXQOn>9r$N
z-uoNYp46)`$&6VJ*Qq@(I;k!gjoj)3WAb=~BO$cNv!?^^r1g|rS!IJx86zo*)Ar<v
z!vTp%+lL^HCZe|^*f}D8J{)yTs7cbtIMj|4ix_OTjHpjXEqTP8mj<IwhLugIx&h2;
z51o$62q*5K3D|{$18}&`ekS+q@q~{O@_q}RvyGpuT742UXyeUfmW*!q!Ahkzg>Jhp
zVN^9f7(KEuQW%(DN&WVt56X6(h?DBK@r=~L@adk-<6F}gf9nsoj0>tuafdVaGU`!l
zamM1S&HaCbqn}8WNUdHvFZ{vziVkz<Vtnx9MFXWUw@%uGrgRDE{Uq~ItH`7izp7~R
zmC@U`oL}KOC6YrUtDNg2L@vQ^DSJQMT3fjnC-2vjZ962GjPaTbS%6k6_;tNItCX(u
zY*i4S6u~xi{cTX+u$>kDy?Rnoa?z~e$$9HCBirQ$&Kb9&O^-{!{AW@$hA852Q{e$$
zv!8f0R>JO5@k+$RKY+h%eKNYC-oEQ-j2-D~9F}yv%s7s@`u47A9Dy$63>`L2d4*Gp
zo;j{S=HU+Iaf!LuyX&o4CuX__70-%?PR==>s#|W^tzJ=+9k@gYXo<3X!u4$zk<Mp9
zpIdPz%^1xkc1p&mNbr#N2)VON$7RNj7lmIOI5Y%)WSwv<JKd^Bc5oSeYY6)*g3ry-
z^JhKwA@BUKdNHg{JU23rRhP!TJzi?FHt}WuW{8`m1Z9@JPK}fZQ<@*RRFL*O9ek31
z))734uReoWin6=}Mclc#7i9i}41WJU@Il_UIPK4GVU)W=`+q0m5?5tKXJzkpSTsme
z5*$viD-Qp?`X5hCobb)J-rz^ZcC5No;>gJ0R>9W>S1k!IyR#t-@H3c{dg4|%CR$L>
zPkt?uO9Y6&tN2~Nqy$Imtt_ZA+;()2F0u}3x)3%aeCmem%1PvXq~J$J1fBhF-#bgF
zpJn7QhSdw75uKO5-BFuO=w~TQvfqlW;wZg#WHfkuBJRFDCS_NhQ~;ZM!-C!T8z$~7
z8<G)YHBKH`3kfN?Z;_)d#I0DywVAN-o}%V;0qRnbU~I$i@&q_}px`CTAPnzNtp~!C
zYFxB>ehkq1tD26LEG@1#Y?G{y)$`4GE}48fh-S9ut<WhhOCKR=$J%|Ap+Dm(hMkih
zPF0;{QOMhlT~-%l+h~$H?-p;y_?1^T%2eMSvpdA?pQiPXdvcE3-F!kHed~orA7u3O
zI&F7En1d8Q%x9u{ba5e%BvDl1m$tLlw?AJ^@O}Wd-NmwbUOGN0w0!4cm8m-E?1R~+
z?o_mhU3%0w8Q);Ce2;6Uk6q8<X=RS>v*jFEz*#qqRE$2jP*>|{>tfXA%pSz4bdgeK
z^dnm)Ia%=>ySh4V+1S-l`@j159sS;YW7`XS5zTgp)9W}>D3xFNaM($J@xOF>nWB|R
zJ!X77sVI**-gnxNB~(MD8q!b8REHn<7xM>+Y{{>aV1OHvxLrJK=l0-=TDI8IQHn%|
zd=sFG+b-xL3cK_bcb<q9zEUAatooVUdrJuqVig0BZ$PQDTTKPZ04S*z)c^RzBfysl
z#@|^~)q1V>9JORYbum1?VO*9`_9^|7LSK3}C|Ly>#yd9<BhC_$va_b~@Ldy&ToaP2
z&eHv?ND`JaW3rgZ`|?&+cwqB<MAPN?r^gJ6Vs)2w&8A{RjzvKhtE&<<DTF6KP|19F
zU%6%?+s^&qbx5Itx&e;1j*W@XWxmf(_x+bf!6fLwG8x_H$?~Pj(Jy|VChr!N{B(io
zjDJ&y+3R(foJqkw5E?`Xx7K@;e&%CSn3BD}!ye1=q|2vF;2!L_Lm^&Uy{S;LHQ$MZ
zp&kwfx-mos1)WLt(gqw2OMdFCce_dVvs7pvXLo$G;Z(J@czPw1@`b&Jkei_hUep+W
z=L-Vorf!CyxdF=R)0XtVd2Y!2&rE*~29b_+<bQCkiU9e3gstr#*npm7Ui7v+7#cTW
z`ZttXAqKj^*Z4cEF_1hHD~lba#kIV_nKK;(?kuUggYX5cE)J6oPPuvQ9u1K~H#^3O
zbKs<%&eQkVtrx^u8J|uJQNJpf-;jFitpoSYjRx?GoknVZ7Bjp>^&Cl96VJ{2>`O<h
zRwxhpj82YfvwQE#44^@h;TY?&?6Hm|pptpG;@QzFo&eB)Sww-fuMGZ1I?hU74ptwx
z<UjhKPlnWe)$UO}rh7Vb!#LiO!ECK>d#|*1+O6(nyZRMVd&fWEYoEo6b@{zL+s4S@
zQO2A=h4$Dy27zfB-X`QP{%U|zSj#tfh~}YK9(|&kE0rM-hAj_z7J6RSu|=r8TU6xh
z!>2Z_o$o!^)kgz&Pd8206vJA+Sl#{+ygGlVaZBLYZ?>d&%`a&}pMH~0v|5tK-wM0;
z%ADyeCjB<m6fVmr%DSt0OqK$k1WBpjg{MZnuVio}X525_MCI1?%XKlA-zGV0qL6Y<
zq*aNb>DCQ9JMWt?2t*Y!P~)(E%n@zJHJvgvpcgf#lX+*~YIMdCi*9FHS-$;x#zyy9
z@ysQePUS#sT#&i#4Wf`by17KHJ41!#zZ+TkT`v6v(f-29xL)d6*r>GqwD0e#(x%%N
zTJ$ykPs^2OY2^N2@W-Pas;nXIa}MvQk0=L<ykg10IYT1RS7I$*Hk-=jo_-FR@JLFS
zxgAmSYa5xSEd5cXmZque=<o?u(s#Q(S7(y^Fr>cHV(9UD$AS)0|Hm6WJu?k;G|C4i
z@A>>sg6x+8VLYM)RdP6dz2^(F!bc3M+99FqE0;xeGJmerU)%^}{d!OD1sfS-W{G1d
z3^LB{*7Ky^A0Fp6o5Z%Ar*b<ie-g*^>5@1}s*E}dMz^z!GOt!bBm4%1y|5-G?e8>1
z|5%-mXMK9zna5lHzWAkem6ytqvc!!K9!`%jF3mgq%lT<ZGIN~I*}mu?X&a?nUy!NA
z63e<Q92j$@5Q+EELyJk&L_KRrE%uPSU4eVw>cWR!%=w(>tuw|ct!B!qtNIV<D7@^O
zQmrEAl_;4jH5jdydwX&Fyf@Xj!8&>~-lxMDoM8A5AlOKp@BPEf)Y}SFl~w8XT%tt8
zYYF@!<YkJ>eo_tUYcoA5<@&lZ_e8lB`ExYB@o2=trGhN<Gi_q5nQ{uJ?o<lK&Wn7G
z<%?@hLHV-U2DyH&xfvh){R%csM}%Mf^mC_@o<z1xcHixbKVE^N+nlAFnwNX%R#tma
z(Or)hv_necv)<d1=|0|WFF)DzozC`r3Aa*rB{$f}Rp-6pZglf33SGdE_kTsB5eN%K
zy?S23h^FQrVsQF!-L?9iyc=)%Y>M{^oyeiebtYZ;Qo79@{NXDG5s7-VN_pUe@j8=m
zQYRS3ea30Xz%gs;R@%LjG{WaAKHZ~z@0^+nfHuxNPG(hr*x_GcY^=l**Lg+umfrG6
zgnpAKeX-MIok?#vLQBb26Bi%8od=+l8H0BJ0RlAzq<e&%*`XVW83;g$Mx0S+16Js(
z(Tn8myfPo|bw-)^)FEHSzbQHD+yBEM1aNIekRe3I@XKQOq!HBsgxg}KHB#XY1X7|Z
z)~yadOF3ntG$cOx$?$K^ve4^PiTxCVoau3u%lbb_5vn>qHH<fBGQ^gAmCV^P=I*I}
zo2F)JaWP~?Y91Azz9--a7cje?D%JCAejOD1|LR`w>9Uc}s{^om81TEjqOFER4?P6E
zxjI!Xb=ZeA^J;OEkaWsz3jvtX2-<gSoH7_bUAH)#@~DJdr7~zMIFZcEuRzUh3Fl5q
zN=bf-$TW;W3emH+?c~Ey;>96aZtI0zDfncp)_y;o!{qs&O{a*kdue=;9FYf41vfge
zZ%df3W_NMLvj&7k%W8z{bgA>-1aRYjyD!;ttQTL@dB_^!3#x<<rOTBW2k_R$)rCwo
z#K5Sve)mQ~JmwcSyD)(~Lt)b*$EVl-94;b-&c#tKs8K+7(E%kq{xaSo!EbXsWTHC3
zd1u?=y&vmgt!7tKo<=@7FG-4><k&L}`J+Zetyl6_e|}>z<nZbFvq7cy@2`G@+{*W;
z^0;VKk^8X0p$@NIzq@vq2RX(gdXj(pa#P8MX}gcOspoq!wjVO#-eW}nf-*sOb!Cfi
z?o`)^*Sf}H4JFa_L?2xwq%tVd5LvEDczpe~jfxY(qJ99@<=0oKAFnQBFrWSF-n?C0
z-f3!<c)LqWq{;W&g_i(kx(fY?Ec(#vnv1pIlSw~4&lVlIiW{!czkKuw5wU+Nyqdf|
z{%Cvx%yMj_3IlGx=?)OW@Gs~5a=3PZGOIA1O8f4xzg?y+i;4QeOwTZ-c+z5m*;ak2
zwgb=dRddqp3LN!UoS9f(w3fOh9H9e9Q`PcIb8)xcFwZ9_aebV5>WF<U@a?m!r1OZG
zVb<+yS=EBzL+gkCu~Fz*KBL|abubEp=ehf&r6t6Wikdpy(z4Uyfd!XipA|Uu@0KNB
za&`ibZi+L$MiA*kEyJBHqU~Lv1-ORt`!6h*VNP3*CGg1hPrH%WFCN8uDo*_S1?_Kt
zE$*o~cXFx(Pe!xQ+-cu={)V!xmwd$kzW1J2Re=@Qp{3jtn|V5uWm{`d(rvbi*rC<k
z4>~l_f2rYK9cf|+8YDW|*}lCqrDMcX*u$U>nvFHdI6u(=9{C?fl|SR3bD(L2v$^bJ
z2>dTog_c8{peeiVIZ(ep_u7HmmSR`no;)-He+}W+b8Rof`?oT|ZCk}0pjDx_MPltJ
zX9D{}oCbu&j&TPp&&a>7OxRL~bUCBjamg~eTE0pGqbjGCe=4RGS!Ctv{Z2z`T41X!
zgp|%RjW(R4iv-3jMg~3ZD~FDq`-wmhHZl=jqW+YW2*P%O>t$JE4R3|LJcyeF!6zu^
z%#2`#zw%4ae$&L$BC?SOc`r39Rg9&Jc`58n9rD*KCPM~Eg}xLDC|p(Sd9?aDWCepv
z7OVE(6UJauhPa>ErNp5@W}9caFKzmF-#NcJwWUSt<a?b-chT|&k23b|YJ-jn(6r6c
z**6Y;mz*WPw@q%<RWK;~A$&=ydOvP_QXf<EUEyz~ZSN4}Dzt4GL~=8rr;mMqR#il+
zM_ty|TaHS0pW5W={L71;f18ms^0-U6boI<=u$6bz^7Iwr?9I-uHmJJGHZ>QK81&?P
zQ_%+^{D65GKd31DJoJ<+KG5M*zJc1o*H2A&L!{{lH!$?S*E|q@NFx#B!(K-XQOh-x
zG0BFEf-+!wi`T3q$FE?>QizO>1go=3B|<=MJhMrbBkjH~x`3%$mV0Ma+Fg7J1BHA{
z(eDo6o=c79Z-^I5j^xh079Y;ad^nH;!U*PcYa0og9vN^DoEgq~LSK?sde$mk%(0V2
z-CK92dSttjXQL3Go*CO-Jb}cS#h;K5b}EB%CO<@~`?a$nL=Qu)TK1<kw}d}`Gc{;V
z?rp^*&XoOuRFbopM1JzV$NRGV($Ozvu!wZcz;Sg-i0{qdB>{A$?EVAylCVHgJFhr1
zzg52zi9xCzAmP6zk)HPc)nK7Ptmie)H(rnE9j;s!;@;8?`ZbzV6H}-R&*!#f%0O6N
zBS3N1x;*p**R<H1Hoi)`rM+!?B}G34UX<0N`!vOk7=F_o9S%R+q9bFw3ep|bZs((%
z355CA@h!a6OP|&Ve}6LxA~>w?W<WPX%A{7!-+GT8M58|n<Fm$|eS|a4s%orCWPJOw
zx!0yAF^be599pAysYR5iM2wSEjTbshR3deT{L8s8vz8>1OfNM?PbpIQ@E6>b9*Phk
zS04_U_thgfjm$aII#3e7i(lN51*JnZPS2JFK-D{e$7-o$S7V)S)g{%Rf)wiDcmykJ
zlRY6eS>boHFXWx-x6ihb<&nB*Vu^e>p{+bwn$1VNq0Q<QJ?;BfBSe-j8*-Q+e0So`
zqOQ}2if3<~QXFfC>GOTh7_<=887%vq2dBsvy8|jtdtOMR0$kL68A(q&U$DQ(*Wldd
zWik8pou0Pmx^=Si^47F-iF*G4)v_$k6dQ$taeq~qgWeWh@$Q;_W5U$Q)1oANT!S$h
zlF8Z>750<h<_5ps^4Jc{YW!DpRU6A<E)Cp-EtwQbh(Y`<?avhO;?Z?op|5)U?&soN
z(IC2roPvJrSgX?u%n#|~8NDYW{XS>ZkN_9Xp^7zcL)R%Bj&LH0e3i%J3EuqSy<!#^
zjA8JF9_e&fUyXJj?o4}3DkCD|uTnp`XfkT22$zV9TGOAXVpTqjiUm?&vj~oUPD~L{
z{f@atMunQtIuI@kh@U)Fm0QIbp@8GrL?3qNSV{14H<Yt9h>!yu4qkMq|D)#<!kchr
zTH(O@Ln<!jw9yC`feo8RS)HSu`Xua^1txNJ@xUnt-X*_Y-BK~ckG*#KS*v<zMK2?M
z-!~{|h|k$9yi%x-m31;KVe$UEVDzq<+uKZ|r=wQ!lp@C8f|4erK6tTrw!md4VLVS&
z!KTj0@cYMVdUw0|-$cY0m3GG=*iiWiM7ymH8ZzN_t_y4Hyeq+`z{`(QPNr$J5ZG&H
zCbs%_^~`-VfMeBWg}zI=e!A-HRjAOJ(W}Rz$VT2OxiI$&o;82&_-;p^p}>w*s*U=5
zNRQql*8n?%3%wBvWey2pr=PVS&9Q$79#jt9HY21=qmRE>JC8_S{grP1fe(}gB(xOX
zn&l{yahw{ZUY8;SL*%6HEGyE(d3?08d(y`tRXc~j`c@v4`1}Jr)1}mIT2Jy0QQ|-M
zzKZS6@3!)u2}T^c5^r68bLM4~`>aX4UoOyfW(>MKG<rHZ6w#d-*ZE3YjvfA}7=2t~
zbAJfb;yFUH=s=&j_nm8IWE$CXe>)_!IVN4Z^@b(hYpb)JHKZh1)L+Zuji0#*_p)jF
zbg|vXl(<&!I~%j1mefCY?X!#i0S`pbc5&sa0Z$ICb;h|R^1bg)zMNcP4fc^)TsGpB
zmgO;Uewovd;tw%q4LapMiM}?cMSJ7-{vYuCwH-^7T|wEBtEA2d#OtP7S+T*x|EBC3
zU+Ti9l9p{R&9~hsY$MY@JWvNuSIC(g_<LVPJ$+t~epDoh+u;urpZzgYa-`T5x4v_^
zx1vvT-}5wZ2wB;kJN)&Me8st$kf_@pigNnWgSt$8_x{J6`IX5j{^qk;RLS4Y23y~F
zPdmrF-wbF&X5iwKyW^m9QP%G`$^b85#nK%>my}_7RT`4%@z$@CyTV37SY-UYgRYCf
zXXLmOgn^Wg8^b3{>s&W}Lj5K_F{P>Fbi7p7$KA--yZ|b3FBp6CcytMS@%<|Er5f*d
zaA9lbQd9oX598GVu%68g!tfPhy$~+9+~eo9hkm!}J{Y<!-)t@;NL5S2QRuZk{ke+E
zKXd*8aZfU*YA0u8`fgLNaTgF#*FW6qF|&Pz*S6y<YuA4voN`=>(Y*2f_tiDCtmKFn
z*!HrTzumTVS8B8kt$(*w&jxdtevGE&A6jIZ2Oh*LvuOWRBo0TMck2K}i)VjOM5b=5
zr49-NeZE2`KoS^gGw!SLC1MJN(f<H<%UhF-CR7bAJRY~G-%4_p5ta5!F#f#o4`6-f
z6zJe_<t<<7it?ZY9>4kRICFE`--aG)b87~E_4bm_%%2o{Au2%2$-e2Ond)h2mf4?~
zf_sgd+!<99{7tu}npSg1M>}O6OHr%Aw%t;6g_Y~S5NwQob9%7)Ak9|j$n;61hhJRp
z67yn?H2QE*q(z1l2}eD1c+0vO9LC-^caOO1%6DLVt$cXZ-+aG!0i~j_`-wB}6Yscc
z!+f#M2G}CmiT%?jTn)Q5hK07I<Tf-ShI7ub7K){RTNUc!=C_tKxM(Qh2jVdB-4FF=
z00#_hW8;ux8TaRq!^;86y!)?xQ(&~$MtG=?aHq&<2zA9wZ$q47_%hwc<!S5ImOtzd
z=><zQw`J@&4_~G?|Hq&t!k^L*f=SzXTmYZIdv(kiDR_l=q<C%^bvWfs3!3I|eq}Y@
zJj(S#lu<FrjWOvIRVo)nRD__%L16wLKE0P>MX6W0ag?}C-R5Q*njC7RA<Rd;5!gPo
z0FOOIsT%3*-s3&c+4=IdcSlV`eeV+XZ%<>$d`j$_(+ir)_(kW6K<5<U&<tdDV2ifV
zU-zzZR0-6U^QH%rX_eiLjH6~@<<7G|wN|y-;7H>9#0GLid{5a!4JAck&A!AL^k(I+
z`~8<bjV_J@ZmCXX`enz<FLU@DA}&rqL>O}HqE<4aSBPTKE;mHz;c7OAVDe7>(Y15O
z?+;h*(Vm71KZKulWC%3shC5BDoTlcke*#28v+$dA>6GB(&$M+NA6ggVWfh-uY;tEG
z<2$UxzYAbfrb7dF(M^XSlcQ_rkMj@b?)_n8k}l_O*yWU__ann->&3LKI$j|d18_bD
zl0(c)mUawPkdvL=$WfIIeCKxV@%)2V?}dG;D>RPFhA<2fu1~coP`mZ~@5X+8Ggfo%
zbxg_2tWh|#+(dsGQ7!F}^PR>f=`-KN$e9n+wC*iu$*3ii=DC$=|I%x{I=Ne4dghL*
zr|qyF|8vQ^bh8ngD*|Kl>6kYCdVDggo=6^gW%TGjF*(e5vu%}dynp<k6uQQ;YNYS`
zs)JgtzTtv6L^}-a;ZFw^_^!2VlA*OF{6OZi?&T`KZSZHE=m*XnKIOS--@?e5FJx<6
zP$_;1S(QC~*F8nFg|!*~=($1wD@TQH?o`L8A_E1l7`wHfvz5@e!B=DiVUos!E!Qx6
zMN=QiX!PY+@2PmgP=9-Iql{FD1#w=i4C+2Ds_Z|T*q~!)RUm8)Qi+i?@WzZX>ZyK}
zGcu>mN_E8MeSA(GJ)?=2H3uf`^sDMw`UDN*$Iz8ppVqZguD+X=Si3ftA|K;DGcgCI
zBW=JkA4?Vv{mvFMar)^nEeP;1w`&}Y_IVBrI&w|Dbe*pA*HN)&EB7A`<-Sp$k);fq
zd7ik*)Ll;A3*gF3x_<LhLoD9|kNlUlD(xw*fq%I{cGowm33m36&GV?jWBD#0vK4;u
z{_MCH4rS}NB>$lK8wmEI=?A?lc0^$ZHnP;;)~7E%=5I*;(YiqNmO`y|U$6^hl{<`G
zw`$1APr1vQ^Rvy-@0CnW<HhmVS+!wC60*v}Mq$|xe7)%Og1er3=eCQ8c*v*i9`~^x
z)ej|)d@v|+Y8q~d4QH%x_A3qE9(1+$O)u)Jmg;cF9;bMH?&A>c2MU`Mui5Q_`P;Ge
z6FqmlEmLyZKS~`NNopi?ffh4MifiIwC4z314!3NqtL2$5cbYyYJo0V$>H`tBEV1+b
zc-4p+==AK-{gQ`l&n!KtI=;HIxzEnrJ>&;HYN(eFDT$Tv2bPb1)m`kb{#6c-obvFG
zkDI#ca2A%-;m1E7@MT~QcpW!%2%|oJ3nc7}g~G?IZ`Kw$A-aVLdjEY6<nR*wEJu9_
zQ*EdlWUDz%yG_#?yx_z|4t7xT(Y_Id)rva&rCgw2;(t4;4d$q}cZ5>0dRN@~gy8dg
zNBb&IoA|n&F!lEpi&JE|?CyY<l2z;mlvP_j><|BjMTtj6bjkk1*mugS9fFqC-TXjj
z6N1aM7vv~sb}1>kc;Z#sM@EU~zdjt7Fw^*7RqB!OYT9aPy`Di~*@+sMZEniAbFZRK
zwtgvFx002=Gx;asD0aB<^MqWHObx}_GBGVQZQw0gD7GO%eDrjkn_`hXoAS3M`x}oS
z)7YJAx2Z#W^E3;>fqf7LwOPtO>oo;F0^tYmS_Pw3n{T@dF`HA9$l7OX)FfFAb5DW*
zbCgAPPr}}rw)-7*?dRa{tQ>5Ss6|v{K4T*DXJ4NBzM#L)cs-DZmiP~U3)RQfsX0N&
zO^Kv5ePY$}-Gt{Adex6x8Lg3xmYraN(?;JwgEaPsOxv@I{OUQKw9788NxGM{2;Wq-
zaJAXW6MaY1l95Cd9BNW)vR!n(FN55D&?#OZbC~msyA;Kjb6+@zjc_0w1l>B04))6N
zdYP@0aoeCSR`vT6vsYN_`LeP$kvW&K99Z`9e!R>+*h2Q?9mq7}o<S`j&<6E0;7-<`
zh(xvL(Je)2p0F97)>O#!wwNcCH*#tl1D4`pl|0sqB7w3lP;UDM5}zuMdP~wykDYX5
zw@9+0CEQ%^C-NcQ^?m);*tw3Y*}PE=bKrhl!bTx3k^F$O>HTl?tW!Jt#=*thPC<It
z*65$0Er!EEKqtaZ-e~lLQKB+6)1s<a&y*>=w_l@kmm36!^d4ANqudkO(Yxg9IA-%|
z2G<r!;HyNFK@2ud>D&`Nl@4uKLaHJ}pq=14*~4;Eg8HJ1op~3HSsUSIXxH7m;!l<b
zt9&fl#>RvmTRIMPO<(<D*o5b5epEbrZCT%}v8mOuRyx1iAvdpYvv_K1ROIcMrSk5_
zFzA;0%W>GOW3u?Q(lueEcQ_?P#`1Td{J}*=|9b%dlO4EE%O)Rx{7$%5iZEl+{e8_D
zI`HMn+VtctIqK={j^^+B*BlZbGP=CI%!d|15oq6q!}MLD-gga2p?KD*eATZW{-s^5
zoEIFz@78YR1fPT{C36Xk@t~42pl@8JE}ptYEH;;lGBUY&QRmTo%~aIjvDk)PSG#2f
zEK0%GfK&AVrQ(Jx2UK1O2{V{80X`uR9uDF5%UkbStCX!(^K#Xd@j-N|9zfx*{F|?6
z4v_`n>XfjWpdm-wsqRPYfpQTwr`eu281JMf!Z}Rr744n+&wSj%9&hM%9q~J{axZW>
z)Qv@BijlaZoR2NNIcSop`S`1+m;n=qRlE=L9=F`ji_ae_S124$yuxZKhg#0?QM`P$
z1JK|(2*0Xag!w4XD@IK|aX4AnZM+~_R}$r87xACp@u3BLoty5*uNWa;wlmiCm-&xc
zg`}1e<=Pydpc8bSCb`y9?3HEImMkE%Xb?GD<!h58E2}e{%pNtXI|0yj6N!t)9xh&+
zx=bvi$SaI81RvF<&#>tlrB1HMmp`R!BH7G3djl)Y>xO?WviHz4OUfGF%8+40WV6&2
z25QMXc(%!e0gz{LxAHDAeD)e^A#sf%wqV14PrLINXNO)A$I(L0FBtupAPp?%2qv^1
z<_+R~jb@8oUA)RtMlib-_sxb^XwP3>dW`F(`TWdnvP!sM=(@pkx@R6xJnI&oA3J}~
z9<On(xn2E4^-K`GXddZx{!gj4(UnI_hdtey*K4X%8pA)z+Ee!a$H^%5`9aB}%-_nk
zZ-8f;`sAG+??v|OLmzMK`{PI^g9GJ1DT`89JT9el>DfFed6`Qt54^rudL8jF=<#If
z;Fq9`-vT3*+dcQYt)8)7sq>#kluQbIKk?iy{=WeIKmxz+W&YT=hTqI<3E5@0LNYMj
zhrep)^uG#6qX}K+5<9NYT0OWOc;>nrc$nx>i7-vEkVMPXbI<cNl}TM#)}1*gsn^J#
z>9fZb%f}$+VjKVuO2pOIP`AXfP3EX<HsY=N8qv_K-|U}jxX+z11myB?Fe;CUP{D2`
zQ;n_Ebrn3iT&=V@Y22l~#;13*EN%iO!LYgZ9C2JF{p_>c$t;t!?oM}*dHfA`T7t=Q
zqC;-^HrvdY9gZ>mYn_)$ff1PlGm*lRjMGUdklS)NYpc82BqB7CP##DIoolN)Ia6rQ
zvzBLeIQ~_-`UazOD|yTnU$QoFQ$ye>lPB%CQ^?%`<Mpi~(leAQJyBmz)imqIVKueI
zzA^jA<!le>UEZ5~nwFT*wd|L(*{_)cO@i+jKQa^F1CjXGKVjjt)8ddh`$Nb_%*lWN
zsr2}lM)3ue`o9rK8PtCeJTUx;tsIrCB?;S9bpHU`HuAxB6nB!D954~(nC&cZpkt0P
zS-Sg0Xmqrl3o^va(c>g!gN9Ogtq3j`Lb34$+$b9A7ZBTJLE0IJ1Rr1l{40fzab^LS
zu{kBPl4~~Xf;8^Ulv}4j+apjwA!FbV&XNAs0RaIXpp4ZR%&Wi$@~a|QRCmoq&AA4%
z%5Wbb=hCW7;OBc|wsBI)JLim^YMj@TC~g7#C{1<~i?-$_rDts;0(VHna>;-P*QIlF
z+CmuMxcBoGuj?1L6G+)OUW5)XYn^71kIgHQoOQ04>~l#nNo~{~PC)k`(xdVl7~m=6
zAn{4$mm}tE=hW1xrpY_)jfihbcNL1SZo}^7kNdRK0bZ|z=xd|XydNa)8tQ*4Kc-D}
za4(1aKW@?6+rFhgqTm6~cBpj{*wIpbPc-t~NId@lJk+5Bb_45Pf||yQsb<?#(GuMs
z{#qf<J^E#SqPV?tN|!~|p4Hu+7G3bkpT38o`u3tT=Flfi#ayMhmh$?J;~&<#p9+<>
zTZqeK7Xc1W865N@jDITRA|uQV)B0C!q(Jf8msf~IB8Cj$@;j*GsINl>AKo05-?(ad
zr*_nwO8j#ydzbKE@uZedEzE*aPJh*G+@tB#53X}bmz^JT#CMT^A>F|D9Exd8(vpQX
zqh(T1<hS#$Wb?=Q=^<Y+LXO+ZH{vnLZ?6KSjz(O0OhXQh_Iv<+4gmgVtw5QKlFCcI
zR0!Y7+n?bXJm>n=h~<JI@{t^bZQtkozPQE#_UqTZCITTW%H~)Lfx?B5pM2!teiW{S
znE~>F=v~ls{{VOnDP@x0<79He>ZQI_i2wtSy__8X06IrUX;}r+n9cwWn*;HH3g^;*
zCQ~!3EOyMDix=8YuOqiw3pfMIWl*@m89DYGe>_uxRY11zko<7!yFeM}bDzjl7GEV)
zwpw2MfWnV#b^6i~E?CR8rHVE`^32JS-u-wVg*n07nGhfDu^^w<gZWeu%L>RyR~wE<
z+kj80=AAP}6`nkqM{=Ji6acdf5I)9B9t)X33&&imW|^=k#D6|I5J|`V_02dHK&43O
zoxluZwgoakWe(;-gC8?+20c$B2Z}%&iN@tZ2V9;3`sWk{CzaeY$p#=#^QcvlHdQi7
zDN&4rw4C~PCYWcBarpydyAlucpkl-%V4;~p6*zYbk=&7vhaSBtkjuJ5i6(SV3~7+4
zeNRm1^`aYO5HfE~uZDJ!m?-3r;i(Y$Dgu7)JYcc|^ABD|ed@}%u*77D6Xl2_E;dJ;
zoa2+uLFxWQHQ|lSiyNs>IYn%=OT{<KjyGhP79}!dG2OV1!ySiGb4pmq6Ka*(yF`I8
zj2@kNKHl^QjK-xx!ULfDyNSymq4yoXN?7ADy3ISeI3NZ%&*Bbo{ORtYjDeM;P&YQ%
zi3$nqP7hyx)X=}WQ6HF4kQ3!CkUcs702%;CN!sAH)N*-j5Lo(hb4ugPQa3sU1eG{o
zIOBo*@k3=>crZp=fE`Nh>7EF{`ukEho{AbV<|CEHSP|TEI*(orCNc#HoR#y7k~!f(
z&tZ&_{{RB3OZ&tHx9)G=aJy6jINCZM2VN>60ONbMMndf;*Xf$GBFd<K(8{^_faEu)
z_|r<_WKJ#7f-A`Tm~K0HAn{GOXp&_jCm3wwCklIvW1ipErQBnA0gxm@J=sH%f!d<B
z5(rX81y1ZL?Z{Erp!Fp7{*_>e9o0~zk(4ZQ7j7`Wk2SI3JC)PCM`d}OMzRHL-~g@0
z59e7jAGB{`!R2yTf^becap{bDP!aNx?`9|!iQol1`qa)m@o{5|v$@*%wmfUoTn-Xc
z46HlgZT@1p@w=ldZWzfJ$;EauK)xgJpZ1gr4aKo7Bx{W4A29kJqv`KlWUTJnq<7~7
zk4opF?;CYPsULdi-0;|GwX1x9PSRV~p{~ApE@Amqeo@l{Cb{nc+j-iw(;N{TIL~~O
z{{ZW+MHa~Gf-_zgWbazbq3vK-Ei1E%bed^S6^nQ7Yo^fb8Elq0LHXn)gXw`<acS_3
zkbr$E)x3L7aey)at_2I7a;c#^pDi$>rC@7G_N!SUY!Z5VR<+xmqyj-ThbtW8Ij)H%
zv7Av+boY+TMCd>xDhTXA{{ZXOMb?MrNK}HQMg|W`>P_F;t)YmFO%U1j9lye$xFO_?
z`?3OlqmSuXsPrXYW^u<xxwRd4DD^zkgwsNs3cntryM%=$i~<EmCYFpc0ME4!1*hEM
z<eA)m7tji$C6tr6`5Cf!CcEa+AtRW@Lp7u}@s<nEK~rW^YQ{dLX3|<nk+EjDxDr3G
zP{SXnHJZ9yXumRi-nG-DBtoj)e)0AutH}r^sgV_AbMI&Z<8E<K8-JMMw`8~Csytg%
z<Wd=g_TaJNs?BCte6_IAf=^s}RAmQll!s%_^=&QUl3m=Zax0LLN;3o3HS5~8oG&0h
zFj5x*vC_QnSJK|zO{W<HHM|~&B;%=(3bUyg<2`Fe)x5Sx0|4+_{{XL7tTeeA)HxU}
z&mPqxX{51WNFB#xQz?}g6AO!pV%Zz9AH;Lox-A<;6I&4LlHBK-&G5_E8<&ddibxv~
zgVC$ftRlA&0TvDi7_8p98zp9W&EALQPVte-o@+nGR>b&oO}l)ShC>l!=tutmV_oj0
zZ~mCzuQ<(eJ~?HF!d7<p8>G13pFjcs02*-kk)>F#X4&Tv735&<?OuyyE$#I9BxI3D
zj19~PP}t}`UQhI{7e=*P%j8$wV?(|6jGdr?!0*We@vlRI1}dy$id0kqSjztZCqc*r
z1;F*Ma{~?JczBs~AfDxw&KyMTg$X80FVKzwKI6SbD?3J2QMR5l=amQFALsF_0Au%Y
zT*k<RaIBqj4oPp}9-@X=+_4)WQUKhptY4ntPCYorYtuOj(U~GU7AU}R^O)NV2XGHg
zhyMVrR@BB7iaIlak`B+5bjA)r{6!(PWR@@?dEX$ZWL=<i<D(yLarsos1iO`GGAieg
z6BzaWBcJQ*O5zbwUQy=Fk_O<V!VLWff2AYD4a+*AV4!X&H*NiDc$;xA6mlvlCDm9f
zAFn^AX_BhVBH<QOw*dKU0QS!rGytslCn*ZV00@%CNj>=hifG-iGcu}?!AuN#{HM3!
zikPf{6f?}L-9v^vdXjjkP8ov63qE?g<n_;7_xeyPg3maTXK7@?#ze)K0nl{7`~@p9
zMDocEfN-Ub3G_J5DFJQlaIcbhjxs?#I&A<SeklTM1VtQK3!E51<JTh@G?>XjZOWxv
zdFN@|G5oSB844_zn8YMF#3ecUhN%%Gl>t_lJmj*KAJ;U}K5-hz%y|Gq!Ox)1GJhT^
z0wIal0eq-DuzAdc^YzX%_|>et9PGG{{hXSv$thGX9nnwjg%7m)bkAB}BX|0_geo}O
zE4V-S=_B=~GAVw~48zKWcOIlT!9PKt$0SthgsKv%aga)}ARfPT_WWtfvNsQ~##f<p
zoS$+zAIhbYC7YMI#D}30g>m&6Cm-(qBCH6K5|*+Cjr_BK3aSuu*MZMmdet^D3`Hc!
z6^<qS<8JlkdvyL)bx~uK2;LSvWVE9yJ+ep5`Oy1a%Of~e!Ts+>Kka`maqUbBl18Rd
z(MlcHg$(2t8TyWTaY_eP5g#=D^z$$Wx$bfGsppMAL}ax+n{Xoo*k^Wrne@k6Rbs3D
zj-FrxaycSBgPdRhGx*XPE1i-Ni6e9zDOEfi;D4OdB3Yui3b6T^Y~@f4_BrF8-{&=H
z-Y}r4h%Z%HmuVl5WBJs4I)Y=7Q+@)2v^Q*wj(SpHHREtYg_T1Br)rWIj^`W-Vn>4`
zNd%Zu4j6OL<L`C=V;w!I&RGn9CIM6PG@ZNm<LOo-IZ(SWy%n9ao-v+1$)N?xj}+|e
zLn&6n51ahsu4!NIq<h<`Wec2b_2(y&O-&-ROky$&50vG=8TRekpu~82utouG<AQ#j
zD#S*p*6@}toN%fRPd&c8W|l~ZwpSsDbpVWxanIl>(JONxi_BB^R5{FtxZ|HnaDAJK
zMTZ~;8?rqC%`uyP6Y&%Hb5uv&=2}cPTt$uu2ZA}|jMr<fcq-pgv>LaEm`@Xp-b%JV
z@1H~MUR$xF+Q`5nkCo1OBd$MQo`$q^uM%q7MZ-;}-@IGM+_=gyJxNo?70X(boVn?{
zKg`lHR<yP~55P7u+QWP&f#R2XsaF_o_1YjL*E!(t6yJD)%4u&+yGa`b%xF7|{&mus
z+t?3a1$^cyw_04=p4|`Oq?Uw>lg4m6)T{S+s*$;Ac8p*OxZEhmT8es?C1S0~UP<Dx
zu4O>y9<_4%M|lo;6`n0xcg6?;s!Y-=xmtUZ1Bs*O9Y?6HfniNYOp5N=w~^IA$34f_
zy=6(JpDD63)sb(jUg&y=SYP*TjnTI%)gKGgQ-#&zxzj{85sJ970uL1gTK1WD5P2an
zN_vcU`j7Cb1=WFEqcJ{(fc}*9?m};>8zKJy8qJh>?i-Se)8F2&&2ba1(4!uePDk}M
zEtZwYUyS7PYOD3?Gg8RGn-yKiQhB5{MIqzTsm=jh16CeDL9FYGi~_5J_|hb)ISSl%
zs;w>!Hd%`?BBAY)d8AS&dA?FkG3aX!?@dd|%k9Z(y(EXBJa(&gF@|Mk_2R8;Wi452
zOz`AQY^X=d1}g_r(-PNJxU?7nakm}872U^h79bRD$6Dtu;x`)My9t%R1+mtpq+AvE
zImtXU#y6fYeq3^+rF0%1o>VcR$>#)DS!-o)CZ6S29DKtaYdcTV6>b_t0T3MHwKp9T
z9D0dzf=k)9h0ZpBeMqkr@s_xCEnTf*BkZ=hi4HoE)Yqc;t6UmRnRj^{pTC`qcK-m6
z8T<$IuP@SchrhT<B{7S2Y`J*=E%Y60rw>WZ=yT$#sK=J($Aq-JM%VIzkanWy=3HRz
z$NA}968VxN?|8_NWDI1tra|O$-!!q9q6FKbDIYKH;Rtc)4pg7d^X7pS&zB)qXjJg;
z<(y=H2`YLIt$htDe$FW#9Ous~ijc_`V-XP+auvca>T{0$DTR{aK_Wi)&ROsR<a!a0
zY?^w+ggl7xPQ&;jI~09DW9obK?kT1$@hm8kpSkAcRRa3s2OU1StqC9y7~jm0DtUzE
z=a-(GkQijQLC5D)sR=T!X35CgAm9P*_)`+yt|j>+D<Bx$#6ElX{{TM5r<lr)E&SNn
zw?ML$lLwEx%ICjPj`RqP?x!vL!ims~Y{uWNGtg9p<!#<<6QDu<uto}G{vVGR914zD
zN{zl)8?t<|ig+E%4*vj5Q&gF!c-_2|U%J03C)bVG!0r8L8EPV-M50~$^R#)2m_DZ*
zcJ%E_=VgLJB1<c;$g16a%H#5?is}JrJeQ1&9kFM2K>OG^9Xez4t4$#CywxF@hUJB#
za#(f&zfuRjdQuZZkVz!&kMhdRwc^MfINV33eW|jj^CU<X97mGPy#4HT80pw^PBE9Z
z19(^o>KH6zfyYyvoMh&rSfGg-7+{lW$X_LZJQJLQ#yLFleKAM`mK6~px`FpF+#>*)
z0PT`Lm(rs!EKJe}wkgLgl+UsM0PA(BO}y~NM)X6BmUIpgeH(5w_|<hV$splfmn4{!
zX8`lZZ_1h&{{SpRQV|rUM$X-m1^{{xPs%?}tuxFq0KaF6jyWZ^^Zx*RpU*VNV1<;J
za~O5N48W?7Ly^e!<W!?#D&c~w09PsoM`8dyDS+}&D!lQNA5x$YN#u@k!T$j3)8mOG
zVLGA-2+4h>OdqCr=y|9dG_i(`XP2CLj&qE58T@(nsdvVqBzZytxcSE?{sr6et6~`{
zz+*!rAbrF++(<kgF}Ps<H0Al2O5{d1fTg8413&DXR5F$TM;*%;unA6^zN8F(euAa)
zUE@`iVpSuRiBBI>!6z7?WD*tJikpFKkjTdi`jCBlQ`B3=5;v5_NCr*MoyVSWkL69C
z8C{j01ZBu2L!6V2GJ5_(m}8bTK3QMhkO)OQp7<Hh=RjPQr^;**tZc_1?^7l?=hqzi
z3Tv^zfxM=3fH1@p^-@nfb*Re5Q*^Q0vtvIgDYOH@=fC4pLh>cMA$ZEM#&-^R@5X=q
zRRs)%<^AfFX#BsGlVKgP*BHf1oI|-|iC+p_7d($Z2&$qY{{X!&Fo=ENSZ!Q#G3)sI
zRfxom-0fW8fs#jTagXrDG$thKr}u?fRItbm$J5u+pk~}ypD67o<<2q3A3;+{p%^+a
z1c2L|fCo<f>1G87Of#Lqi3~CC{vS%Kip6zTXWUg}ax=L><J+FSsa|B4sukbJLNZUM
zN_I<0l|Zqs-cip7J#bI;?NJC(B*2nFagW{Ox2gXC3Qd$Mq=WuiB8{2DFc=5hKgxk_
z>%k<qA0Qh}2+n!q6f}t$9%M{gmff5ZxadVJP9+RVs;a0etIsC`Bz}LbOJh6FhuV(K
zM(WZ)$nq#~jmIPTn)G~cT-S+c*WcN9_VYvLNw#pTzyiB7$j?5f^RH~RkVz0A<w(e{
zoXqL+)#mPdcq#Kzw_%F@L*)13som=a9P@xZ>g>?@%vT(At~X!OHA_!6Xcy0b^YU`T
z@c#e`^ZA-Pl1#k%^dYkD38F6$K+lmfit^oN=T}lisw`cZ+;TpE@m%BC>NCFUi~ENE
z0Jeu8kgZhj)Xq((vGfd{AcdEQ9@sU>>)N~p!z%*)00*sk?w-251ImI~<x|yNi65<X
z`X`63USW5r5#|GxKy#0J8*HVu&WgpIt<{*|;;sVt>&;0GsQ?UMQ>2BE=M|ilnMs04
zDvnswjO^cdniP&RQOGe(GFUXejm<$Nz){KP6p|3V>V?dw2Lh<fWzE?B_db=KEXGcU
zG{+`MG1`-1Q^=$s#z#z4auA}Y$;Th9RJiMk5EV%!k33ebt8Lm(O3M+qnt%=o$v)M!
zr&=}1!u0P{$V%nsX>OHZw~d${Sg(56va@8{_Nd~DC0s0he-e9|WrQzg+kI;M%jcn2
zJQ3EKxu=mz=Tp;dU68m?I)HlC1@DN4qK$81ACYFf&v1AEcNwiI{6A?ljPjDmyx^MP
z{A+*qh|@&UqQV{=sNfC<PW5nvs!Np$bB#E2Gn>9I;@=U<=+YfF)NKr;02jAYjFb9S
z^{OmZ9$mG>(8tqbj0N=}v)h`Xr0G!U%eFRIWX@S70I2FZbnJegTGjIls4Q|i20{=w
zw%`vR{;K*6H3d#SXMtX;sVk5vRoc-MmvelwGp;`-2c8Zo>Wd<oWknC167n6G>OcxG
zJu&)Jf&jxUBZ6`>2@jF%O(b%J`JAv~K~Uo=2XB1+e@f~wA}Z|p^W89ic8pAkpYH&?
zXRmMNQUFzk;SnbXEbJOioDg%7{xqIrly{CvB5txsoB8LzJY(CQe+pC(mS%R&PBMyf
z>Fd|)KoX*~YQ{+(c>>{MmOuk!bKD-D*y5soAaxPP6e^{i-b1u{oG(yv2ORs<vRyk5
zD6s2|s<|U4za4SdpIU}nhJ{LxopZV4Vlw>mk<a7}2njYv6lKJg%e;TAjavi{rx~c{
zmTkpKrMhj-B#4l}bRZmzRD_^1G;pM9eqfuoD*A#r$ogWSksoPEF6C8K4%v+0cHDUX
z0QK=o<0KP0OtG|Y6YbpCI~VD|{7p-`Rh>i<TVQ<5rygSi`t#TEszY+%{i%#+kk6B!
z!=Bx{Rgy6NLP$wt{;ft&*9V{ewIC!H2=nlSO3k%M9%DBj-Nzq|4lR`$2L?ClM1z0p
z!C%ktrmzf%%CQG00&T>cV}bSS+;ylN+ycur;<PQ2R#Tq+f#i$~bAe0+iQ`DmK4u6T
zkpn0_fFyOO<&~X|ZYCfcg$uXx$5Zc8I-H{kGTFpY!w?)FLErN<&$HtuV5x@3%AYb0
zIaR?V@&-xA)__DCl2g3*C-;&#C4RhM{wAhPilZ8VT=VimvS-||&QI2&c^*P#%+ZW+
zW58z}!w<WRbmE$jlwaM65I4*~QgVMfV>B6<sog5C@Syw0uR(*-pKd3L7`8cMlYmbc
z_Zh}Hr-+f9Z7A#pLJ@`O{n~c|1tQuxviT(&<;Sl)XSH3)8FvJV-ek=ZmgEiLPdsol
zl0A(vRpyOAMH>$7%!OOq+t#O@xZMO%h*7yDkV|{_C(@q|9EOrPRkM&zHlJahpM@)d
zR!Ak;<@s`qugxjwdVYE5p{BLCS;xo;&ds3hC)=iLQZ$9!<z+?5+|HTDwm|;?IjCQ1
z#1t6BMBqkpKN3f8sWh$zOt74YzRkk&s2G<Xn?N9cF~v(1Q<&OarXYCpLu}4C=WBD$
zKc!DBX(Kx9Bsa^EysCh6k++_|T60-0$q8v@A%c|=;PLKGe=(YtQf7L_66KB^q(61h
zg5+m82dN)ZPh{R1B=W-G7LR5~$2|e**XdS%$NSJsET@v&l`)QU&T@XVBncP<BC6vk
zi7`A3@sN4X9+U;j=gM^}YY)!E5>dAS>@(jVUbM$R5XmE;9Y*{S?Vd&rUN({y0LP5|
z;1P)*PUQV618XW5jTg!UeCp&Aw+E6Be0J(6xUNxMkF}(kxd(2=Ayl8o)9~h)k^|;2
z^Kd>=_#h0Pm3>qgQDKD0i_i|NKN1J!Q8Af!msCN}WRCs1_2!F|S8&Y-niXRRKh_4x
zZ*II)zFd*c?;5!+v=Xcto1gx@POwRCM3Y4d1|dFBay@<ed(`&!(%n3YQQ}p{l^bP#
zm_0`%XYi$PDhP}+BF5|qT(n`!V<SB0xW`KN9|r0JQ1I=nq&DEbTW%cXPCuo2M4EQj
zRG#B90!diFDH@KyHa-6UI`l7x*9zKmLW?HEY=Zss=yG#jW@ii1QtWyeeEs(mw-^-+
z(fP5IBd=Og*lGh4$plw|dg$YI{{ReqtnWYpCkGwto`=E`Lm=OR0k2KCLihk?tDAhL
zO7Yj4N;YPV-D+|6`VvHh?EsqEwY6B|T;qznBx800;8l4u7jwz#Yh-5ICmU6G0+5uE
zN}j&8N?V*M$T+Ho{{Uo)xHw~siXDi(jS~>xwDqVZLJm4oiCL65=N!`9F!@+?BB84>
zr*ksok@yZPDtV4btsBV+2C&_Uaw%Lw54=dHGh-R(J5n!R`KJ{)>61)ECCTZ>)}fGo
zwPk=KrYfA09oQ#09cqy+k-UKc^`lGieZ7vW_8AunNE^xHK9!$)IZ$?!yR~wfgcy@{
z4o@bo#PeA9VSNPAhF1Wdm0C?n;!~Cw_pchW@g?@0g}lae1Mab=UU>6SyM>{OAs+5G
z<damPDQr@!7_Cm@#9lFVm}!<xzT#Z(b?0J^wV4W-FzGXiTO|CTk}==6>N8k64xJ=$
zoBO15B(f2?jt@cKuQ}$rWPol~`#6?D+$v-h{CoWlYumw4RO8I|Jd9m;QdV0L`Cx?!
z<rz=i-G(O|XQn-S(wTlq0<%bZ85kBs_4FV8dY(uT_bOWuN}Q`j+t{9;T-0TGRVOZb
z5TmERIP2UB?YYK4suyWs`Nq^xa(<j}IOP5m_{@l>YD7tI;c?g0=M>$aXCQ_^#AFQa
z@7p;U&uU<TB?Y8~)w7T!0f8R4r*RGQi%6TLk}HCKPoH=`-3afVeQDu<lVZf6u;sRb
zTem0w0If;#EJQ9+GH_H4yN-KjC;3y5B8))$mAUz2F_y>Sl0O<Q0E`oGMq&_h?xX=q
z_z?iBBz)wJ*%`-E_;#W^x66YgZp!hUynT7;NXsh@BN-?CTM$2y<M5yXcSCBhgOogc
zpa41Q$E_onSTj51ji)R@Oy{{LC-59`Q+W>>glvfhPR4w7J$*;#Ra~+-W(Amx?rpn>
z_8o`4A(K4JRb!FVNEmY4m?%BRKj-;0<7tGin2tj`7vq!3?0xB&jK+x?WwVyT0qxWu
z^X*S<@&b~e+xJOK;YYb2U#%ttt|ECPCfy^IKn2x_Y-fNMgN`~?V84CR2lI|we65B9
zrbz^6+Z2rO#$33Wqzpp5nQgy`>F7D8IWDc|%Mm+CcL)m)LBZ$hXj%@#)K3`-hC#Rh
zk}R7_p5*b|d($L|FzE6$n@DDp9gn)7Zs#1+Ry>4sQb=5?mts#jz!<>i`P58NR!G?y
zKsd=IInS?toDSU80U%hN9!-f6Anui$1xL_w1_y4vs96;TN+B#u5~c8eQQH**xK&1I
zokvg*9!4?OAd!wZ=BEvFFWeF;ugkSjuqYY0<Vk@vWwF;MIM4E^JhCA!ZQ;U!mQ#=i
zuglJQQpF=VVk1%jIBelhPQHiUp;q$?28bgLLo_)j>Be#R)m(zj$}FREMHt#JcVHgA
zz~jGDnnen+E88L~9PEALU>}IiN7o+I;>^sfB@MMtEJ7c^V<7YEO}EU4bgK-ZPaqI@
z$4r62sTpb<B7C<pG6BdbkO#Yw{V8^)1Nqj{1Up9P%N6$Y6p<`)I4lf1Sbpzz;5q0<
zI{TVrlgP3$g_T(3`Lm%XA3@jj>C%{q2~RFV8%-pc{{UAWHjl0|xAdsd-WcU}Mjzet
zWC!vEK~dL?bDAB&hkT6K=aBeO?~D`vdsI=$5^j-Seh*OIT8=$P?s@2HMqIa>WMr8<
zraf?+b@c#q?afXmjCq@7xOTwEc>ZE>>D$_=86b66k<5}D?Nc@oA5Mp#!l#xQ1R%t1
zim~Jg&R6N%sOo*F5ht5&*l8h@y8YE;3dh%z*Zlj_83RUESfh?G!;EhOJvSd-{{YgE
z+XwQ{O}LZts3#udrZf1|a`~@xBM~DANy#yU1oQ-P_3w%Rnr(&G1BMxH!~xubK5t>g
zRd=#*3`&K!g$~g252qi}oD%c}F44yMJL5PkJ@N@S_NinlkOnt0O(4M9isTcYUO=D+
z8#o$chKc4sd5dzR*mmu~G}-j`QXvk`WE;36Aak4p$3Ib0e&@{cWMZL?=2MTGxyjGU
zGyJN&qS=0UCyq5-?#mLaPhbv9eR!lhh&0$XGn-ivNnNWPK%SW=CnSy!Pw8D3gKmU+
z*OJo@-XRMU4Xi&5W7fHwg)zpBDYT7P9$V&iBdA_Jn8B?L8vSiA;FT@aQ_WBq4W}K>
z4?X)=J|-OWnmRDD<*1qHTF$5am<*;ibpw#2Cly0a@k|<|9&MGxZi9o4s(lFUTc#wP
zw=#ppX2YQAQM8gJoGUE9eZmZ%YWaRw(E3<gsMgkGh+vd8Lg&O&9PM>bJ*!sZ!}c=A
zw1yw<u?DIi3FzpVktA{d08J$)`qgqs*Y{=>&xvJ>f2=}%>l*jQ?w@=i9=$8GIyQ|2
zZL-!M_z(ovb>^3*T*tAjp(Cd#Ijt05Q#nOFjtck3^9YCttfSMdRnvT5s9)-E+D8n8
z$iNH?<Lk#t?8k%jhhTok9y6SE#dH>$U7d;)wYEst9N-L^O=xqqW>&Fj1SMusyB$YL
zn&MC)j8kS~8;!j)%}~^Cg2p)m+Oru}`hE_73d$cdao(ez>w6w~^r<0Z>48Bdgirv-
zS{Q%^0nd6xV~*7v)2f4kObDfNSCjoJgpv@A&*x8?V~%mnWnJ80ADXQrHp=qL=1<EV
zqo1v2-hlnMtMEi*=Nwgg*!J;?wDlpJ)#)WfYy3p!wRBw+2_u@~9l(viK0wC<`sSZu
zri;tBl0{;Q!9h{R4_uz!mC{X-9wXeFGC~Gkr1C(=KZSbOS{idR&#zZrR7nIv*@Gp)
zQh6#lcR!y`^UX-;<wQP2(>tD6F+hF&$J4bm0?ea&nR&o;Jx^il$4ai|Pd{jkO2quc
zu!!f`RQ)@8*QAaz$pPf@*$T2Q=V?aePI@T*FR#DjPbHZoWC<zgNjS&U^~dAVpmP{a
z>SO_*8JTwgqtl={^rvBlS7OL^<9wTA+Sv6Rap^#YBNQY+gs|n7);zbdAfNH5!$S#g
zG{2Y|54ncy{{XvAEpAkVc}#~m0E`ZqBo0ruX%GO78juHdFNgg22Nb|YkY!zumV@TZ
zq;u04$4>my{MicbG7}RIl}-=8<M`EgmI$Qs%x}2!8+8494)mp91a5({Pa-)p`D6KH
zP$F&bB)btrjJ;G0h4=QLxJ3g6H*&-d2>Jtq^{7iAR#_xT*pfEPxGHndbr|{|&YA+A
zRIwyumj@*Ajs^kx^rSLVI|#zF6OsTclb=lUO`Ja9s_l#da(EuyK9tuAtFl4mmj3{r
z$2d9l8T{(8EC4RC7{SOGE$iqr`qK**mf_Mcs3KyZ;~l>YW4G%~idS?+jdrle$#Se)
zrziCs8e}_nqZtb4BN+j9<2;W+??WP~m5`7L&J_I0eQ*cq%^`{<VHsw&n2g}FE&$K-
z93FkU(g|deNkmGkASZDr47ut01Ky+D<`p3xNg26*IRn%hR!!L69ZTQ?lEHcB3y<-|
z07)Qn=!g~qeq)ok5!*kPdTR*`VCGLVAgFfELHg8UDAD4NG8~M%7uu`rc>4Zgp)G(>
z5C93u1B`m+m<kcHaT#_P{{T`65&mH3pX*YYWlRMU^yIcOe=;f}ce(RqR_EkJ2PMDV
z9SvGvISU2Y7d!yqW4C;h^`H%PRgD-*(r(Ayja5qhX@qTmnV6{MQ6f199-tmG>qMZo
z5+Xu3Sp<c0I}8Jl%Z_>Vr~wQfP0Up|XHZU0pzcrk_o^V!g<2?yNFs>{%N252!S&A=
z`kp<htddC(5!gwv=MKbeQSI{(PvMG*1R+Cxp9Szr<yfA)kWcx~N^EN_#GBh=Nr2q^
zp+Nd}>FG#ixb2W8*@SKfEI?cn>+*nqN`BaZ!Y(2U$C$r=)PaMM(;4Qdi4qKc?hpvZ
z6p~rJM?CfE=}y}xmn4ET+Ca<gPyikC)A6Nnv2CRd3n?e(IKu(E@*ckQ=p>RgAH9wk
z<6armmR$4b0qN5x@v1EoF>}4An;7}u%meF@pUV{RQDNFwdW<N{q^h^3M}Os-0>*@w
zQY_6Z*Rw{UMl#<xAE#P|NzB&<PqajtOcrgd%sT;+N$c44sKwWnGi-1fjzLl~y}O^w
z`Bcv=k?xnv1%6^=cKMtR4o)x!wh!k(tV!mwMZe}UF$zx9$_{{V!2TwlS<-a^L^vNi
zd0|5K!62HbZc;@OJF1d?V&RKz9hc?l@4%#2k?r!ZTSt?-_meilGI5g2k8E_}fU#jp
z?JUA9v0R9gaXz0h{QB|DHsWh_Dvd16+$d5=9Fd;j<kCkBoA$gZj_QaPpJGOF)Mtus
zofL{>6G#-FoCH>iKXcdf&*MmTEGyz!8Ytk8XyeI<Gi0A!l1@0NjlId7DBOrgJdjtX
zI3Ns@+Xj(gYq>oC04c%+AzDm^BydhM$3I_6j(HL_ScHtceZ?8vbNoE=KQDR!n&Lqa
zVzI<zWC)W=<dN9t1KO!%-9UEvgqI8)xNLfQl5zB@WSZnQ!l=qX0}*_y>zw}pU*%1B
z1=LxYcQYJ^FM<b6pmFu2_8eW0RnTvK)umg?2suHXJM^oPuECMbay|&XEd;i?B_sKe
zlaj#o>Bs*7uDbRctL3o}bn3XDOGbR~QbtA9<=P+J+m`%AP&aq-5*`HrcHNrXnj`wv
zDG={C99DXrKGBp}uAlEJg`=I^kbaeE<8#x2OxU3N)uv}DHY{tjjPdJFl3vPcH*9n@
zURMeT-}80FGbR&UBw>z0Zk5bxw;7WJ=RE~!UtOvv8P0jGeq#3$ZX%_kd5BR9w-uur
zVKRPRDYob$T)K?*rIu`hTkel)l!EHSQqBPYaJ>Qbs#48`J<e$*ol!~1JXSr;@~Y%#
zApR9;8MaMxbYo6VN&PD|H(ksVIl<)BDQ=#33a2F2?vZ9=K+Ve@wObOkWyo#BaSxZE
ztjpMmVr!%^e7tn5ySTnq!0Spb?6$Nj*u;xys?aM+u2=$~ll1<i@zbSSd7p(yRTOn+
zbCJ$_e<7NIWN3=3vuz}VRr!>kp&!bWtg*P*+vVC!OkrXablgWg{{Z!?>FKLQBf*}s
zC26h-1$K-?{{X-nf_|k(^{Dou#u7&bbHZ)`Pdx}D2mJff7ErOEm85b;(yR|2+3Uxq
zDT_Gr@F9tS$io6i`U<j30LH3kg{|$!3aokDdz>#!{#>4v4bdz4VHJ9?^9kMb7y$kx
z{*_$rjTDFsECC946OW+k2emjwEXeW}VG4{LfDQ+8Gwba@50c_tiW|#BEtce9o`Zln
zJ$a}%ZBiF;1pfdC+6e3k#~;p}x*~kY_LW>@xIf5pe+rg2^AzMfirq594Z-ev@zB!(
zyOR_ytrMJpx!N$NuYBNj;9`;~WjWl)$iS%)95b#lgPi040M}B8%s=a6-8M4PM!D<A
z`Ffu937IBkGReIoB}VWUEx|eG=|B?VHX91OU~t$yIp{_)o}GWCDL}v|^U7@@LoU|`
zInM_NkAF&Qw88-DWmvhx!zatPzEE`s-kawnra0B*^BfQy3=lfyPxQ~@NMfq0<~*{4
z^Dw|{{YP)EYNX~E)rlG8U<@37XZ-P3Rd5MY=SGKV+<$lp{`c~zB{9TGF^?+44Ef`Z
zm;@8e01%Cg{{SIYBjzqTdLNge&u(dmuzjO+LR33)&ZCo_N$h)$)cA*+JbqG%ROjba
z?gt!o_vV$#De|8R8;#|UBlH>R#RDCNWims$H$%4tNpH`L4te@ggSbi_Y{sMpd}r4f
z-QV%;QSB@kIWHImhTs>V9Ou7WQp7=x<r~^WCmT><dGzF(1VqIo1P~-6fOCLA7~+Am
z$_m?MVn#PGY<21HO%wU7svHtjFO;rW=h&RDJap;lP&$=6a=Vu-SV#}#d;Sy-!`fGU
zv3<zY65k;wp8Ry_{{Ysfyc5ZT4Yk`QF}N!b$GHa`GgS|gyq9+YxK$f7{e3D~8~25t
zDA=|LE~SnzI*~vf0l1A-<lLZ>%Mwdxo=FtZ8q9pg-6I}{e;<kOS4&A7jnbSUBapdY
zr+oAJ)C)35?&~XOkV}Rc9=kyN>c|?uWry$FJaRq;)<GiUJZ<?%9eWXu^yy4zX-Tp-
zW6XIKNI#kF?NNT{$dRMI<_Bu1z;n+z9>ck(M+`_ndt{n*T!N!;Uv9kh><vpP4qJy@
zZIo>t2$UY4<o>+=6xpPi8IO?D;N`rfInUKbFg?ysG)o`}vf+H8ocVhWOJ_Of1Mv40
z#6)5;r3^!nlNet{X6SmKdH@*QZFDwm5$JbD4=1t7$FFLYMZ^+d*tqC75~prPdU6Nl
z{uLarZ}xXPR#XE6WQsw@IVG`=%At_MBY_ZkB3vEMFj2Vm@7s<I09uabXbFAO4B-6R
zka65@!Tb*%)X?)gIV*AoL1MvOLF_U|xZnzbMZc6mmH?%=PcV}0-vL{U52>VYC;)LJ
z5r6>8JCbwTk@=JDKv<sPlW-GESY(i!f!sm*bk9-kQb!`P?Nzl54p9`coO<@>uX>6o
z%v+M$=qM)#a|Kg@oB@-c=g&0x<J}LHa3gKRox9kB@7J%^kP1U9{_#;j$lLdd=NQ}y
z;~B>p{OR%tM1n$#7~y~s;Z8e}qn!1?H54$!Hi#NX<3LUVjyreGd;0XI%40F?Ss1zd
z#zg^6GlCm-MmZ<efizG1m0v1GkSmhpJdcMXzXK!j&rwZ^?p6}0d7|8NpEKqo&=b&f
z?NAWrZL2tP#BEd?vU-xh{ng-}Gw(|zs|HUoBcGIS&zMIU$>SY(pe#;U#czq@D67ve
zxrsf_JN{j&v2QulMy%{`6V8|BBN*TVjPdJIF>g6Mr`}i+<xk!El12?i(JbvTmTlmD
z(#M193k(zZcccj$-VnNYJVOpjvdjtxBepUC{6%`Y#8?B+*N^yqR{q_vJEKTLji|A0
z9)SM<TJ~t2e6Vxcyd26a+Na$1@G||;RpMYdQhy47z)vI*TBb<K{{UKRd3eonD4m?f
zQGfx?e=3FG1C!s@wH`zV3smQoa6!kh%~C>a&XxcNHJNgW^ADSz;MM7FR|lM*=ULL-
zBBA8u`t+)?n~{}vy;rFBs!0G}na)7%S8gXpW5+!!F6!-LlM3oRO%^h2v}F-SNdRY{
zteeZt+lK5fdZT%(1#EB24*9Gry-~74u{q|KDEW(5+J@YK*cFL2(@fYIBB6PnX5^FY
zS8VLd5s-6E)*|hew3`zwp_umktFg6&Z64m$o2OfB9R@3YBmqDIp|e<_3SvIBn|gpo
z+;RqMQceav>Xq2}2<$}>(T(hLmU^T!EUg2hN%wrcxOM*k>wPL_RFf`ABXL|g13kNS
zKToZ2NpU5%pk#@P$s3)mU6qccx{aulWJx;wkCLGNXSd^DLx-%UtoJ-xwE11jllj*1
zx*{@`UZqLM>;VJtsH3=!c_K2q?it7ceqD1-QZ2TREXTO#(Bt|406Mu8(wKuI$e<I;
zMyEOKJu9fh0FFiZV#}~Cl>{*#iR1940c2AmtbrrRGNwl0KAihd;tl%=cVc){KsR;f
zlHg}(c$9&K>T<t_9=+%g$DT(7qoTGj&78Q;Q-<VI5=CVBO|v0CKFzD2s^hQF&}6m}
zpEl#lX8YJAF&OpE5B~sOo*V;_D@u#ND!3pYbH;tYDga?rIY^}uk@FPUf=T0p+k!fO
zN_U*_fU=muP(Z{%h~V(29S=?qdJB~gvf;>17?5|U@7tdL0AE@o5S&9C=1ly{43TA6
zdY+_yS*Kx)VTje?LlHa>@r)jNZyEfmDIx*(6;&W-%U%a;06qPxca4-Wl0PeH$NIhM
zqo)Mt2kDArN>G(golAV7)NOCW1ab8kpa_yXV#?2NgV~k3A5q6zC1vxGgorjT%M(Y(
zzU*>%$JfwP!?-LXNdsq=+!*6H<wzJGnW&+5dCHOj4g3kX=eg^~JJDboh>vlY+{DFq
z3}!rgkVZ)2rn!z-oH+92d=TNX%D{pNAQE$*Z{<<kMgu<i;%S%eBjrgQhC7qbYILm|
z<@b`S!icy<IO(^j^yyMDuCan*bVMWtP=sLP>B%&bn3_2me70S^3Kbyzc;=<@!@`m*
zf!vIcSdzZS2leB<KtY1sFc7e1E6y8tf8>2>fnGG<Ym)5IZ!E!a`seG{npc<RP~KBE
za&oyWdV7vPDxMos%4CrlKv1RE<^$i;@TenV%oW@OZ@N%zQ`ls52j%Kb0ERI!T!q64
zWE)Ij2OaU#p4|Yc3`L2=ilh=7JQ96+)DaltW*$g8fEz;<+sCI*^Tuj#Ee<!ulY!T7
zr@5vFOB|8zAUwHT<$=lf$?N!^T3<R9kIQy(8h1AVFbU%dKcJ|RWeYBR=|U+OmTp+&
zX9E}m{AtWyS!2pIxC4cbR^<K*`seYgWFkW}rBx!f4J&-1eDb-+xg$TFR$x|EEN$XN
z`=BXcTio?Og)HSJ0s$NmZOPoIcYQOHl6#Zs+ceGSzbZ00UzqHFlxKi3$6uizT15{?
zQKXB`xrvbAyo|V21CSJ89)0uDqmvm1D^o8dtnC7;5<0QS$3u?2vr{`ONUjma2GC<W
zcM<44z53+wRZY4BzDP>98+NuZKAyAy$t01Gubi=byLO3pGkzTL?ZBy((lpzIb}Som
zF^G?RV+3~VP?IAjOtN`hJijoF`REQvr^jz2sbLVoAwX6bC$Q_2_3J>(VXil2vf~+0
zSdzYk5$lR#saXF2a~#FSOp?X|jt(}QXZ(*^sv{EyRZ!s$UE)oxk<K&KN3U~EY%pec
z*lkb<0~<YY!99E8keMW{BRCJ`1<4H~89rY4<n!C7r9~9+ZeO#bN=V_^xC1A@IsEEX
zjy=x7rdZEEyoi>^s3Qsoy&;uLCdIa6x9*$|&j*9`9q0kXE2|l06Ec(gv`i}h0Kome
zxTKO{y#R3FFZ#SQWBs0^^f;!8nb1UL+&SsLf!`V9J$iBNN#)&dF{((Tb~0I6vDfaL
zbB@2{(gInoB#;$zJ90ipZT_6?IRg}tNh%g&F<pa~VY>rAaB+ZrxToi0gN>{{T>YE^
ze<FRoYBUnB%J9Zi_9#m^^d8;w?LY&>g@j?iB$5$9IX<L-K<(b29lFVw)*~b2Fe=Oj
zdHdUd&tBfO3Cb(wVhWf;yp?4iL+g)x=8`!YRd)qJVpM`oO5_2I3>@Pa$fPqu2?d?Z
zZ7k7zk_RAT2*C8tIn8>+7l6haJQ0yzGmw&kFg6dqz(%X+0`>2nNzHVcABqun*j-2j
zs-VV6`{TE!54We~UQTC8xT&s(rI*!7xHHjO>uBA(3Odwns9<EVJ+YeRj;$N1{onxh
zYO5}?hz1;Ew>>MxQax8=rJGSCk`Er$m2;_WY!W(k>x$;Cb-l-FWdII-YR8{j1CKNx
zLOBMti!q#zs$D^OC4m{^ip!r-0did8xjFT%&A}(zJt~CSsXa5Ft!QC$q`cKe?5nZH
zd)6J^s6fbmPg=*G`P}iqKdn@4&U4h$xQka8&nd#5J!-lm%>C+EZ8wpToc67ITUCwM
zAOVU2E0wJ*m3d|3wrg_I+iubaUVjR7aVTBNGJ6wR7IyC%t4e-z>BUQBq*}6ws`5T#
z*jAirh4nR7H7nB<W9B1{0sU$jq7q^VARn5j+;TShRnRfpimf<R=O0=_XN*jC>Jur?
z5-|O1XG6PtZ9xLF1(a-HJNF-`{c9stP@47ZW1yY!`P1WKn_W7o1Xrg<R%xDXMRd{K
z<&;QX95FnQ#{;*nKb=@Wg>xhDMn==dI^(xBLK4joC^%&dyK}o8x%c#~2$o|K##ehB
z@E?=zK3euux;Pk&%^EOR+-@W)?o>GGxRIURdS|sY%xe+c(W~bHx^Bl}M@n#ZfQYcF
z{DZvx-==uy-`0zjKW7-o85lhP_aBuqM!7Km0L!~HWM}6jduOry`-+Y-c8#IKHb5)#
zgZOtJT3x$|e>6K2l0u*7=~1)!h*7>l+YF~U^*nL(6u_B_1#t7qFhRqwACT$!Q;LU-
z$Pz8R$m5>b@BVwzA~M^C92Ukfqi#PQbM7isjwU{9!#ka)m_fo1e1A;P#xZ=&hsexv
z<L^3=xaX%h1m}->fkF)Dc--4nV*nG3@=rnPKb1_(jB|ySY+;$?$;UuC41PH2#X|Az
z`Q;6R_e%_8^WnWQNC&7%SQWcsSY(reOM09fo}SeSiZ)a;u=AMnCNqz5lh^PE)|bs@
zMfn7S84V(~<MhW-PmmdK=%pnq@`Ma>e-b|)w7`KOlw1iQj57?dZ<mlV4n2Q5WOK<Y
zeDdNl08tUfJ-<G1eL9MHgfxiFGRDF}4r3&P$F>3X`g+q@+E5jiIUXa76g!6*$0L9}
z&uT0&%nh}|iOMeienPAtfI-i1_iDNuX;s9iA;R&4w4D7abCiY@SlTryxPse*9_Jmn
zG^Kvm0rHQUsz*CE?e-qO=M;n^O9$HvY-uCMm*y7x$JFN?stEkWGC54C1ha#T=Z?JO
zQ_Mb8r_DlCe8c#Y9OR$N@b65?DYg?HM1%Kkc>@{9Z%(=A(wNGO(s_nOc1@>fUEg~h
zIrXb9%7h<2Fj#IO_b~+ekx_^ndKnN5ow((2e+rsKRgr+)dFsj6^Qy2N5(wko8QJ9#
zoP<2&;Nt*&JJg7hOgF}?$lrIM=hGO@KN^Z9hA?*8LZ~<*HO5Kzz|Z;SqL?ER&ntlV
z42;af9)Sfnu_#9KS;9*s#PV_r6OXSRhM5tSw=&uTf^bYHh5C`y`c&U%FzzdEM&a{1
zVQ>$oM^2sTk|-r&5p4wSBooFu=aN0RG=@4k959smXi5J7Sm~S&xWN9EN>{d)cfnYj
zb{A?fC!U8qAEjAs#pFkDryvF-4tn$*dizv&Mo8{AkkQ6S+*!F{?4WVY0EZiAP)udy
z$oYe83QuwVL8%(h&yzfE@uoJ$C5$h)z$A?0(yIt#NL$R6!fx0B;d<w`GwafacwtOQ
zDGGTJryO+Slm7tf%}C1)Zsnvx=@1zVrw1d@;r{?r`BE%n$yQg|m>XTx@Pnq&)OY0e
zs7a9q;Gky*K3MDY&NKC-CBpHAc?roUEW_K30nRhur63=@+6R^?7GisldF{?H*rB7B
zEUzjo0Pvt=2i%VINgxGekrFa~;<p&|7#Yno%YT)2Ht^fFscpplIKbrov<R3M5S2iq
z<;GZ(jQ8a6`QzH42?U6YtVksM+r7ISkISV)v3Vvmkh2h3ax;u)C!gn1Zj9l}4fyI?
ze;$fYPkLi5{I10UsVaF5fPMNOTx9!t(jb2{D2S=pSxT`igSSr9$XCl!AXK+rS++PE
zc=SB+QG+6e3{<W$f<OfNl4@H5R`c2wX(2Kb%E<W`^(15JF~Rkx3H-HIX}070qn2*O
z1K41D)R5XG(wuzDxP8>x7a1Jm8T$HFElPWRIP8tQ*#-bp%BUTQ{P_J%VLU}RK34TM
zh90DsHMAcr!)$R}+#@QmXD1{coloIh=BqfG`a->MHjqjDdHU02o#k@!Hc9*{Dao12
z@xb5_*0}4}=T@=3I$XNk)9~h@scO3YmXR&UDRU>6<}&1`eEZjXb@21V2;@V3XDoT+
zb26XAVE+I*^N$GJEw7DqiJR_=g&hFvk^O7wo)`m;)#BIpXQArR_oJ!flXwTjz?}V;
z@Sl(6S@U=kTZ|T#OGNe(G5$imu5OsD>#Ke0NdV+l4y2K{vWq-YUkpnL#MdDI0J^{9
zRc<tuiB8O)b~Wi5wwuE;sK`H^a+gp%YH|iWaZOc`o2HS-{g8&|rB4hi&H(FIrCbsY
zKPq$)gZDtLh`Xbmtw`auIqh07#)zYK0Pal*Yboa{57RYn7z*_pkG);NB4}e=gO8MS
z6>2;NC#f|OafKKyo@&jwRb%sRe^J}%Qp!lV5`_T2=~9k5iehDeJk!n)b);Av6UH-C
zuE_)ak@;1#fHTEWxnSr(>FYp`DDfmFFA+@rr6I@SIsIz7ecW@?)Yh+yBLh{4jt<_n
zl5nZ>6ZPi1sqApibF|YW5@`1F6-jnR6q3Yk#~kDNR)CH<QI<tcLCY1#ZU#u_K9$4S
z-rQL_Nd%in=b#|{L9VAs)nUDGvVQJg?kOO#{{Up*{#EKyuNIPL6zMeXjWsJ2WfRL}
z4}zyZAmoMm(#XuPkispkkDgULdX9Sk07{Wrm2$hu<c*1u$6V*|=A!#33S~%DNgM*F
zoSwMB;2P;MBLsv3Gqs2TA2}a^reWeT70EBun2G1t1Nv01WRbj?BUpCy1Y^|u`t$fy
zaeSqbRTn*EI2im7TA>J$CzeJ7?QgttG4${0PIZrJ?oH7#+%q#AdSng{<4jg*(BaW{
z5*9!Tj=g~Ve>#sN&Nx<5eo_D@co^p&<JyqPg9T##RHX;V6@kWkkig^*spg@1BYY&$
z#pX6T51a8g$9|uk3|Q@OB*^=tXxcdEka9<S)M(6-Ia8Ky3n>K$u^eYKz<jE#71wLU
z8Rb>-s87@1+pp4<Wein>aK7LIw$p*vyAjW+ADu8l%Opd}jzm+nL1Gkl#zEu1N^9rN
zQtjre9uyM%dW_>I9-^rrCzjq;4K>2aumw~oIM1giBy`3&=dTpi6ReH3<qm#8`xL+B
zo|x^DdQ^)XMT^Ff$jqPsGTTR?To7~Z(34s0Rt#=;0r(;Z-B)3?0xmamjAR^f_)%e&
zE<{Tj1VBzU?q8G-s6OJ1u(w^MM&Foid@yW*oZw(npK5*3$_G%=1_TZ<(0BBv;t>NF
zS~Ilg%iFl8KgjSp=bp5zA+fYl$tV#tWk&~pm~eWpLC?~i1R&dkENt6zhL%Esy@QVV
z;~jpK*yIu6$c=Xr#G<meKE!`a(}SpCw8#Rk(gSYZzK0}!T>UA4pe77S6lLRO1=2yD
zhw27@UqM8o<rpi53<n?$nEW{YLZg;w=T<S;mYkoxuoY9+pzGVULp*So9%{0<7%F%p
z@*n5viU8YLN+S7yg;ENp@Il58PJ`Uj#IhBUl2EC;B*IBtcIThcpii{mt-qL&tCDdi
z-p71;bUgn6N-m?7F4y;wC@Z;}01`;gzaNKVRMwXlP<9FtRZ8vynMVwLdi>tpP#?`N
zwWKPIx6G0DWcuy@02)WQMwUfp4i!;x=7WRzbKCqW>dF`fxJ1Cp?_Ib*jz<_g)ZAkg
zz?B#=j&e^ax0BpwkMe&Sj#LoLiRUMn+m1^IJvyFv{{ZXMrG$~HG8K%D7_WYu5!>Gt
z46-N88g^)rfY}-x4!j)p_oZ=(JY6SwBw(Nsw15tI103LgjY|ZD<JdADPrgJ$IXrTD
zV*;Uz=0am=gjvq>z}@TVpQTF-Qap~#3%)XN*$1AUqw=W%h8uJx<6IH^PD2tq;dgPL
zT5`NWWRV#JjBpCZcX#B1dF#}BelFaM%C3NIA1L4|p8R6~ezhKdc4k#%Pr4n(57(jp
z0P9c!yULhUQOEJVOJ^SZidOy7gauR%tg;n9QhFbts?C^LLVfN!s2KWWbNE%5Ad=!>
zA#rf*G6Z?SKD)W+j`TK`tf<Aw*$^2cXWCgCJZ+6R$DueMkfw`}yq@3yOA-JblyVQ_
zT^*-}<uRm}bF?HAm5hSSJu{9f`rBAprr01r!=Z1OkHpuJh|VZd(mJ!$p_JCCth7c2
zo}WF?^QKv&jlO)&;Di0#an1*(0IR-5v=~FWbO$A08*}u>KaD>2>PC|VvIkOn)DXFq
zvAY8~CcI2WYhJF-$o6PulqqV}-<dqO1<2lTpm3wGt`AYVGhIsGcXJTGO73TgwlP!4
zTJzbM`GgU-aqXY;`O%kq(v+E&XYR%^TLQ3D>73L>zkA8yxuKY-$0Q1jWr)Uep1teU
zXO1x?duzDv6ClRnl=0Z+zM#=HDD_Pu*6|1{EMd6y?_V!WxhHolINF1E=1qF{!d-Qy
z)8^AAf0`4zFi&dZ#Y62Km}&i!(`6gDs?K(TI@P1ds?znY7LL@+%gbe%7=h2Vaypiu
zfZQB=*KZ;MD>CvR%Z<7GDr`1+#P%_Rjk)HT9Ay{<82l@&xw4Gpl<VzOCA5Phf<1Fv
zL9?E5Gm<c*l6mjNPaIM?2WR5OpCO79kQAQGM*^ZZIpfSE9-wdyZkdq%pD|S<p5RrR
zaIxbfE$fP=xnt-vSMA0+jtAvT3o6_U=7Kmm#V;7h7@^1m9q9ugk%F#z)hU>jIL9?+
zXXD<ePbiAr+@1jRr(n6jc#*`qxd7xMg{-&8OmUy4D#i1euOxQrSmvrpkCZ6~o^jH<
zpsf>%ZtQZg01s-G8JZ~-)R0u<9CWJuWcR11d{q*+JsQp9z0;$d040$?ZQbyHQQs7}
z%%)jokz6)exap2C2XEG?X(X<bZ;rlRNUL$n<|$M1<DaSZ`qnsn&C_lbbw^!%xm1dr
zG-9yxK@KM)aT(dT51|B~PT$I-5t(pSDH%cFyB0rQna667tYMRC;41yixh{UV{{TLe
z-O{q`P$QJK+$*p@L6iLd09yBHR)tveLERobT2rSkSt1-3lMK+3LHV5XjPMj6<&6IT
zSIfFE5m})*Jzr_vo`VCQ(we(nSyfn!<QU~rx%K6F$NvDTkp!<GP^z)#ZqVld4*YZL
z-=VEc#)gtvJh3R;I10ZhBp%=A@$E|BuE}PVoqC1ZRZf4|0~pWw=A>JZoJ=-u;es*X
z^ZAba=A$g3)zaae2`4);SpNWYVEc~WrBVVN-@Gxiqm@ttP6;cX$~N#mfQ~9vQy-e|
z6NwH%F-9Mr{XpCJfAy*{6o`thn<G}=urdsjjyn2(I(oVw%BYcoaG7nOa!F(D?d?@z
z095-s$kF+Vslwq)9P|L=fuHMD%wi-C@**&An<F8K<MQoOTtAw4k&3C@$dAFm{_}JC
z)iv9fcZjYJ2v>j0&Idhz`qZtc%jg_zNRUXelED^50CwjfXC1NcQOeKc11l_HxJ;%A
z$NvCdJklg!Z3D_ij|1cf<v8~5&%a7oBaD_|)rdJO!V-G-!2CZ70BXCj$L^ygF^7}O
zTpn;q#z!9B)n(%H_PfrdLglu~0LS~oImR(jLc&>9B1bcp!%Ms6TyS>w7~`Dsa%foN
zo#ojZE)ax^kV5u31FuhRd(r|I+GP$S4;TY^4THFz=L096_@|sicozs51_WFM+%dty
zMnA1P$oo4xL-urK{{WV^Bjyc`+4+lo03Nj8vCBKWsd*z7W4mlw=j)zNy#p?@DODrS
zAOXGifQmiFa1S(>4GPWs#@d(!$UbI%2XV+0ijp?mTfY9%tY?KiG3(s)_2#Qy$sxVo
z(lB-dmH=^q$x+*yeFfBwTp8bJbyt@=yuuFNoQ{V-TC~?P0;=*W$Xk_?Ok>ypG5OVa
z<7N^0uNDu?W!tykoC<tykz2Y&8$=jwFUH39&U@61nkiR1A(_d}SIpoJyn+r$_ohq>
z>>(LK<#1#Jk6yXOD2ziIlP8=Pj9`K>)0|`Vq<8rX7aOyX4>|4lQm}{*o8|5vSzP?N
zmz?|a)317vw$K%bNZaN<NXcJeQTb|dE2qnhe&7rad*}Jp*z9lalWZ2Gp!rJ`#?$WA
z6P#eLCu2xLQ+A5EQa|1m+N<)Mhj3M!@Z^4VGC#@*kABa+k&U?M3j%#Q4l8Qg!;+Wt
zFDHO!A0oxM!1|s6t($E(PqAfddsGB;cIAiDJwFQa@fpS*mXY_Lk?GLNYgE>HBbU?k
zd+XD_LoK{TvO@xZ4{qo5uByV`-o*;U2x10Vxn}yBl4(N&l6sy!D?Ck!TPLaSUptG;
zYT{j<i?Q!va1^lW>sQ>rETy<4)hU$`9zwl4)t%qE&N6)}joK179P%-bO7qd$WX|e$
zoadTtw1y|-(K2m01QDE32ohGd(9Zgo%NC4|PDduZ=3UXrA}|?JM$$j0f313KP~sny
zkN~a^#J2wcX4YnGZH`bR2cSN=KU(d}XKIc;&J50->8W-xi5zprGyeeVrjhdHxcXA^
zNx(dD@BaYSq%Dl7Jw|`ewR<e^gLZOT2ORvz<xj7vtq%?A(rCKeS18S}pPP-j6`B}y
z2d5e87wPV4j~OgZF!}y2SpFTVWgcZ_RAtKUkEitgMl0(`=83~A4%IA;*EQr`0P!KW
zjM-c_AH$Q<y)HYYbQmCx)#geZuE(bdsVkNlhp4Laat<ku$0Xzmf#vt8<tpV%sIoa9
zm1JDnmKZ&2W?8^f$gKI?5!3M%QAA0YlGzO8l4>&&r~yYF^?qVO`F7`}XUOMq2d!+3
zSgNCN#&cI-$^QTfqZk|<^H*Z|eq&5Uu>51CK{MbUdem}F&H$+QXM;>GHHkfI8(f@4
zYFBm%t!W<|jNlGyj@K@@eZ2B{&w98kvL@_~YC;RM9COeX!KgP9+3oMtRL)r=Bj)Fv
z5C}C`0gCK72~=}ZB9>sGNy)`TgboS(D_2FeGF<uPen`E0x1~)<s71D2I628Abr!$4
zw~jG@Q38?pQ-qiuJ*uNI569zE1Dp}kyg6@k-j0gJxSRkv;P&*V28_v;iZ{m}GUt!2
zK$ruqKNvMosXA`(b_r9A)ugUYVceMv#1V`f9DOtVjaQO1L%u+MQI=+mxhJq6&$y`r
zcc}~HVDny;EaJ3unz`rI%IQntb|7ChSTdDp#^Tw)cKq@0)0#}h<q!iXBQD-hCmxyX
zai4zGWH4Q<fO2`wIbns@8x$SH<-TV61Dt{EE7GN$(3i%VIBI28qwu?x46ax#Xy;+b
zc^f2kAe`~()|O;hNmrgyNWoypbM;_<&ONGsvf%GByrA+?a;>|z8$CZ7j^bxf-do5~
zR|F6+2m3?}<N5mWUacDR>Z{Y0&pM?Fl-;JRFvV}X1zt^yf_Eq<j+w%r(A7!Mtbx`S
zI0KU12TXf@RQY6ZpSk2`mB!$w*Pai4-n9dn+GQ;g1JrJeD&y1+1#4q6%0Bo(Qiv4o
zDA_IVo(TR`Wh_ayG9=N*2JMPi5xKkaTYv_8b5&vU5e$MaDcQjDGDze2m9dQRj{db`
zM)Mus=gci409zn44{q(j#!f$#AY)oN5&)_qw`Y$lA1pQ==RFC*;2-Bqgcvss?<#@B
zTQi=+a0Cwh^V*e>9$Drp$k@SH*BH+nlg@q5ueqq=Fc{1Vn_0L4i6b4s11Isw9MS-d
zN=OW_6bsbgfxFOrzW)HB?M#v<nnq*{;2ds3y#D~>)UmRnEUe)PIU5HcW1bF1J9Iyl
zGV&R2r}H28peR)_mD&L826*~V287Yv?3AwD9PVzUA6}JS^#e32vbaKn8+peAJx@_m
ztX^b{*aeRa&g6gq<cxG3J*l@i7Z_D8Hjmy13OWp9kAHlcR~>)|)FT6O<s-_phah^e
z7{_ip(-+Nbp^{*L^>h6B&S(wh7sz<rFUlk!;EaAb&VRzRZ8V#U_Y7l-I0E2ERE8(e
z4*h+r3fPKtW6e?78&RQBw7FoeXT(q-;7G$EK_7SN>T6$4(C(fv8N_H;1j!f<N6>Zr
zYhEh|EOxRfX#(vM$;$!gJq1W*a7WB5=W$u=o|G5Op8gvpiubEK`3$$xY;5CQ$g{`}
zcSr^^>KCWynwo2;IQg&_pr}lnnB>$F0Lz{Qcy)0VYdg){_G!_lNm>fT;^<=le!SD(
z;Fxy-o^Uv<wv!SJ5=JU`Bn*t1=dER8?oTX*P?M3KdE&F&?O<?DdFxl?!L{Qgjw?1n
zw*;R3>7)$VfR7{+d2W>1l$6dm=}_B~<%8O+7tCiJ2Q?3Jk%xA>atA<ajB;(1V<NV$
zBHT0A*0SZcXxO&giq<bfDJ^bnS<JFTM>sumSiU6F4fT+gKlRX^$~}E)*7pV{BO_@e
zKGmY6Ox<XVojIu?PAa4vS>?>R=L0>mGC%s}nn(k%Bd>qY{41mJ4u>VQvR_*(7+B@i
zda3^a3g>tOs$d)(4gvP{HS|<!#;jDLeAQ|)r9M_P9i(F_M?Sd!0PE6`z(5^I>VV~s
zyB^fMuqwDy*C)5R_o%@?aAbmd1Iv4{>?>0e&5gmey9F32&qZQ!_}8lVcV1hF6(nL0
zsXc4RTO{pFHq(>0g<q+y{TBU@qYQQRtSZyy)Y_E!S?rA`nI9EaM!@E%X?l^G5DTdu
z)ukX;8OZ0RMRIc3?7hkoN$NjZr9Ak+AI`NJ+jDw*)k&<&F&}!4Q8#lUS=%|lAFWg@
z#FNfVYs+Lo`M5nPg2MxG9D0*fiDfty%MP`BZWR2rHNB<)>5_daX|0qgTx9jYrWP|F
zjBp3znq~<Et^hqxb5{kSVmRm0pY}twxEc2CRFN#lyO2i#Us2MyO;S?R?I7c?OxJU%
zp+q<zH%jyC$qUTywYrh=u+4N*MipN|grzya9Q4@SXWUdn1mgn~J8oif55GhBibd_$
zHMxN-YD)xOSe`hpvc?ay+N@d0UP<*enWAapU-YSg3Nj-ezV);d1mJP$UUn*~ljKLI
zgrefP-%%5mX2)8zicDUDpjG2It5`l*+;RBV436|M5B~tJq&t@coSKY)2M3B!c*o^Z
zF~!Ikr>uj4laG3c(gwlkC>d}`g~l`Z((VVIhaKvul<~)EaF7wVpv5Z<G+0?1u_N4?
zf0Z1}Hw-xF%6a_ivbW9GBBjYexE>E$(w#}umoy!j6Q>%BmP+W2^vQ&|GAoV_Q8~!z
z{(I9Shht@2vTptBw%j2Z7(8{)U=Lc*x46t>IL>Osgg!<{Am<~XHSJ+@sVB=_Y25O0
z8B|`hpUBIBTjy9KEZecUlXiZbb?=@imLOze;K|3#5suM}4suESD#YsNU|A$8x%mf0
z&(xgc(@Bm6iE#q14&c$|QT(&?BoE5H`c+|8JkWPXhf<X3%a&@zK&Y{m%wakwZv2XT
zR<D;ZLL>o6l~{s-f7>L02hiue3U==O-z~;6H)GIsp(7&U!^GRyEJKaQ+o=G4K9!*e
zkH{s2uObHoH<T2R`0PmeatFReHe44Zt7P&^BLaW#k^cbKs|IM%Sw7PMV}Y^U6=B?x
ztI6~k{HX*lbD1Ey2${wjPzm?JQh!=k80KN*krF&{<l$u7k6euB>zayjxW-(GBwv+C
zaEGA4AEixeYG+hmDW!7223bC0dEju}$m{7{HLjMHe>}<>PN5IX7vJ3b*A6ouPYWB%
ze#dqb1yd0%Httu`G$e*GCF-j_K@sGTxapsI*LMJCBZ`ZDM)FDY%}2PBIj@Su;_6~2
z%{G009}P}~d0>ItCpA)cDajmmt4!SIIVX%&Dfl228Lo6}^dmBnjmMnRlwn91DtR>v
z9-Rg#QcI413cC|=tO;tC42cy$A27#GwDN-hk<V}`g|=Xil;(gYiT8#C@H$mXoEP2K
zu&Xd1^rlcq4hR^gT&7odUU5hXt<Ub)JOU_ELm!(U_Nwr^ZQGn;rcw?;BR;h)YEpU&
zDZ=D;s<`=Cn2Z{+_mgXKDGY0~9AMC$fta%*=O_>2YDgb3fDbF_Q`|yWf&j;VdaD@2
zH(}{oUg*zeTrKCPKo4+x*Eg&9c~vC2vd-a>(RvT|Jq>NixnIm&jQUlGPn<AH?)NpN
zD$=Cy6FSr(Ra!@yvM|g>J*+yTe+RpJ`%`iV>cv}+lzh&A!n>_UN4LMonL<c-^Hq8L
zM}Nk-twY1Qg@QErGTZV@(T}=6-R)k@99$}B^k;`(2U455)frzm`mhG!&z7eOzf;`Q
z_EULN07xi*iAMnYRbVm(;Ba|Z$3yPMo=KCg!?a^?7*+Na)w#*B=o%I4E2{4Va7B6r
zviY%sdCzfP7pLlS+OXRp+nzJhy%$39v=Qw~$jD#sq5g;Z8p?DV)f-c+wr6D|4U@>I
zyqvF0dy1M3b4k2VE$^Tt_G7gEM-@7>Zp14g$8|ZZTpBi0Ov{qfar>o@uS#gKBZG_{
z+0AYJmw$YZTvLU-agn`{eOL-yrCiU3$p`=@euku$&_^D2D*KAFE~%y3XU)BUU}S*%
zkK{S5ElbAwG%=NdXPy0a?O%Sp{*_UsC(xNrD|SdC8}PZ~uN3)_A%UHpRY2v5z#olq
z*WNsxkgco{L+IGte_lUI<#itrUtVRWxskxh12_Zlt>cD$OeJ1D4L=fVaJ26YncdVh
zp1(m{O~V7o*m2is!4+v<Nm=D$#COMP&$)GX7+~YEJy+P)wo%a-Hs!e)IUwgJsU!5O
z`evSQXB&s^7nV8e>?yitocFSBIapNu&76J$x~NttBUs}BQ3n8VTy^X6u2}ANVetIV
znp+Z$vBm(vRTu)1PFo(Mnv4@O^~e=GNL1wWUUNM}iKB~*9+an{AEijWdg78m2h2Y&
zTFko<41s`YFmaLEo_)Xuo19YuK1*VbF-IBeONszJ1u4N9&(?wIN>r8LQUOqo#~G;;
za8@02#X<%;{<SH{QMCOCpk%NN0rOz``c%qWCmj0JF@P8Yj%sWi<w+loDp=7orr<td
z_i70t9$DcyAoRckzfbec8`zKlI34NX-G=4I9eC?qIBZ=^Jg){}Uky&YZ8Sw2pDaf*
zJV-$#d4Q5L^z`gVsNu9pWRfzD$fUW9DIGhvBrhCi^{WU9xn=n`V{u+Shw!9(P}`9v
z*#h9mc9+~wMk9=V74?`rWHB+i-?8&Jyd3cI*Hl!D5jjnfg@tlmn4Ax&;N);Kny@V1
z<}{Hlt{f57W(0l*jE};evL?b+<+|RatYCn|gUBF%Uuq_q45!W0%E&lxnI9+DErVUi
z<GI^GV+NQ6Pz;`iM&+3LlU3#}(_nP(nwu=-JM|zOR8xPg$>Sr6{MxNaRFjmQ+4>bY
zMhliJLOr{_@ZeQx*@LJ|W74iM!jF2RJCeab1D<_rD;II-asfT+oz6>>-_+HWa(EzM
zcB+>r4i8Q$keOVz4$?XIrCjGHBC9iHvd6y$td0;KdRB~!lOt{iudOc8vvK57L~sci
z=hmcbY&>=BDheKiZc;FFjE>w=Tn-AJl(2uPUEGkzjCMcd)VBZ@QlMb3Z(2ZRljXK5
zbiquHq|`D1Uk4!crCB_%Mtb_t)xk1ANi{ksARN_A!#s2%rwxT3hrLNdr(QY?cdW@{
z0sH-HOt>m?dsTOgGXhsM(-TE#iA*6m`qSpJj&<IL4m;GQB3KXz9cpYg+-IQ0JB5t4
z^X;4o32=HEu@&+vpO~ri%}n@ULG4uD({ae@?N0aHhKjm|kEiPBNna*@^233X{?PCK
zd9GUTK)tn>YQ`>6e(Rw5RDZkIHP`u4MoAeWmNp>c9rIn3aaAeld!vrN5}jRbW_jD8
zC9oKk>R*HTRPau40VngW>h23${WAXm?NK3RT%?42z=7D;1qx&a8Nsh>318bSj}sM#
zbYA)zaojrdy@%sc{l0u-c^>$xXqf;Ie=3|sy95)DdhJN$xp6fa!UZy%dzyOQx<~if
ziK?pr2dzkL@IU(WST02+)UBVGkx>R?l4@4BZQOMA%|1J0j4I^%=BXhzRFD@Onx{JT
z$*rMi?3{!7Re$XHF0T^O4Tfg~jm@+GI+AK<XsfZp@^(f%@8v)MP{;kApwzY+LrO&V
zV`_t)r})0Lp!Rmwmp?m;n}p!9@QO#LbNJ$xYm?A*uPU{7Eg*VSaOrC@*O-BDFsM2J
zDlo=Canh?rzE%K(T2Mo?9<|3U4(RGl1VsQX=~e+Fr~d$|nYe8^=7oPjoYpOyEeinq
z{#7R2;-gSFILD<-Fju&#W!#Ct$@CQoInOy2Jh%&t^Hs6bb3zju-9|dqg#dxU&*@O?
zIpZ}XOmT`}h|Y72@k%qEywb2CjX6~0`p^OoenI!CRfisx8jks?QGQd$erXL43O9GF
z2&`AAs>(_=POZjGODPg<8-^)yfq;3YsmS&e?Zb?9??_@C00(MvD3O(L0|Ubh=N`lm
zL8#<xwtAXHW7~?_g=x{6oHs^QX-2GEWwC6d!ekM=%o`X4ow&~njO2Rt9`z2!em9oe
z^7Dd6w^99mwP8$hC{|IDbGUFx_wQDAMoInr;OCHv3WMmm1meEW2aJX$9Ls*F`7B-*
zczN0F(B4Jg5*+m4)Hf^pwIe)nO|+1xk~9AB{3()LF>GL9jydBs`S$4hqPd&q#&JZa
zC=Lz<XS|?Xp193uBW{Q(;2Ks7kP?4~imh{!o%2?Y0H_?AuW^!qU;=8Q49^2SN9k5E
zg~0Tv2UG1<BIF)w*$8^%U~z%^)s7l4bJWx-zN7W0q4~m|K<FwNXtff4>AB~FM49r?
z=Q!Y0v8h!ff(rFDUg+Z7^#x8%NX+@ZVn_y}$j2&b)LAIRR5C8r!TjpU9DZOi+Na4y
z9C1}6mpBK5{OZp9t}{~5(->sOQ;HT$pOhMnfM?D*rB!g`1CiGTknUK>;2+bqJ7)De
zPZ+2}9F975sbY29N9jlgmBurk1uC2o#%T_Ak&dUXX;b%LlhE;00!oR{1Cv$cw*&&e
zDIMy4**HC^vW=+6AEh<8rLjRQq`r}~=t`uQMPgYGV$2tj_|$$f_;{WSw^`!VVY#;h
z8)Q2rW09S!+zkF0>q#M%Qb&cIB~&F{4hpwXkHiY6q-r)-dNs(@XR?BFcC7ahNq2C{
zMmENuaCJPM=DmyylGQWA%vZdwbBTKZ>a5?0snb!l9b=Gl&qG)XfXsxq%1Gp3@#;HM
zzEB29uV30T$>m2xHA^+=9G{T?02*l4Eqv8ihE1gK+lLvhe+m>3N&3>rHnu+SQ~A^9
zVakrfb&&@JPy7n4#HL990CjCMsQx8P41G;vSW9}qBHVd>hS7{xh|?yOcS~_Ao}`1<
z^R2b9lO1;|#-lQzKksfJeFY=vH(G02>X))2{{U#(%O$iRoyvfWGkO9#Q|vVR2=y3R
z_T<3?XUu6H-_Ku{kQqC!detV?Ce?1W3;9GUFd~T}1yMolihk(hr@e4vX8Czh+k=Yd
z<};=WgLZPqlZvhzFP87xohqHjdFfArGR_X(Gv2)Ik?8JdT7`^csLAhE41*^It8xb&
zDe(=>$u)~MiDg?W-lmO7Ao?0e;u}X}Q=*V?Yc|bNCP9<WUeu)VnhJoY*R4d(K&dQj
ztT_UqB>H>eoZO7lbDo{OX_7rg0MA2CRmV=0F!@3Cr$&TikwHSf4hQ8x7~?%DCF|3g
zba?OhQUMu0Q|nG#1p@~@^fY-s$EP(W+;fqPQYi>{JdB>gkY|b+!N$=}=n3!XNCzwJ
z!32+QT2lMI>Bp}X7*me;`ce`%6+H)fb_<fRI|=vePf?W(-@QP`<iVwgG5e%rwE=SA
zeYoO~-^mdwEv)1p-j*QE`O{=!kQX==Qc0C1aB<ePp;lDg;$v13nzW9V=3@hfOnj%;
zw|cE`>*oWWI;qBJxN>~V;QZB6S7B+m9z>f*u&x**vTsq7ozJ~F2iuy{w*BNl<dcfZ
z1h@s5oy<7&`c{UU$~V-H%BpKXhUJEcg=3TX)N(FH4Oz|zrplncJ*zZm%z2j^fa9J3
zr(5zs829Fu<exL@X&2?_G0khbGc5pAWalS}MB+?!_ol{j;2uRe_}h*u8D^YhI8ZT>
z#aERx45NEw;Nuw;91Kjzr;(bl#~bn7bNuR1$_N6cGvAtqLJtP49vIXzbu~y#tOBVg
zwM`pkGoE^KY9rQ#@Aan9DU%ia#Wh<aEz{Pf1LP*7bBPEQB@Ny4gP+2cP8@OgP~At?
zk-qL|0bX25li&2Ix8*VFIjU-YRyY|Hi7Nxp8fgmT-eJk(f!?KQGaCcb2L`G_cgjKU
z=~6fPqB`?UZcXlrL9lka6V3%^cv|k_%IfOg3H5lLh6?FX2bH#-`RE3E`kK9R#T=CY
zV0uyEjVj+$@n)lKaMK8aNaRH+Or6Wrj2v@brVac@m5*8`aJtMgTkHCSQo(Z+f_5f5
zrrj#!=jT1oJesTxYIvd;An`_{9kdAqQOFfzLP#7A>`C|QS!1nw(b(~xj8J$vAW|^Q
zL;*kmsi`rD{{REln2w7|nOzi!^T#}Ot=T6kzi@%txveTkRtOu6<MOSkv*nIWbtj>n
zwH<YPb7SGl%aAn)1=|aBo+1QHKaE&*JYu=)9kJ;^wl_&BVS$W+#($k?c$>>@A5CcC
zSY#11JEJybImTNgkINNG;X))auL!Xq1MmjCtW>UgI9S_Ksm#*>jx*A<)-Zuo3aMr@
zE_>Dg0OQSY&7JUFKqwqzBCNp@=PEfgL;+f}3V=ryjG44zJVlIVrwX_S6o6pjmn04=
zGh~6Eo;p=o8yVxRIh^41^s4ePz#jETmc-wlwB!UfDm7744mqYINTa!_Tki2o#^Znm
zM<G3GdXzPf%y~5`k=u%g{Ax&#V?z=o0OO97F#M_N0PUI=l{Aa77(c{UK7yPwKrPac
zC^9PK;M352*zHIL78nDrO*4$~&M9X3Sm0D@#Gk^d!ep$#j^9I4r~)m^$v>q*5DYSU
w=M_A%6^%B4H+ABWgptaHBkvx1)kz~}Z08xNkOrB_{Ha464xg1$(3h$I*@~~LD*ylh

literal 0
HcmV?d00001

diff --git a/fixtures/suspense/io/public/img/sebmarkbage.jpeg b/fixtures/suspense/io/public/img/sebmarkbage.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..bdb0b7874e04b6ac6bf44884b7c76c9c25e99961
GIT binary patch
literal 18137
zcmbSybzD?`^Y7A13hW{c0+Ld~A|Q>V<g%oMG%QL=hagf*NeL{mbcduMEiT<GAtF+e
z5=%FC{XW0@{GQ+a>)w0z%<FY_&(@ro&&+$?Gv{{pb`fw-U0F>TfP;erc!_-gZf^ij
z6(LIUP;H1LtGx|B%+=PO)k|1Fh?U#Z!_nEERZU%mRb59(h1E;!G0!7bH&4q~j&FQf
zrCB9}h;M%Y6ajd+xPN!-hL7C|?hp{*;}Z}Q5fR=YB_<^$AtoUqBd5AYMovjiLUNDh
z9wjvp1Oky#+^3}h(oz9Iz`tLDgNOYLKEYiAg1bO65;EZb^LE<_puB@KgfoPP!v?^m
z#KEJ)x%~!U0RV6au&Vym_P;h9T<m`&B)W5#m<0QVhI;^996UT+e7wK^8vE`*?0En_
zB>~j~VR=GoT}vW1H{j!tgxovq3N>9I$oM{oh?V=hyTmm2Y3b-6a&mF=@QQ-Po`_3G
zDn3(ER#8<`*MsUC7#bOySligz**iGGJl=SEdHeYKg}x69kBE$dCnhDQd`wMCN95%f
z6c!bil$O=j)i*SLZfgGWwfh^Yr?;<vU}6$IH9a%?eQs%aW%c*k`o`uK=HT$?_~i8L
z{Nk@(H~_qVsr7Ho{tvw<v3lX+<Ky8I{nZNx*BdK%l=uV>gbAtSb%`w9sM#Ke+yN>i
z<kocEWfy_$gRI=giD@`QmmXsNs`ig&|96VL`~TAH--`XWUUL9aJRGd?@F)SYfNMw|
zoEz|OiL2MaQKHQYCg%PRk#_ixCr;!=sceXE9>cg2NT#!of+RlfmpbnG12JJlXPHMJ
z3}LRnSaFHAzwEH+i1Ckk#Hq!cbq}t8iv`7x=D8+BVDUTEbCp$(Gx&bMYtZjyTVJEI
ziiwW;(*D`7bCb})Rg3`-BP0Ea6sG}6s79I%I)@Pvo5~rQ8DdDL;nJoDnhWHWAXi~T
z*F5IjgcdC;NW=E=$zjRAFb7WAjXhv7j%awcWZ8SW3S|}WSG#Ck1VU!Y<T3A?mntTS
zgQ`BIAw9no-1L(diL=ED2BkVy%%hrL9orJ&Q4Ywa_^Jy7aNSk(EHr%bl{McgwAQ-b
zO%$n#-~U8695AqPawrPHWuna;EvckjS>F79NVAf(8+TqgYxkA=1T@lx6bf{LJ=ui1
zva3tPzKDYjsA(F<S-HuN`_q?lN|cXl_Ei}D2Kz}wq6kx)D}m_=K@Afq0m`71-Yy|W
zB5Bl{u_0VR>9S={2$(%>Dmi)DN^=AD&Es;q_?2-{BBFt0+DaWZ<c<hcG<Z@@IU2{u
z{}5~^p)7eQ?<P6{OH)^^K&Sbk^L_^}hx*h9o+|+jXIaV#2>-D!5fGrO1O&YKx26Bn
z>i-;*0famz>Kc9;FtKQSX-NxVq)aFGU$m>v4Bav3zf|!lzm$Czsv31N?DIXqOMY}q
z$zH;}JhKVWK9H1f_zMn>YE`K+-=a<&^>`4}M(D#5+<C>v|A9W?T$)FW%EO$aV4d^(
zIr>K_m)O7$LdQ67>Uede<p_+^tYAXKA@~6un38cSd;|8-bS;!mRH5?;h?<k80<@OS
zdhWncG2jLjz%f3r<fO%|bBW_3nr<%VC*}PEmYj+l){jMLGZ^Bc*Q4x2P}+25HHg{>
zI2kqiQv_RuivEY?V&zfwWGDANx*ln#&UXF{E)~pEQ?{LVf9~VIA)090R9iu;2J!m5
zaay>Kcm_G8LAJ?BBAVJXoF?_6mT1V@4*YRUBBxSp)FA8c{NmNy80gU$^rPthhuVzD
zEM1k;Qr$ivg4!$=m{2yaw<|tutHL9_HRNtp^zG0%L##Fk6Vx!N#0m8<H7h6>3Pmq}
ziL?_hkNTmdhA3Hm1GeLm=m)1W7Ef2G@T?%vo6&|~h~BmVR*W5aj?0Dn0v(=w5uLE!
z)+;Eg%TM;h`UOOQpWdye$3riCrP5yI!Ex#POwUq*^^Gu~75ozKcyUL?L{e9d0H{0h
zKiBbpu4!&j9UN6hNBR)ZdYVE(P3LiS+zszpLaYADi|woh+g5>>5k$e|zYaOu6V7Uu
zEtfio%!e3W9hAbQ{1E4KgLLGszOvPvO~N8G$>$XdZ5^Ieb?!cldfJTW-$J}%3QnUh
zkbG8zv?X&=hluo4Fx@&^2K6%mNq9^V5IrKKsWPRhMg|%<F3DJ<E&c9F&dXm+m(yPq
z$ze_ePAMg;Q#q=PV2F@1P_7W`r#q?O3*ZES#tlS<O=8P3Uyp(;nOkQ!+)*DB;&>fq
z5tR(CFdJv_A_%&%7@kGWo2Q1-s{T^cgKB`KlJJ6Fy>>|s-GCMSp@i4C9IEF7*5OX>
zDcKRD*&_SfK8D|((AbJ8uMfxn)aI-i|H5MKG%q7@X1y~9G^tnBXng<Zy(hQ-4QS~(
ztF-E9!y8W5>35<0>{(Nf8|Bx^@`)2H81=;GCKcvb{IZ|)`W029R1;UBbq^U3joKNJ
zH_cTD9<dqrm*>suo9s!fb_g@g&F>D51?|U{4>yNx3xd7NDF>vT6dmegZBiF1INFbs
z6ZO-6=WIYUrr-+xQzgHow*`1G2G&SXdZk&k+8rjCE)Pm4PK(!)3rKIqQh?S~3Us`@
zr}JMin*2z28V=yj!wOJWjzkT+=5>__|Jx6ojzo(}VBVX>-?csXEZG#+Wzbcef2u~2
zZyj8y$P~>QCzg|he`FotOnSpGC!JD3;JRf^Elm&8j`k0$qkKZ6MLrc?W^H`EC3~Df
zf$*}espNEq5O_2P{ijaoBc!yQ`#o`#Qk<rd<qUQ~)8Dlb$QSLA11=YAX~CXsz>G=5
zA_icxOQmiHh^Qtl9!ma5=33A3Fb#u2P9>}DD;1W@saSoV%tP}{Bm)klce<R*B%Q+K
z(4ZJeV`@NKYAwz<1r6f03BVx8taD!*SrsYcmX&s{6&Wz<HWv;$bWX>mwcD&TF(L+(
zSqfim<cIr7XtFmK``XeJ+e%k<@&hqxY5w%*Pro4^Wi!s~y*UpV5^$B<D$cF0O!&+g
zm$K5qA|==^4sN1mkoAyYe((Bgq9MvNr;xfgQHxjqrEi&AQ*Wh4l@M(7VY!2;AwD#C
z(G5DG#rq}+ZXo0^F{$>1=fyVb3TSw<_H6<DrwYi)GVekLW|LTQS6EL;2tehS>R~`9
zqF1m2&R|@81GZ#*!WL?zIu+H$d~79#S6b1uiZYJV(18_I!B9e=ms-NcZUbam9O5~X
z=`6+d{}@~DZzTW6s*>YM0HCfCfDq2ZjpOjw==nfw0)I%GLr_pyzzzpEii6iW7{Q}|
zkayZDUOhXF7@(DInaTf*e=##6%h<5DBMS<QWfT>Qst@)PUY(IP9HbuUnLc^Lur(^+
zDRp^tp>I!H9#?>Vl=7Q}bgGY~P;T&$xPiMH>dxJl^R9*oMwN*yG?vy>@EOLhWeX+_
z3D?w;M8vjC)QCOs{F<FY5}#P)9G=IQ08un#ll7_vpB*|>ZcNp$01UJvB_@&I!<3YK
z(x3)WBabqt-usor+$~LN^L?&3sD-NE9M*`yEzL({iwzT&&No)0G^!`c;#>4oG(r9!
zlh+ZOZ>A0^ldY46J%nNpc;k-IN|*KeN3>;<Y%ho=%A8D~^lJ&8mNH@^F_|$tE1~D;
zjbkno$Jwp%O6?EeK(Rmy{pOlxv&60k$~P%y%xx|!>tSx9^s9FdI(Ccao>t?w`Uw=A
z99J3?XBdc~o8qxQkAiGNdR)0{1_uj=&3JAB6SBnfYJ7OAuZC^`>T_fv8pC;W?V1`a
zA<%rkEDMB9D&^LY$Lq2?M@N2yS+Pdz<-)^=fmqD2Q5=kT4V<5}P)y}EUH2fBtJ0VP
zMc^TFtPYnPw=fA>`)kvG$v>%C9bm$J<@ndaiNW_pb(I|eIS|Mgj;bF$w|G|$>9y6h
z=pac(vAB^=^HupOlgaV1wEEgkzkT{(Vo<B$SO>jlezA|`j_yhSn}CkMw(WHb!FNi&
zv*~69@gIj_9$<p8ik_U89tP=zFrNDpO`}L#V;CX+)JHr_i8lV2BHssZs57Caac9X3
ze8gQ=Vu_M0cQVZwyL_%txkz<V>^bpLZAD#{7D#^$2_C$E2HKb<-mCQU1x07YPfL&D
zc@`+@*$s`Qv46$#vIIy{S|8#8$qz9%i>LoR+lNw*4M9OQ&}FJ1c8Eh$JfwVa>KQEk
z1vby3=BFmmgYFbBMa)QDwmghXB$prGG*nbhRKh&JwZ`kQPjSx`8B3rT=q+;fzRhu%
zKNxp;WMdko2gn|tg`Yo#PW~Qm;47CnsQvo;j`TI(AMw?$(`xdw>m_*?50|PJT>XOm
zGDONdCQ3<=Cn`z#7(KoZyot@F33c$fUTQ<-o|ta~y$!Dk`xvJQ;kN*h=`Zb&lo-ZW
zrplemMJixTmSA2RE6H)|r}v*AeEiDW3+8<a`0iU<qqJ(>pw>wsUKveXQML@1cG%ZG
z)jlvHQ9mWkx)QJXVjPRjrjadS*bt3P)BhpfdBM1DN<bZ4$he9LHjKyU;MxOcUb(4j
zx$|b{ziFhIobL-#%@_D3C!*E@<D4+G4-IgcZvV0TrhzQ^v&KCN4|7=WWTBIjcWgP#
z+c44oO)bs(ryb)eAvZW?>p4ObNfL#uFZsP@U>Q0JCe7!<t(0}<y}vzCCqBn3876h8
zlS$=M?p~#7D6I{o8aJMKEgz?8{DE;fud_dA=>1|`$~`8SyZarKVvJn~<vp=%-n&GD
zC?o6=cWGAtmXhV(0J-)y)+)Y?IM?6gZ5Z-jvb_F{vKI_X8|G2UAD+-~)5FuJy*a)q
zD%MMwZtec+|8cyj6m-B_;0$y94gwe(oR%gu<5j`(GRYg9Q2{^Rn_>{<><&y1^L$-d
zPs%Mn`Ayll0+>@cuNsVhP%X>wDp|LHbzdOT84zTkFCWL_t9Vl*k0PZMbAHZ_guE|v
z`!l<U?&lIOP1G36iWPM@+k<|}P(fEcTE~A*lFWMTQ!+lvI8zZ2u%Gt1sbS{z<Xyqt
z;?A1~3#}nGeW##tCf%WlC-usgYYi#2tp+qPDE*tJN*i|oaD+Fk-UFo-;{hG7Stz2i
zN{Ed%J}t#tZ_}sfHSq(}P`+k}Ymj<9BBHNziH4s^I~rxsOf_#q?h5Pcw{8At+q`of
zm<Q+E)?UDcbLaeT`3I!ys;N5w@+<%G0wushtb>qp;c+%qN7K)o*uP&_dRc3laPPuX
zHm7&RtRM}ro&d+l#v(fAJfFWHSbdf;>qmVH*s9=r{*jCPadBNfXS~3O+^DHlj++57
zeOU5IHOE<zVZf@JPCv@z10%fpaiRl9)p}ftSuMGn-j__YbAiq?_z1ZNJR}(xhR(Dq
zKjsV-Q>^EMLR@+6@jZ0K`#3}H36&I>3WE6F6lEK{GdAvG%X|ApeiQzwGYKWniyX*%
zAwuU^^E;Jmuq7ps79QZD{3%b`1miZL2!Hpano}iIFgBGkoL4D;zLEjmf>L|JPt;eb
z$t>0U;bhYY{*y0nQZDXipr&zym}5CQq`7S19HmZ6t;tkwH6aUr42CL*K+0n#Nooh4
z4C^T`>dW_nd1Zm=WqzP5rF_&f6ZzKHm$Vug@=`m}<*Tt4TB*wD-A8s1j<5mDJYH9I
z4PHQ-E8n+vS)b>Fi9gIg$1{wkxP1zokYwq-(4TyzZ9O9DeLbJuyk`=5-s5y%Iq4K~
z?WD^hUKRSzKb7*l^a&2UEPhy3O*AGtB%DC?z5cTRbl(*O6zzodGf+4z#|@EU{_Z(^
z9vbYXpRi^507Y}3Pu3C($}Z|oU*^SJj{j@LbE%tRkGNnaf8#p}2!MDM<^@y1c^q)K
z3-b#B`pvHs>Zrr;INR+pb_H`I9sXYA`UR|kvVGM7nB6kbcrx=LaW8HDpbA&Mbxxhf
zf!f>VL7XqxJBP}?m)Y7W5Xg0g8fcrmQ(u;O^-fMpSpT;k;*%d#aN?ag%0LkTSO0X)
zdzV|p){#IC8iRz@T9?qt=*g3Y#6i)lwyNa>u1}$6!?=8p7d<pA56}~68(W8mA6Qy+
z`t@qvbiTMjhE{#;qtHcdUhOdyYrHWo@Ci)G!SUv3SxH6YLMsAEcbM`f-Ho}BEJ2_0
ztW^I{hr{eM!>ZCTc!CehThY=kH}CLB^^^D+%m#&5J!Ntg;7F0|04rG(YSel_N8Xzn
zOO(=R!OA+oY#pK>2BRKG4?i6`>MQFz=CGemS8b|N=FM&?R9q&b-`37jRFVYB%rmld
zqO)z)6RneeAe`J5dIx&dkP5ABle;)nKL(%}w3lp(HUkd)_!ba-3m~^o>W*Gv5I>bm
zWgFO_SR8m)5!5;p)3XBK(w$5jXn3Oe^UvTrIhh9D!OpS)cM)yFE)*e^+N&2am*_k#
zSV<DxCo$(+6Qf;`%5o_-b+BXPq9a#8T<Oq{TCkT_IwB`paPI1IS$AUY{C(^KmnFvX
zEb(9A03MO&YFK2R&Ep^npy&C!_OTY{sY0n}OhyA>bQXZ@uL+M1DPk^4g^V{heBEu_
z{zw`o^xdK3f^Xfh!eUE(5Sv}+?93*IlT1z@Q%Rc`XW|V^51S8s`gt2(@Fp}(GQRXf
z|H&bjL_ZQn3?0%LH-XG9r&7!I<R4WX<LG8<8ruR^G5V{FmpY0M63ag;8gLNi@=D}{
z8}@R68G?E3x8Y&oYB_x&U+8152U2=)O5*2pY#_`8@(+zX`#>Zmphq8lBjUR>-L%N*
z!4g;7$T;=Q_J;yLwPxe84P^C93v3M2^_FFvJ9<pi#7k*35{3;RLQ2}NSu)tFOG|`b
zWRYiFHW9s^pV|{C)Qj2A&%whj{y7O!u^~~v=GC{%_9=7XQqMBA&aS8bs2G!tMbD+U
z9y<`el}bD%v|ox%KXZyE$8tezWWk`)&qa>}EvhA-wKC^n_2Q7@!ts<qx;<HfRyunO
z$x=jgJ;QG@g6*_smN$QBT{;gfaL!h~rnci_><V+X?(}=wiahfsbq4IKpkK~xbo|K>
z+YvO2r(<?+l=is=Y#S!r{JI4YJ$`iMTl@o);1YDt>*l`fK--KaG?(VH%A}RhbIM@7
z7x~Mm#KPF{Kr*Oa=#Cyc=}hLNw%)3F*f+nRiwcg;ZEbQ*VfT*{8pK&P%Vo;SlIXHd
zQfLy}SG8d+7I+aO-gF@aijZpu3k58o{{{ZM{(||uxFbMvJwyk0T<y6W0X9eA@Hlek
z5DNEKbWoZLWE9NLe`Yqdfuo(tokGr<OV8;!yvoj;BG#|Rjr*$<v+J85aQf_g3-?YK
zU2xW(0UM_R;*Kqo<3x0ty1*+eY{vm8J6bSa%vAWc&Ziy+37ZDq<{vtl_K2)b&b$O)
zEWoeNM^qidOscl!1tG0jWrVaKsT5!`U2Wa<R^+j)dddY_+T$o^DC!H8YZp;7m-7MB
znRDmIE<9Wwk#;?<`-#cnK@0P1jGBfw4aN0h=M4zO{-$bg`4h8#^xOLGBhY%^_dWC1
z7Ln(OTfjE~XNgK_R%g2pM@)S8y;MORHc}-Z74)>78<<8Oo?^jPQV#9Hz{v~#L`Qad
zmU`Qk<w;Aaeaw+acU6ny)tT3S=nT{OcAE43Y2LCp;9_$8tSoZjn74!WIA@$@>VQ|C
zlK@H<GM!oZ5wGz1_ozRCvX^XG(|&uh2UD^~^d}uGJ~E@d=9E*SPiMQkeDR)r|D(Ei
zL)dC@A{!$XU!@_Lk)n4C2nfA)+6Xu6mgr<^bJ}tpIHI!OY<>mYhYOaTbzz9QJ|igt
ztjji@^g)~?;J7LardI`lN|x-5ix>-+TR@k*45jb1SCHhV&x7*OPCxU{)Xq(>$pRiH
zzFds+pUE&m)_L1^*@?T9O*=JvxRvUbeelrB_n+Zezi$ouAd3Y$!2S8-oQ(UF&86L>
zScS1_d*%%2HeVWJ5ha@C^Z!JYSkIZz#d;1<cP^OfV<McuEs+s7knh_K*H+P`xdW*7
zgTOrbx07m{DFK6#0mrl@Ye-MK4|+Ft=Xki=eL`k$x~Yb&WW(1u%-qCFWVOV|9`R8<
z=BQc%7H|w7X#(Ssu2rb%kNVk(D0$JASR^2_wp!lgbfv7WCg}7%h5oq<dnf1aK#3o%
zqbj1;s3~{t!1j#16%k5HSRt#Y!yFzerr-xv*+pdH3@iL3!(|J4mlu@6k;Tg?VM1!>
zdka9lxdq78Nw93o3h)glluyb$Dxn9rtR!&Xs9f<4TEh-uS1Kb`N2R%ic2b)&V+LD|
zay#(eiIwk^T%{6~9M<rm5rS{9RB!d7>R?`-a}<%hn@OSa4`}EjJXwM><UZayB7tMA
z>`{Rmgq_NP|LGr7vd;^dvDvUsL7C`0Y!O~C$a^Nbe;G;F+Xgl4FLsvbtz=>#5{S9D
zJdyeQeR0R&mGw}Y_!Xs6AOL9BYIvgCa1eCAOBmmGhU)WD3vOFU%mLrlr#VQ}MUQE-
z>$s4V=MtYFgO4_JTyWW#-zCSv*vP(Q@rDR-<#iUZn9&g-1D*<y^((ZkOUp~TQq_Xq
z=wCi(?dt{acU%DlmuR*Bj55vsxSpo@{7umMlonYHqD|vbUeCx}ylxP5_*illKeP$S
z*9X4}>E}YD2hR4)1^Hy9_`}z-X+w4R)-qWT83fUh9uOC>G2=<`d3bqBlJ&`2T)nP^
zMi81d@4q-<)ITK&d3`dV`JcmwJoyvB)Z&|}y+DZ~*`I4kUesn<+RIwy*T|()C2`-8
zuA^#DQoH1gFUAn+cudQ$^V`Z4S?Oy3@Uh=aY9vzhPduV$G`kQ!fwnKyW@Sz>SA?&b
zFbDQAmm})C;T2!gV-*PL%JybJFOSOhPD_MrG`mppf+p!Vm=c?9`G@X4We3EW=*L)C
zx`##+<(B>`Eum1qLn{l<aSktLLFqhEJT7!MrjFyKp#||Bm6#sowmhZNSdw}4wy%Ru
z8o&G8F!@C&J2y+L-wetPNxD9vYp!3&(=A)9ez;ZbbKYu?AxmSh;y&6mz>++P9UwL}
zl#NZjpi3W!O@<fIrp{7GF#oxO13GX9QnT5F+?B|2XsS-qdz4nD>JHNu0Rmqb4y&!%
zl}1VPVA}o0WSrPmUFOm4_7(~fWzkqn$o5kd9(mX9sT^}r8Sh^59Pt5sHz@dK6yY;@
zL+wBkL&r)*dCW0Wz|#vFJ-e?>ul>G0LryHMG9My+5_8iq<_$WopUO$NWTt1Vw`z@`
zUk&2+VH;f*d<Tvv|AlknzwH(6eR`LLkHXc}sk&rUuD9@op}~_(;PUbXGUA4PtXhg|
znd!L-n%$xL5tqMjD5))a5t&;icQtivcm-rwvbbVrxyLW{!ja|&znyd{Eu-&duZ3Iu
zK)bfu)0t3+09BnVPtTZ--$C?-3AvI+44EF4ho18HiX-tsM@}*g7PivT(yrwYqwBBO
zie_W<``7=dXmH`eST5r)U7-X_2E<P1eo0oOZr&)<)L6%Dj%S92YVGfI+dB;&@IT8+
z8CpBH`o3z;+I}-JwaaCFI=@^S4-#<KmH-38TfKI717dy;a}FFp1y41fbAd@1c}hiU
z7~Yia=smTuD$f>?kHNasXOpb+5{p7Y(y(8oJ|#A9VgAQp(kus#_wD}B$I$THAToT_
zu*<)0G`|kUxh&q4$0Nc($;Pf>mYradBhkvrew){)Frp1!mnE>dR(NvCYI^e32;XwO
z#tqFYuk^Pj2bXUSmi4Q>F`vVjPnUw~s?@!d93Sa?6F!}9d@FBGoakAlzBPf~$Bem_
zG)JpmLHn-sMUz0>N#G$j(<Ur%F_zQ^r(&Orqj22U)B8$6=Vh=nlsXH7M5C3XGk>UT
z;OO@Umu-1Nf!yV+H8=g%p^1pK5b0>QelxD_9ii>^Cu4tvk@aRh$PD7uLCml}(Vv<;
zCXW?D#GjV@TKMyiC!JrBmmBbn+{$NuKC~Xo52*M29o`GGg`kXfdDzWmd$RNK5Eq4c
zvR3d~RTC9P$TFfc(@i5E_0~x+?ALyM5Sf#KP|>x*h={*qukk(V_-{6bs}2v<AVTt8
z%qf?pt|9p^p<?m`+6sJ_?UT$i_g^IKqCTO|RR@d)1%L31uM8xm;BBa}g!#@kT^9s6
z2S$8})jyP)A}56TER^!CV)S~B*N_ZWb85q~LuF;>Qj;hg>r-_sUe1@b!Qy4nf6<#*
zv;zPpW8+YLa`ReZFtG{QL)@nCcTm2DC{4Yg_QpEJgKs3_r`0-N(k;V&M&dw|%*mGd
zpKX~m40k;ZmFT@}7>rEG@tvJ({q);R<DLI07?{PY!VUt)2%DSCo`2=MEGm~+s}KS3
zws>-;Q+YjbrU2t*qDOqo{<vxqiJ-&c2o#2dA<e^v&h=C({Bp-qDQ3g?ZFd;p?@ZE1
z)x(u@hCfilBR|MrKx0Q>RBp&ZeAAetl6dtGp8)7b?yWk{tr>znG(R^a-fS`WK>Ht6
zP=fptH6<b#ZvhwEQ?~$nBtDb<x7QV;G}|wzFB^L)9^3**?J;HVP1jNtUx9fHD?wux
zb5Fjyor#<{-i*e|B}zPaEbHYi&v66ZfA2C{7!-9g7r}xr_!W8XgRN;4sz)3aYI-?}
z62-;gyxE*WX3@>XJ@Zp?mtUapvu$(7gThWFRYp<|eb9m5WH;j&xY;Af4N{S|0#-9G
zq{wyvYc$rnO&2J_iz-K8x|}{aw%?L~7%s4e8p5wXX*#6blm9%^v%0Lqav0G6c3IkS
zW|zY&p?NRSIAWtCD*&OTEMgIK)3?AZdH<`ET9((~TfX_v?ONj(+|`N%%&^Zg$OlDR
z%aa@N9=dSzqhQQ)3+14Kzf7m{VCGD>#XclH!op!fl!f+(QtD?9d-u+_c<$*JjPOe&
zXboA<70iAXzn}39!OrT)(ct@l<!C&}_Qs;p7Q(Ajv%ca`hJHwdzH*2y(|0G=H2f%5
z-|S-qa+u8}s>YAsRA+$i3+&kiS#UQsA{FM^VRBdcMn4viEeq*HyVqFgtsK+?#G<9U
z3;&K@Jludibw9{Iq?{%{!mX=_Swwwt#~OiIC=>mO`!?-S;?0gqmER0pn6|eV^fN$r
zN~x!i0Fhb2?(a{XaLxDLS&gOAH!c0}dGdLt&H4I<(nE!Lc%mXa1PRDA6z)`cP{Q=-
zPO0gXFS&<&#uTYr9IS<Lt<XcK12;75gD^@COKim{$t~1V`;#V=)g40mrm)E;d{<$o
zuY_Z{D5<3E0F3|m(K?ufK6(FciP3RRxbjM<?prd|;gk~EW9DR}0`nJY<GJCIg%@)_
za{Z$UjK*-#h|4FPGQfzg8=Bh5JQhh#8<#za-|_3_?3Yh{9yE|CYkK|0lXp4jyt7!d
zXQ5UWrXxJr;AiAx?7?E3yp+X#sm6?V>6F!hFE}Fmds*<BxI=uZ#v;$+vuGttR}^k0
z(U(Y;k&dU5$gizK-WW>Eyjqno72oSpJU9K|^-5KWS2G#btAnZw$J{P{MJyohfDk#F
zkd;bl7Tj{aRlTXEQkKX3M9T%rqhKA%xCXX%LT(=Q--WOArW#MnayNf$_>*4`YYKcn
zme!h{kUdTssHqN8>#Rms<8JUQ{UUXgeB)H}x-wD9kCEc0Ey(|7D4Rxx|Ewclq5lhm
zom2W_@vm>LwvQ0_vw&;9pPhR3zUdcSWIAr|%WB=a3PnRJ`Tct5v4|M~c&hI^_Jk-~
z$YY@b{g~WCZHu!iNGu4wfPV`JbHj{&yRcHWZtzd?a2CD=JX$@E*ix<L`?+V~jD`7{
z0i=y{qv2PEj6NdYraivI6);x4H932w)@0WzIsQBS{G;Xb?^ZTn?z2mI7OyXqE6?j4
z@KF!dT+YC`3$ZcKlIpJyhW>5b@i^9F$1~K0<wy|R1t<VvnT2U(WksFD*SwFMmBO7>
zT+0Skuj=2{vELln%>|`o{z<X}7v&O;3QSeM(CKJucCM9>4b$;rFO*Rs0+X~m^(L)(
z%c#4rC0S$fapi+^O^rRBC#(}9Y_QmyP0^DL*nKX?oYWeUnv!{p`sxMRSxa*4<ugsW
z^-O4$mNM`CoDoe?MSeq%P(6vKWp^dV?35m?La9zmIXH8zv^+NDso44@K$NQq5VY~O
zCiPfsIPdHGN=+E@>et0TcpQse^I0klJ+kkzXRH3<!`9aJNSy2J1?_ugij8W@gRUzd
z+8Y`qgT}Lr9zFf0Z?019qtflQKs&}SdIls2!~KZI5GMhyHN?N>*2>h21Z@@C+60Bt
zmZ+q#h}`@<HP`Oi(4#vP)Ojmnk*#35+<ptV?x>QA51TVpyfJ|h%VMTwCpu*17!5;X
zrgP8jDKBS-CD{TyPYXMlc=@|Ag+z$M_+*X|o~7POWm<Y2Zd^~dZ7pNork6ZjJv>GR
zN}sx!9Di(;^&@=VB9fR<ImfK8Lbmns;0bpVrhv{I!GJvl^pixh(K^|edv}9Y%rG4N
z??xIwc+)c0TwyFMSqB+sQiDd?$(V`H^zw|QYy~)?cc|UsvzpiUS%W}Zaxbr)wl-8g
zB2;#KZ7Ir^9^7whU<oE;;?Dalt?QwR?cbA5nogD$BLL@vC)@ifR}XIiIN<bzC-aUd
z=gC=Ij|=*%WEG<9P$|RR&++x#t<M*C?A257qr4qClqdp9aXZKY<ck_3s<%u6;P@X?
zAIo);T02>_4rzEcV<dJ2jC%t6@-4OJrD63h+6#Q)y#vVhBW%m@?j<$@L&k7*9QNe@
zp{nth;U*e?CxwQEGU)-vL<1h?To^oqoAH_7`cLyBPMwbT%=4GCY~RE(FT1<W&UNUS
zQ$MN{jobZhXQhoTDyeE~R#%F54?ffdOaWu0d2F_I`ev)8&QCu@B<TuE9jflSX^fgX
zu%|gu*P{ir=9ts2$?!eysUc0G4!5;}8W^&%j`#bG$^!{TG=zFvy%!OuPHIeoOhfad
z54AlGq5RYDl-2Zmyy=s(c?p*^@l`FQVKjR)`=u1DXnAI15Ve~fD_NVvix0b#sv9@V
zKFSvKXNe>aiT<3EJ&j+Ix3J#y656~75Zljzi=(-9goF9sojqA3*pH8x_K%GCvD@iO
zaVo#TH^Kf}q8jpEg7TEki(wW5@&BX)DBxP#*2cq4^P5pXAIB%&0v2-(31nCtba#6^
z$ri4#8J_;^k+^vEXY850R43-pB_G)~smgO43$nW+@O?MrH(8$1Tfi@4Yfo-*@I7(S
z{i~xYyft4nP_5&6uSvw)1__Jo6b|><WF~Y|$>&SG(A76N&vJu-En7nF1pK1-?RG>B
z-bnmbwgt(v)Z9&T^D~6&#7ZV_X66j?e&<?y=XHqG-II(Rdz4<0?w!WZ9Nsq~CQD1B
z`s`x^pY|wYVze77cBbd%Xp=2<<?uF9#^#z5D)P_cVHf!)8&%NMmwVU-m5#15cMcw-
z-iuI_WL!@$YqC8%-O6EgkHy^HSLA-!&DerKt<hDBZ<W#z>n*@b=_hg&d?^!@a{l%f
zK=5S0b5cfV<6@wCuw=7~scq#I#ky%)+QJhl(lw+QOGeEBu`FjH847ABae^IgG5ip4
z_Zl#+1UgdL&Q$`|1F|+m|IRjG6Ey(ni6zPub!$cyA@svjp7;}gxSBsKDi>VCUeq-|
zPK38e{aB7`v~7v|Dv~zl{I=5fQW*a-bE*w;qp5u2pU%L~{;@Y_2YPoMalrc=VJM^C
zrUi?QG!2bI_pq)-NJy0YtTE2~ru7Z_G*(i%BubR7PbB~<u!;va<jmt($xfzAsIxiL
zY39=oI4Lnrnhq7~d1_y&$WCFB5Nqh_u_I5G(7c*GMUsiG>Mr)H8t%^t7w+SLLOvZA
zJC|^XM$yv>XfK(U?h7tqFwC`J|FlC(yI;Hs-EF?7;Zo9`%duWF8ubQ`M}qe0X4~f4
zd$11p`bseW#b)DRqqreK&1puntjTsh;V<Ex-%Z+1vX0<9@W;nx`HbX3ytbR_lDg*U
zCl7R+I)|TYIw#}o|GEO&tv?AOjo`v@Hm$DG@TrbQ1v+9aLe>6jrJ8JRHHj&@4<P+S
zg5{Dw-~;WVVF>)R44Jt8dXRym|1*vjl?_?~xYSie{q^@l(m<ZA@7pK^#!xMCO+xn&
zF%K;RRyUnewoDFIh|R%ll5erg%6>^#-!O~tCgeF+EWINHOi*AQri;#;+4BCgxu|sJ
zzhC`q(hKJ)YJFt3OJM#MAi#Hcdg8E8a;13IP+(kpzrHbPM=#Tcz}z*cU}e7=ed+K_
zD33QxA3(s=Vp#XCc%V6ctjURRCE!{6vy}z`9soOCVYTUH=bjSNhO`5%?kwa+)I;vB
z5<i!7Jz&C>ECAcJCs5sApOa!(3Uo9ibMo4+^9whZHM#s0M;6eGJxMV}`1w+DE6JM7
zQp%9-sH^w5g7=CD86P3Wtg`w=EeVk(3sRSOEKT@!^r*C((J+>Obl4`*dHsk1%fOAX
zRAQln906h65k0^}ojV7=;OFz{bOgXqmfshNG7GqqJDLCL{?o!<%UQ!5m|u)vVCLlW
zg94aQl7)<uU-`CV%#1r@I_(E(qC$7Wl3eP+-suz9-%6aXsC7lC5h?*mqaezlhBcGk
zVU7#9NuHNz<u)QVlh~RqAki^SlZquR6RmY~MBD%5Q=A%Mj(z90mRFCG-1S{-)q-yY
z<AjmC22p2@S@qOGAE7He5Mfcn_`-~fXqD>ekBT~VJEByg`)<0A6K9Ey>&Co~ilvZG
zv`5-h7QMSW&eXuV<qJJzVdVkvUkBs2fKL6%c&Q4fh+N)D9hLkm(lgfp;rv^GqgfAO
zp_j<0(d4IU!&vooan$2Gt%W*50NT#d?b#S8DB<*or%Xpz!4A${_Jr7pne3@(k8?fo
z`Z~oGko?Lt09F(A_IG#+(0(?ZsUyj7s99p$eEZTBM!0<vKD{zJNYK`*h%`!wKddGo
z_pp$TvS@2Qr?D4wjLxt{01tHu`?t09MooT8wXo@QPONA1KKA$p#EU!68BTN-J$9BT
zspaX6fzBH2s?#T{69v5;1(Q4JeQjs{g0YXRzozf^o?jUG#C;3!Ie3dR47K*Q+MMvT
z%Vqk0%JqkGe`8bTUOUG2+Y9@thX+f2>-`FH>{}idW_&oNzk*wNh~8bX7dT8uQjzd^
zz9;qU+&*9XBGfGHwCO0XaF?Za(RG_lL39kGqAtx{8MnWu?69Ze2N1!!>ffZgBS!?o
z?9FvNyZLp7v+}|~=hudy;PrvXHQ%fs@rn%p=C8S10NItcogrJGj7{$pnLXI2j(!l4
znVN9+ID+vFUNFTNbg5}uXTCVWTgqbIy(57w_&aEMZo*rZzZCz6cD`&b!bC&Y9COhL
z8CP4t&V=P)Ng4i!fCnXYS)J&PFxzdvdOyxAH}5BR>DRN@KNUPrjH_4-;`2$e63C#w
z8uC^pDlYVOq1`qBzgE{Yx$!SG+DnLjdEo`pcCDr_Ur%a2FoIWA{IX<RJT939Xp6>m
zv*mktfr*5wW<eyMnH=~Nbm~aQY!-5MdQGCzn2*-ka;*pm1HQ^g!|sa@OUyzAmftbW
z&Nxd#wR(ZoTp$K9C44dAI9{r5(e<|`RlCo1?7bdUPM3e=?^-VK5-&FXK3Zz7=!EaT
zmeN=jw>nwZ_HIP`<5R@Ko&B)hSkH}$T!VvdJA0C^f^C6;OFQJhx-V?oVr%a#M=1n9
zy_^x;uj>@{;ZuZqlD!ot6InqPdPn9<tb;eli}FiPnn>AlwbOTdabh4BZc4acw2iPG
zyu4sMU5Po7=>pDNWSI4sPSnRJWRh%yauHa24zCAd?={#Hx}k%u5WYJNoZ(e^vfOWw
z-KmBL@wNSIGTqYaZ+hGAl(c8@L~Q<t{i^t=U+XV-c`Z_r={zE7$635WYiszo=3!|H
zQ#7&Lu!M!EQ3S}{I&>kk7%vXS^fj}(7Z~OESn&Z-PIZ~=%hB)%b4=SF+}WDnv5+ej
z?+N>`b4MiO4O=@j%6wU#(W%{FNypR52k)?Yn&tc85+XqGOgneeh4%URgG<d7oYBmc
zN3x6TBxi;}G)Sqc(fqzo?F*luny^oOa3#tq4$;*9!ZWqYQoNI+d!~aeN8+xzcO9<&
zH7s6uT=2&s2e&pr<zCac=bdzKq7Za^8DhFjvW)Ok^NK`l)A8bjKc#FKa&$d%XKwJD
zNnwlYxS2Y|HMaRWUB)J-qIhO#vGP-l<1BPJtsvS`Q)@{9TToR{{7JhM#%+~o>7Tu7
zY)pB$^;Q8(5BL{v<^An}-Id2?d!B;K$<2sLz=NkMCYaG^bFNFX<;@Q=5EcZ4g6^nV
z2@?@{zx#{S%&T9IW7uv1zHNN#FEW}1c5M*$g6uU`9@EWEqbbJB%90(ABy{4sEla**
zG#q&{4$YyS^XDb)ixx?`Eyo4+T}3o~n^29yl8h!WrQ4VAAjh!tP5Jvoe&H&GjxyG|
zEjmg)sYI2^t9I|Mn0eW*bnM-#zUJF^E+=H?2@d1WE5AZNJ48v0sP=+LW9wtwkm?S@
z{gwABRDKe1jd@n*1Q7-Z)4x)DfzCw@bqgtX?+R9<XIS<PmylN+pEt{Y<w^#&SczKR
zG+YOT7B5*mSE5%2=_>>a0YE>MQ|Ig_ZG8mK1BGu4-7?WR)`dVrx1*CSAU$`E<#RP9
z09U1*Px$qlVdj&a_MKKiKKpS)*@*^nzL2w@<pNRr8K}=OKAMuAqq*FMw*WiP<L_zH
zUd3FiL2^!pvX0Y&MI#zXE%saAri6O;OAuxwz39o%8~w$nX2=Be^y}K!=WNM#dGq;&
z+(`&jIql|bGUY<%9cf-cAxQbUXr+f(l%sx)u060NQle+~J;k0sq_L4N6`HUoTXWh?
zac1<3=2exzgG13_#^~ngH+Dp;*v1-e*A?F}IT!~@9&FW$cOrhKBf}WLUEloWy+BPl
zK}(bM6f{1;<4>_{Y#=TG@X~s&J(Pmr4omTGTK(|u?Usi`aXeoUZ9Gl|CtqX6xPgGS
zjRI`BgdMcPmM&iTl>m^*5#c)>Us|wT`OjNGY0~wi+8>QZ`z37@bv%3lEb|35a}xs|
ziJ>$jLV0{%{v30C9F4rDbwW^dR^PpPbyd}Y!8)TH8taU`TU{!C*q;5<F>E~~o`ai{
za6+ZliPCJcr(0|4h|1<+W*)bt6uPfRmayLFhe%gbGE0ysQK}oh;XW(Bv^Jutk=b^#
zj(O|59sX-rOznAdz(*_h=iWsw;FS?A=XI17pJbi&s$a}!VBA{%p-2ym+-cq|fH*cg
zZPziT7kCG9g?5*I;ybLuj=0+tc3$*!j1jH1_D+Dk14QWoS8-QT9+AsYOg}4OT%Sws
zb4(P2!Zl~3f4Eil9j_O9{vr!v8C}VG$wzcE5*4Z`C?CHIAJ~t0?;>SisbcNW!S}LX
z(8heNy>34~oL`E)psV<M&a;?+UdHBKO;4SI-+Lm{oiDQ-{nh?BIQp42CfSlz)+=!5
z>6GO+SlkifQGhI77?uPkL*TVEaBdVq*gwrAs~9)AyJIuqLElaK#yjjsfmE)}RxjMJ
zW_RVAAAMUGkoy;ePTvCRZpgkH5q7nstxf&@5R}vZ!n3Cl3uy8cIdt<Qcf2h7Qq#-C
zvo!3Z^4s~;rmGo<na-v1*K7Ui09&0+%Y>9)LLb!n7CWOj-hFG?o{_a<3EROKE*GWS
ziz=H5jH6JC(qh%DL0soE@wtPz%D#Ba&D9gPfZ6D!`&X<Mq$|@dFTa;<ouwbh*v6l!
zth^X29_7m}(hs{p`O8F1czx)_7w)AeP}0E->7-rM&&r=jr`j>sTG@t>r|cq&`S|bY
zaHH@x<+_0oxQ10Q`4PRaGB#kwK$e548-Ps(Eb0K>qP!ckia(O?tuOSy49^(#7MZuZ
zHQtxF1q36st!($}_EVS522BIhF*ZBB8D;Yw>+A-AAl_f_J+fN>ydfj;N6bu}?Alsg
zXJ0j;i5l{w;dDWp_J%T+I}f;q{vG`0sq#hfh>P~RjC?>ell}ZU*LkR_kViJ8T^R6d
zWt94JR70s<|AF;WHVsU?$<f;wbD^7&$)0o<t_!8!i?78g+L-El{7IQJglvV^=z!g)
z)YWxS51h4l!ur5;Fl#ZVFo%Fkn@X;rDQdAvgtahxrEtIHbQ-64zlQH)UNNpB$BNk%
zQL0rQYu&zY2!(kp6iEE(@Sq=V6xTpqBhBrFdZvbLVTU}zDf!v1hfsM%9Mg>NUGR1B
zMG*zqzx(3huc!v`R~5^T2i6(iSa|5yUrVl=bcBzLaDH62o68~3K0a3IrU?J!!>&Qb
zO|=Dy85EP1-!T()JltmQAPD=&>F*Hzi$V&=aWRnosgIn0IAB;z!fwy(-O41<LNI`d
zM^0kcFY1N$j-!I;N<ZanK2TQ!ZO$XC1SG|Z4i4NDqN53T0NQuC0#2HD?VHCjM2P%E
zTD3smZYZ~7_~BPQw}5w1K9Mk4#!At}A9<5UeO)X+y}j(N#b%_vVXrWU#s^CX8FNxM
zh*wFeyHiii`OhdEiQ;g;I_Qp@)*;SvG<B&^lD9lur_-K;lob6S&ar#Vla^z>Nb+K$
zp-(p{QT6!OcjS^($9)+d$2tF8Nwd1>jPHOItIVBSK**cw>7QZ~Px*{0bLA4A<$~lo
z0dH7R0yZy!0rzFegXp`<%oXk%Oao2DE#H;+>dTI_C&qf&FSH?m=ad&>`e8<XPn-<Y
z;!_K`fnNCyZ?b10A!>3t1Sn4KzuF5c5mf@Ph15y@1RS8JrYxS{0Kh}61+j0D6rM3y
zeBr`nphL=}DVlMwfPY)m@79XShM0rD@YlymLW#tGr?O1vIgh{Usry~b8T7!cf8Aof
z4?DGHN3^B+WaI}*E<TeKGgDppSWU*-oZ+-!H^}OTds5)&#=C#~SI5MO(W_X`bWw-l
zPA}~!D7||7-iDveX;Kq3%A<cPkoT&xx6((Y2T2#Jej&{{Z86{J@j$Q3MbUUfUAVb7
zs;Wf3Ka;bga=3b{Zei%VBW=ow`PaHrf3(J8ws=u0bHnn&PTg{$F8Xz?!otzlf9>7b
zj_DM3E0s^Y+mwfdr!$)T#yG_rwM}AwWKJ6IYd#yzKDy%@<QOx%r}0Q+I&BAqUt?CM
zn_9HamCaLemZNCHMZ_e%^_-6(OKX?UUlrlI%F6N5-D4rk(b27BLFKg*iT0!Syu73z
zx&Ef{tA}U$EbkvpUtkPgLu?7s;*YJz4A7g+TYj`s92lzBkMBE(gJ^mef8cn$p?Phf
zo0`Ppah+hEoD;vFdmkPoQLRP!+l0kQE7<|1%u0aAmQ1Q^!azWmKm9S7x)2*{iPZnz
z=A-a*V$4qm|FI0tF&_Br`qJnu(kJ623RBtldK~3@BEPd*)}wNL6nj3i-B|APB`{_9
zTMU(W{$mm5PIo5^9_r#-HY>)UrgY#(VM{AwDFa>iQFf#W^Z4{teCCL)1NW(jycJFt
z-45g(FVn)2bG2A+k2|%E&Yj_Bw0;xSWQat1hjgP=fP^&Pj}9AT=s|$_S!Ho_WVC~y
zb@brpUa~k{3Ur*)H><E+TU9I4162iH)_yB(K#=%V`EmS-+L;jY&dvQfln41wdtKbE
zqfh54X|CxfjE2h0NYScML;kOl$I$G)lONn4??AZG91gf;)pA6Z2H|cRvDz{ztko~C
z$@n-vV7Vb~S}b(c0dVJFuZ-W{D}xnsHzlA~4*nmfHNi7(`=}YY>x_okv=pcB?2QoV
z=Xlq`7Fs9ZeZwn|J&MA9k%h#;krnp@Q<y*mq4bf>vemt;SnSnKqTq}l7XJZTp=A%%
z?ckqARHBpAn&>eGf3CJJ>fb6su|Q#cD?~FXL|uyrY<{x)^o93F1sX7Z9d#$urmXN2
zTQBzxssL-2Fwwh(qy$5uHfq_=>CfRWB3jbd5>B5Ab0ncpt0I<VW00r?w!~-R4eyh~
z{3*9hbDe!@FAUR73V-p=p8fH9I8{2($oUATD3uP(eBtPpWZJ^~f@RHr!UaTw(L9vi
z{4k51T+f8u$IY?pDsU9fG34+9-E~7a$tVeD;07}fj{<uFNTETt1R=nCs6&wjWbv#i
z>~wt2<k{rtgRedLh$Qt1=Z2QEia#rlN7(^DkC3fEzAcKdTLAG+0E3+X7l}Y2>-p+-
z-RxgC&W@wLE2XhFR=r=m^o*IJ?nTR|hv-!n5oRxc;-ghsJhlXC&_h4h2sW9yEbfW;
zN6&Cm+kgh)U4J955|AD{^Y*X1mqe84meaoNZp$&-U#ei8*J80adT;O#pXH<HBjoE0
zL|ap50~~_kqvlS>L^s4t%a(ap<o*PyHea$<bylRIOugsCS6>XjRw<JcF=tP$8=l3-
z4X+RDtJH9=XwM7ltS^KhR-|zCiP#Z797qcnlSrlldi4IUh`j*)WfCTK?Wm&GmK4ia
zpiQC{57^sAy=bce82I3l_=>_M@)kg;5_wGGK1cKZ8GJ~_*!gY9TZ*=0+zxI2WlB<<
zkYFK6L%e<VrPs)>ED`jE5j!8~@-$B$hYTfV8{Gs1fi~c6N`6PB2TCkCi>~9{kmu!$
z^=&11K!f!>Y^?*J%YzdDxC^ehx3Pm0-kU0l^4oGmrn*W@C4l?}rqT*m2b_wZN<q4B
zyL4Oa!11wP%p<EW+xWC0auNiq4?Bbif+|L~B8Oaoq=`=Z<tN3M;wvsBORIf3(JyKX
zDPhL-J4kN418~2&X-&<N-IRnQcU5ufdFb>9q0<sYkLdyi)lG9tjF)Uaz4C^mhvtVR
zwQ8U1XK{*g+8Q(QS8kZux_Wx1`m}7%A(WO_b)g?ctdyS1k{O|Y|12)>J<(alr|Lw{
zK)aO}QvxnknXPp)D@mP4pnmg!vfk*l<?Cc$O6n)2_+HG(&YZam^s(L3t!ujhfu}Zw
zec}bbbUxA*(Fr*cpK@|lKF(WkyxS=?hL=^RS>&4>cEC-|JPfyPgibyW+vUlq)e7Xk
zx3_fTS-SL=6voUyWnKFztk5dRj{Ud%^)hTPq!p*s2Rl&G5Suv5sOH}NTYhKH0_wxp
zCFv3>+V$G{o}p#BE&H0sw%MDKL;s1{<4@vrRu6}z6OjAsON9|36+-Yj^FE>s*Y3nX
zqMWLEfDjR|B(2zO(`<|9RbYywTR|ljO*kxntU&W{=eGd_{WLJx$zB4WjsuP(0Y7UF
zZp`>|IWm|sokTHn3TcJ><{A34<?GV(b1c?<im}Kl_0jGg_)eVov(~=jC(Cp@EfucF
z%&+P8kn5H!^8n3D#ciQSAxo3ias6@|3=C1%PV1kV>9{I=Q?k|q1SBrihfi1#fl3pZ
z7BL1~$U(HvD`w@u@;#O_uGCI>zF`c5Q6qlvn4^_E(k?m3hb1<k^iuYUt?g_E!>%>9
zlhEGVr0FfhsB%YE_{z6>wwlDpdGPBO{_vz?xyBO%*9u*>ICwtZ)#Z#WvG-~Eo^6ws
z{f^BmrF$`$O?Ya|1b0_q)#283S9UVwv>+!Z4{id`s;~Dh$iWlE`Y_X`CYQ%watq6G
zDFFo4tq&a0{R|FVbiFXZ;oCWip27XgB_cSuiyN-`$mSqw_s<>BnS{STXRg18hcN%6
z1JRh?W-hK{@I?ytVyT_MMOnfmwZoQEUyoF~Goig>C2njCfBRd@9RFT^=<AMT%9vU!
z%bmqWk2NX03sHP)Fz8!3kbKuQ#|9}c@BFj851U$)B$+}TX_6=!P2(3{Z$)pK&le;%
zUr756gvogMcJxrNe1;!SH-5Gfy|m-b+#ixe9PWHCImky}2L?KlEVnw!IEn?3!D=h@
zhZ7U!my_H|u0}mn(qJ0toO|XxVd0uWeIC<@7o6|Zq(=Rmg!y-L_kb-Z&ObN^h3+E9
z+^#(FY)1p}vA$ie_qvJN4Wd81Xetj-W+A-tbi;lW-Gc887evzqs=68`Li%3?O!yOT
z-GHv{I(2aAVMuMQFURMY@1DBsSLf_JvZ@Pv@a`d;gBB_uOyCX4_4Z{^dp9Vt11VLM
z+uw<g5Z(Aw!Jl{s`tqfF;4q9A2ZB$#7W=N{=mm=&Ft4JKpfJZxi2zGf|K$Mlg73FI
z1nK}Buz?r*(%)N#^XYQ%!O!)+Jm*uZV!TRt;B`R`+pOlkE^d7pK(Vig`hsXu3rp&z
z9K|%vb(B`D*HEWEdLhf&{?I3()eM98&9A%p!@?HzK!x9qfY(hLXf&L*?02|FqW|ju
z3cmwD{LmyIaBIt+to-_Z^qVL1Flt+CX>YC~w}Bc-rEQ3cGD$s!Roo6a$*-~h0AN4a
z(0Jd(jpLnm({_)iNTSUoA1u>j?+;M4>BF4bg$Y)lCqwFw*vsG?9|pc3MR$7${{V!G
zR|`Gdj5&;B<&1g^bM>#HRRX?6HaJ#11zZg0`c#<ay;QkXk@obdDo{~f1*6iA^i>;$
z6j4A06j4A00*qpTKm`<0Km`ZuM|vm#qKYU1JJeITOyisk)S1UM!~ACWfe*tkhMpnu
zEWI@QN0mW8dGUoGo+&qFawjDixij*Y{t6%QMZACeK<Zj-QkK*70rm*g9Io-p5%|~3
z<E3Bm2Df$MJ$F#mFJv;^-cI)tyBy`2i9gH=qCV-b8gk~9&(84`eXQj!;!#Bv2O<3h
zc-zI+-Ve}bzqo&yK@q2SZo~7hkhQ&T>tEHbFYcRklQCn?ap(nl2ki^3-QD=aY4S;%
zNFZ4fG1GDCYs&$ys?&3uiavug#7d=KWziFPf{?yyHt$G><~7QAgq!Fx0a3pMQy84k
z1f{{G-;UK5X-7&4WAjb(27Uhkl`|yN)=(|g>=x`uN0CsK>w<ApeNqLhv2(-v1^0=s
z*3VD2dx@KZ0O3ceJ*(+ohF=A2d?1lt-vN875D9kWWA*~NuK;*QOYpvrZyuj)BHn?W
z&n(9s&2?4kQ=pco+2C*#;FR91BTNpMsQ|?w=}X$W&u?vm6j4Wd1}!B5iU2xMM`}H2
z0dYx16aZq3QP9vw6aZ06jtwOM6m+7GN&qOLgFpz!X#8vAKlmw^jX$zJ73rD`a_pB?
zyBmgofjRzoud^Gs*1t1<;HR3M#Qy*jJU6Dh=F&SBbx%T039PDoCk`@Pw3+dcC!B%~
zPY1U&nH3tbVYr-=$)|t~d93)wvFQH*0)7u_e;Ym_Y5pG5)T|Bj-P|uoVh1e5_C1Ha
ze#!U~!Fq4Q{{RbV+76Wh!DnR>#(`HEJ<0bq^N;)!zrdO{iSRnt#1^*L)wPM_H&-po
z5Rw#C9)JPU)SCLtSD{J?E1y+>p&E4ghYqx~cA#}Nx$A}~#U1E9XaJ&$PSgOssKp(q
z%>WdlkWeT9#TcM<q@V?(6lVsE^FRhD#RIh-lmNm&{OjP~_$n{P2GIN&rT7}kW&1{|
z=4+s*<`FMIN4c-N+?>C#uf;Fhzr=U?{{Zbp<4A92GR3D$6}7VVNc@y+er#)>5iVG0
fc=?T2PKJli;P3?;Vw2LBwRuOwF({&n1b_e88&z-T

literal 0
HcmV?d00001

diff --git a/fixtures/suspense/io/public/img/sophiebits.jpeg b/fixtures/suspense/io/public/img/sophiebits.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..f0f97bc34fe1105308244b6abcd6cd70e831cd63
GIT binary patch
literal 30625
zcmbTdWl&sA6s|kC1h*iA55WmGxD(vn3Beg8FgSd;PX>1w+}#}#f(;T}gN5Mk5(ptT
z=bT%o&d+o2s_Oo;yK2`{dsX+^>wWw0%HK6WBmf%|6AKdq8w(2y2L~G$j|?C0)hj$I
z5>i4kT55VaT52GW0mQ?~z{JH21hNUUbMf*C3JTJ*ib{&`OYjH?@}uD3;NZQ&qr}Ij
z<Yxpj^8bI1zx@DWY?N;(-_TH)0I0+$Xv8Rghfs<E02B<A{~3V)H&9T~&@nKvuyJr-
z5dlz9(9lrP(J(O3(f_Rs`u7ZgPK-gq$R~?Qs`CMh$%BkPEV&4qS+40Tx$f*GNWdBz
zj)P0_nv#l|<qazvJBJ`xNLWNvO#YpMqLQ+Ts-C`qp^>qPsg13jy@R6@#M8^$$Jft4
zAR;m<Iwm#_mXey5o{^cAol{&=T2@|BSykQK(%RPE(b?5KFgP?kf*c(ipPOG;Tv}fF
zzWQ@}XLoP^;PB}9>iXvP?*8G|;}Z%1?SJ9?oBtQk|G`82j|UYU9St4pfAFB7`u-be
z#ON4|e3&G%I#?e(NSXM<u*u|-i<-XTFbn8jl3PP(aVbE8KUuE+2h#r}`o9AT|Nlkw
zzk&WY&)-!59vaHO4~9kzkOria0r(6H)suBF9z9`s^j5>3=65DmXFvldn;Ys<{8ZiI
z2XLv8o;cAfcfe?c3tE|G5POePyRIR1%`m!s*$4)25{HRAHb7r<-9r;<(pgTNI+ui<
zoJ|NW`RGz43ns(G<mb4i<FI`*(i~Ok6Ak&VZZ)eeLeITDat%PPyMtQW8VQ@u8*z#>
zECJB8<g`*51cd2Fz@Rs4;8GUrGMWsF4wx~65<>^)+GdNTqOc+eNZ6OK7=WYNh|9k*
zNtz7orlGiU5mz#8#$GX+Z`1E!33Y>Vj2-m=p`4savxY~px?(9FCca!X95uKL-CUS|
z`hL}_J(l2=<?ge7`JlnA8vWJVJ&qXYidN5=oqyw%CG$Hty~x)+A(GQ!u||+7TT)Sc
zu@sUVJasvO>5F%}-KwXbW57<QDMFr!gAyJAhday|mI|!Nk&`bF24e`5fJ|FqYSG`$
zwJL$Q^UA0)aw(FSki5E$R+G0(E+?J5!zQlQUtf$%b+tVEpE;@6%_ql*@inX-ZMPyc
zQ;mMmk)|5(oW883G&juLSKUs6>oQ|Vc>K{(74VB3we!V$#>hj(l_2xY^Tw6@BwA%I
z3S?HcY*H)3q6HsOeEv9@8!?A(d_V#h3j{t=R(AZCP3we43UlHl+W7un$1sHlhpKvM
z=ucMku?QHtm+5G}V0dLML|H}!F_J?N%zXQf9x-Y91O2?h?LDm|`!FCln_N(6yh2>2
ze5GEs;JAPI4K}*o*kfZK`<gPcOy!MNWAyYWp*E)YLKua(+iOZRk(y#&4N{Irzvtsx
zDeKfwS9d>J&Wr`)pehLjK!v5Is$17p8CmBc{P{l;EIcg{)`g|CS$88YaTif19M*<D
zd-Q0vS;`+b!jL{YE-rZHs~gg!fE>HNID2T!zI@)wersR7MM8yoyD|2=U5pXP*}M`S
zN`X7zjy$(y9m&Wx=axw&@q6i$8pZnPSjV3d^K-FdJMJ+OkytJ=+Kr&&zQx*1qC}pL
ztWF1Lm9>xFj^W?9&p$YMB%#?7-VA#h=8SYy9v`|c^s--%(FN-YjFlEGI7v>vB|^b-
zm;ad3f3CL-MnW=#qnI*wyEbuXdZ;fjvoHqLi<+ez!`!ect5^TDrW^@1jg%`Ya!sz|
zt|ID+3^fqS&CZoJxGgIDtltP_O6KanA7PqN)x&kgs#bAtfevpv1ZlxJqWkOe?ZoaY
z$Nu#t8gm$BkxtBB)~5vnW*tYSV{J`5I&lL>rbNA;VWijR7+tsYe*%s(2Pmcrvv<wi
zQFrd9-_N(HR9dX~1uNsqU|wpUGFZ|1-%02_udS`@<V@|O5bG?EPQQOI$0@4Prvm+G
zjrbJXPc{<+wqj(^Jw+{MRiWk)TR2fiEteg3a{tgC4yd@&?gCvY6D4d!F_lP4iFEMR
zi~+PoDqS>IN_MyO737v8S7<SGKBP`!mx?i`=0iqP(GUyRomHa4_&DeMCbE)FVO{&#
z><33WB!PVNsws0b`6`WVd0b`j>f;ApVDpjRPiX2+q;gSBh9-vCCex5`CjBtoF8=Y#
z;Nxp2%db#zW1n{>VK>0t#Wgh-l|-aqb=ZjP(Pla6FiGe&M)3ESbg^bTPG(h*{=klS
z4=noJ2HSD;H<B}Td9~?WLdg}=#@C6kHVA8}Yr|$(`&=a@XqfCd^Z@_DbR^e-t32cM
z2pq2~!o=CLKMEl5H1E6HnTGO~Vp`UEz=ouloS1o3sbY8Y`$A+*GO1gqr%nSeo$K@I
zYeWy=a4#j*-@n&oBmsH_Q(4!|?Dk#^!B}_o?~aYsLzaPP{TDiFAwG}z0#^6<u=$nJ
zxApB_q$k8?DZ;48DtVLU6M{#!`pNGtCUiCtqoCi^(DA|LA51kFYzOHk6F!<xk>_iO
zQRO=@!@_yGj7fF~aDnNa$Ef*l?Qxm~dXHqy(R_RJ7}JFhF33Ozsoc)Gn)kFPLXkLf
z%93(t(pmKiI}AItl9=ph%3plskv1md2+PAVQSR(xA3Et4L?vSKReo74@|TgGQ>8*c
zxN^P3;#1<0CH{f5;=7OkS=WAtWaj)=bjIS>C)Y0fjPE%W89dg@*>*)QqqxO`8Jw1)
zDu>@W>2At8#73pdEt8d7#3k~4($cnY+F)S1=~sqTkUSW|Y(DoX0lvwvyAo}WNJ72T
zRH>tJ5j4ii-!IPbE0G_?%(LDq$h@xI=_+mKLK4utDRskS_so~w&RW0HD8}8iQqhty
zC}OigmN`uEaV%CY`k<{Z8dKR}I<YXYk5w@4h}3Rql!_bJuBF22!&Of+oYSteWv2Y<
z#crin+nXIcDa-?mROi+{xrpPhNc>)=ms|;YSCuPrl=`?Rvx+;MtESYI=Mx%*sTsJ~
zSrLv?U!3tyaRl&0;7oj%UBs0PRX!HMtQ@xU^gENt&E-;&uBvW(c<ZV7!~A8^rIO?h
zut;lU*tJ-|?4^b{!>aSvDl}0m8Ez*x8KtyYNHsY7k82zHMw>kFX_3d`J7@aw6l72n
zy2be+5pA=3<L$uB>gFK71-dr>?|_1jW$zQ_rj}pb>vQ#~Pzfpo-5>DDsiM;du08(+
zaAYg%7F_3GY+WP%0=(NpB_Tbg{mUuJLsAAt6Sv5an<EoU9OfR1aK%-voce&^kaXj8
zyKCLOvfs>ZxRar3_xmj>UW}Q{J#FoV(G1A~sU2|J1i~E?A=8>BpI%Zy%}p16-U%X2
zzOZ?Ob@SVXy__J#nuKk0#*XL?EK|8Rc_+|nn1|^vK=<(&i$&`<xPwz?Az#<|(8#C{
zb$jW3a(HX#Wz87K=PTuY%g2U`k{-{GVsdbl?<9Ll0D{fXfTfH+T$4{K)FyN*|G_IY
zmysL-1#*f()d?jPmYY+VyqPKNMqVEj|7#mt?G3=wp>fk$KqdFD%$^W#<80Ru=yR|s
zA|XiU=<G)=<X+K_Md)?%J(ej<=$>sCU_Vx24rei~ja3z-7l~>6Zx>EB*Y+X^Aeada
zlsyXqfX+G+YFk{PIpsm8ulqUE(_{m$^v7~Q@=RA6#tEKJ2FX-{OXE-a<})&(xX$kc
zE>0AU=gvR=_d+&DO0yTGYlbzyl#PZR#^Xy85TL8ZN%rB!^9Ov9TS-Sl>RZcO&4`61
z7<UiVxGKkKs`ld2%5%xvX9j|{q2qjp&J@M>!kz`^KGjA~kq<WlwpRJCC6@k++k=lK
zi68X&>J=BaNmQ?73YQPsf9^~><L8^Ms<N6dO%Y%j9HTDi9^g0VYxxUU0_S-^aR#gi
z?;(rfszjaEJzXQp(_i|`b<=7+C);Q~vE-Vi00=%;%Jx53(-s~$FwYk~R}Y%=t4wnd
zik@hXHOrZZMNHSZ6(>(mvvyf@N+i}FyKNDQ(yONDO7LQ>`<9>4N2yuFlND%FGHem{
zZzFK9_L9)nnkr#oVF>zw_X19<veSJUJ!x6jlL#ro1#K3TP%5+^WgMTkM5T4quDg@3
zlaEgHtm`Gjcn6_D3UsEQdA~pNY5&QKnWWQ0`y8T5v8_Bpg@*FDaI#>NL&bd78R+?3
z)rG$09>npDAIa$kKl`wN>SP`xExH>J_I%jZA7)0|lF(LG;jFjv)5x~z?mI^`eez$x
z-S0&%rI|ggDk|iTMv8=0hx}~+i5^?IX{s4rMCpl8PI1=kUR!P_Ob%<Sg88-{snPK{
z>h<ena~?5?K(m)8U~u}+G0y(4zZ2xE8q_Xh;D+96W*Itcl<4_1e*q2V>FgrM37t#2
zh7Rrzn2gyaUbJge^jR;R<>&ScMdSHdWx|)IV>{~xd>(ji*Zn)JssBoZkfM68cwM{Z
zsCCkQx;DN}80E-4dA3vo`qH<Vc3M9>3393EF3xz}^Xrpw#@^oTR%HlxURw99(5b=8
z;S0wec*FagRR=QE5YWLA*=&lp*DNUt4jvr1AK|^WMWCskR6#hz5CazGlf-mpbi7)1
z`Wj+px$x5odez&7IoA&nA9OnA3h^t}Z0q}X8mqOM>08xoJq_uoveN{sdBqY<kG7lI
zBj1i<Vu}Uo)2}6+;}*i_C9-+m5~n~*YS{h)sA+;!QlaZ#xEjY%tN)uAJ=6c#=Fk=y
zd?LauHIQ4W#tlDQCqse^4fZ=h_(XB;J9{>A=0la4KlH<|SF%=c#87@5nFwVzvn4Yt
zD0+rZ&(L4i2D%Rf4FPv|4eK+3Ef$?#>u_EzonK1{I81dmiq2iGIre_(i~4pw@Py4p
zMYC+4XHhOsKL5H6GxytR%+iFppYSG}48`9)W<_-Arkhk;)XM8t<|8&MgB5=P)oEN&
zApO^uV>Zn{KaH2{f^6^ZZY%NOSDLe}O{eH~DYDP<@B+<rT@09781UN!JR%HH0Lk}H
zR@X5rRMN*({4nMo7@XeLHj_L_JNZoqDdt~Bc<zDV#fU?r>y%DcajhIrLUAi1tw;GV
zy+t^Gh+#gzc9z3^*kxejCUH3Bf4~a#nF<m6>h0xP&L07M3&c&UU$qf84^u(pvu96g
zkk~hhDUIaDn<<B)G3An==usT9lZ^fVc)VlYFSW@@A&$uLc`dh!o5paV9fx|O;an(E
zJJvQqV4wt<=t^yenDBV&ufKMK%mb~N!Zjfaya)S8ax$kIl-1TE+2(QuVe76>d!yvK
z246+VtKN_Y)$sUCY~h9%pUVKqM$T0pL-Lfz&38I(sviV~U7}TJ4fJhO{K$(fV6NOI
zwDV`NTU$^0i^I-FP39_X_5<u+L4N@Sa|N}2snaA1Zj|g>O|-$`U2%A+e2k4)P|w7M
z$4TG0vWXfAgdwBGHPYItA%%SHBjxmaKIC<6+(C+^$@i9N3ET`DYA>#X-y2mKOLG=e
zuhCKct5bWLCduuf&YYf5&)v7Q{t_?VA<i;oMpEz19i-Du)Iyr%P>FsWM2!9gNFRVT
zogScCtpAR<*!nD41@k?`V>UXR5)M!lVQtt^*DdfD#+>G$kxs{hy7OX&puB`ktJ)wF
z3hCuU%U3{>y<PlJSz38Kn<ssjr~tJ2I&fYZK=##IXN3|2{aX>qY92^>^g*I_;G9hp
zmEOu7*>&~zhYR%;d8^whJ4S2{5p=l2kt**B!_A3|q%79SW)d9AOLz$R_#vevY%oRO
zNRzvVRg|ve`AQqDmq>Q>)M?zrA3gQtL>`?0F3Nf9;wh&A^4k<Hy!dem=J@$p`>WP6
z%$bvCt2Aswc34fpJXjuHv@Sk}IvDyL>xO>E;Br*Hh<UCS^hwx?(t8v**E!t3mi85^
zdfrz8B!;jlAw1EXK#ShEtH28&^f*xnJ-iJe?it~B+jlK}uGiXl`fc=qAk){wg^pcw
z322k#JZ8qnYbVX)CzZbGr#6yejP1&k)JxU>VKHRLNK*BqU!GSJ#e=P@Qt^8Qj;SVk
zaIg{9uVHU$pX68Xn!BrPraTPydf@{Nl<3~0wJPB3tzJGP9b?vW_747L*ICe1O-Ivw
zETh8NuwhRp#jKl7|7~^C=3_Em3XUb@bCK^SLk0&}uCdN1w{I0yCnUX~cPj^2n2l=U
zcArSJES=;pbc2rS`w2L!IY#Hx-${H+r`m7*JnLcSK~r;X89+UOZGH(cxOv46HKVQc
z=<EQ4X|*jR?733>?5bbK*j1#9p)iigvER=OdV0gtBt2nnb)Wg0zV*QVER*Aa=43jW
za%oaI4$yLz=iK7!ZtVIE_ac06Yh@%x_F`*@ej2w!mE<6+-Hn1ykk_PxZxKz&nd9MN
zu;7}&kAW3PK`vc8&J;zT#lW5)t>0gM?WHAV&Sk|+H|BuYDWOy-mMV02INqSC)ISgk
zl=SAc)OxKx<DOQ#P!-Vl%~-Td3@hCoaOuMRgR-(*P1{1d|5%koYo=<7lY2`Eo&bF>
zAuY!_Q+zL`z7NSTWqhbta#K>^&gF{%=h!`!B@S5+8X~$M=@RJs3~?1(bYlf&ErAEc
z!@{v-0M#j@w!!8pB~I)9+f|TJH>71;PGgB<`CHVqoISCz^v<f+$p)!k%8d2;OW#C^
zObUM+7E&6PqfFJ@ZW34Z7*>46SHa<#lf^J>ZxQR0->P3XEawj??aybNhjk{PdJgNz
zpJ;K^VoUt?DgU;*;Pt>~Lo<IvUchw-H4;7K<?tjybq_V*?1^kQ%-&riv&mqkuOp7%
z`1IWz_7|WNqt)tU$v-*6!#Q<l;r5`H`jEgJ3yh-uBK2}d(N;TAXThf%JWcsi8Tt6)
zoy1@#j&SJIMw#xqZIH_YV+2>E#?~K;bH}B;@p&{Ryw3u@c#Fb7I$hsmkMfmnsx_oU
z9FCqDt{(qwPj&CyRt;Z$L6gAPUF-sRRyO-~_?M&k@Vld&JQ5yRSZ4n`s<TnLzAl9h
z*^t`|NC5@JEHvR*`gr_WpE+kqW<X{DG@yNxH%S03QSom5H1}fb>?;ZduOz%ArT54_
z&t_o}o9W*cAy0Rw)X_2ItEe;KVaja1(7^3ZjgK;ZEcQCr5n;)rbtOh>R11Tx=L!17
zI~RmSrK`XCrSr77;f>dR)!%Y8RT!RN4UTrF!>j8N(@j+6{xbK>WLPfGovfQl)4Y-~
zKjl*}C}P}3gfT@aN6Yxy1!z1DA=0fv!PcH?`(3~5l8@A~3Db-EIX&VlX67Tg6tMw;
zIp|@(?B0aR?0C=(g_!bC0Fo6${Py~U{sQ7EsF-(|tmuPV2O=Y8B9@BB5~HW^U%w(`
zh~7yG)C)sWPLqXVniFhCO`Ve9&<d!)EsC0rF6hUqgseClbmmWvv~~#uBG%@TJW~_;
zoQyFN)Eg$FJ}hOTC4>y=Yuo@+JQJ{ATDMf6D~kTG<N4FGPx1N*$}>h=ls*^CAw;o2
z<mGBq=4hj*j#j?GWLKQ>pExttzw{&Ly4C73lalxl=jJ{iHhWXpsZ<+5{P~NUzZ^_d
zcJw<BMObH+!Ky(zhaajfpe?O)?dxl`L;v+#B?crKMD0Ynm{*SVQ`O|ybq~>!?MhGa
zU8vQ(4xe1{TJ<zf2}+3l;<sHQioceliRL+1SIjw>!mIJ_a_7h*Ip8%246DM6E=!PY
zJO|EkIT|IjS|QUtrXen$@SJkk-zB>T4J!y<u!*mU9O7#cDMDGWu)dVZOW|4(<Q)=}
zfv4On$OD!(?Bk#NA8Bz54h)zKiCfpYfi};7AbY9AG|DV!66Dh-@<CyzYC(|3x+afA
zeksBR)DofV9weSFD7o>F@L#^Zso#jncI`k6VT~(a==XMU+uf9;qFjr4eLd68k4#KA
ze3POcnQrFHaf7TEht=3}yTJ#J4Wmr>g&L@)>7(8?i?3U~*|+~a+{rw%c=D=}L52D~
zx1N)x_<>}|NdBlU({Q2dQezVa%AcFi650T7q-ov3E})&SU93@2RH_0q=fW-8gqC<a
z&cH-_$1^zS4`e*{?Sh)XFeX4>!TrlyH);C0yi@zBEU)rZwH!y?N%LiKqTNYN5mPVi
zK>czcuDTHiFKZnK4~K3m#(owmk8%x-hYGd+Hvl>JtE?JUs!A$PLt8*jY^eCmC*oiO
zswy-B88FINIR#rUohR(WhZ|SMn>Rx`nJznYiwF5!3%gy(F2(8!N&0*zN68n<M~MMP
zcas`iwJV(%fl7bwB?ZoY{D9p!$JuT^7-7JhNguikLYBHK<u-3b_`HJ$nDh5({3JRr
zClO6ZJrmvaF~*Ztx``3T?1?7HDyG=c4V=35+?k(hl?r4jL?x_}-OELOT3_p!xhL<p
z#Hzh2pXq<5b*=e(Q1Y>l?|OreiDcmz7BwfZgDUCfglhfzuB`T@qmR@`>QJ&^1DkOy
znlBvL%(x<C*TrR=G|e>%>BBb10Z{XDj~Kj8>Dc;+FoW_~ktu;uhG4<mh1OOP@diRA
z4s!36jVv$lIOH=he~sr;pQOG~gBql?T*;bK>Oy_J*FkELqcjyq7oJfOs{)Z_2rtzK
ziT(MRY?&AGb12!EQdZ)+ZQ}heA4gfXve2^xg^$!t4xr0xGvFx4P>M9idoJSigF}c@
zZ60NKC-Y_XX*1(R&Y}Po4GBl%q0^=nGYJF313B(Ge?gY5LF_I}69?I+>lht{@|rSO
za)jNK7m435g@7fkVU7%7OIEjVweMD;6GF-vI~@@Ti_AQCn<e{Hqvello!<EQF=b*@
z<nOVHPBm0BWmm{{fj;zQ95uFQ7xT1#0Z(`A>b%TY@C2tvMT>C&{`|_50d|Dj>C<mr
z>?!vUTn`^>0)P7CGG;*7o%xe4svtD-DoGI=%*L4c@xA(jn>_Fg`S7`w)8C<>0n9?k
z+16YkT9ac~?D954PJjj|_FIn}tsaGnnPHJ#8BZVXkfXcODg4?ia3mQT?^a6>tpw1!
z7#hWamGJNVE@h8BP3Qni6c3utCI!M2I{><)l^0s})ftbFa1rpq^{SzyD!#^gGmUG`
zu1%PB#Z*7(u!UKTze}i<uq$d6N%eQVN27NdCO&G8LsnH!@CDp*6|&E&Rbw@#*1ZoL
za4AK)^qN3djEam}%n=6CKaReNnktTr%~7te-l6egl|h$1?ACDg&%dG-))&9!nLFjp
z<r71o`qf7FHft#EcAp#Ctbrw#-r%G$09MspnAiUT{CKNpP1KDqWy&S58hibT3Fi1B
zj+QDlYS*o5ZEr5->fRT*(meR0P;r~OSH5<aif%4jIAd(*8xzj}+0gb4+o?gX+aG^;
z+K`hyG)R##*wLTP>wuQqmnqolxqI8_{3tVI=Qpe0w4f-p`HhWouxfUS9E&e1&R^8)
z*z*YuUPmNw%B#=l<dt?~*r*?%Rozw;5uA>*FyS@sjWHic6{x0vyGeRc7NI<X9ob*r
z)%ti?$n)=pQZq@pJXCEbP%^*TLr#l`fDG7+&1u8{=@4wFC(ODWvM$Z-AyC$blftFP
z0<<y+n=4APPi9X`G}R|7{SPU)v2tVx3&<dgD)q;zGvZP?k=58xc|JBnk96YSTv$I?
zSjaa<3sY%)nt?Gh9E2GheB=@b0zRewx~+-97Fc-78S6nbt1;Iz$){d~{b9eugyu64
z`UbgL(;Qgar{)9Bo{U~sjY`cOHh+9)jY5m>`UB#r=I_hH2l~OVbKX#~9A^G)=OLGG
z^vt44u+|@JTgI6bc|#C@yF7b4ALI>`51nj9S;(2z?nH{zU;I3a&A)a|kur9NX*C3Z
z9&Mmb^-jjOlAKxz<8zehio`N#bL}>o9Eks{8yL52a`qE_d?%XeBb1fV%AMS`M3Hkz
zb@<`(*kfbQm7K%kloGh+?#@CJ41WK*5M(1U9$Sksr&#8R2a2;YWGt=gQisx}V?A>Z
z4i6#a&Sgx+jtjfQIVeK@`89={ZsLHCA0o_yHX<`l<pJZ8HEZYGBnqP1A=G<!@hBkO
zt9pEWh)Aj!#36MI&-Ou%gV}LIC+x{crSgcI6oE_}Xkv*S(V_&;QpX`Yi?{VvO2Znr
z5<QHTw#8%bC#C{;&kTBJ6oIxOZIiEn4rwf&7s;j-D_@bFk99tk%;<D6ZAP{qzLG;(
zQ}`0910qHRiOFKRh2_|L_`MaB5By%_pnbd$+iV=hX7cXjm8W@@*rHwAfCT`VC|Uii
zVb_1vja=A(KNmJ9x6)I|vQ%=s{RgalvSg9@BGTXV$A3rjLi_$Ged*J+ZGA%}y0tT3
zL>7aF1{w))Xw!sdxfObsdaYfDeLXvLbR?yrp=>O@TGUYRE6ZfAl>Dvd`ytW+PCvTv
zH9|3fZb-j*mLj`Kt^AmHePGx`lahd69CqQbpjpV6MH;QMywtm?{0&NkOhB&oyv0KA
zj$Bh6lK7a8l;bnj;GSCN)-*B6V~j6}_Z(4l8tub5GF^T%Tk9iD!eQN|w6FnU(@qj!
z7*TQ%JNCLaI<ehCkTX}FDOObn)${)h)|nDWHBXy2w<Kz6ah)#bRHP-i*G|r+#Nk5(
z&UYBv&h>q(=?n0uu@w*18-dUS>F#RvrTPRpmwXx^QDWpT-=*bSUy8IO!V8<ZyDL2)
z=`%rgZyb}RPb~t&j!a7iTE2y@i6%u&9KcTMyk3d()BZR>nlDAwn2t<k)C)K6qUFTs
zuHm%J{9GP{bo=ISUEJPQxd?(4{Aq9}#=`}=+rYHuX67nr$XMhi-CabrvyssKC+=nn
zI9++2s3g)WeX4%bap|iyQBkVLMJUdNfdw&&KUOx?gsbLj_lMfQ0Q~Rk&K{tLy=}z_
z4#uz2rboBAq^_i;MJ6U==3Z!p<N^>eDt7MKbg6>>MkB_wI3+mfR*oGzgn5}khC-*=
z>(usxz|fF-Y1|{`FlLLwBuTM(V7ZKgf|V$`A*6&fTM2B<oPuH0U&Fga<S0fx(;KTg
zZ)?t8rXppo$KuAJKF%L>qrH`rquJ{%IFnT^D6j9Shq066@Jho;WxH6tG>$5?GW*({
zy>xfZreL77hIoCVnJ3#`Tt6UZ@QSQ>St(imzcr5ny@jO-G?vwHzj$Ap^{YSlP$}VV
zcA`%rqY{R#cPad}XP8q`>_d>7PF(<_%I-OH!*ZPsA`^7S3R*le_gCwJ>bo%)j%^tT
z(hEymrCKa^?M^ro=(O=GicAK49L$0_s{h&4RRQnE!1I5JOn(fx{R@bRFCc&;3cxKU
z%fUzWRDlN`xbTCjnsEY-y6#Jk>ub(@aay<xK4z&w|6M6_j=C=u{7My5fk(2EVPOS(
z6z}BR^GWaip=<=IWHT%Rgjw-cR*qJUmafT+f6J!jNFV;ZrO2t@KyES9G$L|WnY2A+
zq&=^z?aL+|<&o1K*V<)3pB{i%`rR^Y^WN#_%x*B4FIBxgEqO;+NP~)*9C19l?qL~U
za~PU{DS86i0l#_^wZeO3p`AA+)>>;9m)r60)Q<Brx<J$BWvs*_#5XI4w!SyJMQ%I~
zOHZ|>E8DFEl9Rua?X(w2{WGu5rTsISu!!t@*!I2SwzT(`r`xS}cB(1Ze*vP^P8`4x
zd`&IjhnS`ckCpa>ib{Gdt(P{Dmn(oS3RbzZ#1wfq{YY8D0oKYQJJGh#8I=<AzFxRf
z<!}1Og*jDLG>-$y69Zo2mtVJ~ND>pQTmoe*p#Cb$j`1;H`+>eq^x9J4k50C;HFDDU
zhOg6Q_OniFdTTC%qvs3>Dhth>KjV%$1`f5e$F9TV=fR)0>Vi4@@EM>O3uqtEs?dt+
zqOM5NKdvWjZFju~pZY3nyfKLxOj2NQCkiI7*#+^PF|)!35)JaV;-i$9H`{G`@#&{<
zJ_fV7StxPF(S9eGP22UUos>7tShZ?;=PoMY0rN6)dy3mct>@*_Tr>zCJ+G!r-pthI
zKmT}kZgpdTP}RguHQ+Ao>*zF#4@J@`q8xLGb85AU#joi*JT0C2RCze<W&Sii7kzfD
za;%{qE=gRtu>IVVqC$!#g0|Xr%Zah*I`0Ls3A^_Ev04q0LtirB?zalQd@|A~{c)i{
z^!?ETn3&l_-jdl_>mWQ!O(gH^oF3}>wV&=KU6Hb$u_MkTFSc{DbF0wh`STX3DUI(0
zaF=Xd(P*<Q^P#kIY!IMwc47QpkBsZ%zI5gr^rldx(+*<E?mU}&Z$fz;<+>72iRv%l
zWGRx*CBx||BPk->BMh!zAdm{@A>dQJU%~55fea~?LqO&WCse3adA0)@eaAv9369vF
zszFg8PW*l}FpUuVDMYxYJ&NfK>r!^U)B8Rpgdx`~$z7Q!7X~kHneS@UUqH_!4jL8q
zgz`(R%oBn1NGCn*f6GOlBY@|C<q*JdH@!~kuVuuq)enEl$0Cwb@3stEUzqWfE~ix1
zyHER13hJ<9d;uO|3e_1KZvybFelPU2vrEL6xWA;YByuQ+tqAbZ%UWh$Zag?nW&dt2
z*t4{(U>jWRWB%z$(cDXy0uMGwx3G4NnR6(Y5h3>%sdmrDFx5LV9$q;~VJRUCo!j*m
z6vDx2Po<KcO6!neyMUSExrw6dhH0S*&f)C9XWj91tuhYE*j<S8TS@iYi56^a^%AsH
zQB&NVB$b+owF7Xg1Q{YmoVCWc(3Wy$@or$506o#bHKLP&OK149;QPMFKb(s!k;HJ^
zkp-`xTrNdWcZi;c-G&O?t3byONms+#c3<lshNx8(LEiO3+o*6w&SsKs5e~f;cCL6D
z8&+~B9_Cb3JAy9_2ijsDI<{4HdVD-;j=XdfH)Qv;3Wnk{JLys}FfXX**J0Dml=$WZ
znG=IfSiX~Vpdd*g9mn7*+|Dd9AaY<d0A@%#`boG>8LoU+dOa#SEP;wu#z5w^b$g<g
zG>FwuSqg-*AB&Emh6>)|%eJ0rN}f;PxQOaK!Oplz0w1#nh%q%mK+Nd|$juO5eI4BO
zpuqIJHH4UH&7Z^I1M>m=D&m+B635ytT*4_%Ynk+ktW<PFoVv?j#4LV%9c>C9%InPW
zfC;j-pEkeyrwJK`t1$EOti?&tjT8;9pZ?05{Q{KoBuT&lUP97$Pi-mo5(eBMQwR!C
zHF7I0G^upUBbqbKtFWm3GB+hXQT^3TE52bn%gujwgBSCJ<S!za4IA04O37N1HPnG)
zEU}6<EUD3d*vHIQ^CP>}D3+|82vk5MLBjzGd98*?waS1gWz=4z`XHnUj-X3FYVQZR
z*MyspUg%b~^EY%cgm4JPcga4#yRAVFzMu_6_*SQ!<xjm!vT82KT&f+s8Hqu-U@<lG
zp;E1*z8>fNwV!h&Aj<a3a^*q~K<+L^kX>n8FwQ8iD01l77+V4-Xp`a)Jkv$!rHVx-
zhw033gpym70_dEWYTpLfmZIozMdq_NlPG+2#aakg5djlsX>jE^g&Jzml&Z&1N<lSh
zL%lg+Fz{H7CLro_+F235e59X7UemDu+j#mH)*HZg0NvfmGw(fkm+oym>5x(A?xi%p
z)BLXlbESTpRi!M@hY>6)sfd4SnYJp@hF%u~LOHOSO^=(<%pZ_~P5Bofm7dCXW`Tnc
zh_B^SChoc;Km39-=CzOt<Wvli{PEKg`hyE?eYx^KhB(7Py-xdn{_2##4=OKh0!u=)
zubs*RtQie}de@$C1L37w(mjFt;64ar?MfGNHC1xN`85u6nZCxk)9uBhZi1r9Ge`I_
zMOmm>?5HGfz+!8<vAZX1vOQjhS1K*?q5Oif{536yfB4YPU)#}EVhGX^2=))ENzp{I
zdSFqn1HQ@^y7IylFBvr<$r?`WD~vq2_->jPE8Ra;?K_$iXN%_~T8h$+jz*O%fXke=
z&%Z%%@jovr)zx!{XGO`+Z4(*|mOs3m!z+GQ3p}A%Xcs;q+BoZq>jPPS#Fm6}AGO7p
z+p<61thPx16pVi$XYbQu`))CK@}kt|pI2-?3d=W7khjG$M4l{P?sr?f9c+AG#q&Th
zcTlmZ^Xs1oLa#cfQ-M*#L{NHfD7Ld*`5jAv`#~7)c8^Yi^IWx*&)obO!}iZYgecbY
zzXmC!UkmeF3Wn43$~3xiZ&1kekwL>Vtpo^M+t8(H#GMfQWyko7?c@Ta#KC-?WM9Y*
zP4vXlrq*enYK2IVv!-dGEgqaNK1y|#RM1zD_JIBuKnUEu`op?d_jAEjVTesrk&yPK
zE$4wgxy1bB+x7R7ugv5+%jB~^R$AR2%{`4%hxBjjvw9GE@h}4r6tR_Kg9p@uz$dCi
z^}bd`3^F{%8P?u?n7OUswcCZVmvd5cI=(+wj{J?#|5Ty5i#HPVU}*Zys82Q1<%`!#
z>v{OMFWeEb54k?l-5fQ%mY>v}k#-EJj|*?KgFIE*W{8Eeg7~!JSENBZp9vu~`}0ed
zP<FC}dHIeG{`z^Et4?<5>E&n6hStfsUA9MY0{@0L;pdKx+W#tj0?uIMkT0=1oGOlz
z601(V#Iu}S*H98QNY&2<&1xJ$$5FZ(38$J31zANHBaNMQP&Ean!PaZSqEzQ1w8#1`
zZNi#+Nwr+xlG~vxOx@hCRa%3@|GUD!7@M>$WxqFy*97KMv=!&gvB2rGUv~tIS3v7G
zW9aX_Bg{U6C=`;;kRBG0U*WT~j5jpsAL3{^Sv50XSl{=;(cvxBEAw1+V63j>@aCSY
zghkCsh=zt`S+02cmtG^7`4Cxn=Y<(@@kpo6u&qMbpo1sj%1Zru9N)A2W-E^Sbmx{$
z#F0sRL(wMz`z4n4rAb5)6%B?^g8yBe0`N-~%pD2zsa?mpi+e6ip)5iVIG1es72JCC
z_N_$(OBja?L(_hAJ^$Qi_7O-`cTxvA*NF}&M{l*dB~|sCX%dfyNT#)MG=^j*Qyz7g
z>M0-Wdk+(LmBx%i4m?axr1E}=M@f!cY!U9JNLO4WJ87c&778Mg`lbIcg75E;fcb;S
zf=&As2kqjqPJF`2nke}JJ+bSzfLbF4{CZf$9a#HULcm`D%9I*sU$3$vYAfPilo>XT
z*sC%1Z*gwZN81;s%MF#DYX<#ZsgFf~F;=eAVBq!LGo1?ypTr=~lEZ7`;kV=0kM;UC
z2mn^+PS|>WKBBI)itOj^E>DQq-CK<B#uiTOo_<#m8LPDIXQHAPN2XP5O4&78Y^u;b
zO(dabjfK)1`H2kcU^g78uDhcngL$29L%b9sC2#OaL&-1KT(886KX`F3f)(mB?XECq
z#{2<;gS*;2Smt#O5{IruqIr7AcWFvFEzxy2B=h}9kH)LvI<KE^JZXr;!lgOd{D1zY
z!f~8K#ggkhxT?ju^=eBJWN!;Qrd;B$p*l~<`fz}6eV(Y^-20l?ZR5t5+&M(F{<Tbx
z-_<KsKS`YW;|=v>_9^G&3!9oUWb|mIeJ&(@qxJV<6Ct_b_Kb3wrhoY@`RwS)>-i*I
z{*X=Ducw4RpO$GuF!rX$_JsHTdA$N_>dJH79$xD*y^E-!p9x&XUd^a$7}ZnixaJNM
z?M`!jKlo$C_P1}{;kaS<tS?_}NucC=TMgF|Q?tUrwK8=c)$^?oJzZ&-gk-s`*@zp>
zpCsN8YOP-ittWm`v$dPkfegDNb!|AeXjOlt(oIbSC%`O%zhCi69r_K;y@-m?*Ex3C
zK7ARDIb&#THQN08!eIAhrq#~=FTf@Fx$-X{a%X7Etz&LTe(?kA9aHgp8p(<Y*Ml=)
zL>Ke)Rvhv`@9mIy_@IA}r5Ms3hdzSasHJ^Y(Q;93JC{xC3T+tI{XACbBOBV20qd`@
zZLFW?WPbra<R7Vzimq&qm339l8uUXZ`kpyT|Ij39ZE?P}m=ioxol~o!QEd7g=iAq`
z2hy3+zCBtA&KuU9nu`zDw_O$l{g})yL7KK8zUj)|x%>r)tu<ZwX%O2RGxFo~mctLk
zJ@VE8gyoo0>BCN9p2yvJZEzRz@}Qo?%Y@PwndP>l0L9!wr|nm4!o1=+hExt8-+vq^
z@BK+jy<qI8pV}QjXIFjVIVp~$OJ_hrRirak2Q$x7LMBoxALK3Ds%a*oQf>Xw@dB0^
zLu|bGfz+`ET1CB=*XQnYNRHG#p`3)ai?i<nh^x(J?61RKte!B{sebnHVZXB@jpD4B
z=Q_o4S2i0NOtxVOs7UEBK$whxeM|T3z7WMc;TL&TnOIOglRlmQx?k-Vw)-kZLSR^^
zO+qIbzND58bx`R&ZwB9EOrdOlWl^i21>6BW@V?fSVkcdN#kJ3K-LN%viiPA|nNg1o
zEZ#7th*qb?*BO+7Bd8HW&xibY4WT8uD(~tv`LVb1TB_iH+%m|H+f~I#%4|z0AoWDo
z>2=0Z**V!q6-?|W>d9xGt-N@Ae!$a0<u@uST*O0tjOIMkeBF@Fu2pLCX0wZ%tJ|iN
zHv0Djaaa{=e64H!WKRnTCEHHe$)r;6?K^$QgP2GOaZBaK!?ntV$!dN1(rR7b=Q*2n
zRfO*}{Zy-wPFu!XK9DZ<DAkGiyx%8{&J^~y>K+s5rIn*B(QL3F9k%&7ZZqYko}Mn|
zK$1t`bLSTQQh`&Ya>m%cc|YauPgw>$1VLMrM?JXT@xKvb6;kp~<-Sn<pc*#I0a()n
zq-Vw|g;y)&eaKux`e=Z+gJZz#SQR#EmVYgcxOP@W7|fBZtB9}ZcV~IiB%>fM4T-#l
zB192P41N=9;07508(6kk^J<vBd6(dCSZ{>%sqrq82({ah*}0T>iSBMUha1{AL3mt1
z@Viy*KiI?I5`mOnQ;D=S1-b(A$)N_IZaXQ&jcekeCm}cUOF;R9kWRsdX=}yr`L3^j
z0ipHM*)^u&8uyO1Wl4Vl#XYr<03J=PeP^+$*^4$#XBKfwe?tZ>Yfb4opRYBJes`p9
z-?HB}07(G}WVAa9>LLA21xxMEqCeLP$h0`}j9Js;hdabQ^M?|(OuzObG~5kD!f=dd
z+)@7m600u$)iSv)AGeJ@iI{v~F3=gR5S22j)T?+cn8O3H#GAeCxGrC;ujk>*OCGBE
zm-Vb@n@zd{ll#}F`Huw>E=eI*;G*qM*)%#`+G-NbP%L*b!is?9%h=Yo=08ta2f-#;
z-Uo$cuSya5`{@j2tkljnncN@}{`wLqyaHW4T<7U8AW8#cDC$8Bv~qk8<>&jyFN79^
z$!Yj7*kb-(-Id%nESE{qoy?&UTvP6cd8`C8`!qD3BxjWzbylESHAS%ytCM#-Q&zk_
z?1vohTH|uSuoYLn#R`j9o5{zLFsk$m@X1)zm62~ir{3`{K;M|Md|EZ0*H)0yiTCK;
zId7C8T2BZH;^(M{e0KKdE_H0D3mUKk7P-L5UnNfobZ(_SvmT4GYQEi!Tcd8V+?_VZ
zCe$(TrrK(1$=Uz8Bw{Uhj%-AG)AaMp6<)vV{Gz~LfTV?f;)FM}fQYB<FW{F#17lA#
zIIf+-F(KIEWW?_xVKGO?Z5eBlJdn!JC-v74L)VXb=uSGKW@_?t>b_E&pDX^^z<9V>
zy)Y>UszXu3LIG!CGX@2(%m)4gm)2Tg2qouBDo+HLF28FmmXGhctICC@S`gQPipZW?
zzP0V=jFFIGs(pVAt+1mj@A~svKKgohqDoy^;!^9T!LVzl^~#gw^b)7SUDPwL5T&2C
zlU!Ne>g<8c>aq~-(Dk%9pA(LoWFRc^mh=~d-E`HJ&rtu}^(tHJx+LL=vAf?}qa;3|
z&G#XBUk1UahWA1`s<dR!eJF0vo=?GT_Oh;27Rg}=`HOB}vQq{XoNPwkT;@GHR=-aE
z3bG<K{Y;x^G{1XYCJS!-_^)sOM17l`HicU&FWJa`-)-wrzg@sr>HXO1*e1v8Yf7i~
zlUri-S@t(QXs!3CpwO<tO3fbU!Q)PJ(w&Yz%xwFms?~!seY%5#@TNhV!81%R_Mx;7
zBj&++IXmTk4atBPU?@~(RYn!NL+f1Oh?EqqeyxLstn=h1C_VRg>nd|mTrHv8As_q}
zWgaeO)a)z-n{`Es_Jj8V+N#3O(w>&RaS`K40*>?oe*P;ptu<vu>TUuxydwpP2CC9k
zrI{JVK6Zm9RU@)F@fq~PuEUioT-Dy)#61I9k!?hCbAH85A<p+wBrAQCu>ZNI@*A6l
z9Q3;U^01P^Sz{HHZzDqTBY>k{IU5}r4xca|CSrp&c2S+N1}Rb?ujc^J*rL*n)a!%P
zgu5f^_t9IgVzBGxp@pJPq&eeSX0${BK#1eqM%){WJbhq`LqWN-&*qXz>jG>E(}-4u
zl6>9lh~g3@4HWi}9VcC97Cl9&hg*oE!_GgaMDQOc)Y{Wk0LeTOKzC;#AvIPZXA%;8
z*7iWK-zUUYOmtyRUBZ)lUsIXj-jugXaI2`RrS0P^KM6kLIMMLL)9uuwWK*isznqR{
z=~`gy{rpCM%%adsMC46hfHS9A8Q(ap9}jq6NkJ>D8egKAz=Fk{nxJ9SHa88G%=<n8
z38r;CC9fMfawlK$=)cf68p!ljWyxZM0$839xM$L>wa<H6U@BUbjh?WCMbjS^34Y{r
zOEwF%RY}+)l?I^X2DZVm(qZ<}Nn0NVrW~i05?6-KRXL|$<-GmHgX$kd%g-wG(mmxA
zU~y-Lx?&J+&0gF^ur+9iU3-Ga>%%dhA<k%J)?FD?XOB*}(K$$gXOTB0z81@#eA-E`
zt|GQ|tzui`+{T`DhIjhNvTD1I^|zL~-#iWSn^bXcxZ}FLK+?DhvhSm+k;Josl!=8m
zjl{nVtg(|Zc|0kQ$iplcFNyUNSB%D~k;D^q;xJ?RBB_47&u|E?dCA*{_R#027<@fH
zCQ^^>HM%|HCh4%6%)zQiDNw-bA%(m7n2$By*+O!voQW}1qV*)_P$FrRqL3Ph)k9bY
zRhcL{Qc8ET>$vxlM`gPfx2_1=&0cs{M!HN%UPck`j5D1^)n}H|+lWC4z%B4UAJ9#d
zE7aRNd(3*uZ#&4xiPPJb`hw>iJJ?%YY6JLE@r>KY<9%Ih4{R5qyZh?Lzq<7-yX<BG
zWM<U(#@CgeMn@?5#dP)6hJ)abFQl{bAHK5Yr)O@fu`CLjP3V^J4~+6l%6_e5Cr)qF
z5~*CF050jx=9YO*Jk!)}6yVCcqPw>)=?MxvjvF(Pm}p{2u7vb!_=@2_ta6n^o6xCP
zTO?fL2@tt!ePOP1Us}}|iMk@#2lK^CYb)N!x1&a+5N;{$n)bZneq%-xXHvhH^;``0
zObK<z+WQlvVPV)|p<Y#S`8oPI$!$+TKV^hn;4|4jZ)7v45(}Xvd$8daZj`-~4_u(w
zRQS1t`EV$NBZZrKgIBKUpQM}md}3ZMt{X*3Te&BHkZdUaPBtvDoXs!%(yykIvify%
zt@h~jc+@`wA^pKkWqNU#(3HTS6irv-m3>F``UGiiG!q|Pu=ZqcM3N|g+Xr-Cy&6=p
zQkz0sq`Vt-NLYAJD~*dNm@3!(XlQO@XZvn2RsY<>DC^4P;T=HbV70}*iLVV~ozK!{
z+fSx*6qw>X|Mtfo>uT?B%h*X#WSy(*_vG04EvN<!%3Kjc^nSO9;9me(dDs?WxV?EW
z0bVWhwV6s6N*|wCrfVfaLE6kbX=6IAj55ZUmT(f^?mWYsC`Bp|2UwNmIo4EjFw2EJ
zN0j~mz0j{mFt~><mIUUmk5n4Ute?D&hPaUvXq|Y6O_>TUc_F|faimW`Zn*>@*;}Ly
z=LPMAiwBD~yqS5RRnd`gKWVM^$T`~T=#KN)>r4*VqKjC&tlf=2It}pX2?31)g~S}b
z%w>V!3bB&#>h|t{r%cS7*Wd!JDk<{7KLLwoady$$o{*l$X~`P$z})Y~$7Kr|&Ha}`
zHXuy2xon;?PqGn5d)*Ww6q^z8WpRQcmf;jsY<KrT+Uf}{v_o~OP+M`OrCeR|r6GE^
z1)3p#6_hvJzfzsu6*=zm9_}w~GXzOwd3XN;CS*A3GS6LtXJX41+v!6B${;DSRgJhd
z{`|8yaABPnvh|N1KWwy&TVQiExv?v<0w{ZxBIt=)|GGcXeSWn+?8DyK#XUn7pQlzm
zS-!cj_=;1-NO)t-*BM09ILQmvkN_{sV*6_%gEmy43#Yhq<W=7x{B2PQ6L8dgQW&&O
zWi^_KHk~XYr*WiuT!U#_Q5h2vKPjUH26<7h$*t0H=xA4{X6f-;1?X$~Rne5mJ;P*R
zEp{C!N3a`diX(1kkNen>dBkqOa(UzKGV^v<Nu~?Ee<CG$8`&EF@Y?qc`24dtMbDN`
zTT|DKaY3t@!W&_Ewvk(`nSb)tXRUzoU#^g`9eN&HPLT3e4Ia59HnL8C=FaExyoRCR
z+wXsWT3pq6vh?1ecl4wAzZ&G{YU}=8zjAI^6?E$$PD@X_Vw9u|L_no_ZHd56-}7Bu
zN)z_T2-?KL5-?=R;+U`$@k-rgryzD8%&YQB!<5Q+_*T=1Va~i?%U6jF&%HVfa}?jj
zleGvSI6_51_o&VPft_$S-&+jdaMks8)O@zMN?2hxc$Pb>BAd6e<9+;eKTt|S_TN`5
zm(&i?!-|4l&Z0T4ltJ}ybORKl;@h!<lOKKNJ^~pJEV)HHca?lO`7$2!CpsSacZkLB
ztv-CcvL(n$lg#S})j~KyZAJBq^fbA={F1I{RQxIuJ6=wn(XHRc+2Q<lM_T>5>nOXQ
z@+9ZLyH8*;$-E!-&7GFg{Uv`ZQ72+~sYo!thirSdw$(vpf;2~FSoyZrOwvN3co=BS
z9~Tw(a)`82#D1|{wAZj80f#UdZLCVr{~>hMjent#PfZ-Eb&kGJ`wG0R&GPPX!0%??
z;ryO%{GvLvU?ev6+n)sUy3~%5a%<}zL>Gczo~z;ZYV(&)gTxpKi7|nIvB&DGcwMtc
zkUu8syV9g;EO)8igD*3<Q}bTlCY#&)P7OTt7^T^t2t?6n2?#X-haSl}heWi!hyv3o
zU8C6?MSN!ln=l>HBi+U`gFQnlUUyI9v6aPt?}IuEU0qh7-`3%1p?jJbA*!mnN)5{;
z=P7m?>jSo@C*6mj0n3WBdz$`Wlt?R}VX_Z!@f)X^LPzxewpI`IerH*<g|lvk3^w{z
z!a$#7EyiY^2O1Cu#e5+^I+|ggTXQ;ZTG!ceQT3u~LQK=pf>7jTjM)4UO2Vh}!z40f
zgMEavVX<}ozAOn3e=)hn-*D-jkgyN9IoFkP9HxRO65Z(&e1g4l1I;)W{-h4@&=B1D
zI(nq+aa)M>mNSQJ>n}j{zgJzcN6JQ^umzuTW+OQ}wXOACt8fBrhW$R(RmV3?kpSN)
zN-J6BXJ@3VJ+CG`6;j7CqVPm#U62?-I<QNad-YITt$4VJsP%&PSTnKxqJ={0GjJAn
zP0V>Y!@IU_j4q0#R8oWod>QU*&nOmo-qxGgikScR{b`9~y)L(JGH}97pY6(3`@3FZ
zz&P)p458LQpY-ew67ht^8vL}6ZP~x38S>jC5pw!gNK7UfkWWc&x^eD%JzUD?*3`-P
z-eznR&*VhY9`~i|RWmI-e)VIanzt4kUzj+A9bV>@O(;id+U0uBHw;N9U_(e7#`hd2
z++Tia&S@R!Z&tx4dU|h4ywf@mYbrm!8e#zn%N))avuL~Ul-?9@w%!*znSfH{G@q||
z1A;{>%#JcMb#SaZ_!(cg?&`MZ<o6_TrZ`ajtAGoj8}m%D6p)_QG&yb?doa6@IPL+g
zjup%--KRL2lQ98f<eXIgq%o-+9XUxelZQplEmx<Tpy1T?i8z4+6OvusTVGuP7P4c?
zJKYvBKA<E&c#4{FMy9WcT)dFCY)e`&%TsrV?ivva&S@}{BJ$HW6oF0uPXL`ZV#z$r
zU0!)|t&o>9{h%=;ob;^^3F^{V>M_|&+pI2JEQsBS<0H`Ytc-|MmOP%+*!fcH!31KI
zw=qoj1+vz3nYY=@E^Ud+Za+Wc>-ENc>eQYmlGvilX)KQ2LPpEC>yiAbeFpdYPs8?C
zS;>+hTkFu#abUA>SdMF!RezaW?S%#QWYYV^9wV9Z6HK^l0rLVjpTy##n^U^Gj%Z!h
z*fQ-`h4Sm3;Nyc({{X^08y(Ff=RUPEX)#-=AQDHZtmRj-v8tlJ)UHQm1W|bwmdUjl
zfFzPwf_WsKN#ve-oRi6}$$sF##dG>x3T_@lgRo$G6I;yTBgTIUx=(h@>ZF>CNZf7D
zHC&wZsrRcX6;?)7J!ws%q9Z8cnJi#}F-WqhJdv7tah&F}x-QJbxv^g`vhm#1Yh^5h
z0%u>PXj~|f!w;=HVNsB$@T~bwRGKJ_5IG)X@-aU3dJQVx0yf48$6A^hgLOSB#^LKt
zMKWCFu)!EnfCVl9=9JS<G{l5HwG5mJmA$Gq<eJV!BD{lxj`f#xGsSAiI5nR-=A)^s
zOvX+PMpNY#YDLCHK==b0t4wUQrrV_OOoZ|dY2ISnOt4GAV}b8n)E+3d(mX{qt>gJ|
zx+zyZGw)qJ&ZVVXBon;IKyAp%M_==rw5;_pZu=Q})s%6>?8A&_n(^Ig{jTpA1N*c%
z729~{#qmuUv#^*u9vzhM2c>zxCc5ZB{7mA+)L#M|I%m?9@-ssB_Y~-e+*P_BK9$gM
zk>?bhMLE=|!KTmz_Rq3GkO=96LBlyCAk=HdDdVj%4ji@)4P3X9OJ_-~-Idj|$82*{
zw{4R(e89m~*Bp$4@99XicRF{7*7r`3OD@@V^BC{$D^tUg2yE^FU`c)(@UJo0*ba@i
z@x~2wnhngC@yTo@5z3$tq~mcOm6W2aZ3%Zh8DdDGjT>=0vJPo1F4pGyNVfnK50rQH
zrd!81*&W=6a=dd<*y-d?9FD<Va7H`&*F2im=E)A!e2ptqx4Id{!z@H+fzMyovtg1;
z4-x&EMg=Zr-0DX?4nLh}_@P6=Y+=JpmkEG<YL2SJ>e^k~LKk}lWju49f1OlbnvEd)
z5`{M~+m%Tr`!|-ujfaen#}z%UyEc&<S+$vyW0DFUFlx_;qI+v|BTmZz00_ry=bz58
ziq9-CeTw!t;aHSm*n(RbC-XS`DW`R*NnGpXdWSV54r)AeP;?<dq$J{;2NV_JfFdNC
zF;CgeI3{Uwl$jRVaH%$8jl9ww#afgaVv3O94Aml7$LY;;+Wx5>g|qzGayU_1I+mc8
z=y1b#rFs4T0GoevB<^y9_>Vv<dQiK&Ft1U@Hjd^b*HT?vGq5Fz{HnapAX2?p@=a_-
zWT|T{(HKBJUvpg5%QTWR6V%sNI_P<lrq<*W&Aj8ctxXGrh>qr~yn6zlT99z0p17zD
zk6QRys|$@T>rY~L+sVChe}%vL;Qn>r?gy=SSHt~G>E154QuvPK7+XI5KU()3;MW~>
z%Ok%HE@<1aWH2K&M)u@Jl_{6CR+W6#0P-`^x!XEY?iNx>1X8{UFNOo@{{ZW)Nblpi
zfhAM-hJUB@s$w<A6<w|5K*A%m6P$b2iZ0p`?A_U;_Ju%BdJ4kT{6TMFZzT5(vL)~D
z{xr#r+)Q_rAotB>-9uriY_@nFc@g(2?QCxKCm!{buX{6CMOx^@{{V%Oi7)(v?gTme
z`2_uO{{YvnzfAEhrmt=0+RU&0;CL(b9jdzcO2$|~k`*uCjw!MD3rdP%EJApn`_al&
z{$i=cHKG;O^>;PC(61`Qhv##EKbiamZAO3~_pI$ZN43+kVOM8wy(ErZkK$`gX9B7b
zX=-Otr?Eor)uM562mA>=X=1n%06HH-SJ(nZM-@uq+sh_M!S@1`qSmN!mGoqxxT7@;
zWS{fWr%{npdyS1Enng>r(iNo8CRCAls&b`h$h=iKhhbSsSkf%Zm3o?|C>Sk{dR6K8
z;;77iTncHHdGCv~_m=6dlw@NDu`I0`<3-gcEin5kCf&K)l1@SVze8Q-s*5F?gWT64
zXxB06`t7_oiwp)OEfN0!mZx_?_-;A>03Lk`61uVGVq<5_x}2~S>|ju%<os#a>s>ZD
zgaU!`y*v+_@TNBor`~`joj_Ip0BgNgBCgBxTL5~mf7AL^OmZk-hbYOXds9Y7N_Tog
z8s{f9(diK-!U*IC3O5mq<X1XtZ%dX%Fi4!XHsDfa)7+C((&e<eky9lPO!xMww7V%L
zg_<TQaJVWDerrnLz5KsrL||8u+~?M`A+>qF&bu~C7EVWgIIP>y+m~CTPS07A;t1`*
z*)yQ|v&L~-7GG(B{{Ye$J2B&L)BgaiT;-%tY4>E#3bBu;q5l9s%Cz+TNZe{mZx`<)
zZ{n<F8|-TvqgF|6Ztq|l!DcyF&!{~9JXH-#QHJ|kwzXKdBv~?kJRi%gQNFgG%U_0g
z5VT6+v;ELdHA3!7f9-3DZB|&vmc+2<=KlZ+6jtVm7ko*nwavoVEQR5KV{tsO_pG=s
zE+d6iB>{T_jw$+`k+w(*xpye0Q~ue{6-iO{j!kPDTE>x9N2su-ZRVw8OwToeXizC}
zOwTmnc&31G0+$qmor<zZWY21hG0!zK3W%*{(V`?)6&=jjjPr^z7Nankj%53zwFpeW
zxwCusEJ;{LQhU}V&AZ;+$7O7|gf~9*)9SMokIIYXUgUPBX!Z(<Zb;?0UuxH$%H~cA
zPTzTh;#+mK(;>D_26?U)?l7{19+l`mEJDo+_RVo$XZu#5z;qRK-J)~Xjpt-iy?{oL
z5$VlTVmD&6buW}C{^_jQIUtWp(i<Grm89$zvzuG!ZWpXlE04hDzL1J!xweXU&Q?SY
z53v>VQR!am@c#f(8jpmncO1MKg})A;rDceX(q@=hT1^|I5ZKK=B+KTdF%rX$DPc})
zi7ig|EeTaKO3Q&$BJoJc!Ou$SS{Uw7lHFxI^O|%v(Z)Vi0<H){9Ey=)RrjcrZuKcU
zY(j(bsX!Q~ZB-ejyowJ4j^{KbVLe3xm$fvu20;|lE^xW#i=eS4O(-OS4M)6UkVr>b
zO`(lwu-kwYA`A@B#Io^9rz$HZiWG`zr=FC<oYDkCCqq;wJQ}?r>sj+0X0n;A4BL*l
zH9|sgYVE^*b)P#GjhoO?M%@gXmEUUl^)<||hV>hbJ+-@J0yrghBX=%?Il%t_fVliC
zr@U`3PRSg$O<~&V(p&!kXXzsNrM1&LN|G)@=cY4^9PY<B=ia*Mx6tIP6{XGua;^2H
z1CvtRLM`sDAq~4@U>{m+YD$y%SD=q2=n6l0w39B^&tXz1{qXb#mho^$q2`}LdXXv3
zyL#kQP1dAQh(4y8M@&?f7$gs+1Fa@-IG{Bk7p-mRfI1Z0mIsQ&9cx2QxqE&4I_8wN
zE}z7AnpK+_B$-AsGx^n<SSPjLBxlWFNyd7AkzCD(iKnt{j~HbcsqH*PJU0?dF|tGR
zFQE3U8h1L=iKTygAKGEKAV|)Gc<X~jrSjW6GscH>ZTAOO%|&Y#pEwh=#AUZKpG?)u
z2qHSO`8ar^JC}^+nrg+_64~nt(p>$aSS;_ftA7nz(;!IoQEti{G$fpkHtq+X%CB1J
z(mJuYiZLF1#RIDo*wnDgZT|oXT**2VWshQ>*dTCgCf2qoArnSzOI6<)2E`X3<L@yY
zDx7`^k+=Diu)~nJ9Y?Kn?WkC3(gkTq61Lz6AOV5-R-|~5cWykM-Ku${wii1_YgBaR
zsLeBUI)G_|G_(OIJk)^HD^dz~6^6A&aZhSt7^!8Tz|Tr-&xFGDH1U!uCQ@32CT3hg
z=SZ>ooUyGK)JBSfpcHvKPU>(S=}C?#=KM~fqf!Ssu0KYLb^M@=;=4~0#!aU2*z;V@
zi54{phplY~?iflxzD72^07fJZYXow*uJgniZulBh?bKHiV<_Yvm9-~ya$=y=?p0xo
z*Q5L=zu9$tV9&!Sl^5J_f0(a4nK9C|d@rk=7sNKVgr6)n$v@pZ8mf`JS}>(9S*Cp!
znPuXbr(-bb%_Y35>ZMLqhC!*OjIb=d#c(6iWEVP&Hla|EWFw_iH}Xg_Bmrv+TG6#l
zLirlb=^@%Wy65nyZS=npY!L|IBo0`}K>kLxk2BR8K|yYGDRCl=?Q@a++|wl0hbiU~
zN23hZU-n+OnKO%aBcg&q{P9`yTI(q$1%PHh-IaK%_m@L>Q-rm-(0PJo3@;_e_gMb`
zkxktuM%m;HdzQ(pm~8d8j~-M|lfc~jzd%2&O&^7CrTOO6XWjkO8%Oy5wKkLJTc;TB
zBGlKn5FRdpIQ}eFbe<=;w#jyl*V8qkz8STSHff$|N{pP$$0PHopToLNSw)4m*5fT0
zKhmYat;PGlQysn_fZkfd(?9oP%OA)J)3os(t2-<I0At*&JQimFarxH0ri}`+`EaCa
z2OCrh*-J!43I_mV9jY8rgyj_ULv5rJL>y-XX9lN1g+EhJtYRi03@^1!xGL1YGcQ0r
zDkf@Ila4C8zZIL2N+TwIyw+^eb>^(kCkC@+Vso0wyR)JZD$dz#RSU-b(NWci6=qpJ
zew9`=`%a*dj#YkRR}!VMM_h=D1&j=~-j%`M>Tde|wDLo~+SG{G<=}u$Pv%Lk>%`YS
zNNub`0l^i2L$Xuh`!|&%VX!vBpp2e>t$LY$9ag>Fj}tV-{ar@N?DE}yCS88@iH(GZ
z%u^rTAoIuPRTV<OGg^A}!IxUNfW(L*cONhDWwVo1LKkI0>s!JuKI`1)oZ~0W9iF5i
z2w=G6)AbMpiZRes&$Vw<9)g*uFp^SNpyH|QN+~}Gt5FulMN0hi?NGN`&6b9fP8?EV
zmXOD<-WaV5D`_OV5TX)apsIG!`LinL0FX0Xd`3Mx#86ALl~&rokKycUWh)v}S9dF>
zi!8T75~MimTXT3!Ljsj-zB7V)*5V|0mlH`A5<&<B((15YE{gX)XU!KsEpxh#=<Vc7
zQyRm=H&;WPA}HhDy1f@oR7GTnLaGX!j!FLjBB*E@z|=IKIZu}&ow5_{TJr0fWsSPa
zB&6r~N4Hv;IXwdD>`4-Nn!rOiWQj=%4|<yGOSHO@OPBrGVdd}Xl6o4B)>v9uE^XB^
zdC#|6Y}bn;{hmh$Y1|<^7H**ZDhgL4xv|sjFJqSO;yB>8i9il`ZoHq;wpQ*CpeT{k
zA1g+rf;%27I&{#M-7fD0TZr0sw(K8I*0Ep3*47sj+f8iJl#qomz7#KE_)|%-Nw=}k
zHAZSuDTGru8%s-yC}0Al2a1dyY1_D^ae=1LT9Hmo3}e8h35s&ljR;JI#YB2kk~Kij
zNVuY=p>8L(WNtwf#9O!6wTvISPSaiMox>Hzc#6TJxbx6(dg8Q$wuDuS(o3PWb#Av7
z?4zR!^PN)7tuEds9r8Yv-f5SuHM*-FK&ra#kZ)oV#-q$ys7sZTUYE3m(dTd12CK4Q
z@zSr}+q5ze!vu8|RY*J<>rUwL+Ox6jzYq1ZsrY>%k@s9$pDn#g_CM#+yLhGCmGk$6
z@2+&+ei<QSwT{<b%)XWG7MBYuB&c$Y&2m?xC|Z3P*+R5txjLg&AqBVKRFX)sMsbBS
z$m9V=DYETx%}SM)hL*e3s&C{*`S3@sDUYc)A~jv!xTTWUCn$LIs^4aiH_UK7K&I-m
zrasJ>Z>8OgAU#HD-)p&HfI!a~$4-4JF$OvlpIVkXb;etqdeZi+ZcrkOOE=$;vkyVi
zuC21|1cAq>rA1X37{y7rV}nrUL!I^>iV<;-%9OQ7xKb9VY@1w>j~S>P@lAO!am_^M
zjMj3IQHYHp$;qgiN{z#}-E4EoG}k;<4V$Q<8Jjugs7m+;HD-4JR$bKUigIX6Q&hAo
zTuuNy;;-noWg=^b`_EaHHqU={Gs**9gT^7Y3ZtN_Z=n-?4>s|!#o9uhUxE48N~Bv^
z!w47(fpPR0u6tXJ?>tp$8tgk;aolh?=M}qgaU6szaWiKC^uQJL*+oCx^B*0b)PCA9
z{<S=>#0-PPx9o>2=A0kKtLg3LT?QusMtP*xNIJ#l-iB8GbyhhHQMNjo=ajwn&d5jH
zOURMs-E+IIG}223{{VQ@3Vv~)T9`HoKBl7gF4jW|^gh)I9MtnT+kx7MP?ayYj)IdK
zB4rDK-kIK>{JE#Y5tYCLj`WHqv{Rkqv97AlIW;2lF!_)IO=4NwmW}q0yNuUaV;9+D
zQxW0LG3qM{lI(R-r=fD+QC72+ljUXLfP2=fT)h4jxMw)Z{{TwkZd6BqGOOd9@y2VX
zn&KHeAkl99;7|@dYYD9rI-|LnW8~TCZxT1nDuaymu9#_%YPwWy97D`NG6!67pXFSo
zj!bbNT)A8iYV3SFn8QvtDx_gt9)-PX=iG#>v@KlR!Kd2h3vk(wDi)|h&dY0iEI`R1
zjSs4lag+EOyA)C1Lvb3o-R7M8aai#@i+q}G%=k$dsU&nGp{&v=AxsfH=x9@YvtFj)
z-9gSc_C0H2_Qy*%va4AKbs#YWj&Kk4rddTbhN%QM8w@bQK$EvE#(l+6eOlrhn}%?p
z%PD*ga5@jrQ?<g^dL0u~W~Mb0Q`pfA%@k6BQpyl@ryi70dQuq1IH3<T)}cQ2GM2@a
zH0J3{T61)!K?J9*Rby5qJ!-R1YZ1Nbt?jDZ#8rn{v^vmfmur|7wtr=lZa!YsuMz^d
zJcCbY#_Zr!iU1r60Y=9S;>|5YzG@D&#I$7?iuJ8()K3p1IIb4+P7z-eae&<`qMY=x
z=Hh63_e6dgw`uhS#|3M%&~^9I_2Z`9Hej9bj8ENf{=IV6DJGe8Bv5v@aaJ$vWxSDR
ziHK~51RjRFU0PDZ`#ElKM+;gt{iIfhwM64@JW$Wc6@%e@LR;M_66F5?q{Z^N_4lp3
zWY?4AdQDk@YC`;A(&InlN+S);PNUFhZq&IoAcP-UQ4kbah0xGWDZtabtWZ?;6q>N^
zhVJV~TQn6k#`#4<EK}-gDO-whek#0=?^#Kg6fxh9YP-k)Jkm)gQJSSJyqumZGkC;p
z#JCK7D-uB^<-mzK8Rn+FxM?5CkCtvRTN*x`u^?v|bJW#*D5mU-+C_reKse;ptET<i
zaZ{?{KpiQ&H)OEliyYFG-On%acAq47am&tF=OVayudl7=WlO1)1Jil0X7L4@&Y+ME
z+VXvOPd4{%aD8jP30hInI~;h*5t`;|<{8}kq+^nLlTk4^#Ypdk+fg3X*>ivgT5)bE
zy(sHI3Ub}L)wWlP&|`pjtzADwJ7bbn&Uql!tBownX}Bjrz{NwFH;oxJbC`-3m9U`K
zL!{bA9lI=wceYD=06+TmV@tA*Ckn~AoAmXqIBmgc$QT?gM5lcXY0<W<rC|y}uEla2
zsPx5aK#Oy3tN|HfqMY`iS|CLnE=b3{X<HzROj%knfJ2JHa_V%(HaYEAOM6L~-HQ|6
zrm(n_Xg6^A8^LV(hqn~Eh4bGef%qVk#U_iXi)%ZZH;liWeoi_Q#SOk)OG{I4NP-Bh
zZROfagM!%XdRF<It&f*$7$x!#ZgJMJV7fYPix?4aZR8$3%~nln=1XZ7D41<>+zvoA
ztlp#~I@U{@cpV&lnTo&fdp9*s-ugi#cMPg-Jn-A!p~%Ho)Nd~3k`=flMu6>KT=Hr=
zXas?avD{fgBKJQ30HtV`Qqnr-z7EmaO&|>ur_NV`4{ye>b&0O5wOOD|pbT^w$-u2U
zY+q{7G>9RQNEm*3P)&39B)!AP(t=!)a(Numj*JpLB!f{fs{~YJQ)raPaZUoCflIct
zaW3R|G>x28q*EADu+t!8NV&~OS2U`aqQzf9$kg(9q*dmXhZR;Ntus|})hxi|)p896
z(b!OVrKaMX6wp|dnWqs^l0^WR%Z2kHVO-v;Vs9W<P9#d{Nyw^g5Jx8*9<@<z5jd$U
zGoG<zF?mz2ao(+^uaw)NZ<o@nPhb*K=ss5MQ$rTaaZR!#7qcbO?q;*PS+<?M7<!8C
zp^;^cWE_SWu0{n6Fjls->BLxtzVB+!%!-ieY~XgM3}T`4Fma!yDU$;xi<nuHX9AQO
zgML>clsy+6iT7YqZsMTxC^7+1*!f4X8S7EG;+kI-1d`*uWhoj)BFNw`TF;(vymvI0
zHw26Wip`Q!oR<7+Ca!cwHr$q3@TBIlZm#w|2h7Ky6&3cNK-iqI=qcK5i_ZRJxh!b4
zmZpX6Ccv|aWaW=F)WaB62c{~eq$?0mI||W_H}&8S)RwHmq=zaO8SP5=+lrGo;+X5j
zX=@`3+{M2`A={3%#rUH~YlLQva==%8DsPaJ&{lk~tL_XqG@&OKb5@k2W_Uc-QwMw@
z`FhoIHuW6Wq-z>{T7BENOv5J)T($O$^0Q58Z7W225DEI%t4@6C=<=%4<T=w@9v;%(
z{{T=KA0&S>d({(VC~_GHAmbSCUH<@vH1Dv%x<$l}KOsd)a>P_=^UGa^%7#Cb4i|w{
z#ls7KC6~VjwJ$(dEIoQwOp%rzoYpDb9*R~k>6Yo_yuDcD3UIV!mPQ;Q>qeUksw-zI
zTD9#}XPJW!kahR0<m|^{fj&*EZ3KqE&$VdT?YYv7EI`_)CZWC&tS*a>mzpdhaceo;
zPUWb2tA&nr<5p>711GT^>r=yaakMjU3%`1m&t5sI(8Us!-@^h+d(vtwZDxQ%N*$n`
zwNG6QEMA^Rwrsm@UpoN>S+~0ohmr^b5`<1YJ?gFMMlDUu#QDI6Uqen+h-s_k%eGkw
z^GQ4ftLS8kCl|KU$mLQ*IZfS4fzqVYXR?mg-K0QfibiP&>x00ncj72?n<lh{Hxwb9
z_dV(zA53eNnm;7%DX_TYle;+|g%?&CEOyae%Fi9dyQYcXFUBx4{KhLLYeY{kY`cpf
zX7(qjtvTa+3GSIALmPhO8cx~9NX10MQUt|m8JZ}L&B}ur>PPEAaXl8JU@1wa6IR)Z
z3SKFhq{*mdk2K!2gwhgeHZ(3M0-KspX<VxkD4~ZGfY4g4GDsv`nuw<rI~<y09w@n@
zdJycX6)B~;sS&9bG2^Q4m35dAP%s43NO5ISl){<oR)`eF0-cL1d3<1wDlrxh0<4-;
z12mceVnPQ>u&UYbQbL1@wy}&<*uqj6mnBmUd+>cIH@NGPJ!#Dnk%BliopTM%x6KN9
zv3FkLvy@)wgp)Ld(uKf3g(_U<l6bClbrfUE6*<P!+NWFe9ZH{}sCO%o8^(Szq*D#X
z?)8S+ij%>`M*5FGdZpZ@18wfY_o|a#3=x{fmr&!D1L|s=nws>C7jMW^*tHamS#Ab0
zPZg1Me$D&4ak-E24uYcHE#bqq7yGNyuUgoFv?$`1h^vrk_6%eU<1BiUT}`FF#Q+M5
z*32l$KZR>S7z2Tdhp94_gW-!9By(34a4IwaaZ--BtsxVdPUEprN_fEQQl6C?4)skE
zimreyXU?Ry2Tt{>%eWlXMuf=4P-L3U+URJck(qO)rlOus(T?X8qiJUarMf_h0E}P^
zS3zNEZymC%iSrT8Yd&N}zG%XqEOWd1SF1voBD39|WoqiAow^)ewc+NL?e7xQ2(y!c
z`qp=t5=Cx-Mk~`bJD4r>_dA0iUO}%ZzLXX!q;gIwYegqybYUjv9Z;97B+kqqT7u%*
zL2j<AflCrNg@@iWk9TnK71@Pe=e1&W*oq6bi3De{tt%_i(ttV>Sy6<Ulpdtx>08z|
za7QAH@t#kuDOfC0)nbwq^GV^lio2y=NBx`tZ<~RNHEX+Obhd6&b_uNSD8jqo8Bxz#
zm8#Tf5zA`w-MCOm&j1dUM)_q+;~beJ4yL+K3_G1dW|#~#dCBd~W?w+}daE>ONH2hK
z#Z+IsHp^BP4XMxMm&o!t&tt_TbJ^N6+ucH21JkMh06)&JCfIcgcUe{qi?#j7rD;VL
zovIlf%86q_tbV->4qBOPb2kZjbD|rEAs|e7D~?+f-wtYRWp>UBG=5ud7|F(ZkIuBU
z4fgOGaQ<LZu~dI_^*@$t8ro|~t?nG=CW8^j8k`aia7ph@`V?G}?Wfg5QQSY-(f14h
zeo!(74}8+!YjgdhZJo$S6+j1W3m&AO#Qv2W(A(N+@<Af9+&0~;d2QX#(-@{R>6=j;
zT(OOIWDo(zaY(d|{{VNrG_^Mdj2g2LCWSt<(~(Wx%_7k?G|~s4u%yr-4FJ<i3Q%eb
zBvV15Xd<p8j3SYj<*5MXm6wXE4)!R&29*h?NIq&r0;QTQhZf?ZXUBScoC>P#O){c9
z$=8};lis4;)|yRGszinPrz7)K$u#sl(qPtxlrnQyQTVDh>zcli@luXSwQ+M!-NhR*
zOp^dr#Lo9CN|4BYc#*!U4NYgJ*i2h>v}FA%vz|>`u#;rNJ?NBGhTFD<O;1a;g$qXl
zkD#tn<w!VOk6~VkeIJ<vaoV|AtrWLP<d%%ql&-Zok0MDMrCqnN&fVEHsw~MoC<3lq
z+U>^~H4a9XD_hvAjt~mbg4m2_f$dYrA2{wR$|3ZqCCFIfQH)ij019MjikU}haYj;O
zml)4Vk$q{Mu~MSuwMfm2Nq}kPMFDeEO~@U1z^7Y8W4I1iD~{c&R$d5E%?&uW8(GIA
zBv!Owl)0ZnDzdzJS5ep3D<KfaHW`Nmbrn%#*nxMJBe_4$w5_zOUnt5IM2*hs&$wn+
zcz{rQkzJFUisq5aPBCwiCq1mBw`@`=8_NTyVrzoDv${*b7&ZZ~QFw4VR(0;2lP+=3
zt#Ersd$ZDlidIKIqFW@J(ohK}kELDKw8e_SniK$@n5w4Qdn=vG*zu1_-Fd|DW1z=+
ziD>SNZQS!k^C6jcsUJ5ycCG1kn}4xvLACbvt$VvDh)9(IV~p`wdghZXcp@+}>DX4B
z%3G9UT;C%^s(E45)IZvDh_)g5YktSVGEV}@F9R9Jb5DmwwT4A$Iof#@N>LGoWvkp<
zyKV%ATy(Cc&%{X%of!KQ5<&T~RP`+>1n40{x4s2*(P<Hj1y)`aeLbm5mqrqO&I<lX
z?k19U1eQN7YH9aY3uPdhMu^J0a1SAcU%0SIW?Og^<d8B)N};a!d}-34R}Kit_NuyS
z#M@gGZLj0B)VE7;X16<sJe-g~H6+mKvPUh|n{p#jhwGigpXXE!ll|a_2c`unh{QHv
zf=4`6Sr^L7dURL1wyWjaPKHKOUEiXL>_>;-j@H&G=7nUAAg$Arlb_bS_cu1gv=Tg9
zh7LH$rd(XzUC17Jo!De#lj=|NCZWZ*qb2hmw~7d-aY#t5Oo*IRSgDxQ3^}M~h+0Ap
zI@5r~1R59-^GXR6;<VB#Y+c8!l_u=e3Mx=4qKRX{=A1~|Q4@+|ImK9pN_nQK=9taR
z2-OVLY%HzCQ*)D6WIR=JGHD}7jO$G!nv@JvO;yb<LVDAq`@)7C)R3lFPz~s6S^<jG
zKsMHWvSYPe-GNCQGu4YH0;)*WB$9Jgq-v;yP{MOgN7&$l(9{L_rzy=_DI=i-O==IQ
ztXb`dbLpDY)1P&@T=b_)7$-QcT9CP%Wy<Viq!_8v9!C{x${D8x0<h&Yb0S!WTvVu-
zH2hPQ4k%G2$N<GSWQ@}6^`{P)6-p$w3b{F{l%CZZj8vngT12;TKqi#o21&pjXj8>k
zyAJ8GRhvDB=lv^4N152pQsqsSBXXPNd~6(od(`%j!F`z=ZtYp|>oMOTw`Wywaksg}
zSxCex_$<4Idi1Wv1hnXKIZ9E!%ysim1IHb!AWnyOII61_-dVRX>V0ZR7H7<puq5=y
zKq>48B;Wzu*DXmoyYxC~#X>gfS25((Tgh$hATr#_kw!Tz?SWj!h`u3PS#Gz|g51x@
zGM~7I{{UvMJ-VMz)#m$7p>XmO_jjHL&~~Q^E=Qq92~v8!5!dS;HLx4vu!P(=;7G#>
z{wBGZHT`08b9Lp8%8CH0vD)Nd55|KGQS&6geJi3ABNNhw5}a1Lm+iIfQrhM@WS7qi
z)my!K7N37%;yV>+*m;0_@t&${%LI_*s<V4$v~)Y@G_6Qows}&71MA+it3oYaJDFlI
zw^xSetifuD7Tk;hRi)D{9#G{0Bb-(aovGYj%niKT!3U2@(9+|+jpdT<yPOYBYnzhC
zl_e;<GfY}UTQ3^^Rc1jNMi+sarExn5#>1BEDxyOq@B8bIm~{a0QpINXFBq+N2^9w6
z$TeBCRMbnf;O^g(lh9*<S?PUoX&kc3GU2wOdv-NE9wQMt!E^*NZQT2hQBKTvmqC)j
zYo)J~A};kGCmAP>GhF1_W!$m-s#Mz(<nA@2EbV)$eX2RbK_hZ<K2Qhv(`UE37S_|7
zpe=(c9Gs|A!EAjhmWHXdxsiM=uAqssVi6!fr;_KXHJsX9xz5vr$gTOL`*r-0*})aS
zwj+=;=8r-Cdsk1Q+6lDelIGaP%yJco$Q{0ds`e?(MQTV5AtsOzX>r9>%xp%?X){W~
zn^SVo@M+Z;r)Gc@;-fs%iN!`u7aAO^lT!t#QLt)Y)o4s>Ek?`5Pn^)o2&=WpC_2+X
z#aVR~9@@@G*$_2C+;di$c&Hs|BH~55lXhuJdQt?YRmAI4!HvSB*;2-&8U)^ktS17V
z@&Q#NlLCj3nhs{Q9@1pg5;ZRDcBo_|)s&Tl9GaO%Dk#>haf-1r?wc;z_MY{rBJ<X<
zH2B_Y&=aEaO>atv9FA)##qMD?xr)U{ttkox8)-Y%40j%&RDe?!o)4uK5WiX!dUT?c
z40NDlfTwn(6sH(D;+=`OyMiFiUoiu*)?l#h<#E@FrxHgjXK@>G&TBgB&7OHxZXHl@
zv2df`n(d(mmC`t?$vxeyS%*!xNsO_^pet_AtxP=EW4I_CKMJR9KkkwkM+w6gB$8^(
z_i)(S$#Zuq#}W*)Hvm?39lg|TO*w17Vp$y`iJjS15M`L004vJ8VdHkxo%HQ3nQZz=
zDB#QNJs0`aZxr~-=UtJltqF$290l(F?fw<d+uCOg`~%nCs+}w9&ua;Sx4%<yww5MF
z^BV*X-j#WgV_nV82O!jPFhn@PP&#9ZuC86M&UPQWpI=JoS{}8mB$r#p*vTCF)IVo-
z=Q%$0b!<aE;4lw3Bdto-tfS=wo|No6q-Tf@a(@bNjE)Wu)~u{f2i+ss)4Z~AfuF*a
zfU%+KO{HH6mpd`FhqZRsI*sg!9M*^>jmCI2z!*xNM_Sd=^_#6M7{~7+C+?o#O2Vxx
z>W@1YhUa|o+}=sGStRr1fUHT>cdBo5sflH1U~`k4gV0v7@jbfPtj<^FByFVd{=E(3
zG;V-(%O3U3X0@^9c{38{R=<+bBx_xzNXs8;%hV0#sc@GHpEQ6CgRO6BS7i*zfRK_(
z@yV>nWx24uiPAi=WdWRUJ!?hY!%IS<+Ugd&?d3*OgYxy{iqf&x<bzF%Pn%D9M(>r_
z^sT$^6Q#Y}Of2J+XJ~x)BCJ^IHoBTy%X0)^D}2X*yNSSGfBv;a@2f#`nbUkw+E`d4
zwM2E4nF$=oPH~gi4A()Y_=@WG29bQYz;e4pMZL#4^dhl*SeB;x+*;d4HX(O({w$mh
zN7AlnnkvtwMKjq(%;dJ`C+6mj3TblPoft}f!-^NJPJ@aGWo86aM2ywfQI2Y(r#w`&
zQep#2GfV)3Qh;$(F^$rqH9HO}yLF^AI8>n2BA=Rj113{S$BKwGJ9TKKp*9%8n~Hl5
zX*(K*%@Y{iDh3&;+M+#aB9RuuN)nuDxuBuyl{!VzqEl0=U{gd%ienUlK56^t4k@H(
zsKXx>8Hkh8tOo|6p5bE{7|m%IUD*v?jlf!|b#@~g7nU^1uCRoTwI+vS_RH@!Y>=2>
zE2UCPa^)2mxyb0WD;X_d63dY9^B-?&)tlz$)`>}u0ID;^GBRBTYHP1{$B_z-bsU*p
zkkojq5{y(G>w%qVin+x&1DZins^oK0F|0e%sRoA!rYH(U07y8e#sr6NUeu99(y&Dt
zCZ?9sOC@JzR%ZEBXMyiq(}msbp@im^m(*;Q@;r-gZ0a_H)Ml~uI~naAA0}CwJF&nY
zO4+x)dq@eKC}Ma3^IYGGd|3{YZ|6FRCU5mn=LNmbpstrLMRmI|r$$w$$!nr1b$ee8
z*qfbBP_H4%#+<VsKtHW{wz=XP{{RwS`I2r+Wk0%v9u#_?Q&q2LzVQa2Z!aG#Z~~5q
zJq21Y$7q1CC4k2jFsJsUeI64B8d|-|(OP+UXB>4t^yy|<302%XV;H4*jG&%S15Jt&
z&AWK~dsfG$l0zp2APdPSu%_Dr!)Z*Z>}qS28<iB3>sBC$LZdvf98e94sUnpTu{i3D
z{SWxn;DIpG5)>YP{dE{Y8kRpO?s|R|&uUuZ641nR#x{;e<L^PuTC6EYo^Ht2xzz0K
zq$6(fqnvO*GsR?0;&vp6QX$V!rH}Yl-ih$vQq~nNbveGt1C7EZ8IuRt@V|~vsIKDA
zz#bg2QU3rE^_jrIdDzLHz@5LPM5LDN@v3H3X6;E?d7ebxA-HqQvW`E7H6PZ9JU}<%
zW@ZHQy>Lg+iuN0?2zY*UD%wS&=e%)<&*r!_$!fn0tmNMMb<@EA0K*)=I(;+LeziRD
zGWy;sF8VW@H}<nH`oagP9DZXWu3FDEyo95GuZ$7MIIeF~@b0OizWbYLB23^-A1Hs|
zL-`(Ryc&(ouOYHKmGAWw+-@mjAyxkIa<kBy?CKV-%^42N6focc#sx*FOFgs@$L1r5
z_io1|)(x(^9o?aVPmrIu%5XP(`c$RmQeH>LZ(P<qwq>-^y4aO|(KhDK?v#cjJu3C(
zq*7^~ZM@q&sK=QRZ@fwCS!r+!1B0Ia^(68uBBHO&j$3zcr40eAq+3U)YJX?HxQ*a&
zlFC)L001Xx{Bgx~_PX_r$DH=lFpNk?%rV$>9ff(-q-3PW>71I18^LZJ4)45A6`GCN
zRU(v8>q_9&gd-J5RO)!C6GZKdRd*RQ{nWzL2xwkvb&oW}Aeyrfr(rfk&<u2{j}8wN
zsLPR1Ne>jP3Pk{<cBCS#GGOyjFyftyxWP-GdQG&1;8H7b*`&=dy#c5y!nH=-YC?FZ
znu3tVG|bbO(**?+pyH(HDl|9(q~jDLHa8}fcQFc}l6ne3$-v~-L8R%M6ip!ck3s2I
z7`ZzmI+YX^*_kbq!ERmnIO$yM*9D~`IRd($6W*=8sf~X7a4U>f1bdq9r38_-6*<S5
zmu#T>b@VWjLbG6>YVYlI_$*+|NUA@bVEA)HEV14@a(P7^z0Gwp1@gS2d8@hSW)-=m
z?BeuA7MCr_{3=NK=|Hr>&01K3#%l@PtxjlKHb|#&51Sr26<8r$1KPBhaaE*Tn&NS}
z)|p)t?yEaKT52X-ROM-Mj^rdz7M?&IY0xnfp$ndP2CgyI#7b6ICAIS)cV<$nx8^>S
z%ZbSXSCNV@P5tWS;~=%zNL-!FPwQM4i#%ucAT;eg7F+jBbN65#r_|S4N(#v4rA~N?
zmPnt)UM#lLATdN%<57RP5|6q)PoS?ghSuWx;qI>_X(nTrb~(jOYiR8xjU<L?*yc%C
z<dak1UJG>cAqo#db4^F9-1>Yj8Z=|e5*cQS+%$1F%}|2GZh10KU@EF2ynvPGsX4`2
zDj$VRd+w_{gMt76vCmqTD3q`pSPxUhLWv+@wHb*#92&L*A`>=pdS|@>ax$o8$Qc8s
z2U@iZ2XH5ndIS8bI20Bqf(L9<^$X9j+7{zIiRd`zicE<!7hTlcfn{ztNbD2<IVYzB
z{Qm$t?|c#9NOY@swGBoc`il+NW4J}1Pkdu1@->g}<HP>|+BZ+H-k@Q)t*~*NW2=30
z$LC(KsnAw)moAHQ=5aOtu~(byt-s8Gt_BB6X^%B*#D5Al4)xB+O(Kgy#{!~gJ*z>G
z0mVea+NGAA%v+0I4ipf0DtZxI-l^ct8&?H|xV4-9dRu_MnCO2j``2qC<Q&x(gsbiX
zl9NwCxW-FU#<gDo>l$Q*?T}tXIy6HK_@U?W&1Ku)Ne=64pz5Q7tT{vY{{SlYf}nx&
z^H}=VhBW<kF?9&@N8Ob;arpNh$BNZe{$e2sQ}`dq^MsZq3S$A&X$6HulAw_f-ci{1
ztGbtkbw3WP$qsKUI=NAXLF!lhKT4s94xhaVGM5-5rZH8%#@xxPuejE-NiOuqV91cg
zAuLD>mOTc2fIppPEO0Z)=13KTV+O9+O%Tumk__TvSq^cI$KJ4~k(Ooy*EJDd^Da-^
zO!jcusZjAq(1X*8VBCilkY41*qdxR`gS`ZUO$c&TsEt)YRuJNwC6^bPNe2{>k;OUK
z5lDiJtKO@QO-*p%6IB(trfU*HDkl{E)YdtqS}M69(gz}?Wz9m%QfP@h%+eE))}Z83
zxX@7crmtFQV@jOU8DUS$QpT+-gg{FgWHGd?5e7-Fr%clp1q{P1dYY(3$(;47s3ILV
zM_BPBqc8lcVq8H9#~f73p+#itmtqS^4u6E=y3|tG^OKcX*y1(2roGe{XXQ=>QHn9U
zCY`%>SoJk`N<@=Ti68EhTkMa0T9rRTukiG&Y?E-nQI2@6G}$!7sm>`@)+Mt$PBOJy
zNKY@!8@CM9Nu+$_+Nn1?8U=AlCks-0)H1eL0<x1FP{211YA1`1wJ7_v*5``CDBZFs
zlaft5gPM_71B!53Y9ewW5ss#un^i=o2MvI<uadzO7Gu~`q5C|DP8TcO`qtFp*2Wd8
zX<{8$TCuUSk?v)VHC5+#U!Wb$c#N_KzPY(YK5fjb_&ksa&OZv)@uiFw{w!;wBg*qe
zCBvMQIV1Aos#;pA2Y1PH$EH22RJA?aw+|Y0{iktvEuE%!4ekBokH)YjX(W?5$S1MQ
zXlgeF<=YuzqXUYk78#C17RGuC4`M3FbTPN4KN_&A>W3S-^%XP_bPOZ_^&sMv<Wzm5
zc0CJbm|RHlk;{{hTvfuc430?^3?*`8DUU(VHEeE3iNdHo0qaPX#z7hb{nL!~u73R_
z*0t+xGTV09pA35KKzTo*{Ht>QbhWT^xB^t=x>mQtjTp2N>a#_OE*lYU9EitH&#g;m
zo0!(*rO3CJ<<#$VdkAcF_-&w!BvGhUQP>LBQ~=a)ro|OE0<doG=Z3UaLJ%r8>&7Wd
zQ!$!Mq$BjjL`6<UMKG@wn>33mx>a^V=~s$onDOyaT4f(B1JaS93_I15l*7d)##53U
zsTjyTtAz0vgd&0$z0(nw2XvO})9RzQ)AGlEMI;)pJXupoNyk(*=6JQe!pCUv2!N5~
z++6ZN1Asj`nu1+E;lfA)1(A0z&(vg(>0Q>dqUm<`4{<sa61L(-ai2g3sphCdq@~rg
zOxGgZC@QG9JY<oa_vW>PuI@UIM2_&&N}3}ijGC7K(r6Pal+84uQ&vc(Fyf^l+(bUL
zI-0C0+lU-c!J^Q8wAPxS-p9R0So+czDB0gFP^~$+Y7`0$60nAvO+3>L1t9B9D^5MA
zp%g~ZgG@1ErR_~)PQ{`IN<~r*1xjjr2-Zu)3^F>?u;lEnZ|J&kNQ90u#<~EZMg>J|
zp<+-6YLwSp6_Mgpo0P7^V}&NTpA+5}lt2$1>#(|Fu@WoJZ{4NTr7m(o#awqgGWu!H
zne;1QV-?c)V!<a3CefYP-CXjZX%Txf0Dn643mbT>;0prm0<>pNWnbCSw{oY5?qt(+
zx#WoR8WJhq7k8IRidha_)G@3t8ePhCTYyOUh7Z!Z4-J62OaOH9*ZEd6-1B1_QBS)z
z4@!iLgHs-q#sd|bA|ya&oFnHn@BkFy(vn5CFpN?Y&O4rhl-3@VsodQ7<504YuaRp4
z7}O5zPD%WQG_@A3H`vm-d9CA;UoDY_6mG^C9;Uhf01)a|T0W9)Z0%Y}hb|A?RsQkl
zYpB*+FhmYM_^x-vbF%4LoY+#rF&{lJc&>>2CUkx3sYzc`%Vd)3_Wn&m`attYa(w{o
z0Q40-!#Y}-2r680fs6`$uo6y@up2Ydsp^*!HNznzYMcR%lx&Z%gj8)5v?!t$eDD10
zPTn98ZaMG30<$4)<Pru?wQJj=g~mS|(2XP{&k`U3GJ0n<SYezfz#M-SK1STc?NN?6
z6(y+o+53-bV!3t&8vq9!V~<bgNg-B{0CSFTN99MD#a!{n_){W~?U9B7RV)bgq(dqF
zoBLy3w$jx}Mr_OMqp$dWHSAh#l3H6NXaa=*0qI;n!>d@PH+QlE*9K!A@_E_-IQ?tU
zlntV>lRkePQO>jS&~V^WS*cAR9M(rF6B(roPRA5bJBLbP9MkEo(vw3(Y`CTssZB<D
z)@;!cl&D=Q&uWZ-YFS96%0bOBj#Sl&0L@l@D>hm%b?ZTOX6b>reCeLdIUnKp*9m-K
up5)0ksTI4P40{2_2^Hwthul{0n)55$OLn@GF)t3|@^-Cgbt0<KAOG2BPMwAT

literal 0
HcmV?d00001

diff --git a/fixtures/suspense/io/public/img/trueadm.jpeg b/fixtures/suspense/io/public/img/trueadm.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..71238e1eb70c99dc5dc7f813628dff9f6e80ec60
GIT binary patch
literal 26562
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
Y1mcl9vJ&OaPkL@CeFZoUDHebK*_d|xXaE2J

literal 0
HcmV?d00001

diff --git a/fixtures/suspense/io/public/index.html b/fixtures/suspense/io/public/index.html
new file mode 100644
index 0000000000..036a0fb662
--- /dev/null
+++ b/fixtures/suspense/io/public/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="shortcut icon" href="./src/favicon.ico">
+    <title>Movie List</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <div id="debugger"></div>
+  </body>
+</html>
diff --git a/fixtures/suspense/io/public/manifest.json b/fixtures/suspense/io/public/manifest.json
new file mode 100644
index 0000000000..282d198c71
--- /dev/null
+++ b/fixtures/suspense/io/public/manifest.json
@@ -0,0 +1,15 @@
+{
+  "short_name": "Emoji Search",
+  "name": "Emoji Search Example App",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    }
+  ],
+  "start_url": "./index.html",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
diff --git a/fixtures/suspense/io/src/api/data.js b/fixtures/suspense/io/src/api/data.js
new file mode 100644
index 0000000000..6af4526ed5
--- /dev/null
+++ b/fixtures/suspense/io/src/api/data.js
@@ -0,0 +1,334 @@
+export const coreContributorListJSON = [
+  {
+    id: 'acdlite',
+    name: 'Andrew Clark',
+  },
+  {
+    id: 'bvaughn',
+    name: 'Brian Vaughn',
+  },
+  {
+    id: 'gaearon',
+    name: 'Dan Abramov',
+  },
+  {
+    id: 'trueadm',
+    name: 'Dominic Gannaway',
+  },
+  {
+    id: 'flarnie',
+    name: 'Flarnie Marchan',
+  },
+  {
+    id: 'sebmarkbage',
+    name: 'Sebastian Markbåge',
+  },
+  {
+    id: 'sophiebits',
+    name: 'Sophie Alpert',
+  },
+];
+
+export const userProfileJSON = {
+  acdlite: {
+    id: 'acdlite',
+    name: 'Andrew Clark',
+    image: '/img/acdlite.jpeg',
+    location: 'Redwood City, CA',
+    email: 'acdlite@me.com',
+    tagline: 'React core at Facebook. Hi!',
+  },
+  bvaughn: {
+    id: 'bvaughn',
+    name: 'Brian Vaughn',
+    image: '/img/bvaughn.jpeg',
+    location: 'Mountain View, CA',
+    email: 'brian.david.vaughn@gmail.com',
+    tagline:
+      'React JS core team at @facebook; formerly at @treasure-data and @google.',
+  },
+  gaearon: {
+    id: 'gaearon',
+    name: 'Dan Abramov',
+    image: '/img/gaearon.jpeg',
+    location: 'London, UK',
+    email: 'dan.abramov@me.com',
+    tagline:
+      'Working on @reactjs. Co-author of Redux and Create React App. Building tools for humans.',
+  },
+  flarnie: {
+    id: 'flarnie',
+    name: 'Flarnie Marchan',
+    image: '/img/flarnie.jpeg',
+    location: 'Oakland, CA',
+    email: null,
+    tagline:
+      'Software Engineer at Facebook React Core Team & Co-maintainer of Draft.js',
+  },
+  sebmarkbage: {
+    id: 'sebmarkbage',
+    name: 'Sebastian Markbåge',
+    image: '/img/sebmarkbage.jpeg',
+    location: 'San Francisco',
+    email: 'sebastian@calyptus.eu',
+    tagline: null,
+  },
+  sophiebits: {
+    id: 'sophiebits',
+    name: 'Sophie Alpert',
+    image: '/img/sophiebits.jpeg',
+    location: 'California',
+    email: 'hi@sophiebits.com',
+    tagline:
+      'I like fixing things. eng manager of @reactjs at Facebook. ex-@khanacademy. 💎🌸 she/her. kindness, intersectional feminism, music.',
+  },
+  trueadm: {
+    id: 'trueadm',
+    name: 'Dominic Gannaway',
+    image: '/img/trueadm.jpeg',
+    location: 'London, United Kingdom',
+    email: null,
+    tagline:
+      'Currently an engineer on the React core team at @facebook. Author of @infernojs and t7. Enjoys coding + being a Dad.',
+  },
+};
+export const userRepositoriesListJSON = {
+  acdlite: [
+    {
+      name: 'recompose',
+      url: 'https://github.com/acdlite/recompose',
+      description:
+        'A React utility belt for function components and higher-order components.',
+    },
+    {
+      name: 'react-fiber-architecture',
+      url: 'https://github.com/acdlite/react-fiber-architecture',
+      description: "A description of React's new core algorithm, React Fiber",
+    },
+    {
+      name: 'redux-router',
+      url: 'https://github.com/acdlite/redux-router',
+      description:
+        'Redux bindings for React Router – keep your router state inside your Redux store',
+    },
+    {
+      name: 'flummox',
+      url: 'https://github.com/acdlite/flummox',
+      description: 'Minimal, isomorphic Flux.',
+    },
+    {
+      name: 'redux-rx',
+      url: 'https://github.com/acdlite/redux-rx',
+      description: 'RxJS utilities for Redux.',
+    },
+    {
+      name: 'react-remarkable',
+      url: 'https://github.com/acdlite/react-remarkable',
+      description: 'A React component for rendering Markdown with remarkable',
+    },
+  ],
+  bvaughn: [
+    {
+      name: 'react-virtualized',
+      url: 'https://github.com/bvaughn/react-virtualized',
+      description:
+        'React components for efficiently rendering large lists and tabular data',
+    },
+    {
+      name: 'redux-search',
+      url: 'https://github.com/bvaughn/redux-search',
+      description: 'Redux bindings for client-side search',
+    },
+    {
+      name: 'react-window',
+      url: 'https://github.com/bvaughn/react-window',
+      description:
+        'React components for efficiently rendering large lists and tabular data',
+    },
+    {
+      name: 'react-virtualized-select',
+      url: 'https://github.com/bvaughn/react-virtualized-select',
+      description:
+        'HOC that uses react-virtualized and react-select to display large lists of options in a drop-down',
+    },
+    {
+      name: 'js-search',
+      url: 'https://github.com/bvaughn/js-search',
+      description:
+        'JS Search is an efficient, client-side search library for JavaScript and JSON objects',
+    },
+    {
+      name: 'react-highlight-words',
+      url: 'https://github.com/bvaughn/react-highlight-words',
+      description:
+        'React component to highlight words within a larger body of text',
+    },
+  ],
+  gaearon: [
+    {
+      name: 'facebook/react',
+      url: 'https://github.com/facebook/react',
+      description:
+        'A declarative, efficient, and flexible JavaScript library for building user interfaces.',
+    },
+    {
+      name: 'reduxjs/redux',
+      url: 'https://github.com/reduxjs/redux',
+      description: 'Predictable state container for JavaScript apps',
+    },
+    {
+      name: 'facebook/create-react-app',
+      url: 'https://github.com/facebook/create-react-app',
+      description: 'Create React apps with no build configuration.',
+    },
+    {
+      name: 'reduxjs/redux-devtools',
+      url: 'https://github.com/reduxjs/redux-devtools',
+      description:
+        'DevTools for Redux with hot reloading, action replay, and customizable UI',
+    },
+    {
+      name: 'react-dnd/react-dnd',
+      url: 'https://github.com/react-dnd/react-dnd',
+      description: 'Drag and Drop for React',
+    },
+    {
+      name: 'paularmstrong/normalizr',
+      url: 'https://github.com/paularmstrong/normalizr',
+      description: 'Normalizes nested JSON according to a schema',
+    },
+  ],
+  flarnie: [
+    {
+      name: 'diffux/diffux',
+      url: 'https://github.com/diffux/diffux',
+      description: 'Perceptual diffs of responsive screenshots made simple.',
+    },
+    {
+      name: 'facebook/draft-js',
+      url: 'https://github.com/facebook/draft-js',
+      description: 'A React framework for building text editors.',
+    },
+    {
+      name: 'facebook/react',
+      url: 'https://github.com/facebook/react',
+      description:
+        'A declarative, efficient, and flexible JavaScript library for building user interfaces.',
+    },
+    {
+      name: 'facebook/jest',
+      url: 'https://github.com/facebook/jest',
+      description: '🃏 Delightful JavaScript Testing.',
+    },
+    {
+      name: 'Galooshi/import-js',
+      url: 'https://github.com/Galooshi/import-js',
+      description: 'A tool to simplify importing JS modules',
+    },
+    {
+      name: 'webpack_rails_demo',
+      url: 'https://github.com/flarnie/webpack_rails_demo',
+      description: 'Setting up webpack with Ruby on Rails: a basic demo',
+    },
+  ],
+  sebmarkbage: [
+    {
+      name: 'art',
+      url: 'https://github.com/sebmarkbage/art',
+      description:
+        "Retained mode vector drawing API designed for multiple output modes. There's also a built-in SVG parser.",
+    },
+    {
+      name: 'ecmascript-immutable-data-structures',
+      url:
+        'https://github.com/sebmarkbage/ecmascript-immutable-data-structures',
+      description: null,
+    },
+    {
+      name: 'ocamlrun-wasm',
+      url: 'https://github.com/sebmarkbage/ocamlrun-wasm',
+      description: 'OCamlrun WebAssembly - OCaml Bytecode Interpreter in WASM',
+    },
+    {
+      name: 'ecmascript-generator-expression',
+      url: 'https://github.com/sebmarkbage/ecmascript-generator-expression',
+      description:
+        'Proposal for do Generator Expressions in ECMAScript. Work in progress. Edit Add topics',
+    },
+    {
+      name: 'ecmascript-undefined-propagation',
+      url: 'https://github.com/sebmarkbage/ecmascript-undefined-propagation',
+      description:
+        'ECMAScript proposal to relax the rules to return `undefined` for property access on `null` or `undefined` instead of throwing.',
+    },
+    {
+      name: 'ecmascript-shallow-equal',
+      url: 'https://github.com/sebmarkbage/ecmascript-shallow-equal',
+      description: 'A proposal for ECMAScript for Object.shallowEqual',
+    },
+  ],
+  sophiebits: [
+    {
+      name: 'facebook/react',
+      url: 'https://github.com/facebook/react',
+      description:
+        'A declarative, efficient, and flexible JavaScript library for building user interfaces.',
+    },
+    {
+      name: 'Khan/KaTeX',
+      url: 'https://github.com/Khan/KaTeX',
+      description: 'Fast math typesetting for the web.',
+    },
+    {
+      name: 'facebook/react-devtools',
+      url: 'https://github.com/facebook/react-devtools',
+      description:
+        'An extension that allows inspection of React component hierarchy in the Chrome and Firefox Developer Tools.',
+    },
+    {
+      name: 'vim-awesome/vim-awesome',
+      url: 'https://github.com/vim-awesome/vim-awesome',
+      description: 'Awesome Vim plugins from across the universe',
+    },
+    {
+      name: 'facebook/draft-js',
+      url: 'https://github.com/facebook/draft-js',
+      description: 'A React framework for building text editors.',
+    },
+    {
+      name: 'es3ify',
+      url: 'https://github.com/sophiebits/es3ify',
+      description:
+        'Browserify transform to convert ES5 syntax to be ES3-compatible.',
+    },
+  ],
+  trueadm: [
+    {
+      name: 'facebook/react',
+      url: 'https://github.com/facebook/react',
+      description:
+        'A declarative, efficient, and flexible JavaScript library for building user interfaces.',
+    },
+    {
+      name: 'infernojs/inferno',
+      url: 'https://github.com/infernojs/inferno',
+      description:
+        'An extremely fast, React-like JavaScript library for building modern user interfaces',
+    },
+    {
+      name: 'facebook/prepack',
+      url: 'https://github.com/facebook/prepack',
+      description: 'A JavaScript bundle optimizer.',
+    },
+    {
+      name: 't7',
+      url: 'https://github.com/trueadm/t7',
+      description: 'Lightweight virtual DOM templating library',
+    },
+    {
+      name: 'infernojs/babel-plugin-inferno',
+      url: 'https://github.com/infernojs/babel-plugin-inferno',
+      description: null,
+    },
+  ],
+};
diff --git a/fixtures/suspense/io/src/api/index.js b/fixtures/suspense/io/src/api/index.js
new file mode 100644
index 0000000000..89ce9ac073
--- /dev/null
+++ b/fixtures/suspense/io/src/api/index.js
@@ -0,0 +1,67 @@
+import {
+  coreContributorListJSON,
+  userProfileJSON,
+  userRepositoriesListJSON,
+} from './data';
+
+export function fetchCoreContributorListJSON() {
+  return makeFakeAPICall('/react/contributors', coreContributorListJSON);
+}
+
+export function fetchUserProfileJSON(id) {
+  return makeFakeAPICall(`/${id}/details`, userProfileJSON[id]);
+}
+
+export function fetchUserRepositoriesListJSON(id) {
+  return makeFakeAPICall(`/${id}/repositories`, userRepositoriesListJSON[id]);
+}
+
+let fakeRequestTime = 1000;
+let onProgress = () => true;
+
+export function setFakeRequestTime(val) {
+  fakeRequestTime = val;
+}
+
+export function setProgressHandler(handler) {
+  onProgress = handler;
+}
+
+export function setPauseNewRequests(value) {
+  shouldPauseNewRequests = value;
+}
+
+let shouldPauseNewRequests = false;
+let notifiers = {};
+let isPausedUrl = {};
+
+export function setPaused(url, isPaused) {
+  const wasPaused = isPausedUrl[url];
+  isPausedUrl[url] = isPaused;
+  if (isPaused !== wasPaused) {
+    notifiers[url]();
+  }
+}
+
+function makeFakeAPICall(url, result) {
+  let i = 1;
+  return new Promise(resolve => {
+    isPausedUrl[url] = shouldPauseNewRequests;
+    function notify() {
+      if (!isPausedUrl[url]) {
+        i++;
+      }
+      onProgress(url, i, isPausedUrl[url]);
+      if (isPausedUrl[url]) {
+        return;
+      }
+      if (i === 100) {
+        resolve(result);
+      } else {
+        setTimeout(notify, fakeRequestTime / 100);
+      }
+    }
+    notifiers[url] = notify;
+    notify();
+  });
+}
diff --git a/fixtures/suspense/io/src/cache.js b/fixtures/suspense/io/src/cache.js
new file mode 100644
index 0000000000..7730daa0d9
--- /dev/null
+++ b/fixtures/suspense/io/src/cache.js
@@ -0,0 +1,7 @@
+import {createCache} from 'simple-cache-provider';
+
+export let cache;
+function initCache() {
+  cache = createCache(initCache);
+}
+initCache();
diff --git a/fixtures/suspense/io/src/components/App.js b/fixtures/suspense/io/src/components/App.js
new file mode 100644
index 0000000000..13762b1735
--- /dev/null
+++ b/fixtures/suspense/io/src/components/App.js
@@ -0,0 +1,82 @@
+import React, {Fragment, Placeholder, PureComponent} from 'react';
+import {unstable_deferredUpdates} from 'react-dom';
+import {createResource} from 'simple-cache-provider';
+import {cache} from '../cache';
+import Spinner from './Spinner';
+import ContributorListPage from './ContributorListPage';
+
+const UserPageResource = createResource(() => import('./UserPage'));
+
+function UserPageLoader(props) {
+  const UserPage = UserPageResource.read(cache).default;
+  return <UserPage {...props} />;
+}
+
+export default class App extends PureComponent {
+  state = {
+    currentId: null,
+    showDetail: false,
+  };
+
+  componentDidUpdate(prevProps, prevState) {
+    if (
+      prevState.showDetail !== this.state.showDetail ||
+      prevState.currentId !== this.state.currentId
+    ) {
+      window.scrollTo(0, 0);
+    }
+  }
+
+  handleUserClick = id => {
+    this.setState({
+      currentId: id,
+    });
+    unstable_deferredUpdates(() => {
+      this.setState({
+        showDetail: true,
+      });
+    });
+  };
+
+  handleBackClick = () =>
+    this.setState({
+      currentId: null,
+      showDetail: false,
+    });
+
+  render() {
+    const {currentId, showDetail} = this.state;
+    return showDetail
+      ? this.renderDetail(currentId)
+      : this.renderList(currentId);
+  }
+
+  renderDetail(id) {
+    return (
+      <div>
+        <button
+          onClick={this.handleBackClick}
+          style={{
+            display: 'block',
+            marginBottom: '1rem',
+          }}>
+          Return to list
+        </button>
+        <Placeholder delayMs={2000} fallback={<Spinner size="large" />}>
+          <UserPageLoader id={id} />
+        </Placeholder>
+      </div>
+    );
+  }
+
+  renderList(loadingId) {
+    return (
+      <Placeholder delayMs={1500} fallback={<Spinner size="large" />}>
+        <ContributorListPage
+          loadingId={loadingId}
+          onUserClick={this.handleUserClick}
+        />
+      </Placeholder>
+    );
+  }
+}
diff --git a/fixtures/suspense/io/src/components/ContributorListPage.js b/fixtures/suspense/io/src/components/ContributorListPage.js
new file mode 100644
index 0000000000..2497f05e3e
--- /dev/null
+++ b/fixtures/suspense/io/src/components/ContributorListPage.js
@@ -0,0 +1,62 @@
+import React, {Fragment} from 'react';
+import {createResource} from 'simple-cache-provider';
+import {cache} from '../cache';
+import Spinner from './Spinner';
+import {fetchCoreContributorListJSON} from '../api';
+
+const ContributorListResource = createResource(fetchCoreContributorListJSON);
+
+const ContributorListPage = ({loadingId, onUserClick}) => (
+  <Fragment>
+    <h1>React Core Team</h1>
+    <ul
+      style={{
+        display: 'grid',
+        gridGap: '0.5rem',
+        gridTemplateColumns: 'repeat(auto-fill, 20rem)',
+        padding: 0,
+        margin: 0,
+      }}>
+      {ContributorListResource.read(cache).map(user => (
+        <ContributorListItem
+          key={user.id}
+          onClick={() => onUserClick(user.id)}
+          isLoading={loadingId && user.id === loadingId}
+          user={user}
+        />
+      ))}
+    </ul>
+  </Fragment>
+);
+
+const ContributorListItem = ({isLoading, onClick, user}) => (
+  <li
+    onClick={onClick}
+    style={{
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'space-between',
+      padding: '1rem',
+      backgroundColor: 'var(--color-buttonBg)',
+      border: '1px solid var(--color-buttonBorder)',
+      borderRadius: '1rem',
+      opacity: isLoading === false ? 0.5 : 1,
+      cursor: isLoading ? 'default' : 'pointer',
+    }}
+    tabIndex="0">
+    <div>
+      <strong>{user.name}</strong>
+      <div style={{marginTop: '0.5rem'}}>{user.id}</div>
+    </div>
+    {isLoading ? (
+      <Spinner size="small" />
+    ) : (
+      <svg width="24" height="24" viewBox="0 0 24 24">
+        <path fill="none" d="M0 0h24v24H0z" />
+        <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" />
+      </svg>
+    )}
+  </li>
+);
+
+export default ContributorListPage;
diff --git a/fixtures/suspense/io/src/components/Spinner.css b/fixtures/suspense/io/src/components/Spinner.css
new file mode 100644
index 0000000000..ce6134a39e
--- /dev/null
+++ b/fixtures/suspense/io/src/components/Spinner.css
@@ -0,0 +1,68 @@
+.Spinner {
+  animation: rotate 1.3s linear infinite;
+}
+
+@keyframes rotate {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(270deg); }
+}
+
+.SmallSpinnerPath {
+  stroke-dasharray: 100;
+  stroke-dashoffset: 0;
+  transform-origin: center;
+  animation:
+    SmallDash 1.3s ease-in-out infinite;
+}
+
+@keyframes SmallDash {
+ 0% { stroke-dashoffset: 100; }
+ 50% {
+   stroke-dashoffset: 50;
+   transform:rotate(135deg);
+ }
+ 100% {
+   stroke-dashoffset: 100;
+   transform:rotate(450deg);
+ }
+}
+
+.MediumSpinnerPath {
+  stroke-dasharray: 150;
+  stroke-dashoffset: 0;
+  transform-origin: center;
+  animation:
+    MediumDash 1.3s ease-in-out infinite;
+}
+
+@keyframes MediumDash {
+ 0% { stroke-dashoffset: 150; }
+ 50% {
+   stroke-dashoffset: 50;
+   transform:rotate(135deg);
+ }
+ 100% {
+   stroke-dashoffset: 150;
+   transform:rotate(450deg);
+ }
+}
+
+.LargeSpinnerPath {
+  stroke-dasharray: 200;
+  stroke-dashoffset: 0;
+  transform-origin: center;
+  animation:
+    LargeDash 1.3s ease-in-out infinite;
+}
+
+@keyframes LargeDash {
+ 0% { stroke-dashoffset: 200; }
+ 50% {
+   stroke-dashoffset: 50;
+   transform:rotate(135deg);
+ }
+ 100% {
+   stroke-dashoffset: 200;
+   transform:rotate(450deg);
+ }
+}
diff --git a/fixtures/suspense/io/src/components/Spinner.js b/fixtures/suspense/io/src/components/Spinner.js
new file mode 100644
index 0000000000..580e9e2d1b
--- /dev/null
+++ b/fixtures/suspense/io/src/components/Spinner.js
@@ -0,0 +1,48 @@
+import React from 'react';
+import './Spinner.css';
+
+const SPINNER_SIZES = {
+  small: 30,
+  medium: 50,
+  large: 70,
+};
+
+const STROKE_WIDTHS = {
+  small: 4,
+  medium: 5,
+  large: 6,
+};
+
+const PATH_CLASS_NAMES = {
+  small: 'SmallSpinnerPath',
+  medium: 'MediumSpinnerPath',
+  large: 'LargeSpinnerPath',
+};
+
+// Heavily inspired by https://codepen.io/mrrocks/pen/EiplA
+export default function Spinner({size = 'small'}) {
+  const baseSize = SPINNER_SIZES[size];
+  const pathSize = baseSize / 2;
+  const strokeWidth = STROKE_WIDTHS[size];
+  const pathRadius = `${baseSize / 2 - strokeWidth}px`;
+  const className = PATH_CLASS_NAMES[size];
+
+  return (
+    <svg
+      className={className}
+      width={baseSize}
+      height={baseSize}
+      viewBox={`0 0 ${baseSize} ${baseSize}`}>
+      <circle
+        className="SpinnerPath"
+        fill="none"
+        stroke="currentColor"
+        strokeWidth={strokeWidth}
+        strokeLinecap="round"
+        cx={pathSize}
+        cy={pathSize}
+        r={pathRadius}
+      />
+    </svg>
+  );
+}
diff --git a/fixtures/suspense/io/src/components/UserPage.js b/fixtures/suspense/io/src/components/UserPage.js
new file mode 100644
index 0000000000..5c15f6be70
--- /dev/null
+++ b/fixtures/suspense/io/src/components/UserPage.js
@@ -0,0 +1,169 @@
+import React, {Fragment, Placeholder} from 'react';
+import {createResource} from 'simple-cache-provider';
+import Spinner from './Spinner';
+import {cache} from '../cache';
+import {fetchUserProfileJSON, fetchUserRepositoriesListJSON} from '../api';
+
+export default function UserPage({id}) {
+  return (
+    <div
+      style={{
+        display: 'grid',
+        gridTemplateColumns: 'repeat(auto-fill, 20rem)',
+        gridGap: '1rem',
+        alignItems: 'start',
+      }}>
+      <UserDetails id={id} />
+      <Placeholder delayMs={1000} fallback={<Spinner size="medium" />}>
+        <Repositories id={id} />
+      </Placeholder>
+    </div>
+  );
+}
+
+const UserDetailsResource = createResource(fetchUserProfileJSON);
+
+function UserDetails({id}) {
+  const user = UserDetailsResource.read(cache, id);
+  return (
+    <div
+      style={{
+        display: 'grid',
+        gridGap: '0.5rem',
+        width: '20rem',
+        padding: '1rem',
+        backgroundColor: 'var(--color-buttonBg)',
+        border: '1px solid var(--color-buttonBorder)',
+        borderRadius: '1rem',
+      }}>
+      <UserPicture source={user.image} />
+      <div
+        style={{
+          fontSize: '1.5rem',
+          fontWeight: 'bold',
+          color: 'var(--color-pageTextDark)',
+        }}>
+        {user.name}
+      </div>
+      <div style={{fontSize: '1.25rem'}}>{user.id}</div>
+      {user.tagline !== null && <div>{user.tagline}</div>}
+      <hr
+        style={{
+          width: '100%',
+          height: '1px',
+          border: 'none',
+          backgroundColor: '#ddd',
+        }}
+      />
+      {user.location && <Location location={user.location} />}
+      {user.email && <Email email={user.email} />}
+    </div>
+  );
+}
+
+const Location = ({location}) => (
+  <div
+    style={{
+      display: 'flex',
+      alignItems: 'center',
+    }}>
+    <svg
+      viewBox="0 0 24 24"
+      style={{
+        width: '24px',
+        height: '24px',
+        marginRight: '0.5rem',
+        fill: 'currentColor',
+      }}>
+      <path d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" />
+      <path d="M0 0h24v24H0z" fill="none" />
+    </svg>
+    {location}
+  </div>
+);
+
+const Email = ({email}) => (
+  <div
+    style={{
+      display: 'flex',
+      alignItems: 'center',
+    }}>
+    <svg
+      viewBox="0 0 24 24"
+      style={{
+        width: '24px',
+        height: '24px',
+        marginRight: '0.5rem',
+        fill: 'currentColor',
+      }}>
+      <path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 4l-8 5-8-5V6l8 5 8-5v2z" />
+      <path d="M0 0h24v24H0z" fill="none" />
+    </svg>
+    <a href={`mailto:${email}`}>{email}</a>
+  </div>
+);
+
+const ImageResource = createResource(
+  src =>
+    new Promise(resolve => {
+      const img = new Image();
+      img.onload = () => resolve(src);
+      img.src = src;
+    })
+);
+
+function Img({src, ...rest}) {
+  return <img src={ImageResource.read(cache, src)} {...rest} />;
+}
+
+function UserPicture({source}) {
+  return (
+    <Placeholder delayMs={1500} fallback={<img src={source} alt="poster" />}>
+      <Img
+        src={source}
+        alt="profile picture"
+        style={{
+          width: '100%',
+          height: 'auto',
+          borderRadius: '0.5rem',
+        }}
+      />
+    </Placeholder>
+  );
+}
+
+const UserRepositoriesResource = createResource(fetchUserRepositoriesListJSON);
+
+function Repositories({id}) {
+  const reviews = UserRepositoriesResource.read(cache, id);
+  return (
+    <ul
+      style={{
+        display: 'grid',
+        gridGap: '1rem',
+        padding: 0,
+        margin: 0,
+      }}>
+      {reviews.map(review => <Repository key={review.id} {...review} />)}
+    </ul>
+  );
+}
+
+function Repository({description, name, url}) {
+  return (
+    <li
+      style={{
+        display: 'grid',
+        gridGap: '0.5rem',
+        padding: '1rem',
+        backgroundColor: 'var(--color-buttonBg)',
+        border: '1px solid var(--color-buttonBorder)',
+        borderRadius: '1rem',
+      }}>
+      <strong>
+        <a href={url}>{name}</a>
+      </strong>
+      <div>{description}</div>
+    </li>
+  );
+}
diff --git a/fixtures/suspense/io/src/index.css b/fixtures/suspense/io/src/index.css
new file mode 100644
index 0000000000..8b7b179ee5
--- /dev/null
+++ b/fixtures/suspense/io/src/index.css
@@ -0,0 +1,90 @@
+* { box-sizing: border-box; }
+
+:root {
+  --color-debuggerBg: #f7f7f7;
+  --color-debuggerText: #333;
+  --color-debuggerBorder: #e7e7e7;
+
+  --color-panelBg: #f7f7f7;
+  --color-panelText: #333;
+
+  --color-pageTextDark: #000;
+  --color-pageText: #333;
+  --color-pageBg: #fff;
+
+  --color-buttonBg: #f7f7f7;
+  --color-buttonBorder: #e7e7e7;
+
+  --pt: 8px;
+}
+
+body {
+  margin: 0;
+  padding: calc(var(--pt)*4);
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  color: var(--color-pageText);
+  background-color: var(--color-pageBg);
+}
+
+/* -------------------------------- */
+/* Debugger */
+/* -------------------------------- */
+
+#debugger {
+  position: absolute;
+  top: 0; left: 0; right: 0; bottom: 0;
+  /* width: 100vw; */
+  /* height: 100vh; */
+  pointer-events: none;
+}
+
+.🎛 {
+  position: fixed;
+  max-width: calc(var(--pt)*28);
+  border-radius: var(--pt);
+  padding: calc(var(--pt)*2);
+  background-color: var(--color-debuggerBg);
+  border: 1px solid var(--color-debuggerBorder);
+  border-radius: 0.5rem;
+  color: var(--color-debuggerText);
+  pointer-events: all;
+}
+
+.🕹 {
+  background-color: var(--color-buttonBg);
+  border: 1px solid var(--color-buttonBorder);
+  border-radius: var(--pt);
+  padding: 0;
+  width: calc(var(--pt)*5);
+  height: calc(var(--pt)*5);
+  font-size: calc(var(--pt)*3);
+  line-height: 1;
+  font-weight: bold;
+  cursor: pointer;
+  user-select: none;
+}
+
+.🕹.👶 {
+  width: calc(var(--pt)*3);
+  height: calc(var(--pt)*3);
+  font-size: calc(var(--pt)*2);
+}
+
+.🕹.🐘 {
+  width: auto;
+  height: calc(var(--pt)*7);
+  padding: var(--pt) calc(var(--pt)*2);
+}
+
+.🕹:hover {
+  background-color: white;
+  top: -4px;
+  left: -4px;
+  box-shadow: 4px 4px 0 var(--color-buttonBorder);
+}
+
+.🕹:active {
+  box-shadow: none;
+  top: 0;
+  left: 0;
+}
diff --git a/fixtures/suspense/io/src/index.js b/fixtures/suspense/io/src/index.js
new file mode 100644
index 0000000000..975feb9326
--- /dev/null
+++ b/fixtures/suspense/io/src/index.js
@@ -0,0 +1,272 @@
+import React, {Fragment, PureComponent} from 'react';
+import {unstable_createRoot, render} from 'react-dom';
+import {cache} from './cache';
+import {
+  setFakeRequestTime,
+  setPaused,
+  setPauseNewRequests,
+  setProgressHandler,
+} from './api';
+import App from './components/App';
+import Draggable from 'react-draggable';
+import './index.css';
+
+let handleReset;
+
+class Shell extends PureComponent {
+  state = {
+    iteration: 0,
+  };
+
+  componentDidMount() {
+    handleReset = this.handleReset;
+  }
+
+  handleReset = () =>
+    this.setState(prevState => ({
+      iteration: prevState.iteration + 1,
+    }));
+
+  render() {
+    return <App key={this.state.iteration} />;
+  }
+}
+
+class Debugger extends PureComponent {
+  state = {
+    iteration: 0,
+    strategy: 'async',
+    requestTime: 1,
+    showDebugger: false,
+    pauseNewRequests: false,
+    waitTime: 0,
+    requests: {},
+  };
+
+  componentDidMount() {
+    setFakeRequestTime(this.state.requestTime * 1000);
+    setProgressHandler(this.handleProgress);
+    window.addEventListener('keydown', e => {
+      if (e.key.toLowerCase() === '/') {
+        this.setState(state => ({
+          showDebugger: !state.showDebugger,
+        }));
+      } else if (e.key.toLowerCase() === 'p') {
+        this.togglePauseRequests();
+      }
+    });
+  }
+
+  componentDidUpdate(prevProps, prevState) {
+    if (prevState.requestTime !== this.state.requestTime) {
+      setFakeRequestTime(this.state.requestTime * 1000);
+    }
+  }
+
+  handleReset = () => {
+    cache.invalidate();
+    this.setState(state => ({
+      requests: {},
+    }));
+    handleReset();
+  };
+
+  handleProgress = (url, progress, isPaused) => {
+    this.setState(state => ({
+      requests: {
+        ...state.requests,
+        [url]: {
+          url,
+          progress,
+          isPaused,
+        },
+      },
+    }));
+  };
+
+  togglePauseRequests = () => {
+    this.setState(
+      prevState => {
+        return {pauseNewRequests: !prevState.pauseNewRequests};
+      },
+      () => {
+        setPauseNewRequests(this.state.pauseNewRequests);
+      }
+    );
+  };
+
+  render() {
+    if (!this.state.showDebugger) {
+      return null;
+    }
+    return (
+      <Draggable cancel="input">
+        <div
+          className="🎛"
+          style={{
+            bottom: 20,
+            right: 20,
+          }}>
+          <div>
+            Latency: {this.state.requestTime} second{this.state.requestTime !==
+            1
+              ? 's'
+              : ''}{' '}
+            <input
+              type="range"
+              min="0"
+              max="3"
+              step="0.5"
+              style={{width: '100%'}}
+              value={this.state.requestTime}
+              onChange={e => {
+                e.stopPropagation();
+                this.setState({requestTime: parseFloat(e.target.value)});
+              }}
+            />
+          </div>
+          <label>
+            <input
+              type="checkbox"
+              checked={this.state.pauseNewRequests}
+              onChange={this.togglePauseRequests}
+            />
+            Pause new requests
+          </label>
+          <br />
+          <br />
+          {Object.values(this.state.requests).filter(x => x.progress !== 100)
+            .length > 0 ? (
+            <Fragment>
+              <div style={{marginBottom: 10}}>
+                <b>Loading</b>
+              </div>
+            </Fragment>
+          ) : (
+            <Fragment>
+              <div style={{marginBottom: 10}}>
+                <b>Loading</b>
+              </div>
+              <small style={{height: 20, display: 'block'}}>(None)</small>
+            </Fragment>
+          )}
+          {Object.keys(this.state.requests)
+            .reverse()
+            .map(url => {
+              const {progress, isPaused} = this.state.requests[url];
+              if (progress === 100) {
+                return null;
+              }
+              return (
+                <div
+                  key={url}
+                  style={{
+                    height: 20,
+                    width: '100%',
+                    position: 'relative',
+                    cursor: 'pointer',
+                    title: isPaused ? 'Resume' : 'Pause',
+                  }}
+                  onClick={e => {
+                    setPaused(url, !isPaused);
+                  }}>
+                  <div
+                    style={{
+                      height: '100%',
+                      width: progress + '%',
+                      position: 'absolute',
+                      left: 0,
+                      top: 0,
+                      backgroundColor: isPaused ? '#fbfb0e' : '#61dafb',
+                      zIndex: -1,
+                      opacity: 0.8,
+                    }}
+                  />
+                  <div
+                    style={{
+                      fontFamily: 'monospace',
+                      fontWeight: 'bold',
+                      color: 'black',
+                    }}>
+                    {url}
+                  </div>
+                </div>
+              );
+            })}
+          {Object.values(this.state.requests).filter(x => x.progress === 100)
+            .length > 0 ? (
+            <Fragment>
+              <br />
+              <div style={{marginBottom: 10}}>
+                <b>Cached</b>{' '}
+                <button
+                  style={{
+                    height: 16,
+                    outline: 'none',
+                    border: 'none',
+                    background: 'none',
+                    cursor: 'pointer',
+                  }}
+                  onClick={this.handleReset}>
+                  🗑
+                </button>
+              </div>
+            </Fragment>
+          ) : (
+            <Fragment>
+              <br />
+              <div style={{marginBottom: 10}}>
+                <b>Cached</b>
+              </div>
+              <small style={{height: 20, display: 'block'}}>(None)</small>
+            </Fragment>
+          )}
+          {Object.keys(this.state.requests)
+            .reverse()
+            .map(url => {
+              const {progress} = this.state.requests[url];
+              if (progress !== 100) {
+                return null;
+              }
+
+              return (
+                <div
+                  key={url}
+                  style={{
+                    height: 20,
+                    width: '100%',
+                    position: 'relative',
+                  }}>
+                  <div
+                    style={{
+                      height: '100%',
+                      width: progress + '%',
+                      position: 'absolute',
+                      left: 0,
+                      top: 0,
+                      backgroundColor:
+                        progress !== 100 ? '#61dafb' : 'lightgreen',
+                      zIndex: -1,
+                      opacity: 0.8,
+                    }}
+                  />
+                  <div
+                    style={{
+                      fontFamily: 'monospace',
+                      fontWeight: 'bold',
+                      color: 'black',
+                    }}>
+                    {url}
+                  </div>
+                </div>
+              );
+            })}
+        </div>
+      </Draggable>
+    );
+  }
+}
+
+unstable_createRoot(document.getElementById('root')).render(<Shell />);
+
+render(<Debugger />, document.getElementById('debugger'));
diff --git a/fixtures/suspense/io/yarn.lock b/fixtures/suspense/io/yarn.lock
new file mode 100644
index 0000000000..4d1a5e75b0
--- /dev/null
+++ b/fixtures/suspense/io/yarn.lock
@@ -0,0 +1,7435 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+abab@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
+
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+
+accepts@~1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
+  dependencies:
+    mime-types "~2.1.16"
+    negotiator "0.6.1"
+
+accepts@~1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  dependencies:
+    mime-types "~2.1.18"
+    negotiator "0.6.1"
+
+acorn-dynamic-import@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
+  dependencies:
+    acorn "^4.0.3"
+
+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 "^4.0.4"
+
+acorn-jsx@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+  dependencies:
+    acorn "^3.0.4"
+
+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:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+
+acorn@^5.0.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
+
+acorn@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8"
+
+address@1.0.3, address@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
+
+ajv-keywords@^2.0.0, ajv-keywords@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
+
+ajv@^4.9.1:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+  dependencies:
+    co "^4.6.0"
+    json-stable-stringify "^1.0.1"
+
+ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.0, ajv@^5.2.3:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
+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"
+
+alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+
+ansi-align@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
+  dependencies:
+    string-width "^2.0.0"
+
+ansi-escapes@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+
+ansi-escapes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
+
+ansi-html@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+
+ansi-regex@^2.0.0, ansi-regex@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+ansi-styles@^3.0.0, ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
+  dependencies:
+    color-convert "^1.9.0"
+
+anymatch@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+  dependencies:
+    micromatch "^2.1.5"
+    normalize-path "^2.0.0"
+
+append-transform@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
+  dependencies:
+    default-require-extensions "^2.0.0"
+
+aproba@^1.0.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+aria-query@^0.7.0:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-0.7.1.tgz#26cbb5aff64144b0a825be1846e0b16cfa00b11e"
+  dependencies:
+    ast-types-flow "0.0.7"
+    commander "^2.11.0"
+
+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-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+
+arr-flatten@^1.0.1, arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+
+array-filter@~0.0.0:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
+
+array-find-index@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+
+array-flatten@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
+
+array-includes@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.7.0"
+
+array-map@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
+
+array-reduce@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+
+arrify@^1.0.0, arrify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+
+asn1.js@^4.0.0:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.2.tgz#8117ef4f7ed87cd8f89044b5bff97ac243a16c9a"
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+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"
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+
+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@2.6.0, async@^2.1.2, async@^2.1.4, async@^2.4.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
+  dependencies:
+    lodash "^4.14.0"
+
+async@^1.4.0, async@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+atob@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
+
+autoprefixer@7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.6.tgz#fb933039f74af74a83e71225ce78d9fd58ba84d7"
+  dependencies:
+    browserslist "^2.5.1"
+    caniuse-lite "^1.0.30000748"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^6.0.13"
+    postcss-value-parser "^3.2.3"
+
+autoprefixer@^6.3.1:
+  version "6.7.7"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+  dependencies:
+    browserslist "^1.7.6"
+    caniuse-db "^1.0.30000634"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^5.2.16"
+    postcss-value-parser "^3.2.3"
+
+aws-sign2@~0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+
+aws4@^1.2.1, aws4@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+
+axobject-query@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-0.1.0.tgz#62f59dbc59c9f9242759ca349960e7a2fe3c36c0"
+  dependencies:
+    ast-types-flow "0.0.7"
+
+babel-code-frame@6.26.0, babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-core@6.26.0, babel-core@^6.0.0, babel-core@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.0"
+    debug "^2.6.8"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.7"
+    slash "^1.0.0"
+    source-map "^0.5.6"
+
+babel-eslint@7.2.3:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827"
+  dependencies:
+    babel-code-frame "^6.22.0"
+    babel-traverse "^6.23.1"
+    babel-types "^6.23.0"
+    babylon "^6.17.0"
+
+babel-generator@^6.18.0, babel-generator@^6.26.0:
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.7"
+    trim-right "^1.0.1"
+
+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+  dependencies:
+    babel-helper-explode-assignable-expression "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-builder-react-jsx@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    esutils "^2.0.2"
+
+babel-helper-call-delegate@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-define-map@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-explode-assignable-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+  dependencies:
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-get-function-arity@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-hoist-variables@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-optimise-call-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-regex@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-remap-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-replace-supers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+  dependencies:
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-jest@20.0.3, babel-jest@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-20.0.3.tgz#e4a03b13dc10389e140fc645d09ffc4ced301671"
+  dependencies:
+    babel-core "^6.0.0"
+    babel-plugin-istanbul "^4.0.0"
+    babel-preset-jest "^20.0.3"
+
+babel-loader@7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.2.tgz#f6cbe122710f1aa2af4d881c6d5b54358ca24126"
+  dependencies:
+    find-cache-dir "^1.0.0"
+    loader-utils "^1.0.2"
+    mkdirp "^0.5.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-dynamic-import-node@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-1.1.0.tgz#bd1d88ac7aaf98df4917c384373b04d971a2b37a"
+  dependencies:
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babel-template "^6.26.0"
+    babel-types "^6.26.0"
+
+babel-plugin-istanbul@^4.0.0:
+  version "4.1.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.13.0"
+    find-up "^2.1.0"
+    istanbul-lib-instrument "^1.10.1"
+    test-exclude "^4.2.1"
+
+babel-plugin-jest-hoist@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-20.0.3.tgz#afedc853bd3f8dc3548ea671fbe69d03cc2c1767"
+
+babel-plugin-syntax-async-functions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+
+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-dynamic-import@6.18.0, babel-plugin-syntax-dynamic-import@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
+
+babel-plugin-syntax-exponentiation-operator@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+
+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-syntax-object-rest-spread@^6.13.0, 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.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.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-class-properties@6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-plugin-syntax-class-properties "^6.8.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+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.23.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-plugin-transform-es2015-classes@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+  dependencies:
+    babel-helper-define-map "^6.24.1"
+    babel-helper-function-name "^6.24.1"
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-helper-replace-supers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-computed-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-destructuring@6.23.0, babel-plugin-transform-es2015-destructuring@^6.23.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.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-for-of@^6.23.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.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+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.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
+  dependencies:
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+  version "6.26.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-types "^6.26.0"
+
+babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-umd@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
+  dependencies:
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-object-super@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+  dependencies:
+    babel-helper-replace-supers "^6.24.1"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-parameters@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+  dependencies:
+    babel-helper-call-delegate "^6.24.1"
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+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.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+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.23.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.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    regexpu-core "^2.0.0"
+
+babel-plugin-transform-exponentiation-operator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+  dependencies:
+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
+    babel-plugin-syntax-exponentiation-operator "^6.8.0"
+    babel-runtime "^6.22.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-object-rest-spread@6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.8.0"
+    babel-runtime "^6.26.0"
+
+babel-plugin-transform-react-constant-elements@6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-constant-elements/-/babel-plugin-transform-react-constant-elements-6.23.0.tgz#2f119bf4d2cdd45eb9baaae574053c604f6147dd"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-react-display-name@^6.23.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+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.22.0"
+
+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.22.0"
+
+babel-plugin-transform-react-jsx@6.24.1, babel-plugin-transform-react-jsx@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3"
+  dependencies:
+    babel-helper-builder-react-jsx "^6.24.1"
+    babel-plugin-syntax-jsx "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-regenerator@6.26.0, babel-plugin-transform-regenerator@^6.22.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
+  dependencies:
+    regenerator-transform "^0.10.0"
+
+babel-plugin-transform-runtime@6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-strict-mode@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-preset-env@1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48"
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-to-generator "^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.23.0"
+    babel-plugin-transform-es2015-classes "^6.23.0"
+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-destructuring "^6.23.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-for-of "^6.23.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.23.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-umd "^6.23.0"
+    babel-plugin-transform-es2015-object-super "^6.22.0"
+    babel-plugin-transform-es2015-parameters "^6.23.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.23.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
+    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-regenerator "^6.22.0"
+    browserslist "^2.1.2"
+    invariant "^2.2.2"
+    semver "^5.3.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@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-20.0.3.tgz#cbacaadecb5d689ca1e1de1360ebfc66862c178a"
+  dependencies:
+    babel-plugin-jest-hoist "^20.0.3"
+
+babel-preset-react-app@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-3.1.2.tgz#49ba3681b917c4e5c73a5249d3ef4c48fae064e2"
+  dependencies:
+    babel-plugin-dynamic-import-node "1.1.0"
+    babel-plugin-syntax-dynamic-import "6.18.0"
+    babel-plugin-transform-class-properties "6.24.1"
+    babel-plugin-transform-es2015-destructuring "6.23.0"
+    babel-plugin-transform-object-rest-spread "6.26.0"
+    babel-plugin-transform-react-constant-elements "6.23.0"
+    babel-plugin-transform-react-jsx "6.24.1"
+    babel-plugin-transform-react-jsx-self "6.22.0"
+    babel-plugin-transform-react-jsx-source "6.22.0"
+    babel-plugin-transform-regenerator "6.26.0"
+    babel-plugin-transform-runtime "6.23.0"
+    babel-preset-env "1.6.1"
+    babel-preset-react "6.24.1"
+
+babel-preset-react@6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380"
+  dependencies:
+    babel-plugin-syntax-jsx "^6.3.13"
+    babel-plugin-transform-react-display-name "^6.23.0"
+    babel-plugin-transform-react-jsx "^6.24.1"
+    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.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  dependencies:
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.17.4"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.15"
+
+babel-runtime@6.26.0, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
+babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
+babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
+babylon@^6.17.0, babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+
+balanced-match@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
+base64-js@^1.0.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
+
+base64url@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/base64url/-/base64url-2.0.0.tgz#eac16e03ea1438eff9423d69baa36262ed1f70bb"
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
+batch@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+
+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.2.0"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+
+binary-extensions@^1.0.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
+
+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"
+
+bluebird@^3.4.7:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+
+body-parser@1.18.2:
+  version "1.18.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
+  dependencies:
+    bytes "3.0.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.1"
+    http-errors "~1.6.2"
+    iconv-lite "0.4.19"
+    on-finished "~2.3.0"
+    qs "6.5.1"
+    raw-body "2.3.2"
+    type-is "~1.6.15"
+
+bonjour@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+  dependencies:
+    array-flatten "^2.1.0"
+    deep-equal "^1.0.1"
+    dns-equal "^1.0.0"
+    dns-txt "^2.0.2"
+    multicast-dns "^6.0.1"
+    multicast-dns-service-types "^1.1.0"
+
+boolbase@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+
+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"
+
+boom@4.x.x:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
+  dependencies:
+    hoek "4.x.x"
+
+boom@5.x.x:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
+  dependencies:
+    hoek "4.x.x"
+
+boxen@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
+  dependencies:
+    ansi-align "^2.0.0"
+    camelcase "^4.0.0"
+    chalk "^2.0.1"
+    cli-boxes "^1.0.0"
+    string-width "^2.0.0"
+    term-size "^1.2.0"
+    widest-line "^2.0.0"
+
+brace-expansion@^1.0.0, brace-expansion@^1.1.7:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
+  dependencies:
+    balanced-match "^1.0.0"
+    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"
+
+braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
+brorand@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+
+browser-resolve@^1.11.2:
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
+  dependencies:
+    resolve "1.1.7"
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+
+browserify-rsa@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  dependencies:
+    bn.js "^4.1.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  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"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.2"
+    elliptic "^6.0.0"
+    inherits "^2.0.1"
+    parse-asn1 "^5.0.0"
+
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  dependencies:
+    pako "~1.0.5"
+
+browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
+  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"
+
+browserslist@^2.1.2, browserslist@^2.5.1:
+  version "2.11.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
+  dependencies:
+    caniuse-lite "^1.0.30000792"
+    electron-to-chromium "^1.3.30"
+
+bser@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-1.0.2.tgz#381116970b2a6deea5646dd15dd7278444b56169"
+  dependencies:
+    node-int64 "^0.4.0"
+
+bser@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
+  dependencies:
+    node-int64 "^0.4.0"
+
+buffer-indexof@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+
+buffer@^4.3.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-modules@^1.0.0, builtin-modules@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+
+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"
+
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+caller-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  dependencies:
+    callsites "^0.2.0"
+
+callsites@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+
+camel-case@3.0.x:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
+  dependencies:
+    no-case "^2.2.0"
+    upper-case "^1.1.1"
+
+camelcase-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  dependencies:
+    camelcase "^2.0.0"
+    map-obj "^1.0.0"
+
+camelcase@^1.0.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+
+camelcase@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+
+camelcase@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+
+camelcase@^4.0.0, camelcase@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+
+caniuse-api@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
+  dependencies:
+    browserslist "^1.3.6"
+    caniuse-db "^1.0.30000529"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
+  version "1.0.30000803"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000803.tgz#3e8d2baf56c2fd5a59c82e227928a0dc2c26702d"
+
+caniuse-lite@^1.0.30000748:
+  version "1.0.30000865"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000865.tgz#70026616e8afe6e1442f8bb4e1092987d81a2f25"
+
+caniuse-lite@^1.0.30000792:
+  version "1.0.30000803"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000803.tgz#9939c37149d38d5f4540430490d240c03106a0f5"
+
+capture-stack-trace@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
+
+case-sensitive-paths-webpack-plugin@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.1.1.tgz#3d29ced8c1f124bf6f53846fb3f5894731fdc909"
+
+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.3, chalk@^1.1.3:
+  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"
+
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
+chalk@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chardet@^0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
+
+chokidar@^1.6.0, chokidar@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+  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"
+
+chownr@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+
+ci-info@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.2.tgz#03561259db48d0474c8bdc90f5b47b068b6bbfb4"
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+circular-json@^0.3.1:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
+
+clap@^1.0.9:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
+  dependencies:
+    chalk "^1.1.3"
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+classnames@^2.2.5:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
+
+clean-css@4.1.x:
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.9.tgz#35cee8ae7687a49b98034f70de00c4edd3826301"
+  dependencies:
+    source-map "0.5.x"
+
+cli-boxes@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-width@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+
+clipboard@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-1.7.1.tgz#360d6d6946e99a7a1fef395e42ba92b5e9b5a16b"
+  dependencies:
+    good-listener "^1.2.2"
+    select "^1.1.2"
+    tiny-emitter "^2.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"
+
+cliui@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
+clone@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
+coa@~1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
+  dependencies:
+    q "^1.1.2"
+
+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"
+
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.3.0, color-convert@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
+  dependencies:
+    color-name "^1.1.1"
+
+color-name@^1.0.0, color-name@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+
+color-string@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
+  dependencies:
+    color-name "^1.0.0"
+
+color@^0.11.0:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+  dependencies:
+    clone "^1.0.2"
+    color-convert "^1.3.0"
+    color-string "^0.3.0"
+
+colormin@^1.0.5:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
+  dependencies:
+    color "^0.11.0"
+    css-color-names "0.0.4"
+    has "^1.0.1"
+
+colors@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+
+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"
+
+commander@2.11.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
+
+commander@2.12.x:
+  version "2.12.2"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
+
+commander@^2.11.0:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.0.tgz#7b25325963e6aace20d3a9285b09379b0c2208b5"
+
+commander@~2.13.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+
+compare-versions@^3.1.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.3.0.tgz#af93ea705a96943f622ab309578b9b90586f39c3"
+
+component-emitter@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+
+compressible@~2.0.11:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.12.tgz#c59a5c99db76767e9876500e271ef63b3493bd66"
+  dependencies:
+    mime-db ">= 1.30.0 < 2"
+
+compression@^1.5.2:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.1.tgz#eff2603efc2e22cf86f35d2eb93589f9875373db"
+  dependencies:
+    accepts "~1.3.4"
+    bytes "3.0.0"
+    compressible "~2.0.11"
+    debug "2.6.9"
+    on-headers "~1.0.1"
+    safe-buffer "5.1.1"
+    vary "~1.1.2"
+
+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.6.0:
+  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"
+
+configstore@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90"
+  dependencies:
+    dot-prop "^4.1.0"
+    graceful-fs "^4.1.2"
+    make-dir "^1.0.0"
+    unique-string "^1.0.0"
+    write-file-atomic "^2.0.0"
+    xdg-basedir "^3.0.0"
+
+connect-history-api-fallback@^1.3.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
+
+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"
+
+contains-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+
+content-disposition@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+
+content-type-parser@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7"
+
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+
+convert-source-map@^1.4.0, convert-source-map@^1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
+
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+
+cookie@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+
+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, core-js@^2.5.0:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
+
+core-util-is@1.0.2, 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"
+
+cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892"
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.4.3"
+    minimist "^1.2.0"
+    object-assign "^4.1.0"
+    os-homedir "^1.0.1"
+    parse-json "^2.2.0"
+    require-from-string "^1.1.0"
+
+create-ecdh@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.0.0"
+
+create-error-class@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
+  dependencies:
+    capture-stack-trace "^1.0.0"
+
+create-hash@^1.1.0, create-hash@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06"
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+cross-spawn@5.1.0, cross-spawn@^5.0.1, cross-spawn@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  dependencies:
+    lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+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"
+
+cryptiles@3.x.x:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
+  dependencies:
+    boom "5.x.x"
+
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
+crypto-random-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
+
+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.28.7:
+  version "0.28.7"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b"
+  dependencies:
+    babel-code-frame "^6.11.0"
+    css-selector-tokenizer "^0.7.0"
+    cssnano ">=2.6.1 <4"
+    icss-utils "^2.1.0"
+    loader-utils "^1.0.2"
+    lodash.camelcase "^4.3.0"
+    object-assign "^4.0.1"
+    postcss "^5.0.6"
+    postcss-modules-extract-imports "^1.0.0"
+    postcss-modules-local-by-default "^1.0.1"
+    postcss-modules-scope "^1.0.0"
+    postcss-modules-values "^1.1.0"
+    postcss-value-parser "^3.3.0"
+    source-list-map "^2.0.0"
+
+css-select@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  dependencies:
+    boolbase "~1.0.0"
+    css-what "2.1"
+    domutils "1.5.1"
+    nth-check "~1.0.1"
+
+css-selector-tokenizer@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
+  dependencies:
+    cssesc "^0.1.0"
+    fastparse "^1.1.1"
+    regexpu-core "^1.0.0"
+
+css-what@2.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
+
+cssesc@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+
+"cssnano@>=2.6.1 <4":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
+  dependencies:
+    autoprefixer "^6.3.1"
+    decamelize "^1.1.2"
+    defined "^1.0.0"
+    has "^1.0.1"
+    object-assign "^4.0.1"
+    postcss "^5.0.14"
+    postcss-calc "^5.2.0"
+    postcss-colormin "^2.1.8"
+    postcss-convert-values "^2.3.4"
+    postcss-discard-comments "^2.0.4"
+    postcss-discard-duplicates "^2.0.1"
+    postcss-discard-empty "^2.0.1"
+    postcss-discard-overridden "^0.1.1"
+    postcss-discard-unused "^2.2.1"
+    postcss-filter-plugins "^2.0.0"
+    postcss-merge-idents "^2.1.5"
+    postcss-merge-longhand "^2.0.1"
+    postcss-merge-rules "^2.0.3"
+    postcss-minify-font-values "^1.0.2"
+    postcss-minify-gradients "^1.0.1"
+    postcss-minify-params "^1.0.4"
+    postcss-minify-selectors "^2.0.4"
+    postcss-normalize-charset "^1.1.0"
+    postcss-normalize-url "^3.0.7"
+    postcss-ordered-values "^2.1.0"
+    postcss-reduce-idents "^2.2.2"
+    postcss-reduce-initial "^1.0.0"
+    postcss-reduce-transforms "^1.0.3"
+    postcss-svgo "^2.1.1"
+    postcss-unique-selectors "^2.0.2"
+    postcss-value-parser "^3.2.3"
+    postcss-zindex "^2.0.1"
+
+csso@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
+  dependencies:
+    clap "^1.0.9"
+    source-map "^0.5.3"
+
+cssom@0.3.x, "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:
+    cssom "0.3.x"
+
+currently-unhandled@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  dependencies:
+    array-find-index "^1.0.1"
+
+d@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  dependencies:
+    es5-ext "^0.10.9"
+
+damerau-levenshtein@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
+
+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.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.0.1, debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
+decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+
+deep-equal@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+
+deep-extend@~0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
+
+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@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
+  dependencies:
+    strip-bom "^3.0.0"
+
+define-properties@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
+  dependencies:
+    foreach "^2.0.5"
+    object-keys "^1.0.8"
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+defined@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+
+del@^2.0.2, del@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  dependencies:
+    globby "^5.0.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    rimraf "^2.2.8"
+
+del@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  dependencies:
+    globby "^6.1.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    p-map "^1.1.1"
+    pify "^3.0.0"
+    rimraf "^2.2.8"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
+delegate@^3.1.2:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+
+depd@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
+
+depd@~1.1.1, depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+
+des.js@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+
+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"
+
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+
+detect-node@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
+
+detect-port-alt@1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275"
+  dependencies:
+    address "^1.0.1"
+    debug "^2.6.0"
+
+diff@^3.2.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
+
+diffie-hellman@^5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+dns-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+
+dns-packet@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
+  dependencies:
+    ip "^1.1.0"
+    safe-buffer "^5.0.1"
+
+dns-txt@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+  dependencies:
+    buffer-indexof "^1.0.0"
+
+doctrine@1.5.0:
+  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"
+
+doctrine@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  dependencies:
+    esutils "^2.0.2"
+
+dom-converter@~0.1:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
+  dependencies:
+    utila "~0.3"
+
+dom-serializer@0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+  dependencies:
+    domelementtype "~1.1.1"
+    entities "~1.1.1"
+
+dom-urls@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/dom-urls/-/dom-urls-1.1.0.tgz#001ddf81628cd1e706125c7176f53ccec55d918e"
+  dependencies:
+    urijs "^1.16.1"
+
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+
+domelementtype@1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+
+domelementtype@~1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+
+domhandler@2.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
+  dependencies:
+    domelementtype "1"
+
+domutils@1.1:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
+  dependencies:
+    domelementtype "1"
+
+domutils@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+dot-prop@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
+  dependencies:
+    is-obj "^1.0.0"
+
+dotenv-expand@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275"
+
+dotenv@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
+
+duplexer3@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+
+duplexer@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+
+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"
+
+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.7, electron-to-chromium@^1.3.30:
+  version "1.3.32"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.32.tgz#11d0684c0840e003c4be8928f8ac5f35dbc2b4e6"
+
+elliptic@^6.0.0:
+  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"
+
+emoji-regex@^6.1.0:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.5.1.tgz#9baea929b155565c11ea41c6626eaa65cef992c2"
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+
+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@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.4.0"
+    object-assign "^4.0.1"
+    tapable "^0.2.7"
+
+entities@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+
+errno@^0.1.3:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.6.tgz#c386ce8a6283f14fc09563b71560908c9bf53026"
+  dependencies:
+    prr "~1.0.1"
+
+errno@~0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  dependencies:
+    prr "~1.0.1"
+
+error-ex@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+  dependencies:
+    is-arrayish "^0.2.1"
+
+es-abstract@^1.7.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
+  dependencies:
+    es-to-primitive "^1.1.1"
+    function-bind "^1.1.1"
+    has "^1.0.1"
+    is-callable "^1.1.3"
+    is-regex "^1.0.4"
+
+es-to-primitive@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
+  dependencies:
+    is-callable "^1.1.1"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.1"
+
+es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
+  version "0.10.38"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.38.tgz#fa7d40d65bbc9bb8a67e1d3f9cc656a00530eed3"
+  dependencies:
+    es6-iterator "~2.0.3"
+    es6-symbol "~3.1.1"
+
+es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
+es6-map@^0.1.3:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+  dependencies:
+    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-promise@^4.0.5:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
+
+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 "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-symbol "3.1.1"
+    event-emitter "~0.3.5"
+
+es6-symbol@3.1.1, es6-symbol@^3.1.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 "1"
+    es5-ext "~0.10.14"
+
+es6-weak-map@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.14"
+    es6-iterator "^2.0.1"
+    es6-symbol "^3.1.1"
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+escodegen@^1.6.1:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.5.6"
+
+escope@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
+  dependencies:
+    es6-map "^0.1.3"
+    es6-weak-map "^2.0.1"
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-config-react-app@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-2.1.0.tgz#23c909f71cbaff76b945b831d2d814b8bde169eb"
+
+eslint-import-resolver-node@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
+  dependencies:
+    debug "^2.6.9"
+    resolve "^1.5.0"
+
+eslint-loader@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-1.9.0.tgz#7e1be9feddca328d3dcfaef1ad49d5beffe83a13"
+  dependencies:
+    loader-fs-cache "^1.0.0"
+    loader-utils "^1.0.2"
+    object-assign "^4.0.1"
+    object-hash "^1.1.4"
+    rimraf "^2.6.1"
+
+eslint-module-utils@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz#abaec824177613b8a95b299639e1b6facf473449"
+  dependencies:
+    debug "^2.6.8"
+    pkg-dir "^1.0.0"
+
+eslint-plugin-flowtype@2.39.1:
+  version "2.39.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.39.1.tgz#b5624622a0388bcd969f4351131232dcb9649cd5"
+  dependencies:
+    lodash "^4.15.0"
+
+eslint-plugin-import@2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.8.0.tgz#fa1b6ef31fcb3c501c09859c1b86f1fc5b986894"
+  dependencies:
+    builtin-modules "^1.1.1"
+    contains-path "^0.1.0"
+    debug "^2.6.8"
+    doctrine "1.5.0"
+    eslint-import-resolver-node "^0.3.1"
+    eslint-module-utils "^2.1.1"
+    has "^1.0.1"
+    lodash.cond "^4.3.0"
+    minimatch "^3.0.3"
+    read-pkg-up "^2.0.0"
+
+eslint-plugin-jsx-a11y@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-5.1.1.tgz#5c96bb5186ca14e94db1095ff59b3e2bd94069b1"
+  dependencies:
+    aria-query "^0.7.0"
+    array-includes "^3.0.3"
+    ast-types-flow "0.0.7"
+    axobject-query "^0.1.0"
+    damerau-levenshtein "^1.0.0"
+    emoji-regex "^6.1.0"
+    jsx-ast-utils "^1.4.0"
+
+eslint-plugin-react@7.4.0:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.4.0.tgz#300a95861b9729c087d362dd64abcc351a74364a"
+  dependencies:
+    doctrine "^2.0.0"
+    has "^1.0.1"
+    jsx-ast-utils "^2.0.0"
+    prop-types "^15.5.10"
+
+eslint-scope@^3.7.1:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint@4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.10.0.tgz#f25d0d7955c81968c2309aa5c9a229e045176bb7"
+  dependencies:
+    ajv "^5.2.0"
+    babel-code-frame "^6.22.0"
+    chalk "^2.1.0"
+    concat-stream "^1.6.0"
+    cross-spawn "^5.1.0"
+    debug "^3.0.1"
+    doctrine "^2.0.0"
+    eslint-scope "^3.7.1"
+    espree "^3.5.1"
+    esquery "^1.0.0"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    functional-red-black-tree "^1.0.1"
+    glob "^7.1.2"
+    globals "^9.17.0"
+    ignore "^3.3.3"
+    imurmurhash "^0.1.4"
+    inquirer "^3.0.6"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.9.1"
+    json-stable-stringify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.4"
+    minimatch "^3.0.2"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.2"
+    pluralize "^7.0.0"
+    progress "^2.0.0"
+    require-uncached "^1.0.3"
+    semver "^5.3.0"
+    strip-ansi "^4.0.0"
+    strip-json-comments "~2.0.1"
+    table "^4.0.1"
+    text-table "~0.2.0"
+
+espree@^3.5.1:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
+  dependencies:
+    acorn "^5.5.0"
+    acorn-jsx "^3.0.0"
+
+esprima@^2.6.0:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+
+esprima@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
+esprima@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+
+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.2.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
+  dependencies:
+    estraverse "^4.1.0"
+    object-assign "^4.0.1"
+
+estraverse@^4.0.0, estraverse@^4.1.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"
+
+esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+
+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 "1"
+    es5-ext "~0.10.14"
+
+eventemitter3@1.x.x:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
+
+events@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+
+eventsource@0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
+  dependencies:
+    original ">=0.0.5"
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
+exec-sh@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.1.tgz#163b98a6e89e6b65b47c2a28d215bc1f63989c38"
+  dependencies:
+    merge "^1.1.3"
+
+execa@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+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-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+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"
+
+expand-tilde@^2.0.0, expand-tilde@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  dependencies:
+    homedir-polyfill "^1.0.1"
+
+express@^4.13.3:
+  version "4.16.3"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
+  dependencies:
+    accepts "~1.3.5"
+    array-flatten "1.1.1"
+    body-parser "1.18.2"
+    content-disposition "0.5.2"
+    content-type "~1.0.4"
+    cookie "0.3.1"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "1.1.1"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.3"
+    qs "6.5.1"
+    range-parser "~1.2.0"
+    safe-buffer "5.1.1"
+    send "0.16.2"
+    serve-static "1.13.2"
+    setprototypeof "1.1.0"
+    statuses "~1.4.0"
+    type-is "~1.6.16"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extend@~3.0.0, extend@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+
+external-editor@^2.0.4:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
+  dependencies:
+    chardet "^0.4.0"
+    iconv-lite "^0.4.17"
+    tmp "^0.0.33"
+
+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"
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extract-text-webpack-plugin@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
+  dependencies:
+    async "^2.4.1"
+    loader-utils "^1.1.0"
+    schema-utils "^0.3.0"
+    webpack-sources "^1.0.1"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
+fast-deep-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+
+fastparse@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+
+faye-websocket@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+faye-websocket@~0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+fb-watchman@^1.8.0:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-1.9.2.tgz#a24cf47827f82d38fb59a69ad70b76e3b6ae7383"
+  dependencies:
+    bser "1.0.2"
+
+fb-watchman@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
+  dependencies:
+    bser "^2.0.0"
+
+fbjs@^0.8.16:
+  version "0.8.16"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
+  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"
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-entry-cache@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  dependencies:
+    flat-cache "^1.2.1"
+    object-assign "^4.0.1"
+
+file-loader@1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.5.tgz#91c25b6b6fbe56dae99f10a425fd64933b5c9daa"
+  dependencies:
+    loader-utils "^1.0.2"
+    schema-utils "^0.3.0"
+
+filename-regex@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+
+fileset@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  dependencies:
+    glob "^7.0.3"
+    minimatch "^3.0.3"
+
+filesize@3.5.11:
+  version "3.5.11"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.11.tgz#1919326749433bb3cf77368bd158caabcc19e9ee"
+
+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"
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+finalhandler@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    statuses "~1.4.0"
+    unpipe "~1.0.0"
+
+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-cache-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^1.0.0"
+    pkg-dir "^2.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"
+
+find-up@^2.0.0, find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  dependencies:
+    locate-path "^2.0.0"
+
+flat-cache@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
+  dependencies:
+    circular-json "^0.3.1"
+    del "^2.0.2"
+    graceful-fs "^4.1.2"
+    write "^0.2.1"
+
+flatten@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+
+for-in@^1.0.1, for-in@^1.0.2:
+  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"
+
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+
+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.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+form-data@~2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+forwarded@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  dependencies:
+    map-cache "^0.2.2"
+
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+
+fs-extra@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^3.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^0.30.0:
+  version "0.30.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+    klaw "^1.0.0"
+    path-is-absolute "^1.0.0"
+    rimraf "^2.2.8"
+
+fs-extra@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  dependencies:
+    minipass "^2.2.1"
+
+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.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
+  dependencies:
+    nan "^2.3.0"
+    node-pre-gyp "^0.6.39"
+
+fsevents@^1.1.3:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
+  dependencies:
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
+
+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"
+
+function-bind@^1.0.2, function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  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"
+
+get-caller-file@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+
+get-stdin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+
+get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  dependencies:
+    assert-plus "^1.0.0"
+
+gh-pages@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-1.1.0.tgz#738134d8e35e5323b39892cda28b8904e85f24b2"
+  dependencies:
+    async "2.6.0"
+    base64url "^2.0.0"
+    commander "2.11.0"
+    fs-extra "^4.0.2"
+    globby "^6.1.0"
+    graceful-fs "4.1.11"
+    rimraf "^2.6.2"
+
+github-fork-ribbon-css@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/github-fork-ribbon-css/-/github-fork-ribbon-css-0.2.1.tgz#7b41c2d3109c0225eae363132ddbb127b6186ea2"
+
+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.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global-dirs@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
+  dependencies:
+    ini "^1.3.4"
+
+global-modules@1.0.0, global-modules@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  dependencies:
+    global-prefix "^1.0.1"
+    is-windows "^1.0.1"
+    resolve-dir "^1.0.0"
+
+global-prefix@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  dependencies:
+    expand-tilde "^2.0.2"
+    homedir-polyfill "^1.0.1"
+    ini "^1.3.4"
+    is-windows "^1.0.1"
+    which "^1.2.14"
+
+globals@^9.17.0, globals@^9.18.0:
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+
+globby@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  dependencies:
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+good-listener@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
+  dependencies:
+    delegate "^3.1.2"
+
+got@^6.7.1:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
+  dependencies:
+    create-error-class "^3.0.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    is-redirect "^1.0.0"
+    is-retry-allowed "^1.0.0"
+    is-stream "^1.0.0"
+    lowercase-keys "^1.0.0"
+    safe-buffer "^5.0.1"
+    timed-out "^4.0.0"
+    unzip-response "^2.0.1"
+    url-parse-lax "^1.0.0"
+
+graceful-fs@4.1.11, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+growly@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+
+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"
+
+handle-thing@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
+
+handlebars@^4.0.3:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
+  dependencies:
+    async "^1.4.0"
+    optimist "^0.6.1"
+    source-map "^0.4.4"
+  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-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+
+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"
+
+har-validator@~5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  dependencies:
+    ajv "^5.1.0"
+    har-schema "^2.0.0"
+
+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-flag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.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-base@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
+  dependencies:
+    inherits "^2.0.1"
+
+hash-base@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.0"
+
+hawk@3.1.3, 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"
+
+hawk@~6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
+  dependencies:
+    boom "4.x.x"
+    cryptiles "3.x.x"
+    hoek "4.x.x"
+    sntp "2.x.x"
+
+he@1.1.x:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+
+hmac-drbg@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  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"
+
+hoek@4.x.x:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
+
+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"
+
+homedir-polyfill@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
+  dependencies:
+    parse-passwd "^1.0.0"
+
+hosted-git-info@^2.1.4:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
+
+hpack.js@^2.1.6:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+  dependencies:
+    inherits "^2.0.1"
+    obuf "^1.0.0"
+    readable-stream "^2.0.1"
+    wbuf "^1.1.0"
+
+html-comment-regex@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
+
+html-encoding-sniffer@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  dependencies:
+    whatwg-encoding "^1.0.1"
+
+html-entities@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
+
+html-minifier@^3.2.3:
+  version "3.5.8"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.8.tgz#5ccdb1f73a0d654e6090147511f6e6b2ee312700"
+  dependencies:
+    camel-case "3.0.x"
+    clean-css "4.1.x"
+    commander "2.12.x"
+    he "1.1.x"
+    ncname "1.0.x"
+    param-case "2.1.x"
+    relateurl "0.2.x"
+    uglify-js "3.3.x"
+
+html-webpack-plugin@2.29.0:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.29.0.tgz#e987f421853d3b6938c8c4c8171842e5fd17af23"
+  dependencies:
+    bluebird "^3.4.7"
+    html-minifier "^3.2.3"
+    loader-utils "^0.2.16"
+    lodash "^4.17.3"
+    pretty-error "^2.0.2"
+    toposort "^1.0.0"
+
+htmlparser2@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
+  dependencies:
+    domelementtype "1"
+    domhandler "2.1"
+    domutils "1.1"
+    readable-stream "1.0"
+
+http-deceiver@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
+
+http-errors@1.6.2, http-errors@~1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
+  dependencies:
+    depd "1.1.1"
+    inherits "2.0.3"
+    setprototypeof "1.0.3"
+    statuses ">= 1.3.1 < 2"
+
+http-parser-js@>=0.4.0:
+  version "0.4.10"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
+
+http-proxy-middleware@~0.17.4:
+  version "0.17.4"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833"
+  dependencies:
+    http-proxy "^1.16.2"
+    is-glob "^3.1.0"
+    lodash "^4.17.2"
+    micromatch "^2.3.11"
+
+http-proxy@^1.16.2:
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
+  dependencies:
+    eventemitter3 "1.x.x"
+    requires-port "1.x.x"
+
+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"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+
+iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@~0.4.13:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
+
+iconv-lite@^0.4.4:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+icss-replace-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+
+icss-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
+  dependencies:
+    postcss "^6.0.1"
+
+ieee754@^1.1.4:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
+
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  dependencies:
+    minimatch "^3.0.4"
+
+ignore@^3.3.3:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
+
+import-lazy@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
+
+import-local@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-0.1.1.tgz#b1179572aacdc11c6a91009fb430dbcab5f668a8"
+  dependencies:
+    pkg-dir "^2.0.0"
+    resolve-cwd "^2.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+
+indent-string@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  dependencies:
+    repeating "^2.0.0"
+
+indexes-of@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+
+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.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+  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.4, ini@~1.3.0:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+
+inquirer@3.3.0, inquirer@^3.0.6:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.0.4"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rx-lite "^4.0.8"
+    rx-lite-aggregates "^4.0.8"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
+internal-ip@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
+  dependencies:
+    meow "^3.3.0"
+
+interpret@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+
+invariant@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+  dependencies:
+    loose-envify "^1.0.0"
+
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+
+ip@^1.1.0, ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+
+ipaddr.js@1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
+
+is-absolute-url@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  dependencies:
+    kind-of "^6.0.0"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+
+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.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+
+is-builtin-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  dependencies:
+    builtin-modules "^1.0.0"
+
+is-callable@^1.1.1, is-callable@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+
+is-ci@^1.0.10:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
+  dependencies:
+    ci-info "^1.0.0"
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  dependencies:
+    kind-of "^6.0.0"
+
+is-date-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+
+is-dotfile@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+
+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.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-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  dependencies:
+    is-plain-object "^2.0.4"
+
+is-extglob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+
+is-extglob@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+
+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-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+
+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-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-installed-globally@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
+  dependencies:
+    global-dirs "^0.1.0"
+    is-path-inside "^1.0.0"
+
+is-npm@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
+
+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-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  dependencies:
+    path-is-inside "^1.0.1"
+
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+
+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  dependencies:
+    isobject "^3.0.1"
+
+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-promise@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+
+is-redirect@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
+
+is-regex@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  dependencies:
+    has "^1.0.1"
+
+is-resolvable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
+
+is-retry-allowed@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
+
+is-root@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-root/-/is-root-1.0.0.tgz#07b6c233bc394cd9d02ba15c966bd6660d6342d5"
+
+is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+
+is-svg@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
+  dependencies:
+    html-comment-regex "^1.1.0"
+
+is-symbol@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+
+is-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+
+is-windows@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
+
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+
+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@^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"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+
+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"
+
+istanbul-api@^1.1.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.1.tgz#4c3b05d18c0016d1022e079b98dc82c40f488954"
+  dependencies:
+    async "^2.1.4"
+    compare-versions "^3.1.0"
+    fileset "^2.0.2"
+    istanbul-lib-coverage "^1.2.0"
+    istanbul-lib-hook "^1.2.0"
+    istanbul-lib-instrument "^1.10.1"
+    istanbul-lib-report "^1.1.4"
+    istanbul-lib-source-maps "^1.2.4"
+    istanbul-reports "^1.3.0"
+    js-yaml "^3.7.0"
+    mkdirp "^0.5.1"
+    once "^1.4.0"
+
+istanbul-lib-coverage@^1.0.1, istanbul-lib-coverage@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
+
+istanbul-lib-coverage@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.2.tgz#4113c8ff6b7a40a1ef7350b01016331f63afde14"
+
+istanbul-lib-hook@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.1.tgz#f614ec45287b2a8fc4f07f5660af787575601805"
+  dependencies:
+    append-transform "^1.0.0"
+
+istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.4.2:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b"
+  dependencies:
+    babel-generator "^6.18.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.18.0"
+    babel-types "^6.18.0"
+    babylon "^6.18.0"
+    istanbul-lib-coverage "^1.2.0"
+    semver "^5.3.0"
+
+istanbul-lib-report@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz#e886cdf505c4ebbd8e099e4396a90d0a28e2acb5"
+  dependencies:
+    istanbul-lib-coverage "^1.2.0"
+    mkdirp "^0.5.1"
+    path-parse "^1.0.5"
+    supports-color "^3.1.2"
+
+istanbul-lib-source-maps@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.3.tgz#20fb54b14e14b3fb6edb6aca3571fd2143db44e6"
+  dependencies:
+    debug "^3.1.0"
+    istanbul-lib-coverage "^1.1.2"
+    mkdirp "^0.5.1"
+    rimraf "^2.6.1"
+    source-map "^0.5.3"
+
+istanbul-lib-source-maps@^1.2.4:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.5.tgz#ffe6be4e7ab86d3603e4290d54990b14506fc9b1"
+  dependencies:
+    debug "^3.1.0"
+    istanbul-lib-coverage "^1.2.0"
+    mkdirp "^0.5.1"
+    rimraf "^2.6.1"
+    source-map "^0.5.3"
+
+istanbul-reports@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.3.0.tgz#2f322e81e1d9520767597dca3c20a0cce89a3554"
+  dependencies:
+    handlebars "^4.0.3"
+
+jest-changed-files@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-20.0.3.tgz#9394d5cc65c438406149bef1bf4d52b68e03e3f8"
+
+jest-cli@^20.0.4:
+  version "20.0.4"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-20.0.4.tgz#e532b19d88ae5bc6c417e8b0593a6fe954b1dc93"
+  dependencies:
+    ansi-escapes "^1.4.0"
+    callsites "^2.0.0"
+    chalk "^1.1.3"
+    graceful-fs "^4.1.11"
+    is-ci "^1.0.10"
+    istanbul-api "^1.1.1"
+    istanbul-lib-coverage "^1.0.1"
+    istanbul-lib-instrument "^1.4.2"
+    istanbul-lib-source-maps "^1.1.0"
+    jest-changed-files "^20.0.3"
+    jest-config "^20.0.4"
+    jest-docblock "^20.0.3"
+    jest-environment-jsdom "^20.0.3"
+    jest-haste-map "^20.0.4"
+    jest-jasmine2 "^20.0.4"
+    jest-message-util "^20.0.3"
+    jest-regex-util "^20.0.3"
+    jest-resolve-dependencies "^20.0.3"
+    jest-runtime "^20.0.4"
+    jest-snapshot "^20.0.3"
+    jest-util "^20.0.3"
+    micromatch "^2.3.11"
+    node-notifier "^5.0.2"
+    pify "^2.3.0"
+    slash "^1.0.0"
+    string-length "^1.0.1"
+    throat "^3.0.0"
+    which "^1.2.12"
+    worker-farm "^1.3.1"
+    yargs "^7.0.2"
+
+jest-config@^20.0.4:
+  version "20.0.4"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-20.0.4.tgz#e37930ab2217c913605eff13e7bd763ec48faeea"
+  dependencies:
+    chalk "^1.1.3"
+    glob "^7.1.1"
+    jest-environment-jsdom "^20.0.3"
+    jest-environment-node "^20.0.3"
+    jest-jasmine2 "^20.0.4"
+    jest-matcher-utils "^20.0.3"
+    jest-regex-util "^20.0.3"
+    jest-resolve "^20.0.4"
+    jest-validate "^20.0.3"
+    pretty-format "^20.0.3"
+
+jest-diff@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-20.0.3.tgz#81f288fd9e675f0fb23c75f1c2b19445fe586617"
+  dependencies:
+    chalk "^1.1.3"
+    diff "^3.2.0"
+    jest-matcher-utils "^20.0.3"
+    pretty-format "^20.0.3"
+
+jest-docblock@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712"
+
+jest-environment-jsdom@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-20.0.3.tgz#048a8ac12ee225f7190417713834bb999787de99"
+  dependencies:
+    jest-mock "^20.0.3"
+    jest-util "^20.0.3"
+    jsdom "^9.12.0"
+
+jest-environment-node@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-20.0.3.tgz#d488bc4612af2c246e986e8ae7671a099163d403"
+  dependencies:
+    jest-mock "^20.0.3"
+    jest-util "^20.0.3"
+
+jest-haste-map@^20.0.4:
+  version "20.0.5"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-20.0.5.tgz#abad74efb1a005974a7b6517e11010709cab9112"
+  dependencies:
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.1.11"
+    jest-docblock "^20.0.3"
+    micromatch "^2.3.11"
+    sane "~1.6.0"
+    worker-farm "^1.3.1"
+
+jest-jasmine2@^20.0.4:
+  version "20.0.4"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-20.0.4.tgz#fcc5b1411780d911d042902ef1859e852e60d5e1"
+  dependencies:
+    chalk "^1.1.3"
+    graceful-fs "^4.1.11"
+    jest-diff "^20.0.3"
+    jest-matcher-utils "^20.0.3"
+    jest-matchers "^20.0.3"
+    jest-message-util "^20.0.3"
+    jest-snapshot "^20.0.3"
+    once "^1.4.0"
+    p-map "^1.1.1"
+
+jest-matcher-utils@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-20.0.3.tgz#b3a6b8e37ca577803b0832a98b164f44b7815612"
+  dependencies:
+    chalk "^1.1.3"
+    pretty-format "^20.0.3"
+
+jest-matchers@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-20.0.3.tgz#ca69db1c32db5a6f707fa5e0401abb55700dfd60"
+  dependencies:
+    jest-diff "^20.0.3"
+    jest-matcher-utils "^20.0.3"
+    jest-message-util "^20.0.3"
+    jest-regex-util "^20.0.3"
+
+jest-message-util@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-20.0.3.tgz#6aec2844306fcb0e6e74d5796c1006d96fdd831c"
+  dependencies:
+    chalk "^1.1.3"
+    micromatch "^2.3.11"
+    slash "^1.0.0"
+
+jest-mock@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-20.0.3.tgz#8bc070e90414aa155c11a8d64c869a0d5c71da59"
+
+jest-regex-util@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-20.0.3.tgz#85bbab5d133e44625b19faf8c6aa5122d085d762"
+
+jest-resolve-dependencies@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-20.0.3.tgz#6e14a7b717af0f2cb3667c549de40af017b1723a"
+  dependencies:
+    jest-regex-util "^20.0.3"
+
+jest-resolve@^20.0.4:
+  version "20.0.4"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-20.0.4.tgz#9448b3e8b6bafc15479444c6499045b7ffe597a5"
+  dependencies:
+    browser-resolve "^1.11.2"
+    is-builtin-module "^1.0.0"
+    resolve "^1.3.2"
+
+jest-runtime@^20.0.4:
+  version "20.0.4"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-20.0.4.tgz#a2c802219c4203f754df1404e490186169d124d8"
+  dependencies:
+    babel-core "^6.0.0"
+    babel-jest "^20.0.3"
+    babel-plugin-istanbul "^4.0.0"
+    chalk "^1.1.3"
+    convert-source-map "^1.4.0"
+    graceful-fs "^4.1.11"
+    jest-config "^20.0.4"
+    jest-haste-map "^20.0.4"
+    jest-regex-util "^20.0.3"
+    jest-resolve "^20.0.4"
+    jest-util "^20.0.3"
+    json-stable-stringify "^1.0.1"
+    micromatch "^2.3.11"
+    strip-bom "3.0.0"
+    yargs "^7.0.2"
+
+jest-snapshot@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-20.0.3.tgz#5b847e1adb1a4d90852a7f9f125086e187c76566"
+  dependencies:
+    chalk "^1.1.3"
+    jest-diff "^20.0.3"
+    jest-matcher-utils "^20.0.3"
+    jest-util "^20.0.3"
+    natural-compare "^1.4.0"
+    pretty-format "^20.0.3"
+
+jest-util@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-20.0.3.tgz#0c07f7d80d82f4e5a67c6f8b9c3fe7f65cfd32ad"
+  dependencies:
+    chalk "^1.1.3"
+    graceful-fs "^4.1.11"
+    jest-message-util "^20.0.3"
+    jest-mock "^20.0.3"
+    jest-validate "^20.0.3"
+    leven "^2.1.0"
+    mkdirp "^0.5.1"
+
+jest-validate@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-20.0.3.tgz#d0cfd1de4f579f298484925c280f8f1d94ec3cab"
+  dependencies:
+    chalk "^1.1.3"
+    jest-matcher-utils "^20.0.3"
+    leven "^2.1.0"
+    pretty-format "^20.0.3"
+
+jest@20.0.4:
+  version "20.0.4"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-20.0.4.tgz#3dd260c2989d6dad678b1e9cc4d91944f6d602ac"
+  dependencies:
+    jest-cli "^20.0.4"
+
+js-base64@^2.1.9:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"
+
+js-tokens@^3.0.0, js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+
+js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.9.1:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+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"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+
+jsdom@^9.12.0:
+  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"
+    acorn-globals "^3.1.0"
+    array-equal "^1.0.0"
+    content-type-parser "^1.0.1"
+    cssom ">= 0.3.2 < 0.4.0"
+    cssstyle ">= 0.2.37 < 0.3.0"
+    escodegen "^1.6.1"
+    html-encoding-sniffer "^1.0.1"
+    nwmatcher ">= 1.3.9 < 2.0.0"
+    parse5 "^1.5.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.3.0"
+    xml-name-validator "^2.0.1"
+
+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-loader@^0.5.4:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
+
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+
+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"
+
+json3@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+
+json5@^0.5.0, json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+
+jsonfile@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonfile@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+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.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+jsx-ast-utils@^1.4.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
+
+jsx-ast-utils@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
+  dependencies:
+    array-includes "^3.0.3"
+
+killable@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b"
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+
+klaw@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
+  optionalDependencies:
+    graceful-fs "^4.1.9"
+
+latest-version@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
+  dependencies:
+    package-json "^4.0.0"
+
+lazy-cache@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+
+lazy-cache@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
+  dependencies:
+    set-getter "^0.1.0"
+
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  dependencies:
+    invert-kv "^1.0.0"
+
+leven@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+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"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
+load-json-file@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    strip-bom "^3.0.0"
+
+loader-fs-cache@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.1.tgz#56e0bf08bd9708b26a765b68509840c8dec9fdbc"
+  dependencies:
+    find-cache-dir "^0.1.1"
+    mkdirp "0.5.1"
+
+loader-runner@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
+
+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"
+
+loader-utils@^1.0.2, loader-utils@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
+lodash._reinterpolate@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+
+lodash.cond@^4.3.0:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
+
+lodash.defaults@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+
+lodash.template@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+
+lodash.uniq@^4.5.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.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0:
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
+
+loglevel@^1.4.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
+
+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.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  dependencies:
+    js-tokens "^3.0.0"
+
+loud-rejection@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  dependencies:
+    currently-unhandled "^0.4.1"
+    signal-exit "^3.0.0"
+
+lower-case@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+
+lowercase-keys@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+
+lru-cache@^4.0.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+macaddress@^0.2.8:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
+
+make-dir@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
+  dependencies:
+    pify "^3.0.0"
+
+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.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+
+map-obj@^1.0.0, map-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  dependencies:
+    object-visit "^1.0.0"
+
+math-expression-evaluator@^1.2.14:
+  version "1.2.17"
+  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
+
+md5.js@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+
+mem@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  dependencies:
+    mimic-fn "^1.0.0"
+
+memory-fs@^0.4.0, memory-fs@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+meow@^3.3.0, meow@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  dependencies:
+    camelcase-keys "^2.0.0"
+    decamelize "^1.1.2"
+    loud-rejection "^1.0.0"
+    map-obj "^1.0.1"
+    minimist "^1.1.3"
+    normalize-package-data "^2.3.4"
+    object-assign "^4.0.1"
+    read-pkg-up "^1.0.1"
+    redent "^1.0.0"
+    trim-newlines "^1.0.0"
+
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+
+merge@^1.1.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+
+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:
+    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"
+
+micromatch@^3.1.8:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+"mime-db@>= 1.30.0 < 2":
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.32.0.tgz#485b3848b01a3cda5f968b4882c0771e58e09414"
+
+mime-db@~1.30.0:
+  version "1.30.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
+
+mime-db@~1.35.0:
+  version "1.35.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.35.0.tgz#0569d657466491283709663ad379a99b90d9ab47"
+
+mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.7:
+  version "2.1.17"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
+  dependencies:
+    mime-db "~1.30.0"
+
+mime-types@~2.1.18:
+  version "2.1.19"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.19.tgz#71e464537a7ef81c15f2db9d97e913fc0ff606f0"
+  dependencies:
+    mime-db "~1.35.0"
+
+mime@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+
+mime@^1.4.1, mime@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+
+minimalistic-assert@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
+
+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@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.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
+minipass@^2.2.1, minipass@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  dependencies:
+    minipass "^2.2.1"
+
+mixin-deep@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mkdirp@0.5.1, mkdirp@0.5.x, "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:
+    minimist "0.0.8"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+multicast-dns-service-types@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+
+multicast-dns@^6.0.1:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
+  dependencies:
+    dns-packet "^1.3.1"
+    thunky "^1.0.2"
+
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+
+nan@^2.3.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
+
+nan@^2.9.2:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+
+ncname@1.0.x:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ncname/-/ncname-1.0.0.tgz#5b57ad18b1ca092864ef62b0b1ed8194f383b71c"
+  dependencies:
+    xml-char-classes "^1.0.0"
+
+needle@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
+negotiator@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+
+no-case@^2.2.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
+  dependencies:
+    lower-case "^1.1.1"
+
+node-fetch@^1.0.1:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
+  dependencies:
+    encoding "^0.1.11"
+    is-stream "^1.0.1"
+
+node-forge@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.1.tgz#9da611ea08982f4b94206b3beb4cc9665f20c300"
+
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+
+node-libs-browser@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^1.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.0"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.10.3"
+    vm-browserify "0.0.4"
+
+node-notifier@^5.0.2:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.2.1.tgz#fa313dd08f5517db0e2502e5758d664ac69f9dea"
+  dependencies:
+    growly "^1.3.0"
+    semver "^5.4.1"
+    shellwords "^0.1.1"
+    which "^1.3.0"
+
+node-pre-gyp@^0.10.0:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
+node-pre-gyp@^0.6.39:
+  version "0.6.39"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
+  dependencies:
+    detect-libc "^1.0.2"
+    hawk "3.1.3"
+    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-package-data@^2.3.2, normalize-package-data@^2.3.4:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    is-builtin-module "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^2.0.0, 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"
+
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+
+normalize-url@^1.4.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  dependencies:
+    object-assign "^4.0.1"
+    prepend-http "^1.0.0"
+    query-string "^4.1.0"
+    sort-keys "^1.0.0"
+
+npm-bundled@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
+
+npm-packlist@^1.1.6:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  dependencies:
+    path-key "^2.0.0"
+
+npmlog@^4.0.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+nth-check@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
+  dependencies:
+    boolbase "~1.0.0"
+
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+
+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"
+
+"nwmatcher@>= 1.3.9 < 2.0.0":
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
+
+oauth-sign@~0.8.1, oauth-sign@~0.8.2:
+  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.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-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-hash@^1.1.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.2.0.tgz#e96af0e96981996a1d47f88ead8f74f1ebc4422b"
+
+object-keys@^1.0.8:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  dependencies:
+    isobject "^3.0.0"
+
+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"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  dependencies:
+    isobject "^3.0.1"
+
+obuf@^1.0.0, obuf@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.1.tgz#104124b6c602c6796881a042541d36db43a5264e"
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  dependencies:
+    ee-first "1.1.1"
+
+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.3.0, 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"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  dependencies:
+    mimic-fn "^1.0.0"
+
+opn@5.2.0, opn@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.2.0.tgz#71fdf934d6827d676cecbea1531f95d354641225"
+  dependencies:
+    is-wsl "^1.1.0"
+
+optimist@^0.6.1:
+  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"
+
+optionator@^0.8.1, optionator@^0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
+original@>=0.0.5:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/original/-/original-1.0.0.tgz#9147f93fa1696d04be61e01bd50baeaca656bd3b"
+  dependencies:
+    url-parse "1.0.x"
+
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+
+os-homedir@^1.0.0, os-homedir@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+
+os-locale@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  dependencies:
+    lcid "^1.0.0"
+
+os-locale@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  dependencies:
+    execa "^0.7.0"
+    lcid "^1.0.0"
+    mem "^1.1.0"
+
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
+  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"
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+
+p-limit@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
+  dependencies:
+    p-try "^1.0.0"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  dependencies:
+    p-limit "^1.1.0"
+
+p-map@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+
+package-json@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
+  dependencies:
+    got "^6.7.1"
+    registry-auth-token "^3.0.1"
+    registry-url "^3.0.3"
+    semver "^5.1.0"
+
+pako@~1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+
+param-case@2.1.x:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
+  dependencies:
+    no-case "^2.2.0"
+
+parse-asn1@^5.0.0:
+  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"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+
+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"
+
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  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"
+
+parseurl@~1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+
+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-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+
+path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+
+path-key@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+
+path-parse@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+
+path-to-regexp@^1.0.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+  dependencies:
+    isarray "0.0.1"
+
+path-type@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+path-type@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  dependencies:
+    pify "^2.0.0"
+
+pbkdf2@^3.0.3:
+  version "3.0.14"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade"
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+performance-now@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+
+pify@^2.0.0, pify@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+
+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"
+
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  dependencies:
+    find-up "^2.1.0"
+
+pluralize@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+
+portfinder@^1.0.9:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
+  dependencies:
+    async "^1.5.2"
+    debug "^2.2.0"
+    mkdirp "0.5.x"
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+
+postcss-calc@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
+  dependencies:
+    postcss "^5.0.2"
+    postcss-message-helpers "^2.0.0"
+    reduce-css-calc "^1.2.6"
+
+postcss-colormin@^2.1.8:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
+  dependencies:
+    colormin "^1.0.5"
+    postcss "^5.0.13"
+    postcss-value-parser "^3.2.3"
+
+postcss-convert-values@^2.3.4:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
+  dependencies:
+    postcss "^5.0.11"
+    postcss-value-parser "^3.1.2"
+
+postcss-discard-comments@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-duplicates@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-discard-empty@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-overridden@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
+  dependencies:
+    postcss "^5.0.16"
+
+postcss-discard-unused@^2.2.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
+  dependencies:
+    postcss "^5.0.14"
+    uniqs "^2.0.0"
+
+postcss-filter-plugins@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
+  dependencies:
+    postcss "^5.0.4"
+    uniqid "^4.0.0"
+
+postcss-flexbugs-fixes@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-3.2.0.tgz#9b8b932c53f9cf13ba0f61875303e447c33dcc51"
+  dependencies:
+    postcss "^6.0.1"
+
+postcss-load-config@^1.2.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.2.0"
+    postcss-load-plugins "^2.3.0"
+
+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.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@2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.8.tgz#8c67ddb029407dfafe684a406cfc16bad2ce0814"
+  dependencies:
+    loader-utils "^1.1.0"
+    postcss "^6.0.0"
+    postcss-load-config "^1.2.0"
+    schema-utils "^0.3.0"
+
+postcss-merge-idents@^2.1.5:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.10"
+    postcss-value-parser "^3.1.1"
+
+postcss-merge-longhand@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-merge-rules@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
+  dependencies:
+    browserslist "^1.5.2"
+    caniuse-api "^1.5.2"
+    postcss "^5.0.4"
+    postcss-selector-parser "^2.2.2"
+    vendors "^1.0.0"
+
+postcss-message-helpers@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
+
+postcss-minify-font-values@^1.0.2:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
+  dependencies:
+    object-assign "^4.0.1"
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-minify-gradients@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
+  dependencies:
+    postcss "^5.0.12"
+    postcss-value-parser "^3.3.0"
+
+postcss-minify-params@^1.0.4:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.2"
+    postcss-value-parser "^3.0.2"
+    uniqs "^2.0.0"
+
+postcss-minify-selectors@^2.0.4:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
+  dependencies:
+    alphanum-sort "^1.0.2"
+    has "^1.0.1"
+    postcss "^5.0.14"
+    postcss-selector-parser "^2.0.0"
+
+postcss-modules-extract-imports@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb"
+  dependencies:
+    postcss "^6.0.1"
+
+postcss-modules-local-by-default@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
+  dependencies:
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
+
+postcss-modules-scope@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
+  dependencies:
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
+
+postcss-modules-values@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
+  dependencies:
+    icss-replace-symbols "^1.1.0"
+    postcss "^6.0.1"
+
+postcss-normalize-charset@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
+  dependencies:
+    postcss "^5.0.5"
+
+postcss-normalize-url@^3.0.7:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
+  dependencies:
+    is-absolute-url "^2.0.0"
+    normalize-url "^1.4.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+
+postcss-ordered-values@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.1"
+
+postcss-reduce-idents@^2.2.2:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-reduce-initial@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-reduce-transforms@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.8"
+    postcss-value-parser "^3.0.1"
+
+postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+  dependencies:
+    flatten "^1.0.2"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
+postcss-svgo@^2.1.1:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
+  dependencies:
+    is-svg "^2.0.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+    svgo "^0.7.0"
+
+postcss-unique-selectors@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.4"
+    uniqs "^2.0.0"
+
+postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+
+postcss-zindex@^2.0.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
+  dependencies:
+    has "^1.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, postcss@^5.2.16:
+  version "5.2.18"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
+  dependencies:
+    chalk "^1.1.3"
+    js-base64 "^2.1.9"
+    source-map "^0.5.6"
+    supports-color "^3.2.3"
+
+postcss@^6.0.0, postcss@^6.0.1:
+  version "6.0.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.17.tgz#e259a051ca513f81e9afd0c21f7f82eda50c65c5"
+  dependencies:
+    chalk "^2.3.0"
+    source-map "^0.6.1"
+    supports-color "^5.1.0"
+
+postcss@^6.0.13:
+  version "6.0.23"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
+  dependencies:
+    chalk "^2.4.1"
+    source-map "^0.6.1"
+    supports-color "^5.4.0"
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+
+prepend-http@^1.0.0, prepend-http@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+
+preserve@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+
+pretty-bytes@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
+
+pretty-error@^2.0.2:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
+  dependencies:
+    renderkid "^2.0.1"
+    utila "~0.4"
+
+pretty-format@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-20.0.3.tgz#020e350a560a1fe1a98dc3beb6ccffb386de8b14"
+  dependencies:
+    ansi-regex "^2.1.1"
+    ansi-styles "^3.0.0"
+
+private@^0.1.6, private@^0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+
+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.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+
+progress@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
+
+promise@8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-8.0.1.tgz#e45d68b00a17647b6da711bf85ed6ed47208f450"
+  dependencies:
+    asap "~2.0.3"
+
+promise@^7.1.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  dependencies:
+    asap "~2.0.3"
+
+prop-types@^15.5.10, prop-types@^15.6.2:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
+  dependencies:
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
+prop-types@^15.6.0:
+  version "15.6.0"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
+proxy-addr@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.8.0"
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+
+public-encrypt@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+
+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"
+
+q@^1.1.2:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+
+qs@6.5.1, qs@~6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+
+qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+
+query-string@^4.1.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  dependencies:
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+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"
+
+querystringify@0.0.x:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c"
+
+querystringify@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
+
+raf@3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
+  dependencies:
+    performance-now "^2.1.0"
+
+randomatic@^1.1.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62"
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+range-parser@^1.0.3, range-parser@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+
+raw-body@2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
+  dependencies:
+    bytes "3.0.0"
+    http-errors "1.6.2"
+    iconv-lite "0.4.19"
+    unpipe "1.0.0"
+
+rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd"
+  dependencies:
+    deep-extend "~0.4.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+react-dev-utils@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-5.0.1.tgz#1f396e161fe44b595db1b186a40067289bf06613"
+  dependencies:
+    address "1.0.3"
+    babel-code-frame "6.26.0"
+    chalk "1.1.3"
+    cross-spawn "5.1.0"
+    detect-port-alt "1.1.6"
+    escape-string-regexp "1.0.5"
+    filesize "3.5.11"
+    global-modules "1.0.0"
+    gzip-size "3.0.0"
+    inquirer "3.3.0"
+    is-root "1.0.0"
+    opn "5.2.0"
+    react-error-overlay "^4.0.0"
+    recursive-readdir "2.2.1"
+    shell-quote "1.6.1"
+    sockjs-client "1.1.4"
+    strip-ansi "3.0.1"
+    text-table "0.2.0"
+
+react-dom@../../../build/node_modules/react-dom:
+  version "16.4.1"
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+
+react-draggable@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-3.0.5.tgz#c031e0ed4313531f9409d6cd84c8ebcec0ddfe2d"
+  dependencies:
+    classnames "^2.2.5"
+    prop-types "^15.6.0"
+
+react-error-overlay@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-4.0.0.tgz#d198408a85b4070937a98667f500c832f86bd5d4"
+
+react-scripts@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-1.1.4.tgz#d5c230e707918d6dd2d06f303b10f5222d017c88"
+  dependencies:
+    autoprefixer "7.1.6"
+    babel-core "6.26.0"
+    babel-eslint "7.2.3"
+    babel-jest "20.0.3"
+    babel-loader "7.1.2"
+    babel-preset-react-app "^3.1.1"
+    babel-runtime "6.26.0"
+    case-sensitive-paths-webpack-plugin "2.1.1"
+    chalk "1.1.3"
+    css-loader "0.28.7"
+    dotenv "4.0.0"
+    dotenv-expand "4.2.0"
+    eslint "4.10.0"
+    eslint-config-react-app "^2.1.0"
+    eslint-loader "1.9.0"
+    eslint-plugin-flowtype "2.39.1"
+    eslint-plugin-import "2.8.0"
+    eslint-plugin-jsx-a11y "5.1.1"
+    eslint-plugin-react "7.4.0"
+    extract-text-webpack-plugin "3.0.2"
+    file-loader "1.1.5"
+    fs-extra "3.0.1"
+    html-webpack-plugin "2.29.0"
+    jest "20.0.4"
+    object-assign "4.1.1"
+    postcss-flexbugs-fixes "3.2.0"
+    postcss-loader "2.0.8"
+    promise "8.0.1"
+    raf "3.4.0"
+    react-dev-utils "^5.0.1"
+    resolve "1.6.0"
+    style-loader "0.19.0"
+    sw-precache-webpack-plugin "0.11.4"
+    url-loader "0.6.2"
+    webpack "3.8.1"
+    webpack-dev-server "2.9.4"
+    webpack-manifest-plugin "1.3.2"
+    whatwg-fetch "2.0.3"
+  optionalDependencies:
+    fsevents "^1.1.3"
+
+react@../../../build/node_modules/react:
+  version "16.4.1"
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
+read-pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^2.0.0"
+
+read-pkg@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
+read-pkg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  dependencies:
+    load-json-file "^2.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^2.0.0"
+
+readable-stream@1.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@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.0.3"
+    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"
+
+recursive-readdir@2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.1.tgz#90ef231d0778c5ce093c9a48d74e5c5422d13a99"
+  dependencies:
+    minimatch "3.0.3"
+
+redent@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  dependencies:
+    indent-string "^2.1.0"
+    strip-indent "^1.0.1"
+
+reduce-css-calc@^1.2.6:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
+  dependencies:
+    balanced-match "^0.4.2"
+    math-expression-evaluator "^1.2.14"
+    reduce-function-call "^1.0.1"
+
+reduce-function-call@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
+  dependencies:
+    balanced-match "^0.4.2"
+
+regenerate@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
+
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+
+regenerator-transform@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
+  dependencies:
+    babel-runtime "^6.18.0"
+    babel-types "^6.19.0"
+    private "^0.1.6"
+
+regex-cache@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  dependencies:
+    is-equal-shallow "^0.1.3"
+
+regex-not@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.0.tgz#42f83e39771622df826b02af176525d6a5f157f9"
+  dependencies:
+    extend-shallow "^2.0.1"
+
+regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
+regexpu-core@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+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"
+
+registry-auth-token@^3.0.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
+  dependencies:
+    rc "^1.1.6"
+    safe-buffer "^5.0.1"
+
+registry-url@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
+  dependencies:
+    rc "^1.0.1"
+
+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"
+
+relateurl@0.2.x:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+
+renderkid@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.1.tgz#898cabfc8bede4b7b91135a3ffd323e58c0db319"
+  dependencies:
+    css-select "^1.1.0"
+    dom-converter "~0.1"
+    htmlparser2 "~3.3.0"
+    strip-ansi "^3.0.0"
+    utila "~0.3"
+
+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, repeat-string@^1.6.1:
+  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"
+
+request@^2.79.0:
+  version "2.83.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+
+require-from-string@^1.1.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+
+require-uncached@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  dependencies:
+    caller-path "^0.1.0"
+    resolve-from "^1.0.0"
+
+requires-port@1.0.x, requires-port@1.x.x, requires-port@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  dependencies:
+    resolve-from "^3.0.0"
+
+resolve-dir@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  dependencies:
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
+
+resolve-from@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+
+resolve@1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+
+resolve@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c"
+  dependencies:
+    path-parse "^1.0.5"
+
+resolve@^1.3.2, resolve@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
+  dependencies:
+    path-parse "^1.0.5"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+
+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.2.8, rimraf@^2.5.1, rimraf@^2.6.1, rimraf@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  dependencies:
+    glob "^7.0.5"
+
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
+  dependencies:
+    hash-base "^2.0.0"
+    inherits "^2.0.1"
+
+run-async@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  dependencies:
+    is-promise "^2.1.0"
+
+rx-lite-aggregates@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
+  dependencies:
+    rx-lite "*"
+
+rx-lite@*, rx-lite@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
+
+safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+
+safe-buffer@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+
+sane@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-1.6.0.tgz#9610c452307a135d29c1fdfe2547034180c46775"
+  dependencies:
+    anymatch "^1.3.0"
+    exec-sh "^0.2.0"
+    fb-watchman "^1.8.0"
+    minimatch "^3.0.2"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+    watch "~0.10.0"
+
+sax@^1.2.1, sax@^1.2.4, sax@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+
+schema-utils@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+  dependencies:
+    ajv "^5.0.0"
+
+select-hose@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+
+select@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
+
+selfsigned@^1.9.1:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.2.tgz#b4449580d99929b65b10a48389301a6592088758"
+  dependencies:
+    node-forge "0.7.1"
+
+semver-diff@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
+  dependencies:
+    semver "^5.0.3"
+
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+
+send@0.16.2:
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.6.2"
+    mime "1.4.1"
+    ms "2.0.0"
+    on-finished "~2.3.0"
+    range-parser "~1.2.0"
+    statuses "~1.4.0"
+
+serve-index@^1.7.2:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  dependencies:
+    accepts "~1.3.4"
+    batch "0.6.1"
+    debug "2.6.9"
+    escape-html "~1.0.3"
+    http-errors "~1.6.2"
+    mime-types "~2.1.17"
+    parseurl "~1.3.2"
+
+serve-static@1.13.2:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.2"
+    send "0.16.2"
+
+serviceworker-cache-polyfill@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serviceworker-cache-polyfill/-/serviceworker-cache-polyfill-4.0.0.tgz#de19ee73bef21ab3c0740a37b33db62464babdeb"
+
+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"
+
+set-getter@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.0.tgz#d769c182c9d5a51f409145f2fba82e5e86e80376"
+  dependencies:
+    to-object-path "^0.3.0"
+
+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"
+
+set-value@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.1"
+    to-object-path "^0.3.0"
+
+set-value@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+setimmediate@^1.0.4, setimmediate@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+
+setprototypeof@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.10"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+
+shell-quote@1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
+  dependencies:
+    array-filter "~0.0.0"
+    array-map "~0.0.0"
+    array-reduce "~0.0.0"
+    jsonify "~0.0.0"
+
+shellwords@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+
+simple-cache-provider@../../../build/node_modules/simple-cache-provider:
+  version "0.7.0"
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+
+slice-ansi@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.1.tgz#e12b5487faded3e3dea0ac91e9400bf75b401370"
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^2.0.0"
+
+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"
+
+sntp@2.x.x:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
+  dependencies:
+    hoek "4.x.x"
+
+sockjs-client@1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.4.tgz#5babe386b775e4cf14e7520911452654016c8b12"
+  dependencies:
+    debug "^2.6.6"
+    eventsource "0.1.6"
+    faye-websocket "~0.11.0"
+    inherits "^2.0.1"
+    json3 "^3.3.2"
+    url-parse "^1.1.8"
+
+sockjs@0.3.18:
+  version "0.3.18"
+  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.18.tgz#d9b289316ca7df77595ef299e075f0f937eb4207"
+  dependencies:
+    faye-websocket "^0.10.0"
+    uuid "^2.0.2"
+
+sort-keys@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+source-list-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+
+source-map-resolve@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
+  dependencies:
+    atob "^2.0.0"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-support@^0.4.15:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  dependencies:
+    source-map "^0.5.6"
+
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+
+source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1, source-map@~0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
+source-map@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@^0.6.1, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
+spdx-correct@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+  dependencies:
+    spdx-license-ids "^1.0.2"
+
+spdx-expression-parse@~1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+
+spdx-license-ids@^1.0.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+
+spdy-transport@^2.0.18:
+  version "2.0.20"
+  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.0.20.tgz#735e72054c486b2354fe89e702256004a39ace4d"
+  dependencies:
+    debug "^2.6.8"
+    detect-node "^2.0.3"
+    hpack.js "^2.1.6"
+    obuf "^1.1.1"
+    readable-stream "^2.2.9"
+    safe-buffer "^5.0.1"
+    wbuf "^1.7.2"
+
+spdy@^3.4.1:
+  version "3.4.7"
+  resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc"
+  dependencies:
+    debug "^2.6.8"
+    handle-thing "^1.2.5"
+    http-deceiver "^1.2.7"
+    safe-buffer "^5.0.1"
+    select-hose "^2.0.0"
+    spdy-transport "^2.0.18"
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  dependencies:
+    extend-shallow "^3.0.0"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+sshpk@^1.7.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
+  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"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+"statuses@>= 1.3.1 < 2", statuses@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+
+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.7.2:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10"
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.3"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+
+string-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
+  dependencies:
+    strip-ansi "^3.0.0"
+
+string-width@^1.0.1, string-width@^1.0.2:
+  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-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string_decoder@^1.0.0, string_decoder@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+  dependencies:
+    safe-buffer "~5.1.0"
+
+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, stringstream@~0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+
+strip-ansi@3.0.1, 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-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
+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@^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-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+
+strip-indent@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  dependencies:
+    get-stdin "^4.0.1"
+
+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.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.0.tgz#7258e788f0fee6a42d710eaf7d6c2412a4c50759"
+  dependencies:
+    loader-utils "^1.0.2"
+    schema-utils "^0.3.0"
+
+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.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:
+    has-flag "^1.0.0"
+
+supports-color@^4.0.0, supports-color@^4.2.1:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
+  dependencies:
+    has-flag "^2.0.0"
+
+supports-color@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
+  dependencies:
+    has-flag "^2.0.0"
+
+supports-color@^5.3.0, supports-color@^5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+  dependencies:
+    has-flag "^3.0.0"
+
+svgo@^0.7.0:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+  dependencies:
+    coa "~1.0.1"
+    colors "~1.1.2"
+    csso "~2.3.1"
+    js-yaml "~3.7.0"
+    mkdirp "~0.5.1"
+    sax "~1.2.1"
+    whet.extend "~0.9.9"
+
+sw-precache-webpack-plugin@0.11.4:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/sw-precache-webpack-plugin/-/sw-precache-webpack-plugin-0.11.4.tgz#a695017e54eed575551493a519dc1da8da2dc5e0"
+  dependencies:
+    del "^2.2.2"
+    sw-precache "^5.1.1"
+    uglify-js "^3.0.13"
+
+sw-precache@^5.1.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/sw-precache/-/sw-precache-5.2.1.tgz#06134f319eec68f3b9583ce9a7036b1c119f7179"
+  dependencies:
+    dom-urls "^1.1.0"
+    es6-promise "^4.0.5"
+    glob "^7.1.1"
+    lodash.defaults "^4.2.0"
+    lodash.template "^4.4.0"
+    meow "^3.7.0"
+    mkdirp "^0.5.1"
+    pretty-bytes "^4.0.2"
+    sw-toolbox "^3.4.0"
+    update-notifier "^2.3.0"
+
+sw-toolbox@^3.4.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/sw-toolbox/-/sw-toolbox-3.6.0.tgz#26df1d1c70348658e4dea2884319149b7b3183b5"
+  dependencies:
+    path-to-regexp "^1.0.1"
+    serviceworker-cache-polyfill "^4.0.0"
+
+symbol-tree@^3.2.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+
+table@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
+  dependencies:
+    ajv "^5.2.3"
+    ajv-keywords "^2.1.0"
+    chalk "^2.1.0"
+    lodash "^4.17.4"
+    slice-ansi "1.0.0"
+    string-width "^2.1.1"
+
+tapable@^0.2.7:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
+
+tar-pack@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
+  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"
+
+tar@^4:
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd"
+  dependencies:
+    chownr "^1.0.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.3"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
+term-size@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
+  dependencies:
+    execa "^0.7.0"
+
+test-exclude@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa"
+  dependencies:
+    arrify "^1.0.1"
+    micromatch "^3.1.8"
+    object-assign "^4.1.0"
+    read-pkg-up "^1.0.1"
+    require-main-filename "^1.0.1"
+
+text-table@0.2.0, text-table@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+
+throat@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-3.2.0.tgz#50cb0670edbc40237b9e347d7e1f88e4620af836"
+
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
+thunky@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371"
+
+time-stamp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
+
+timed-out@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
+
+timers-browserify@^2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae"
+  dependencies:
+    setimmediate "^1.0.4"
+
+tiny-emitter@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.2.tgz#82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c"
+
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+tmpl@1.0.x:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+
+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.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.1.tgz#15358bee4a2c83bd76377ba1dc049d0f18837aae"
+  dependencies:
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    regex-not "^1.0.0"
+
+to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+toposort@^1.0.0:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.6.tgz#c31748e55d210effc00fdcdc7d6e68d7d7bb9cec"
+
+tough-cookie@^2.3.2, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
+  dependencies:
+    punycode "^1.4.1"
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+
+trim-newlines@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+
+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"
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-is@~1.6.15:
+  version "1.6.15"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.15"
+
+type-is@~1.6.16:
+  version "1.6.16"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.18"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+
+ua-parser-js@^0.7.9:
+  version "0.7.17"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
+
+uglify-js@3.3.x, uglify-js@^3.0.13:
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.9.tgz#33869666c8ab7f7658ce3d22f0f1ced40097d33a"
+  dependencies:
+    commander "~2.13.0"
+    source-map "~0.6.1"
+
+uglify-js@^2.6, uglify-js@^2.8.29:
+  version "2.8.29"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  dependencies:
+    source-map "~0.5.1"
+    yargs "~3.10.0"
+  optionalDependencies:
+    uglify-to-browserify "~1.0.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"
+
+uglifyjs-webpack-plugin@^0.4.6:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
+  dependencies:
+    source-map "^0.5.6"
+    uglify-js "^2.8.29"
+    webpack-sources "^1.0.1"
+
+uid-number@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+
+union-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^0.4.3"
+
+uniq@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+
+uniqid@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
+  dependencies:
+    macaddress "^0.2.8"
+
+uniqs@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
+
+unique-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
+  dependencies:
+    crypto-random-string "^1.0.0"
+
+universalify@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
+
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+unzip-response@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
+
+update-notifier@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451"
+  dependencies:
+    boxen "^1.2.1"
+    chalk "^2.0.1"
+    configstore "^3.0.0"
+    import-lazy "^2.1.0"
+    is-installed-globally "^0.1.0"
+    is-npm "^1.0.0"
+    latest-version "^3.0.0"
+    semver-diff "^2.0.0"
+    xdg-basedir "^3.0.0"
+
+upper-case@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+
+urijs@^1.16.1:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.0.tgz#d8aa284d0e7469703a6988ad045c4cbfdf08ada0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+
+url-loader@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7"
+  dependencies:
+    loader-utils "^1.0.2"
+    mime "^1.4.1"
+    schema-utils "^0.3.0"
+
+url-parse-lax@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
+  dependencies:
+    prepend-http "^1.0.1"
+
+url-parse@1.0.x:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b"
+  dependencies:
+    querystringify "0.0.x"
+    requires-port "1.0.x"
+
+url-parse@^1.1.8:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.2.0.tgz#3a19e8aaa6d023ddd27dcc44cb4fc8f7fec23986"
+  dependencies:
+    querystringify "~1.0.0"
+    requires-port "~1.0.0"
+
+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"
+
+use@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/use/-/use-2.0.2.tgz#ae28a0d72f93bf22422a18a2e379993112dec8e8"
+  dependencies:
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    lazy-cache "^2.0.2"
+
+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"
+
+utila@~0.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
+
+utila@~0.4:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+
+uuid@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
+
+uuid@^3.0.0, uuid@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  dependencies:
+    spdx-correct "~1.0.0"
+    spdx-expression-parse "~1.0.0"
+
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+
+vendors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+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"
+
+walker@~1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  dependencies:
+    makeerror "1.0.x"
+
+watch@~0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/watch/-/watch-0.10.0.tgz#77798b2da0f9910d595f1ace5b0c2258521f21dc"
+
+watchpack@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
+  dependencies:
+    async "^2.1.2"
+    chokidar "^1.7.0"
+    graceful-fs "^4.1.2"
+
+wbuf@^1.1.0, wbuf@^1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.2.tgz#d697b99f1f59512df2751be42769c1580b5801fe"
+  dependencies:
+    minimalistic-assert "^1.0.0"
+
+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.2"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+
+webpack-dev-middleware@^1.11.0:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
+  dependencies:
+    memory-fs "~0.4.1"
+    mime "^1.5.0"
+    path-is-absolute "^1.0.0"
+    range-parser "^1.0.3"
+    time-stamp "^2.0.0"
+
+webpack-dev-server@2.9.4:
+  version "2.9.4"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.4.tgz#7883e61759c6a4b33e9b19ec4037bd4ab61428d1"
+  dependencies:
+    ansi-html "0.0.7"
+    array-includes "^3.0.3"
+    bonjour "^3.5.0"
+    chokidar "^1.6.0"
+    compression "^1.5.2"
+    connect-history-api-fallback "^1.3.0"
+    debug "^3.1.0"
+    del "^3.0.0"
+    express "^4.13.3"
+    html-entities "^1.2.0"
+    http-proxy-middleware "~0.17.4"
+    import-local "^0.1.1"
+    internal-ip "1.2.0"
+    ip "^1.1.5"
+    killable "^1.0.0"
+    loglevel "^1.4.1"
+    opn "^5.1.0"
+    portfinder "^1.0.9"
+    selfsigned "^1.9.1"
+    serve-index "^1.7.2"
+    sockjs "0.3.18"
+    sockjs-client "1.1.4"
+    spdy "^3.4.1"
+    strip-ansi "^3.0.1"
+    supports-color "^4.2.1"
+    webpack-dev-middleware "^1.11.0"
+    yargs "^6.6.0"
+
+webpack-manifest-plugin@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-1.3.2.tgz#5ea8ee5756359ddc1d98814324fe43496349a7d4"
+  dependencies:
+    fs-extra "^0.30.0"
+    lodash ">=3.5 <5"
+
+webpack-sources@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack@3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.8.1.tgz#b16968a81100abe61608b0153c9159ef8bb2bd83"
+  dependencies:
+    acorn "^5.0.0"
+    acorn-dynamic-import "^2.0.0"
+    ajv "^5.1.5"
+    ajv-keywords "^2.0.0"
+    async "^2.1.2"
+    enhanced-resolve "^3.4.0"
+    escope "^3.6.0"
+    interpret "^1.0.0"
+    json-loader "^0.5.4"
+    json5 "^0.5.1"
+    loader-runner "^2.3.0"
+    loader-utils "^1.1.0"
+    memory-fs "~0.4.1"
+    mkdirp "~0.5.0"
+    node-libs-browser "^2.0.0"
+    source-map "^0.5.3"
+    supports-color "^4.2.1"
+    tapable "^0.2.7"
+    uglifyjs-webpack-plugin "^0.4.6"
+    watchpack "^1.4.0"
+    webpack-sources "^1.0.1"
+    yargs "^8.0.2"
+
+websocket-driver@>=0.5.1:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
+  dependencies:
+    http-parser-js ">=0.4.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+
+whatwg-encoding@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"
+  dependencies:
+    iconv-lite "0.4.19"
+
+whatwg-fetch@2.0.3, whatwg-fetch@>=0.10.0:
+  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.8.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+whet.extend@~0.9.9:
+  version "0.9.9"
+  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
+
+which-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+
+which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
+  dependencies:
+    string-width "^1.0.2"
+
+widest-line@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"
+  dependencies:
+    string-width "^2.1.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"
+
+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.6.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
+  dependencies:
+    errno "~0.1.7"
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+write-file-atomic@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.2"
+
+write@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  dependencies:
+    mkdirp "^0.5.1"
+
+xdg-basedir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
+
+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:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+
+xtend@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+
+y18n@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+
+yargs-parser@^4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
+  dependencies:
+    camelcase "^3.0.0"
+
+yargs-parser@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  dependencies:
+    camelcase "^3.0.0"
+
+yargs-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  dependencies:
+    camelcase "^4.1.0"
+
+yargs@^6.6.0:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^4.2.0"
+
+yargs@^7.0.2:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^5.0.0"
+
+yargs@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
+  dependencies:
+    camelcase "^4.1.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    read-pkg-up "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^7.0.0"
+
+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"

From e341e503b2659a1227c3900d1c94b30d054100f0 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 1 Aug 2018 22:21:26 +0100
Subject: [PATCH 266/277] Move async fixtures (#13304)

---
 .../io => unstable-async/suspense}/.gitignore       |   0
 .../io => unstable-async/suspense}/README.md        |   0
 .../io => unstable-async/suspense}/package.json     |   0
 .../suspense}/public/favicon.ico                    | Bin
 .../suspense}/public/img/acdlite.jpeg               | Bin
 .../suspense}/public/img/bvaughn.jpeg               | Bin
 .../suspense}/public/img/flarnie.jpeg               | Bin
 .../suspense}/public/img/gaearon.jpeg               | Bin
 .../suspense}/public/img/sebmarkbage.jpeg           | Bin
 .../suspense}/public/img/sophiebits.jpeg            | Bin
 .../suspense}/public/img/trueadm.jpeg               | Bin
 .../suspense}/public/index.html                     |   0
 .../suspense}/public/manifest.json                  |   0
 .../io => unstable-async/suspense}/src/api/data.js  |   0
 .../io => unstable-async/suspense}/src/api/index.js |   0
 .../io => unstable-async/suspense}/src/cache.js     |   0
 .../suspense}/src/components/App.js                 |   0
 .../suspense}/src/components/ContributorListPage.js |   0
 .../suspense}/src/components/Spinner.css            |   0
 .../suspense}/src/components/Spinner.js             |   0
 .../suspense}/src/components/UserPage.js            |   0
 .../io => unstable-async/suspense}/src/index.css    |   0
 .../io => unstable-async/suspense}/src/index.js     |   0
 .../io => unstable-async/suspense}/yarn.lock        |   0
 .../cpu => unstable-async/time-slicing}/.gitignore  |   0
 .../cpu => unstable-async/time-slicing}/README.md   |   0
 .../time-slicing}/package.json                      |   0
 .../time-slicing}/public/favicon.ico                | Bin
 .../time-slicing}/public/index.html                 |   0
 .../time-slicing}/public/manifest.json              |   0
 .../time-slicing}/src/Charts.js                     |   0
 .../time-slicing}/src/Clock.js                      |   0
 .../time-slicing}/src/index.css                     |   0
 .../time-slicing}/src/index.js                      |   0
 .../cpu => unstable-async/time-slicing}/yarn.lock   |   0
 35 files changed, 0 insertions(+), 0 deletions(-)
 rename fixtures/{suspense/io => unstable-async/suspense}/.gitignore (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/README.md (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/package.json (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/public/favicon.ico (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/public/img/acdlite.jpeg (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/public/img/bvaughn.jpeg (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/public/img/flarnie.jpeg (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/public/img/gaearon.jpeg (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/public/img/sebmarkbage.jpeg (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/public/img/sophiebits.jpeg (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/public/img/trueadm.jpeg (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/public/index.html (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/public/manifest.json (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/src/api/data.js (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/src/api/index.js (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/src/cache.js (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/src/components/App.js (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/src/components/ContributorListPage.js (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/src/components/Spinner.css (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/src/components/Spinner.js (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/src/components/UserPage.js (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/src/index.css (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/src/index.js (100%)
 rename fixtures/{suspense/io => unstable-async/suspense}/yarn.lock (100%)
 rename fixtures/{suspense/cpu => unstable-async/time-slicing}/.gitignore (100%)
 rename fixtures/{suspense/cpu => unstable-async/time-slicing}/README.md (100%)
 rename fixtures/{suspense/cpu => unstable-async/time-slicing}/package.json (100%)
 rename fixtures/{suspense/cpu => unstable-async/time-slicing}/public/favicon.ico (100%)
 rename fixtures/{suspense/cpu => unstable-async/time-slicing}/public/index.html (100%)
 rename fixtures/{suspense/cpu => unstable-async/time-slicing}/public/manifest.json (100%)
 rename fixtures/{suspense/cpu => unstable-async/time-slicing}/src/Charts.js (100%)
 rename fixtures/{suspense/cpu => unstable-async/time-slicing}/src/Clock.js (100%)
 rename fixtures/{suspense/cpu => unstable-async/time-slicing}/src/index.css (100%)
 rename fixtures/{suspense/cpu => unstable-async/time-slicing}/src/index.js (100%)
 rename fixtures/{suspense/cpu => unstable-async/time-slicing}/yarn.lock (100%)

diff --git a/fixtures/suspense/io/.gitignore b/fixtures/unstable-async/suspense/.gitignore
similarity index 100%
rename from fixtures/suspense/io/.gitignore
rename to fixtures/unstable-async/suspense/.gitignore
diff --git a/fixtures/suspense/io/README.md b/fixtures/unstable-async/suspense/README.md
similarity index 100%
rename from fixtures/suspense/io/README.md
rename to fixtures/unstable-async/suspense/README.md
diff --git a/fixtures/suspense/io/package.json b/fixtures/unstable-async/suspense/package.json
similarity index 100%
rename from fixtures/suspense/io/package.json
rename to fixtures/unstable-async/suspense/package.json
diff --git a/fixtures/suspense/io/public/favicon.ico b/fixtures/unstable-async/suspense/public/favicon.ico
similarity index 100%
rename from fixtures/suspense/io/public/favicon.ico
rename to fixtures/unstable-async/suspense/public/favicon.ico
diff --git a/fixtures/suspense/io/public/img/acdlite.jpeg b/fixtures/unstable-async/suspense/public/img/acdlite.jpeg
similarity index 100%
rename from fixtures/suspense/io/public/img/acdlite.jpeg
rename to fixtures/unstable-async/suspense/public/img/acdlite.jpeg
diff --git a/fixtures/suspense/io/public/img/bvaughn.jpeg b/fixtures/unstable-async/suspense/public/img/bvaughn.jpeg
similarity index 100%
rename from fixtures/suspense/io/public/img/bvaughn.jpeg
rename to fixtures/unstable-async/suspense/public/img/bvaughn.jpeg
diff --git a/fixtures/suspense/io/public/img/flarnie.jpeg b/fixtures/unstable-async/suspense/public/img/flarnie.jpeg
similarity index 100%
rename from fixtures/suspense/io/public/img/flarnie.jpeg
rename to fixtures/unstable-async/suspense/public/img/flarnie.jpeg
diff --git a/fixtures/suspense/io/public/img/gaearon.jpeg b/fixtures/unstable-async/suspense/public/img/gaearon.jpeg
similarity index 100%
rename from fixtures/suspense/io/public/img/gaearon.jpeg
rename to fixtures/unstable-async/suspense/public/img/gaearon.jpeg
diff --git a/fixtures/suspense/io/public/img/sebmarkbage.jpeg b/fixtures/unstable-async/suspense/public/img/sebmarkbage.jpeg
similarity index 100%
rename from fixtures/suspense/io/public/img/sebmarkbage.jpeg
rename to fixtures/unstable-async/suspense/public/img/sebmarkbage.jpeg
diff --git a/fixtures/suspense/io/public/img/sophiebits.jpeg b/fixtures/unstable-async/suspense/public/img/sophiebits.jpeg
similarity index 100%
rename from fixtures/suspense/io/public/img/sophiebits.jpeg
rename to fixtures/unstable-async/suspense/public/img/sophiebits.jpeg
diff --git a/fixtures/suspense/io/public/img/trueadm.jpeg b/fixtures/unstable-async/suspense/public/img/trueadm.jpeg
similarity index 100%
rename from fixtures/suspense/io/public/img/trueadm.jpeg
rename to fixtures/unstable-async/suspense/public/img/trueadm.jpeg
diff --git a/fixtures/suspense/io/public/index.html b/fixtures/unstable-async/suspense/public/index.html
similarity index 100%
rename from fixtures/suspense/io/public/index.html
rename to fixtures/unstable-async/suspense/public/index.html
diff --git a/fixtures/suspense/io/public/manifest.json b/fixtures/unstable-async/suspense/public/manifest.json
similarity index 100%
rename from fixtures/suspense/io/public/manifest.json
rename to fixtures/unstable-async/suspense/public/manifest.json
diff --git a/fixtures/suspense/io/src/api/data.js b/fixtures/unstable-async/suspense/src/api/data.js
similarity index 100%
rename from fixtures/suspense/io/src/api/data.js
rename to fixtures/unstable-async/suspense/src/api/data.js
diff --git a/fixtures/suspense/io/src/api/index.js b/fixtures/unstable-async/suspense/src/api/index.js
similarity index 100%
rename from fixtures/suspense/io/src/api/index.js
rename to fixtures/unstable-async/suspense/src/api/index.js
diff --git a/fixtures/suspense/io/src/cache.js b/fixtures/unstable-async/suspense/src/cache.js
similarity index 100%
rename from fixtures/suspense/io/src/cache.js
rename to fixtures/unstable-async/suspense/src/cache.js
diff --git a/fixtures/suspense/io/src/components/App.js b/fixtures/unstable-async/suspense/src/components/App.js
similarity index 100%
rename from fixtures/suspense/io/src/components/App.js
rename to fixtures/unstable-async/suspense/src/components/App.js
diff --git a/fixtures/suspense/io/src/components/ContributorListPage.js b/fixtures/unstable-async/suspense/src/components/ContributorListPage.js
similarity index 100%
rename from fixtures/suspense/io/src/components/ContributorListPage.js
rename to fixtures/unstable-async/suspense/src/components/ContributorListPage.js
diff --git a/fixtures/suspense/io/src/components/Spinner.css b/fixtures/unstable-async/suspense/src/components/Spinner.css
similarity index 100%
rename from fixtures/suspense/io/src/components/Spinner.css
rename to fixtures/unstable-async/suspense/src/components/Spinner.css
diff --git a/fixtures/suspense/io/src/components/Spinner.js b/fixtures/unstable-async/suspense/src/components/Spinner.js
similarity index 100%
rename from fixtures/suspense/io/src/components/Spinner.js
rename to fixtures/unstable-async/suspense/src/components/Spinner.js
diff --git a/fixtures/suspense/io/src/components/UserPage.js b/fixtures/unstable-async/suspense/src/components/UserPage.js
similarity index 100%
rename from fixtures/suspense/io/src/components/UserPage.js
rename to fixtures/unstable-async/suspense/src/components/UserPage.js
diff --git a/fixtures/suspense/io/src/index.css b/fixtures/unstable-async/suspense/src/index.css
similarity index 100%
rename from fixtures/suspense/io/src/index.css
rename to fixtures/unstable-async/suspense/src/index.css
diff --git a/fixtures/suspense/io/src/index.js b/fixtures/unstable-async/suspense/src/index.js
similarity index 100%
rename from fixtures/suspense/io/src/index.js
rename to fixtures/unstable-async/suspense/src/index.js
diff --git a/fixtures/suspense/io/yarn.lock b/fixtures/unstable-async/suspense/yarn.lock
similarity index 100%
rename from fixtures/suspense/io/yarn.lock
rename to fixtures/unstable-async/suspense/yarn.lock
diff --git a/fixtures/suspense/cpu/.gitignore b/fixtures/unstable-async/time-slicing/.gitignore
similarity index 100%
rename from fixtures/suspense/cpu/.gitignore
rename to fixtures/unstable-async/time-slicing/.gitignore
diff --git a/fixtures/suspense/cpu/README.md b/fixtures/unstable-async/time-slicing/README.md
similarity index 100%
rename from fixtures/suspense/cpu/README.md
rename to fixtures/unstable-async/time-slicing/README.md
diff --git a/fixtures/suspense/cpu/package.json b/fixtures/unstable-async/time-slicing/package.json
similarity index 100%
rename from fixtures/suspense/cpu/package.json
rename to fixtures/unstable-async/time-slicing/package.json
diff --git a/fixtures/suspense/cpu/public/favicon.ico b/fixtures/unstable-async/time-slicing/public/favicon.ico
similarity index 100%
rename from fixtures/suspense/cpu/public/favicon.ico
rename to fixtures/unstable-async/time-slicing/public/favicon.ico
diff --git a/fixtures/suspense/cpu/public/index.html b/fixtures/unstable-async/time-slicing/public/index.html
similarity index 100%
rename from fixtures/suspense/cpu/public/index.html
rename to fixtures/unstable-async/time-slicing/public/index.html
diff --git a/fixtures/suspense/cpu/public/manifest.json b/fixtures/unstable-async/time-slicing/public/manifest.json
similarity index 100%
rename from fixtures/suspense/cpu/public/manifest.json
rename to fixtures/unstable-async/time-slicing/public/manifest.json
diff --git a/fixtures/suspense/cpu/src/Charts.js b/fixtures/unstable-async/time-slicing/src/Charts.js
similarity index 100%
rename from fixtures/suspense/cpu/src/Charts.js
rename to fixtures/unstable-async/time-slicing/src/Charts.js
diff --git a/fixtures/suspense/cpu/src/Clock.js b/fixtures/unstable-async/time-slicing/src/Clock.js
similarity index 100%
rename from fixtures/suspense/cpu/src/Clock.js
rename to fixtures/unstable-async/time-slicing/src/Clock.js
diff --git a/fixtures/suspense/cpu/src/index.css b/fixtures/unstable-async/time-slicing/src/index.css
similarity index 100%
rename from fixtures/suspense/cpu/src/index.css
rename to fixtures/unstable-async/time-slicing/src/index.css
diff --git a/fixtures/suspense/cpu/src/index.js b/fixtures/unstable-async/time-slicing/src/index.js
similarity index 100%
rename from fixtures/suspense/cpu/src/index.js
rename to fixtures/unstable-async/time-slicing/src/index.js
diff --git a/fixtures/suspense/cpu/yarn.lock b/fixtures/unstable-async/time-slicing/yarn.lock
similarity index 100%
rename from fixtures/suspense/cpu/yarn.lock
rename to fixtures/unstable-async/time-slicing/yarn.lock

From ae63110335dd1bf83188940d0209a8d58dd7cc9b Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 2 Aug 2018 00:02:24 +0100
Subject: [PATCH 267/277] Fix time slicing fixture (#13305)

* Fix time slicing fixture

* Remove unused option
---
 .../unstable-async/time-slicing/src/index.js  | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/fixtures/unstable-async/time-slicing/src/index.js b/fixtures/unstable-async/time-slicing/src/index.js
index 2c903e0a39..e6212c1020 100644
--- a/fixtures/unstable-async/time-slicing/src/index.js
+++ b/fixtures/unstable-async/time-slicing/src/index.js
@@ -1,4 +1,4 @@
-import React, {Component, PureComponent, unstable_AsyncMode} from 'react';
+import React, {PureComponent, unstable_AsyncMode} from 'react';
 import {flushSync, render, unstable_deferredUpdates} from 'react-dom';
 import _ from 'lodash';
 import Charts from './Charts';
@@ -64,9 +64,12 @@ class App extends PureComponent {
     }
     this._ignoreClick = true;
 
-    unstable_deferredUpdates(() => {
-      this.setState({showDemo: true}, () => {
-        this._ignoreClick = false;
+    // TODO: needing setTimeout here seems like a React bug.
+    setTimeout(() => {
+      unstable_deferredUpdates(() => {
+        this.setState({showDemo: true}, () => {
+          this._ignoreClick = false;
+        });
       });
     });
   };
@@ -79,15 +82,13 @@ class App extends PureComponent {
     }
   }, 1000);
 
-  renderOption(strategy, label, enabled) {
+  renderOption(strategy, label) {
     const {strategy: currentStrategy} = this.state;
     return (
       <label
-        className={strategy === currentStrategy ? 'selected' : null}
-        style={{opacity: enabled ? 1 : 0.5}}>
+        className={strategy === currentStrategy ? 'selected' : null}>
         <input
           type="radio"
-          disabled={!enabled}
           checked={strategy === currentStrategy}
           onChange={() => this.setState({strategy})}
         />
@@ -107,8 +108,11 @@ class App extends PureComponent {
         this.debouncedHandleChange(value);
         break;
       case 'async':
-        unstable_deferredUpdates(() => {
-          this.setState({value});
+        // TODO: needing setTimeout here seems like a React bug.
+        setTimeout(() => {
+          unstable_deferredUpdates(() => {
+            this.setState({value});
+          });
         });
         break;
       default:
@@ -124,13 +128,9 @@ class App extends PureComponent {
     return (
       <div className="container">
         <div className="rendering">
-          {this.renderOption('sync', 'Synchronous', true)}
-          {this.renderOption('debounced', 'Debounced', true)}
-          {this.renderOption(
-            'async',
-            'Asynchronous',
-            false
-          ) /* TODO Fix async demo and re-enable */}
+          {this.renderOption('sync', 'Synchronous')}
+          {this.renderOption('debounced', 'Debounced')}
+          {this.renderOption('async', 'Asynchronous')}
         </div>
         <input
           className={'input ' + this.state.strategy}

From d79238f1eeb6634ba7a3df23c3b2709b56cbb8b2 Mon Sep 17 00:00:00 2001
From: Jiawen Geng <technicalcute@gmail.com>
Date: Thu, 2 Aug 2018 08:09:37 +0800
Subject: [PATCH 268/277] add nodejs 10 to windows test (#13241)

* add nodejs 10 to windows test

* remove node 8 for better build speed
---
 appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 9b2a740845..8191e610a9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,8 +5,9 @@ init:
   - git config --global core.autocrlf input
 
 environment:
-  nodejs_version: 8
   JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+  matrix:
+    - nodejs_version: 10
 
 # Finish on first failed build
 matrix:

From 95738e5cfdd0f6ee2556bb1c95d85d1ab4b35167 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 2 Aug 2018 01:34:08 +0100
Subject: [PATCH 269/277] Tweak fixture instructions

---
 fixtures/unstable-async/suspense/README.md | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/fixtures/unstable-async/suspense/README.md b/fixtures/unstable-async/suspense/README.md
index 3a2c911542..566f56950e 100644
--- a/fixtures/unstable-async/suspense/README.md
+++ b/fixtures/unstable-async/suspense/README.md
@@ -12,15 +12,22 @@ No. The APIs being tested here are unstable and some of them have still not been
 
 ## How do I run this fixture?
 
+Clone the React repository.
+
+Open `packages/shared/ReactFeatureFlags.js` locally (make sure you didn't open a similarly named file!) and set [the `enableSuspense` flag](https://github.com/facebook/react/blob/d79238f1eeb6634ba7a3df23c3b2709b56cbb8b2/packages/shared/ReactFeatureFlags.js#L19) to `true`.
+
+Then follow these steps:
+
 ```shell
 # 1: Build react from source
 cd /path/to/react
-yarn build -- dom,core,interaction,simple-cache-provider type=NODE
+yarn
+yarn build dom,core,interaction,simple-cache-provider --type=NODE
 
 # 2: Install fixture dependencies
-cd ./fixtures/suspense/io/
-yarn install
+cd fixtures/unstable-async/suspense/
+yarn
 
 # 3: Run the app
 yarn start
-```
\ No newline at end of file
+```

From fddb23601f1a1328756bcb74da3e5bc0c7a762ba Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 2 Aug 2018 01:36:44 +0100
Subject: [PATCH 270/277] Tweak other fixture instructions

---
 fixtures/unstable-async/time-slicing/README.md | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/fixtures/unstable-async/time-slicing/README.md b/fixtures/unstable-async/time-slicing/README.md
index 48b802c803..8d068a393b 100644
--- a/fixtures/unstable-async/time-slicing/README.md
+++ b/fixtures/unstable-async/time-slicing/README.md
@@ -4,23 +4,26 @@
 
 This is a demo application based on [Dan Abramov's](https://github.com/gaearon) recent [JSConf Iceland talk](https://reactjs.org/blog/2018/03/01/sneak-peek-beyond-react-16.html) about React.
 
-It depends on a local build of React and enables us to easily test async and "suspense" APIs in a more "real world app" like context.
+It depends on a local build of React and enables us to easily test async "time slicing" APIs in a more "real world app" like context.
 
 ## Can I use this code in production?
 
 No. The APIs being tested here are unstable and some of them have still not been released to NPM. For now, this fixture is only a test harness.
 
+There are also known bugs and inefficiencies in master so **don't use this fixture for demonstration purposes either yet**. Until they are fixed, this fixture is **not** indicative of React async rendering performance.
+
 ## How do I run this fixture?
 
 ```shell
 # 1: Build react from source
 cd /path/to/react
-yarn build -- dom,core,interaction,simple-cache-provider type=NODE
+yarn
+yarn build dom,core,interaction,simple-cache-provider --type=NODE
 
 # 2: Install fixture dependencies
-cd ./fixtures/suspense/cpu/
-yarn install
+cd fixtures/unstable-async/time-slicing/
+yarn
 
 # 3: Run the app
 yarn start
-```
\ No newline at end of file
+```

From 6db080154b8a24a1af5385630e41dc814ede037b Mon Sep 17 00:00:00 2001
From: Ideveloper <zx6658@naver.com>
Date: Thu, 2 Aug 2018 10:11:17 +0900
Subject: [PATCH 271/277] Remove irrelevant suggestion of a legacy method from
 a warning (#13169)

* Edit warn message what use deprecated lifecycle method

* delete setState warn message about prescriptive and deprecated life cycle

* fix lint

* Prettier

* Formatting
---
 .../react-dom/src/__tests__/ReactCompositeComponent-test.js   | 4 +---
 packages/react-reconciler/src/ReactFiberScheduler.js          | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js b/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js
index c0b30b032e..6e1320dd7c 100644
--- a/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js
@@ -466,9 +466,7 @@ describe('ReactCompositeComponent', () => {
       instance = ReactDOM.render(<Component />, container);
     }).toWarnDev(
       'Cannot update during an existing state transition (such as within ' +
-        "`render` or another component's constructor). Render methods should " +
-        'be a pure function of props and state; constructor side-effects are ' +
-        'an anti-pattern, but can be moved to `componentWillMount`.',
+        '`render`). Render methods should be a pure function of props and state.',
       {withoutStack: true},
     );
 
diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
index 325522b2c4..a7e60f17b1 100644
--- a/packages/react-reconciler/src/ReactFiberScheduler.js
+++ b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -210,9 +210,7 @@ if (__DEV__) {
         warningWithoutStack(
           false,
           'Cannot update during an existing state transition (such as within ' +
-            "`render` or another component's constructor). Render methods should " +
-            'be a pure function of props and state; constructor side-effects are ' +
-            'an anti-pattern, but can be moved to `componentWillMount`.',
+            '`render`). Render methods should be a pure function of props and state.',
         );
         didWarnAboutStateTransition = true;
         break;

From ad17ca639b9d9e2be5cfa8b40c9ad084f35e4c12 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 2 Aug 2018 02:29:15 +0100
Subject: [PATCH 272/277] Fix Prettier

---
 fixtures/unstable-async/time-slicing/src/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fixtures/unstable-async/time-slicing/src/index.js b/fixtures/unstable-async/time-slicing/src/index.js
index e6212c1020..c7f666e5a1 100644
--- a/fixtures/unstable-async/time-slicing/src/index.js
+++ b/fixtures/unstable-async/time-slicing/src/index.js
@@ -85,8 +85,7 @@ class App extends PureComponent {
   renderOption(strategy, label) {
     const {strategy: currentStrategy} = this.state;
     return (
-      <label
-        className={strategy === currentStrategy ? 'selected' : null}>
+      <label className={strategy === currentStrategy ? 'selected' : null}>
         <input
           type="radio"
           checked={strategy === currentStrategy}

From 470377bbdb1874eec247a082ce418b0d26c43af6 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 2 Aug 2018 02:33:52 +0100
Subject: [PATCH 273/277] Remove extraneous condition

It's covered by a check below.
---
 packages/react-dom/src/shared/ReactControlledValuePropTypes.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
index 65e16ffbe2..ccf1cc6a88 100644
--- a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
+++ b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
@@ -30,7 +30,6 @@ if (__DEV__) {
   const propTypes = {
     value: function(props, propName, componentName) {
       if (
-        !(propName in props) ||
         hasReadOnlyValue[props.type] ||
         props.onChange ||
         props.readOnly ||
@@ -48,7 +47,6 @@ if (__DEV__) {
     },
     checked: function(props, propName, componentName) {
       if (
-        !(propName in props) ||
         props.onChange ||
         props.readOnly ||
         props.disabled ||

From 5e8beec84b83d6f1836071b5c187fbd95a839b96 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 2 Aug 2018 02:46:08 +0100
Subject: [PATCH 274/277] Add a regression test for #11602

---
 .../ReactDOMServerIntegrationForms-test.js    | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js
index 0f6a0cab49..6e2d95fe50 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationForms-test.js
@@ -414,20 +414,35 @@ describe('ReactDOMServerIntegration', () => {
         },
       );
 
-      itRenders('an option with flattened children', async render => {
+      itRenders('a select option with flattened children', async render => {
         const e = await render(
-          <select readOnly={true} value="bar">
-            <option value="bar">
-              {['Bar', false, 'Foo', <div key="1" />, 'Baz']}
-            </option>
+          <select value="bar" readOnly={true}>
+            <option value="bar">A {'B'}</option>
           </select>,
-          1,
         );
-        expect(e.getAttribute('value')).toBe(null);
-        expect(e.getAttribute('defaultValue')).toBe(null);
-        expect(e.firstChild.innerHTML).toBe('BarFooBaz');
-        expect(e.firstChild.selected).toBe(true);
+        const option = e.options[0];
+        expect(option.childNodes.length).toBe(1);
+        expect(option.childNodes[0].nodeType).toBe(3);
+        expect(option.childNodes[0].nodeValue).toBe('A B');
       });
+
+      itRenders(
+        'a select option with flattened children and a warning',
+        async render => {
+          const e = await render(
+            <select readOnly={true} value="bar">
+              <option value="bar">
+                {['Bar', false, 'Foo', <div key="1" />, 'Baz']}
+              </option>
+            </select>,
+            1,
+          );
+          expect(e.getAttribute('value')).toBe(null);
+          expect(e.getAttribute('defaultValue')).toBe(null);
+          expect(e.firstChild.innerHTML).toBe('BarFooBaz');
+          expect(e.firstChild.selected).toBe(true);
+        },
+      );
     });
 
     describe('user interaction', function() {

From b3b80a48355ca6dbb61e09f2ef4975be0b973fa4 Mon Sep 17 00:00:00 2001
From: Yunchan Cho <chan376@gmail.com>
Date: Thu, 2 Aug 2018 20:04:31 +0900
Subject: [PATCH 275/277] Inject react-art renderer into react-devtools
 (#13173)

* Inject react-art renderer into react-devtools

This commit makes react-art renderer to be injected to react-devtools,
so that component tree of the renderer is presented on debug panel of browser.

* Update ReactART.js
---
 packages/react-art/src/ReactART.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/react-art/src/ReactART.js b/packages/react-art/src/ReactART.js
index 7ee384707f..ccb2eeb5c5 100644
--- a/packages/react-art/src/ReactART.js
+++ b/packages/react-art/src/ReactART.js
@@ -6,6 +6,7 @@
  */
 
 import React from 'react';
+import ReactVersion from 'shared/ReactVersion';
 import * as ARTRenderer from 'react-reconciler/inline.art';
 import Transform from 'art/core/transform';
 import Mode from 'art/modes/current';
@@ -131,6 +132,13 @@ class Text extends React.Component {
   }
 }
 
+ARTRenderer.injectIntoDevTools({
+  findFiberByHostInstance: () => null,
+  bundleType: __DEV__ ? 1 : 0,
+  version: ReactVersion,
+  rendererPackageName: 'react-art',
+});
+
 /** API */
 
 export const ClippingRectangle = TYPES.CLIPPING_RECTANGLE;

From 46d5afc54dbd4d44b370f0a066021678d3a332ac Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 2 Aug 2018 18:16:47 +0100
Subject: [PATCH 276/277] Replace console.error() with a throw in setTimeout()
 as last resort exception logging (#13310)

* Add a regression test for #13188

* Replace console.error() with a throw in setTimeout() as last resort

* Fix lint and comment

* Fix tests to check we throw after all

* Fix build tests
---
 .../ReactErrorLoggingRecovery-test.js         | 79 +++++++++++++++++++
 .../src/ReactFiberCommitWork.js               |  7 +-
 ...ctIncrementalErrorLogging-test.internal.js |  9 +--
 scripts/jest/config.build.js                  |  5 ++
 4 files changed, 94 insertions(+), 6 deletions(-)
 create mode 100644 packages/react-dom/src/__tests__/ReactErrorLoggingRecovery-test.js

diff --git a/packages/react-dom/src/__tests__/ReactErrorLoggingRecovery-test.js b/packages/react-dom/src/__tests__/ReactErrorLoggingRecovery-test.js
new file mode 100644
index 0000000000..562853f850
--- /dev/null
+++ b/packages/react-dom/src/__tests__/ReactErrorLoggingRecovery-test.js
@@ -0,0 +1,79 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react-core
+ * @jest-environment node
+ */
+
+// This is a regression test for https://github.com/facebook/react/issues/13188.
+// It reproduces a combination of conditions that led to a problem.
+
+if (global.window) {
+  throw new Error('This test must run in a Node environment.');
+}
+
+// The issue only reproduced when React was loaded before JSDOM.
+const React = require('react');
+const ReactDOM = require('react-dom');
+
+// Unlike other tests, we want to enable error logging.
+// Note this is not a real Error prototype property,
+// it's only set in our Jest environment.
+// eslint-disable-next-line no-extend-native
+Error.prototype.suppressReactErrorLogging = false;
+
+// Initialize JSDOM separately.
+// We don't use our normal JSDOM setup because we want to load React first.
+const {JSDOM} = require('jsdom');
+global.requestAnimationFrame = setTimeout;
+global.cancelAnimationFrame = clearTimeout;
+const jsdom = new JSDOM(`<div id="app-root"></div>`);
+global.window = jsdom.window;
+global.document = jsdom.window.document;
+global.navigator = jsdom.window.navigator;
+
+class Bad extends React.Component {
+  componentDidUpdate() {
+    throw new Error('no');
+  }
+  render() {
+    return null;
+  }
+}
+
+describe('ReactErrorLoggingRecovery', () => {
+  let originalConsoleError = console.error;
+
+  beforeEach(() => {
+    console.error = error => {
+      throw new Error('Buggy console.error');
+    };
+  });
+
+  afterEach(() => {
+    console.error = originalConsoleError;
+  });
+
+  it('should recover from errors in console.error', function() {
+    const div = document.createElement('div');
+    let didCatch = false;
+    try {
+      ReactDOM.render(<Bad />, div);
+      ReactDOM.render(<Bad />, div);
+    } catch (e) {
+      expect(e.message).toBe('no');
+      didCatch = true;
+    }
+    expect(didCatch).toBe(true);
+    ReactDOM.render(<span>Hello</span>, div);
+    expect(div.firstChild.textContent).toBe('Hello');
+
+    // Verify the console.error bug is surfaced
+    expect(() => {
+      jest.runAllTimers();
+    }).toThrow('Buggy console.error');
+  });
+});
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index d5fb55b492..16653ea928 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -116,7 +116,12 @@ export function logError(boundary: Fiber, errorInfo: CapturedValue<mixed>) {
     // A cycle may still occur if logCapturedError renders a component that throws.
     const suppressLogging = e && e.suppressReactErrorLogging;
     if (!suppressLogging) {
-      console.error(e);
+      // Rethrow it from a clean stack because this function is assumed to never throw.
+      // We can't safely call console.error() here because it could *also* throw if overriden.
+      // https://github.com/facebook/react/issues/13188
+      setTimeout(() => {
+        throw e;
+      });
     }
   }
 }
diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorLogging-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorLogging-test.internal.js
index 9b417309a6..f651e98c30 100644
--- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorLogging-test.internal.js
+++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorLogging-test.internal.js
@@ -144,11 +144,10 @@ describe('ReactIncrementalErrorLogging', () => {
 
       expect(logCapturedErrorCalls.length).toBe(1);
 
-      // The error thrown in logCapturedError should also be logged
-      expect(console.error).toHaveBeenCalledTimes(1);
-      expect(console.error.calls.argsFor(0)[0].message).toContain(
-        'logCapturedError error',
-      );
+      // The error thrown in logCapturedError should be rethrown with a clean stack
+      expect(() => {
+        jest.runAllTimers();
+      }).toThrow('logCapturedError error');
     } finally {
       jest.unmock('../ReactFiberErrorLogger');
     }
diff --git a/scripts/jest/config.build.js b/scripts/jest/config.build.js
index 7ad1cf68b6..bada59a627 100644
--- a/scripts/jest/config.build.js
+++ b/scripts/jest/config.build.js
@@ -10,6 +10,11 @@ const packages = readdirSync(packagesRoot).filter(dir => {
   if (dir.charAt(0) === '.') {
     return false;
   }
+  if (dir === 'events') {
+    // There's an actual Node package called "events"
+    // that's used by jsdom so we don't want to alias that.
+    return false;
+  }
   const packagePath = join(packagesRoot, dir, 'package.json');
   return statSync(packagePath).isFile();
 });

From 1609cf3432659a2e793a24ca0f786089257f2a05 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 2 Aug 2018 20:04:03 +0100
Subject: [PATCH 277/277] Warn about rendering Generators (#13312)

* Warn about rendering Generators

* Fix Flow

* Add an explicit test for iterable

* Moar test coverage
---
 .../src/__tests__/ReactMultiChild-test.js     | 61 ++++++++++++++++
 .../ReactMultiChildReconcile-test.js          | 72 +++++++++++++++++--
 .../react-reconciler/src/ReactChildFiber.js   | 20 ++++++
 3 files changed, 147 insertions(+), 6 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactMultiChild-test.js b/packages/react-dom/src/__tests__/ReactMultiChild-test.js
index 906934cfa6..e1d4d87ea7 100644
--- a/packages/react-dom/src/__tests__/ReactMultiChild-test.js
+++ b/packages/react-dom/src/__tests__/ReactMultiChild-test.js
@@ -294,6 +294,67 @@ describe('ReactMultiChild', () => {
     );
   });
 
+  it('should warn for using generators as children', () => {
+    function* Foo() {
+      yield <h1 key="1">Hello</h1>;
+      yield <h1 key="2">World</h1>;
+    }
+
+    const div = document.createElement('div');
+    expect(() => {
+      ReactDOM.render(<Foo />, div);
+    }).toWarnDev(
+      'Using Generators as children is unsupported and will likely yield ' +
+        'unexpected results because enumerating a generator mutates it. You may ' +
+        'convert it to an array with `Array.from()` or the `[...spread]` operator ' +
+        'before rendering. Keep in mind you might need to polyfill these features for older browsers.\n' +
+        '    in Foo (at **)',
+    );
+
+    // Test de-duplication
+    ReactDOM.render(<Foo />, div);
+  });
+
+  it('should not warn for using generators in legacy iterables', () => {
+    const fooIterable = {
+      '@@iterator': function*() {
+        yield <h1 key="1">Hello</h1>;
+        yield <h1 key="2">World</h1>;
+      },
+    };
+
+    function Foo() {
+      return fooIterable;
+    }
+
+    const div = document.createElement('div');
+    ReactDOM.render(<Foo />, div);
+    expect(div.textContent).toBe('HelloWorld');
+
+    ReactDOM.render(<Foo />, div);
+    expect(div.textContent).toBe('HelloWorld');
+  });
+
+  it('should not warn for using generators in modern iterables', () => {
+    const fooIterable = {
+      [Symbol.iterator]: function*() {
+        yield <h1 key="1">Hello</h1>;
+        yield <h1 key="2">World</h1>;
+      },
+    };
+
+    function Foo() {
+      return fooIterable;
+    }
+
+    const div = document.createElement('div');
+    ReactDOM.render(<Foo />, div);
+    expect(div.textContent).toBe('HelloWorld');
+
+    ReactDOM.render(<Foo />, div);
+    expect(div.textContent).toBe('HelloWorld');
+  });
+
   it('should reorder bailed-out children', () => {
     class LetterInner extends React.Component {
       render() {
diff --git a/packages/react-dom/src/__tests__/ReactMultiChildReconcile-test.js b/packages/react-dom/src/__tests__/ReactMultiChildReconcile-test.js
index 090230be3e..f04b7ece7a 100644
--- a/packages/react-dom/src/__tests__/ReactMultiChildReconcile-test.js
+++ b/packages/react-dom/src/__tests__/ReactMultiChildReconcile-test.js
@@ -248,7 +248,7 @@ function prepareChildrenArray(childrenArray) {
   return childrenArray;
 }
 
-function prepareChildrenIterable(childrenArray) {
+function prepareChildrenLegacyIterable(childrenArray) {
   return {
     '@@iterator': function*() {
       // eslint-disable-next-line no-for-of-loops/no-for-of-loops
@@ -259,9 +259,27 @@ function prepareChildrenIterable(childrenArray) {
   };
 }
 
+function prepareChildrenModernIterable(childrenArray) {
+  return {
+    [Symbol.iterator]: function*() {
+      // eslint-disable-next-line no-for-of-loops/no-for-of-loops
+      for (const child of childrenArray) {
+        yield child;
+      }
+    },
+  };
+}
+
 function testPropsSequence(sequence) {
   testPropsSequenceWithPreparedChildren(sequence, prepareChildrenArray);
-  testPropsSequenceWithPreparedChildren(sequence, prepareChildrenIterable);
+  testPropsSequenceWithPreparedChildren(
+    sequence,
+    prepareChildrenLegacyIterable,
+  );
+  testPropsSequenceWithPreparedChildren(
+    sequence,
+    prepareChildrenModernIterable,
+  );
 }
 
 describe('ReactMultiChildReconcile', () => {
@@ -311,7 +329,7 @@ describe('ReactMultiChildReconcile', () => {
     );
   });
 
-  it('should reset internal state if removed then readded in an iterable', () => {
+  it('should reset internal state if removed then readded in a legacy iterable', () => {
     // Test basics.
     const props = {
       usernameToStatus: {
@@ -323,7 +341,7 @@ describe('ReactMultiChildReconcile', () => {
     const parentInstance = ReactDOM.render(
       <FriendsStatusDisplay
         {...props}
-        prepareChildren={prepareChildrenIterable}
+        prepareChildren={prepareChildrenLegacyIterable}
       />,
       container,
     );
@@ -332,7 +350,7 @@ describe('ReactMultiChildReconcile', () => {
 
     // Now remove the child.
     ReactDOM.render(
-      <FriendsStatusDisplay prepareChildren={prepareChildrenIterable} />,
+      <FriendsStatusDisplay prepareChildren={prepareChildrenLegacyIterable} />,
       container,
     );
     statusDisplays = parentInstance.getStatusDisplays();
@@ -342,7 +360,49 @@ describe('ReactMultiChildReconcile', () => {
     ReactDOM.render(
       <FriendsStatusDisplay
         {...props}
-        prepareChildren={prepareChildrenIterable}
+        prepareChildren={prepareChildrenLegacyIterable}
+      />,
+      container,
+    );
+    statusDisplays = parentInstance.getStatusDisplays();
+    expect(statusDisplays.jcw).toBeTruthy();
+    expect(statusDisplays.jcw.getInternalState()).not.toBe(
+      startingInternalState,
+    );
+  });
+
+  it('should reset internal state if removed then readded in a modern iterable', () => {
+    // Test basics.
+    const props = {
+      usernameToStatus: {
+        jcw: 'jcwStatus',
+      },
+    };
+
+    const container = document.createElement('div');
+    const parentInstance = ReactDOM.render(
+      <FriendsStatusDisplay
+        {...props}
+        prepareChildren={prepareChildrenModernIterable}
+      />,
+      container,
+    );
+    let statusDisplays = parentInstance.getStatusDisplays();
+    const startingInternalState = statusDisplays.jcw.getInternalState();
+
+    // Now remove the child.
+    ReactDOM.render(
+      <FriendsStatusDisplay prepareChildren={prepareChildrenModernIterable} />,
+      container,
+    );
+    statusDisplays = parentInstance.getStatusDisplays();
+    expect(statusDisplays.jcw).toBeFalsy();
+
+    // Now reset the props that cause there to be a child
+    ReactDOM.render(
+      <FriendsStatusDisplay
+        {...props}
+        prepareChildren={prepareChildrenModernIterable}
       />,
       container,
     );
diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js
index 97aaac8c2c..1ebe9863eb 100644
--- a/packages/react-reconciler/src/ReactChildFiber.js
+++ b/packages/react-reconciler/src/ReactChildFiber.js
@@ -46,6 +46,7 @@ import {
 import {StrictMode} from './ReactTypeOfMode';
 
 let didWarnAboutMaps;
+let didWarnAboutGenerators;
 let didWarnAboutStringRefInStrictMode;
 let ownerHasKeyUseWarning;
 let ownerHasFunctionTypeWarning;
@@ -53,6 +54,7 @@ let warnForMissingKey = (child: mixed) => {};
 
 if (__DEV__) {
   didWarnAboutMaps = false;
+  didWarnAboutGenerators = false;
   didWarnAboutStringRefInStrictMode = {};
 
   /**
@@ -903,6 +905,24 @@ function ChildReconciler(shouldTrackSideEffects) {
     );
 
     if (__DEV__) {
+      // We don't support rendering Generators because it's a mutation.
+      // See https://github.com/facebook/react/issues/12995
+      if (
+        typeof Symbol === 'function' &&
+        // $FlowFixMe Flow doesn't know about toStringTag
+        newChildrenIterable[Symbol.toStringTag] === 'Generator'
+      ) {
+        warning(
+          didWarnAboutGenerators,
+          'Using Generators as children is unsupported and will likely yield ' +
+            'unexpected results because enumerating a generator mutates it. ' +
+            'You may convert it to an array with `Array.from()` or the ' +
+            '`[...spread]` operator before rendering. Keep in mind ' +
+            'you might need to polyfill these features for older browsers.',
+        );
+        didWarnAboutGenerators = true;
+      }
+
       // Warn about using Maps as children
       if ((newChildrenIterable: any).entries === iteratorFn) {
         warning(