];\n- }\n+ describe('with fragments enabled', () => {\n+ it('warns for keys for arrays of elements in a fragment', () => {\n+ spyOn(console, 'error');\n+ class ComponentReturningArray extends React.Component {\n+ render() {\n+ return [

];\n }\n+ }\n \n- ReactTestUtils.renderIntoDocument();\n+ ReactTestUtils.renderIntoDocument();\n \n- expectDev(console.error.calls.count()).toBe(1);\n- expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(\n- 'Warning: ' +\n- 'Each child in an array or iterator should have a unique \"key\" prop.' +\n- ' See https:\/\/fb.me\/react-warning-keys for more information.' +\n- '\\n in ComponentReturningArray (at **)',\n- );\n- });\n+ expectDev(console.error.calls.count()).toBe(1);\n+ expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(\n+ 'Warning: ' +\n+ 'Each child in an array or iterator should have a unique \"key\" prop.' +\n+ ' See https:\/\/fb.me\/react-warning-keys for more information.' +\n+ '\\n in ComponentReturningArray (at **)',\n+ );\n+ });\n \n- it('does not warn when there are keys on elements in a fragment', () => {\n- spyOn(console, 'error');\n- class ComponentReturningArray extends React.Component {\n- render() {\n- return [

];\n- }\n+ it('does not warn when there are keys on elements in a fragment', () => {\n+ spyOn(console, 'error');\n+ class ComponentReturningArray extends React.Component {\n+ render() {\n+ return [

];\n }\n+ }\n \n- ReactTestUtils.renderIntoDocument();\n+ ReactTestUtils.renderIntoDocument();\n \n- expectDev(console.error.calls.count()).toBe(0);\n- });\n+ expectDev(console.error.calls.count()).toBe(0);\n+ });\n \n- it('warns for keys for arrays at the top level', () => {\n- spyOn(console, 'error');\n+ it('warns for keys for arrays at the top level', () => {\n+ spyOn(console, 'error');\n \n- ReactTestUtils.renderIntoDocument([

]);\n+ ReactTestUtils.renderIntoDocument([

]);\n \n- expectDev(console.error.calls.count()).toBe(1);\n- expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(\n- 'Warning: ' +\n- 'Each child in an array or iterator should have a unique \"key\" prop.' +\n- ' See https:\/\/fb.me\/react-warning-keys for more information.',\n- );\n- });\n+ expectDev(console.error.calls.count()).toBe(1);\n+ expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(\n+ 'Warning: ' +\n+ 'Each child in an array or iterator should have a unique \"key\" prop.' +\n+ ' See https:\/\/fb.me\/react-warning-keys for more information.',\n+ );\n });\n- }\n+ });\n });\ndiff --git a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElement-test.js b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElement-test.js\nindex 935937836a..8a296917c0 100644\n--- a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElement-test.js\n+++ b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElement-test.js\n@@ -12,7 +12,6 @@\n var React;\n var ReactDOM;\n var ReactTestUtils;\n-var ReactDOMFeatureFlags;\n \n describe('ReactElement', () => {\n var ComponentClass;\n@@ -29,7 +28,6 @@ describe('ReactElement', () => {\n React = require('react');\n ReactDOM = require('react-dom');\n ReactTestUtils = require('react-dom\/test-utils');\n- ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n \/\/ NOTE: We're explicitly not using JSX here. This is intended to test\n \/\/ classic JS without JSX.\n ComponentClass = class extends React.Component {\n@@ -235,12 +233,7 @@ describe('ReactElement', () => {\n var instance = ReactTestUtils.renderIntoDocument(\n React.createElement(Wrapper),\n );\n-\n- if (ReactDOMFeatureFlags.useFiber) {\n- expect(element._owner.stateNode).toBe(instance);\n- } else {\n- expect(element._owner.getPublicInstance()).toBe(instance);\n- }\n+ expect(element._owner.stateNode).toBe(instance);\n });\n \n it('merges an additional argument onto the children prop', () => {\ndiff --git a\/src\/renderers\/__tests__\/EventPluginHub-test.js b\/src\/renderers\/__tests__\/EventPluginHub-test.js\nindex ea4accef40..74421573dc 100644\n--- a\/src\/renderers\/__tests__\/EventPluginHub-test.js\n+++ b\/src\/renderers\/__tests__\/EventPluginHub-test.js\n@@ -14,13 +14,11 @@ jest.mock('isEventSupported');\n describe('EventPluginHub', () => {\n var React;\n var ReactTestUtils;\n- var ReactDOMFeatureFlags;\n \n beforeEach(() => {\n jest.resetModules();\n React = require('react');\n ReactTestUtils = require('react-dom\/test-utils');\n- ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n });\n \n it('should prevent non-function listeners, at dispatch', () => {\n@@ -33,14 +31,10 @@ describe('EventPluginHub', () => {\n }).toThrowError(\n 'Expected `onClick` listener to be a function, instead got a value of `string` type.',\n );\n- if (ReactDOMFeatureFlags.useFiber) {\n- expectDev(console.error.calls.count()).toBe(1);\n- expectDev(console.error.calls.argsFor(0)[0]).toContain(\n- 'Expected `onClick` listener to be a function, instead got a value of `string` type.',\n- );\n- } else {\n- expectDev(console.error.calls.count()).toBe(0);\n- }\n+ expectDev(console.error.calls.count()).toBe(1);\n+ expectDev(console.error.calls.argsFor(0)[0]).toContain(\n+ 'Expected `onClick` listener to be a function, instead got a value of `string` type.',\n+ );\n });\n \n it('should not prevent null listeners, at dispatch', () => {\ndiff --git a\/src\/renderers\/__tests__\/ReactComponent-test.js b\/src\/renderers\/__tests__\/ReactComponent-test.js\nindex f0db215a0a..86a22155f3 100644\n--- a\/src\/renderers\/__tests__\/ReactComponent-test.js\n+++ b\/src\/renderers\/__tests__\/ReactComponent-test.js\n@@ -14,8 +14,6 @@ var ReactDOM;\n var ReactDOMServer;\n var ReactTestUtils;\n \n-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n-\n describe('ReactComponent', () => {\n function normalizeCodeLocInfo(str) {\n return str && str.replace(\/\$at .+?:\\d+\$\/g, '(at **)');\n@@ -297,21 +295,11 @@ describe('ReactComponent', () => {\n 'outer componentDidMount',\n 'start update',\n \/\/ Previous (equivalent) refs get cleared\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Fiber renders first, resets refs later\n- 'inner 1 render',\n- 'inner 2 render',\n- 'ref 1 got null',\n- 'ref 2 got null',\n- ]\n- : [\n- \/\/ Stack resets refs before rendering\n- 'ref 1 got null',\n- 'inner 1 render',\n- 'ref 2 got null',\n- 'inner 2 render',\n- ]),\n+ \/\/ Fiber renders first, resets refs later\n+ 'inner 1 render',\n+ 'inner 2 render',\n+ 'ref 1 got null',\n+ 'ref 2 got null',\n 'inner 1 componentDidUpdate',\n 'ref 1 got instance 1',\n 'inner 2 componentDidUpdate',\n@@ -406,8 +394,7 @@ describe('ReactComponent', () => {\n 'Objects are not valid as a React child (found: object with keys ' +\n '{x, y, z}). If you meant to render a collection of children, use ' +\n 'an array instead.' +\n- \/\/ Fiber gives a slightly better stack with the nearest host components\n- (ReactDOMFeatureFlags.useFiber ? '\\n in div (at **)' : ''),\n+ '\\n in div (at **)',\n );\n });\n \n@@ -434,8 +421,7 @@ describe('ReactComponent', () => {\n 'Objects are not valid as a React child (found: object with keys ' +\n '{a, b, c}). If you meant to render a collection of children, use ' +\n 'an array instead.\\n' +\n- \/\/ Fiber gives a slightly better stack with the nearest host components\n- (ReactDOMFeatureFlags.useFiber ? ' in div (at **)\\n' : '') +\n+ ' in div (at **)\\n' +\n ' in Foo (at **)',\n );\n });\n@@ -458,8 +444,7 @@ describe('ReactComponent', () => {\n 'Objects are not valid as a React child (found: object with keys ' +\n '{x, y, z}). If you meant to render a collection of children, use ' +\n 'an array instead.' +\n- \/\/ Fiber gives a slightly better stack with the nearest host components\n- (ReactDOMFeatureFlags.useFiber ? '\\n in div (at **)' : ''),\n+ '\\n in div (at **)',\n );\n });\n \n@@ -486,79 +471,76 @@ describe('ReactComponent', () => {\n 'Objects are not valid as a React child (found: object with keys ' +\n '{a, b, c}). If you meant to render a collection of children, use ' +\n 'an array instead.\\n' +\n- \/\/ Fiber gives a slightly better stack with the nearest host components\n- (ReactDOMFeatureFlags.useFiber ? ' in div (at **)\\n' : '') +\n+ ' in div (at **)\\n' +\n ' in Foo (at **)',\n );\n });\n \n- if (ReactDOMFeatureFlags.useFiber) {\n- describe('with new features', () => {\n- it('warns on function as a return value from a function', () => {\n- function Foo() {\n- return Foo;\n- }\n- spyOn(console, 'error');\n- var container = document.createElement('div');\n- ReactDOM.render(, container);\n- expectDev(console.error.calls.count()).toBe(1);\n- expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(\n- 'Warning: Functions are not valid as a React child. This may happen if ' +\n- 'you return a Component instead of from render. ' +\n- 'Or maybe you meant to call this function rather than return it.\\n' +\n- ' in Foo (at **)',\n- );\n- });\n+ describe('with new features', () => {\n+ it('warns on function as a return value from a function', () => {\n+ function Foo() {\n+ return Foo;\n+ }\n+ spyOn(console, 'error');\n+ var container = document.createElement('div');\n+ ReactDOM.render(, container);\n+ expectDev(console.error.calls.count()).toBe(1);\n+ expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(\n+ 'Warning: Functions are not valid as a React child. This may happen if ' +\n+ 'you return a Component instead of from render. ' +\n+ 'Or maybe you meant to call this function rather than return it.\\n' +\n+ ' in Foo (at **)',\n+ );\n+ });\n \n- it('warns on function as a return value from a class', () => {\n- class Foo extends React.Component {\n- render() {\n- return Foo;\n- }\n+ it('warns on function as a return value from a class', () => {\n+ class Foo extends React.Component {\n+ render() {\n+ return Foo;\n }\n- spyOn(console, 'error');\n- var container = document.createElement('div');\n- ReactDOM.render(, container);\n- expectDev(console.error.calls.count()).toBe(1);\n- expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(\n- 'Warning: Functions are not valid as a React child. This may happen if ' +\n- 'you return a Component instead of from render. ' +\n- 'Or maybe you meant to call this function rather than return it.\\n' +\n- ' in Foo (at **)',\n- );\n- });\n+ }\n+ spyOn(console, 'error');\n+ var container = document.createElement('div');\n+ ReactDOM.render(, container);\n+ expectDev(console.error.calls.count()).toBe(1);\n+ expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(\n+ 'Warning: Functions are not valid as a React child. This may happen if ' +\n+ 'you return a Component instead of from render. ' +\n+ 'Or maybe you meant to call this function rather than return it.\\n' +\n+ ' in Foo (at **)',\n+ );\n+ });\n \n- it('warns on function as a child to host component', () => {\n- function Foo() {\n- return

{Foo}<\/span><\/div>;\n- }\n- spyOn(console, 'error');\n- var container = document.createElement('div');\n- ReactDOM.render(, container);\n- expectDev(console.error.calls.count()).toBe(1);\n- expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(\n- 'Warning: Functions are not valid as a React child. This may happen if ' +\n- 'you return a Component instead of from render. ' +\n- 'Or maybe you meant to call this function rather than return it.\\n' +\n- ' in span (at **)\\n' +\n- ' in div (at **)\\n' +\n- ' in Foo (at **)',\n- );\n- });\n+ it('warns on function as a child to host component', () => {\n+ function Foo() {\n+ return

{Foo}<\/span><\/div>;\n+ }\n+ spyOn(console, 'error');\n+ var container = document.createElement('div');\n+ ReactDOM.render(, container);\n+ expectDev(console.error.calls.count()).toBe(1);\n+ expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(\n+ 'Warning: Functions are not valid as a React child. This may happen if ' +\n+ 'you return a Component instead of from render. ' +\n+ 'Or maybe you meant to call this function rather than return it.\\n' +\n+ ' in span (at **)\\n' +\n+ ' in div (at **)\\n' +\n+ ' in Foo (at **)',\n+ );\n+ });\n \n- it('does not warn for function-as-a-child that gets resolved', () => {\n- function Bar(props) {\n- return props.children();\n- }\n- function Foo() {\n- return {() => 'Hello'}<\/Bar>;\n- }\n- spyOn(console, 'error');\n- var container = document.createElement('div');\n- ReactDOM.render(, container);\n- expect(container.innerHTML).toBe('Hello');\n- expectDev(console.error.calls.count()).toBe(0);\n- });\n+ it('does not warn for function-as-a-child that gets resolved', () => {\n+ function Bar(props) {\n+ return props.children();\n+ }\n+ function Foo() {\n+ return {() => 'Hello'}<\/Bar>;\n+ }\n+ spyOn(console, 'error');\n+ var container = document.createElement('div');\n+ ReactDOM.render(, container);\n+ expect(container.innerHTML).toBe('Hello');\n+ expectDev(console.error.calls.count()).toBe(0);\n });\n- }\n+ });\n });\ndiff --git a\/src\/renderers\/__tests__\/ReactComponentTreeHook-test.js b\/src\/renderers\/__tests__\/ReactComponentTreeHook-test.js\nindex 76a5513549..06b1fe07a7 100644\n--- a\/src\/renderers\/__tests__\/ReactComponentTreeHook-test.js\n+++ b\/src\/renderers\/__tests__\/ReactComponentTreeHook-test.js\n@@ -9,13 +9,9 @@\n \n 'use strict';\n \n-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n-var describeStack = ReactDOMFeatureFlags.useFiber ? describe.skip : describe;\n-\n-describe('ReactComponentTreeHook', () => {\n+describe.skip('ReactComponentTreeHook', () => {\n var React;\n var ReactDOM;\n- var ReactDOMServer;\n var ReactInstanceMap;\n var ReactComponentTreeHook;\n var ReactDebugCurrentFiber;\n@@ -26,7 +22,6 @@ describe('ReactComponentTreeHook', () => {\n \n React = require('react');\n ReactDOM = require('react-dom');\n- ReactDOMServer = require('react-dom\/server');\n ReactInstanceMap = require('ReactInstanceMap');\n ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');\n ReactComponentTreeHook = require('ReactComponentTreeHook');\n@@ -37,9 +32,8 @@ describe('ReactComponentTreeHook', () => {\n describe('stack addenda', () => {\n it('gets created', () => {\n function getAddendum(element) {\n- var addendum = ReactDOMFeatureFlags.useFiber\n- ? ReactDebugCurrentFiber.getCurrentFiberStackAddendum() || ''\n- : ReactComponentTreeHook.getCurrentStackAddendum();\n+ var addendum =\n+ ReactDebugCurrentFiber.getCurrentFiberStackAddendum() || '';\n return addendum.replace(\/\$at .+?:\\d+\$\/g, '(at **)');\n }\n \n@@ -107,68 +101,6 @@ describe('ReactComponentTreeHook', () => {\n \/\/ Make sure owner is fetched for the top element too.\n \/\/ expectDev(getAddendum(rOwnedByQ)).toBe('\\n in R (created by Q)');\n });\n-\n- \/\/ These are features and regression tests that only affect\n- \/\/ the Stack implementation of the stack addendum.\n- if (!ReactDOMFeatureFlags.useFiber) {\n- it('can be retrieved by ID', () => {\n- function getAddendum(id) {\n- var addendum = ReactComponentTreeHook.getStackAddendumByID(id);\n- return addendum.replace(\/\$at .+?:\\d+\$\/g, '(at **)');\n- }\n-\n- class Q extends React.Component {\n- render() {\n- return null;\n- }\n- }\n-\n- var q = ReactDOM.render(, document.createElement('div'));\n- expectDev(getAddendum(ReactInstanceMap.get(q)._debugID)).toBe(\n- '\\n in Q (at **)',\n- );\n-\n- spyOn(console, 'error');\n- getAddendum(-17);\n- expectDev(console.error.calls.count()).toBe(1);\n- expectDev(console.error.calls.argsFor(0)[0]).toBe(\n- 'Warning: ReactComponentTreeHook: Missing React element for ' +\n- 'debugID -17 when building stack',\n- );\n- });\n-\n- it('is created during mounting', () => {\n- \/\/ https:\/\/github.com\/facebook\/react\/issues\/7187\n- var el = document.createElement('div');\n- var portalEl = document.createElement('div');\n- class Foo extends React.Component {\n- componentWillMount() {\n- ReactDOM.render(

, portalEl);\n- }\n- render() {\n- return

<\/div>;\n- }\n- }\n- ReactDOM.render(, el);\n- });\n-\n- it('is created when calling renderToString during render', () => {\n- \/\/ https:\/\/github.com\/facebook\/react\/issues\/7190\n- var el = document.createElement('div');\n- class Foo extends React.Component {\n- render() {\n- return (\n-

\n-

\n- {ReactDOMServer.renderToString(

)}\n- <\/div>\n- <\/div>\n- );\n- }\n- }\n- ReactDOM.render(, el);\n- });\n- }\n });\n \n \/\/ The rest of this file is not relevant for Fiber.\n@@ -227,7 +159,7 @@ describe('ReactComponentTreeHook', () => {\n expectWrapperTreeToEqual(null);\n }\n \n- describeStack('mount', () => {\n+ describe('mount', () => {\n it('uses displayName or Unknown for classic components', () => {\n class Foo extends React.Component {\n render() {\n@@ -699,7 +631,7 @@ describe('ReactComponentTreeHook', () => {\n });\n });\n \n- describeStack('update', () => {\n+ describe('update', () => {\n describe('host component', () => {\n it('updates text of a single text child', () => {\n var elementBefore =

Hi.<\/div>;\n@@ -1919,7 +1851,7 @@ describe('ReactComponentTreeHook', () => {\n });\n });\n \n- describeStack('misc', () => {\n+ describe('misc', () => {\n it('tracks owner correctly', () => {\n class Foo extends React.Component {\n render() {\n@@ -2089,7 +2021,7 @@ describe('ReactComponentTreeHook', () => {\n });\n });\n \n- describeStack('in environment without Map, Set and Array.from', () => {\n+ describe('in environment without Map, Set and Array.from', () => {\n var realMap;\n var realSet;\n var realArrayFrom;\n@@ -2107,7 +2039,6 @@ describe('ReactComponentTreeHook', () => {\n \n React = require('react');\n ReactDOM = require('react-dom');\n- ReactDOMServer = require('react-dom\/server');\n ReactInstanceMap = require('ReactInstanceMap');\n ReactComponentTreeHook = require('ReactComponentTreeHook');\n ReactComponentTreeTestUtils = require('ReactComponentTreeTestUtils');\ndiff --git a\/src\/renderers\/__tests__\/ReactCompositeComponent-test.js b\/src\/renderers\/__tests__\/ReactCompositeComponent-test.js\nindex 2fb2085216..75f3e8060f 100644\n--- a\/src\/renderers\/__tests__\/ReactCompositeComponent-test.js\n+++ b\/src\/renderers\/__tests__\/ReactCompositeComponent-test.js\n@@ -13,7 +13,6 @@ var ChildUpdates;\n var MorphingComponent;\n var React;\n var ReactDOM;\n-var ReactDOMFeatureFlags;\n var ReactDOMServer;\n var ReactCurrentOwner;\n var ReactTestUtils;\n@@ -26,7 +25,6 @@ describe('ReactCompositeComponent', () => {\n jest.resetModules();\n React = require('react');\n ReactDOM = require('react-dom');\n- ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n ReactDOMServer = require('react-dom\/server');\n ReactCurrentOwner = require('react')\n .__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner;\n@@ -123,25 +121,19 @@ describe('ReactCompositeComponent', () => {\n var container = document.createElement('div');\n container.innerHTML = markup;\n ReactDOM.render(, container);\n- if (ReactDOMFeatureFlags.useFiber) {\n- expectDev(console.warn.calls.count()).toBe(1);\n- expectDev(console.warn.calls.argsFor(0)[0]).toContain(\n- 'render(): Calling ReactDOM.render() to hydrate server-rendered markup ' +\n- 'will stop working in React v17. Replace the ReactDOM.render() call ' +\n- 'with ReactDOM.hydrate() if you want React to attach to the server HTML.',\n- );\n- } else {\n- expectDev(console.warn.calls.count()).toBe(0);\n- }\n+ expectDev(console.warn.calls.count()).toBe(1);\n+ expectDev(console.warn.calls.argsFor(0)[0]).toContain(\n+ 'render(): Calling ReactDOM.render() to hydrate server-rendered markup ' +\n+ 'will stop working in React v17. Replace the ReactDOM.render() call ' +\n+ 'with ReactDOM.hydrate() if you want React to attach to the server HTML.',\n+ );\n \n \/\/ New explicit API\n console.warn.calls.reset();\n- if (ReactDOMFeatureFlags.useFiber) {\n- container = document.createElement('div');\n- container.innerHTML = markup;\n- ReactDOM.hydrate(, container);\n- expectDev(console.warn.calls.count()).toBe(0);\n- }\n+ container = document.createElement('div');\n+ container.innerHTML = markup;\n+ ReactDOM.hydrate(, container);\n+ expectDev(console.warn.calls.count()).toBe(0);\n });\n \n it('should react to state changes from callbacks', () => {\ndiff --git a\/src\/renderers\/__tests__\/ReactCompositeComponentState-test.js b\/src\/renderers\/__tests__\/ReactCompositeComponentState-test.js\nindex 277dd119ca..e2e04fa70f 100644\n--- a\/src\/renderers\/__tests__\/ReactCompositeComponentState-test.js\n+++ b\/src\/renderers\/__tests__\/ReactCompositeComponentState-test.js\n@@ -11,7 +11,6 @@\n \n var React;\n var ReactDOM;\n-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n \n var TestComponent;\n \n@@ -179,17 +178,9 @@ describe('ReactCompositeComponent-state', () => {\n \/\/ setState({color:'green'}) only enqueues a pending state.\n ['componentWillReceiveProps-end', 'yellow'],\n \/\/ pending state queue is processed\n- ];\n-\n- if (ReactDOMFeatureFlags.useFiber) {\n- \/\/ In Stack, this is never called because replaceState drops all updates\n- \/\/ from the queue. In Fiber, we keep updates in the queue to support\n+ \/\/ We keep updates in the queue to support\n \/\/ replaceState(prevState => newState).\n- \/\/ TODO: Fix Stack to match Fiber.\n- expected.push(['before-setState-receiveProps', 'yellow']);\n- }\n-\n- expected.push(\n+ ['before-setState-receiveProps', 'yellow'],\n ['before-setState-again-receiveProps', undefined],\n ['after-setState-receiveProps', 'green'],\n ['shouldComponentUpdate-currentState', 'yellow'],\n@@ -220,7 +211,7 @@ describe('ReactCompositeComponent-state', () => {\n \/\/ unmountComponent()\n \/\/ state is available within `componentWillUnmount()`\n ['componentWillUnmount', 'blue'],\n- );\n+ ];\n \n expect(stateListener.mock.calls.join('\\n')).toEqual(expected.join('\\n'));\n });\n@@ -289,20 +280,7 @@ describe('ReactCompositeComponent-state', () => {\n child.setState({bar: false});\n });\n \/\/ We expect the same thing to happen if we bail out in the middle.\n- expect(ops).toEqual(\n- ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Fiber works as expected\n- 'child did update',\n- 'parent did update',\n- ]\n- : [\n- \/\/ Stack treats these as two separate updates and therefore the order\n- \/\/ is inverse.\n- 'parent did update',\n- 'child did update',\n- ],\n- );\n+ expect(ops).toEqual(['child did update', 'parent did update']);\n });\n \n it('should batch unmounts', () => {\n@@ -445,45 +423,43 @@ describe('ReactCompositeComponent-state', () => {\n );\n });\n \n- if (ReactDOMFeatureFlags.useFiber) {\n- it('should treat assigning to this.state inside cWM as a replaceState, with a warning', () => {\n- spyOn(console, 'error');\n-\n- let ops = [];\n- class Test extends React.Component {\n- state = {step: 1, extra: true};\n- componentWillMount() {\n- this.setState({step: 2}, () => {\n- \/\/ Tests that earlier setState callbacks are not dropped\n- ops.push(\n- `callback -- step: ${this.state.step}, extra: ${!!this.state.extra}`,\n- );\n- });\n- \/\/ Treat like replaceState\n- this.state = {step: 3};\n- }\n- render() {\n+ it('should treat assigning to this.state inside cWM as a replaceState, with a warning', () => {\n+ spyOn(console, 'error');\n+\n+ let ops = [];\n+ class Test extends React.Component {\n+ state = {step: 1, extra: true};\n+ componentWillMount() {\n+ this.setState({step: 2}, () => {\n+ \/\/ Tests that earlier setState callbacks are not dropped\n ops.push(\n- `render -- step: ${this.state.step}, extra: ${!!this.state.extra}`,\n+ `callback -- step: ${this.state.step}, extra: ${!!this.state.extra}`,\n );\n- return null;\n- }\n+ });\n+ \/\/ Treat like replaceState\n+ this.state = {step: 3};\n }\n+ render() {\n+ ops.push(\n+ `render -- step: ${this.state.step}, extra: ${!!this.state.extra}`,\n+ );\n+ return null;\n+ }\n+ }\n \n- \/\/ Mount\n- const container = document.createElement('div');\n- ReactDOM.render(, container);\n-\n- expect(ops).toEqual([\n- 'render -- step: 3, extra: false',\n- 'callback -- step: 3, extra: false',\n- ]);\n- expect(console.error.calls.count()).toEqual(1);\n- expect(console.error.calls.argsFor(0)[0]).toEqual(\n- 'Warning: Test.componentWillMount(): Assigning directly to ' +\n- \"this.state is deprecated (except inside a component's constructor). \" +\n- 'Use setState instead.',\n- );\n- });\n- }\n+ \/\/ Mount\n+ const container = document.createElement('div');\n+ ReactDOM.render(, container);\n+\n+ expect(ops).toEqual([\n+ 'render -- step: 3, extra: false',\n+ 'callback -- step: 3, extra: false',\n+ ]);\n+ expect(console.error.calls.count()).toEqual(1);\n+ expect(console.error.calls.argsFor(0)[0]).toEqual(\n+ 'Warning: Test.componentWillMount(): Assigning directly to ' +\n+ \"this.state is deprecated (except inside a component's constructor). \" +\n+ 'Use setState instead.',\n+ );\n+ });\n });\ndiff --git a\/src\/renderers\/__tests__\/ReactEmptyComponent-test.js b\/src\/renderers\/__tests__\/ReactEmptyComponent-test.js\nindex d911008ba0..e8a61a6833 100644\n--- a\/src\/renderers\/__tests__\/ReactEmptyComponent-test.js\n+++ b\/src\/renderers\/__tests__\/ReactEmptyComponent-test.js\n@@ -14,8 +14,6 @@ var ReactDOM;\n var ReactTestUtils;\n var TogglingComponent;\n \n-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n-\n var log;\n \n describe('ReactEmptyComponent', () => {\n@@ -69,20 +67,18 @@ describe('ReactEmptyComponent', () => {\n expect(container2.children.length).toBe(0);\n });\n \n- if (ReactDOMFeatureFlags.useFiber) {\n- it('should still throw when rendering to undefined', () => {\n- class Component extends React.Component {\n- render() {}\n- }\n+ it('should still throw when rendering to undefined', () => {\n+ class Component extends React.Component {\n+ render() {}\n+ }\n \n- expect(function() {\n- ReactTestUtils.renderIntoDocument();\n- }).toThrowError(\n- 'Component(...): Nothing was returned from render. This usually means a return statement is missing. ' +\n- 'Or, to render nothing, return null.',\n- );\n- });\n- }\n+ expect(function() {\n+ ReactTestUtils.renderIntoDocument();\n+ }).toThrowError(\n+ 'Component(...): Nothing was returned from render. This usually means a return statement is missing. ' +\n+ 'Or, to render nothing, return null.',\n+ );\n+ });\n \n it('should be able to switch between rendering null and a normal tag', () => {\n var instance1 = (\n@@ -233,15 +229,8 @@ describe('ReactEmptyComponent', () => {\n \n it('can render null at the top level', () => {\n var div = document.createElement('div');\n- if (ReactDOMFeatureFlags.useFiber) {\n- ReactDOM.render(null, div);\n- expect(div.innerHTML).toBe('');\n- } else {\n- \/\/ Stack does not implement this.\n- expect(function() {\n- ReactDOM.render(null, div);\n- }).toThrowError('ReactDOM.render(): Invalid component element.');\n- }\n+ ReactDOM.render(null, div);\n+ expect(div.innerHTML).toBe('');\n });\n \n it('does not break when updating during mount', () => {\n@@ -293,21 +282,11 @@ describe('ReactEmptyComponent', () => {\n \n ReactDOM.render(, container);\n var noscript1 = container.firstChild;\n- if (ReactDOMFeatureFlags.useFiber) {\n- expect(noscript1).toBe(null);\n- } else {\n- expect(noscript1.nodeName).toBe('#comment');\n- }\n+ expect(noscript1).toBe(null);\n \n \/\/ This update shouldn't create a DOM node\n ReactDOM.render(, container);\n var noscript2 = container.firstChild;\n- if (ReactDOMFeatureFlags.useFiber) {\n- expect(noscript1).toBe(null);\n- } else {\n- expect(noscript2.nodeName).toBe('#comment');\n- }\n-\n- expect(noscript1).toBe(noscript2);\n+ expect(noscript2).toBe(null);\n });\n });\ndiff --git a\/src\/renderers\/__tests__\/ReactErrorBoundaries-test.js b\/src\/renderers\/__tests__\/ReactErrorBoundaries-test.js\nindex 826faf37f9..0442b570ef 100644\n--- a\/src\/renderers\/__tests__\/ReactErrorBoundaries-test.js\n+++ b\/src\/renderers\/__tests__\/ReactErrorBoundaries-test.js\n@@ -9,8 +9,6 @@\n \n 'use strict';\n \n-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n-\n var PropTypes;\n var React;\n var ReactDOM;\n@@ -399,12 +397,7 @@ describe('ReactErrorBoundaries', () => {\n log.push('NoopErrorBoundary componentWillUnmount');\n }\n componentDidCatch() {\n- if (ReactDOMFeatureFlags.useFiber) {\n- log.push('NoopErrorBoundary componentDidCatch');\n- } else {\n- \/\/ In Stack, not calling setState() is treated as a rethrow.\n- log.push('NoopErrorBoundary componentDidCatch [*]');\n- }\n+ log.push('NoopErrorBoundary componentDidCatch');\n }\n };\n \n@@ -507,14 +500,9 @@ describe('ReactErrorBoundaries', () => {\n log.push('RetryErrorBoundary componentWillUnmount');\n }\n componentDidCatch(error) {\n- if (ReactDOMFeatureFlags.useFiber) {\n- log.push('RetryErrorBoundary componentDidCatch [!]');\n- \/\/ In Fiber, calling setState() (and failing) is treated as a rethrow.\n- this.setState({});\n- } else {\n- log.push('RetryErrorBoundary componentDidCatch [*]');\n- \/\/ In Stack, not calling setState() is treated as a rethrow.\n- }\n+ log.push('RetryErrorBoundary componentDidCatch [!]');\n+ \/\/ In Fiber, calling setState() (and failing) is treated as a rethrow.\n+ this.setState({});\n }\n };\n \n@@ -639,22 +627,13 @@ describe('ReactErrorBoundaries', () => {\n 'BrokenRender constructor',\n 'BrokenRender componentWillMount',\n 'BrokenRender render [!]',\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Fiber mounts with null children before capturing error\n- 'ErrorBoundary componentDidMount',\n- \/\/ Catch and render an error message\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- \/\/ Catch and render an error message\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidMount',\n- ]),\n+ \/\/ Fiber mounts with null children before capturing error\n+ 'ErrorBoundary componentDidMount',\n+ \/\/ Catch and render an error message\n+ 'ErrorBoundary componentDidCatch',\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -676,22 +655,13 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n 'BrokenConstructor constructor [!]',\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Fiber mounts with null children before capturing error\n- 'ErrorBoundary componentDidMount',\n- \/\/ Catch and render an error message\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- \/\/ Catch and render an error message\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidMount',\n- ]),\n+ \/\/ Fiber mounts with null children before capturing error\n+ 'ErrorBoundary componentDidMount',\n+ \/\/ Catch and render an error message\n+ 'ErrorBoundary componentDidCatch',\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -714,20 +684,11 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary render success',\n 'BrokenComponentWillMount constructor',\n 'BrokenComponentWillMount componentWillMount [!]',\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- 'ErrorBoundary componentDidMount',\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- \/\/ Catch and render an error message\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidMount',\n- ]),\n+ 'ErrorBoundary componentDidMount',\n+ 'ErrorBoundary componentDidCatch',\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -806,29 +767,15 @@ describe('ReactErrorBoundaries', () => {\n 'BrokenRender constructor',\n 'BrokenRender componentWillMount',\n 'BrokenRender render [!]',\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- 'ErrorBoundary componentDidMount',\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorMessage constructor',\n- 'ErrorMessage componentWillMount',\n- 'ErrorMessage render',\n- 'ErrorMessage componentDidMount',\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- \/\/ Handle the error:\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary render error',\n- \/\/ Mount the error message:\n- 'ErrorMessage constructor',\n- 'ErrorMessage componentWillMount',\n- 'ErrorMessage render',\n- 'ErrorMessage componentDidMount',\n- 'ErrorBoundary componentDidMount',\n- ]),\n+ 'ErrorBoundary componentDidMount',\n+ 'ErrorBoundary componentDidCatch',\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorMessage constructor',\n+ 'ErrorMessage componentWillMount',\n+ 'ErrorMessage render',\n+ 'ErrorMessage componentDidMount',\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -860,39 +807,22 @@ describe('ReactErrorBoundaries', () => {\n 'BrokenRender constructor',\n 'BrokenRender componentWillMount',\n 'BrokenRender render [!]',\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ In Fiber, failed error boundaries render null before attempting to recover\n- 'RetryErrorBoundary componentDidMount',\n- 'RetryErrorBoundary componentDidCatch [!]',\n- 'ErrorBoundary componentDidMount',\n- \/\/ Retry\n- 'RetryErrorBoundary render',\n- 'BrokenRender constructor',\n- 'BrokenRender componentWillMount',\n- 'BrokenRender render [!]',\n- \/\/ This time, the error propagates to the higher boundary\n- 'RetryErrorBoundary componentWillUnmount',\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Render the error\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- \/\/ The first error boundary catches the error.\n- \/\/ However, it doesn't adjust its state so next render will also fail.\n- 'RetryErrorBoundary componentDidCatch [*]',\n- 'RetryErrorBoundary render',\n- 'BrokenRender constructor',\n- 'BrokenRender componentWillMount',\n- 'BrokenRender render [!]',\n- \/\/ This time, the error propagates to the higher boundary\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Render the error\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidMount',\n- ]),\n+ \/\/ In Fiber, failed error boundaries render null before attempting to recover\n+ 'RetryErrorBoundary componentDidMount',\n+ 'RetryErrorBoundary componentDidCatch [!]',\n+ 'ErrorBoundary componentDidMount',\n+ \/\/ Retry\n+ 'RetryErrorBoundary render',\n+ 'BrokenRender constructor',\n+ 'BrokenRender componentWillMount',\n+ 'BrokenRender render [!]',\n+ \/\/ This time, the error propagates to the higher boundary\n+ 'RetryErrorBoundary componentWillUnmount',\n+ 'ErrorBoundary componentDidCatch',\n+ \/\/ Render the error\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -916,20 +846,11 @@ describe('ReactErrorBoundaries', () => {\n 'BrokenComponentWillMountErrorBoundary constructor',\n 'BrokenComponentWillMountErrorBoundary componentWillMount [!]',\n \/\/ The error propagates to the higher boundary\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- 'ErrorBoundary componentDidMount',\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Render the error\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidMount',\n- ]),\n+ 'ErrorBoundary componentDidMount',\n+ 'ErrorBoundary componentDidCatch',\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -960,31 +881,19 @@ describe('ReactErrorBoundaries', () => {\n 'BrokenRender render [!]',\n \/\/ The first error boundary catches the error\n \/\/ It adjusts state but throws displaying the message\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Finish mounting with null children\n- 'BrokenRenderErrorBoundary componentDidMount',\n- \/\/ Attempt to handle the error\n- 'BrokenRenderErrorBoundary componentDidCatch',\n- 'ErrorBoundary componentDidMount',\n- 'BrokenRenderErrorBoundary render error [!]',\n- \/\/ Boundary fails with new error, propagate to next boundary\n- 'BrokenRenderErrorBoundary componentWillUnmount',\n- \/\/ Attempt to handle the error again\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- 'BrokenRenderErrorBoundary componentDidCatch',\n- 'BrokenRenderErrorBoundary render error [!]',\n- \/\/ The error propagates to the higher boundary\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Render the error\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidMount',\n- ]),\n+ \/\/ Finish mounting with null children\n+ 'BrokenRenderErrorBoundary componentDidMount',\n+ \/\/ Attempt to handle the error\n+ 'BrokenRenderErrorBoundary componentDidCatch',\n+ 'ErrorBoundary componentDidMount',\n+ 'BrokenRenderErrorBoundary render error [!]',\n+ \/\/ Boundary fails with new error, propagate to next boundary\n+ 'BrokenRenderErrorBoundary componentWillUnmount',\n+ \/\/ Attempt to handle the error again\n+ 'ErrorBoundary componentDidCatch',\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -1015,23 +924,14 @@ describe('ReactErrorBoundaries', () => {\n 'BrokenRender constructor',\n 'BrokenRender componentWillMount',\n 'BrokenRender render [!]',\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Finish mounting with null children\n- 'ErrorBoundary componentDidMount',\n- \/\/ Handle the error\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Render the error message\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Render the error message\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidMount',\n- ]),\n+ \/\/ Finish mounting with null children\n+ 'ErrorBoundary componentDidMount',\n+ \/\/ Handle the error\n+ 'ErrorBoundary componentDidCatch',\n+ \/\/ Render the error message\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -1064,28 +964,15 @@ describe('ReactErrorBoundaries', () => {\n 'BrokenRender componentWillMount',\n 'BrokenRender render [!]',\n \/\/ Handle error:\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Finish mounting with null children\n- 'ErrorBoundary componentDidMount',\n- \/\/ Handle the error\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Render the error message\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'Error message ref is set to [object HTMLDivElement]',\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Stack reconciler resets ref on update, as it doesn't know ref was never set.\n- \/\/ This is unnecessary, and Fiber doesn't do it:\n- 'Child ref is set to null',\n- 'ErrorBoundary render error',\n- \/\/ Ref to error message should get set:\n- 'Error message ref is set to [object HTMLDivElement]',\n- 'ErrorBoundary componentDidMount',\n- ]),\n+ \/\/ Finish mounting with null children\n+ 'ErrorBoundary componentDidMount',\n+ \/\/ Handle the error\n+ 'ErrorBoundary componentDidCatch',\n+ \/\/ Render the error message\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'Error message ref is set to [object HTMLDivElement]',\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -1149,26 +1036,15 @@ describe('ReactErrorBoundaries', () => {\n 'Normal2 render',\n \/\/ BrokenConstructor will abort rendering:\n 'BrokenConstructor constructor [!]',\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Finish updating with null children\n- 'Normal componentWillUnmount',\n- 'ErrorBoundary componentDidUpdate',\n- \/\/ Handle the error\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Render the error message\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Stack unmounts first, then renders:\n- 'Normal componentWillUnmount',\n- 'ErrorBoundary render error',\n- \/\/ Normal2 does not get lifefycle because it was never mounted\n- 'ErrorBoundary componentDidUpdate',\n- ]),\n+ \/\/ Finish updating with null children\n+ 'Normal componentWillUnmount',\n+ 'ErrorBoundary componentDidUpdate',\n+ \/\/ Handle the error\n+ 'ErrorBoundary componentDidCatch',\n+ \/\/ Render the error message\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -1209,26 +1085,15 @@ describe('ReactErrorBoundaries', () => {\n \/\/ BrokenComponentWillMount will abort rendering:\n 'BrokenComponentWillMount constructor',\n 'BrokenComponentWillMount componentWillMount [!]',\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Finish updating with null children\n- 'Normal componentWillUnmount',\n- 'ErrorBoundary componentDidUpdate',\n- \/\/ Handle the error\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Render the error message\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Stack unmounts first, then renders:\n- 'Normal componentWillUnmount',\n- 'ErrorBoundary render error',\n- \/\/ Normal2 does not get lifefycle because it was never mounted\n- 'ErrorBoundary componentDidUpdate',\n- ]),\n+ \/\/ Finish updating with null children\n+ 'Normal componentWillUnmount',\n+ 'ErrorBoundary componentDidUpdate',\n+ \/\/ Handle the error\n+ 'ErrorBoundary componentDidCatch',\n+ \/\/ Render the error message\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -1264,26 +1129,15 @@ describe('ReactErrorBoundaries', () => {\n 'Normal render',\n \/\/ BrokenComponentWillReceiveProps will abort rendering:\n 'BrokenComponentWillReceiveProps componentWillReceiveProps [!]',\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Finish updating with null children\n- 'Normal componentWillUnmount',\n- 'BrokenComponentWillReceiveProps componentWillUnmount',\n- 'ErrorBoundary componentDidUpdate',\n- \/\/ Handle the error\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Stack unmounts first, then renders:\n- 'Normal componentWillUnmount',\n- 'BrokenComponentWillReceiveProps componentWillUnmount',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]),\n+ \/\/ Finish updating with null children\n+ 'Normal componentWillUnmount',\n+ 'BrokenComponentWillReceiveProps componentWillUnmount',\n+ 'ErrorBoundary componentDidUpdate',\n+ \/\/ Handle the error\n+ 'ErrorBoundary componentDidCatch',\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -1320,26 +1174,15 @@ describe('ReactErrorBoundaries', () => {\n \/\/ BrokenComponentWillUpdate will abort rendering:\n 'BrokenComponentWillUpdate componentWillReceiveProps',\n 'BrokenComponentWillUpdate componentWillUpdate [!]',\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Finish updating with null children\n- 'Normal componentWillUnmount',\n- 'BrokenComponentWillUpdate componentWillUnmount',\n- 'ErrorBoundary componentDidUpdate',\n- \/\/ Handle the error\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Stack unmounts first, then renders:\n- 'Normal componentWillUnmount',\n- 'BrokenComponentWillUpdate componentWillUnmount',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]),\n+ \/\/ Finish updating with null children\n+ 'Normal componentWillUnmount',\n+ 'BrokenComponentWillUpdate componentWillUnmount',\n+ 'ErrorBoundary componentDidUpdate',\n+ \/\/ Handle the error\n+ 'ErrorBoundary componentDidCatch',\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -1381,25 +1224,14 @@ describe('ReactErrorBoundaries', () => {\n 'BrokenRender constructor',\n 'BrokenRender componentWillMount',\n 'BrokenRender render [!]',\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Finish updating with null children\n- 'Normal componentWillUnmount',\n- 'ErrorBoundary componentDidUpdate',\n- \/\/ Handle the error\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Stack unmounts first, then renders:\n- 'Normal componentWillUnmount',\n- 'ErrorBoundary render error',\n- \/\/ Normal2 does not get lifefycle because it was never mounted\n- 'ErrorBoundary componentDidUpdate',\n- ]),\n+ \/\/ Finish updating with null children\n+ 'Normal componentWillUnmount',\n+ 'ErrorBoundary componentDidUpdate',\n+ \/\/ Handle the error\n+ 'ErrorBoundary componentDidCatch',\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -1451,22 +1283,13 @@ describe('ReactErrorBoundaries', () => {\n 'BrokenRender constructor',\n 'BrokenRender componentWillMount',\n 'BrokenRender render [!]',\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Finish updating with null children\n- 'Child1 ref is set to null',\n- 'ErrorBoundary componentDidUpdate',\n- \/\/ Handle the error\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- ]\n- : [\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Stack resets ref first, renders later\n- 'Child1 ref is set to null',\n- 'ErrorBoundary render error',\n- ]),\n+ \/\/ Finish updating with null children\n+ 'Child1 ref is set to null',\n+ 'ErrorBoundary componentDidUpdate',\n+ \/\/ Handle the error\n+ 'ErrorBoundary componentDidCatch',\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n 'Error message ref is set to [object HTMLDivElement]',\n \/\/ Child2 ref is never set because its mounting aborted\n 'ErrorBoundary componentDidUpdate',\n@@ -1509,35 +1332,22 @@ describe('ReactErrorBoundaries', () => {\n 'BrokenComponentWillUnmount render',\n \/\/ Unmounting throws:\n 'BrokenComponentWillUnmount componentWillUnmount [!]',\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Fiber proceeds with lifecycles despite errors\n- 'Normal componentWillUnmount',\n- \/\/ The components have updated in this phase\n- 'BrokenComponentWillUnmount componentDidUpdate',\n- 'ErrorBoundary componentDidUpdate',\n- \/\/ Now that commit phase is done, Fiber unmounts the boundary's children\n- 'BrokenComponentWillUnmount componentWillUnmount [!]',\n- 'ErrorBoundary componentDidCatch',\n- \/\/ The initial render was aborted, so\n- \/\/ Fiber retries from the root.\n- 'ErrorBoundary componentWillUpdate',\n- \/\/ Render an error now (stack will do it later)\n- 'ErrorBoundary render error',\n- \/\/ Attempt to unmount previous child:\n- \/\/ Done\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- \/\/ Stack will handle error immediately\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Attempt to unmount previous children:\n- 'BrokenComponentWillUnmount componentWillUnmount [!]',\n- 'Normal componentWillUnmount',\n- \/\/ Render an error now (Fiber will do it earlier)\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]),\n+ \/\/ Fiber proceeds with lifecycles despite errors\n+ 'Normal componentWillUnmount',\n+ \/\/ The components have updated in this phase\n+ 'BrokenComponentWillUnmount componentDidUpdate',\n+ 'ErrorBoundary componentDidUpdate',\n+ \/\/ Now that commit phase is done, Fiber unmounts the boundary's children\n+ 'BrokenComponentWillUnmount componentWillUnmount [!]',\n+ 'ErrorBoundary componentDidCatch',\n+ \/\/ The initial render was aborted, so\n+ \/\/ Fiber retries from the root.\n+ 'ErrorBoundary componentWillUpdate',\n+ \/\/ Render an error now (stack will do it later)\n+ 'ErrorBoundary render error',\n+ \/\/ Attempt to unmount previous child:\n+ \/\/ Done\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -1580,33 +1390,21 @@ describe('ReactErrorBoundaries', () => {\n 'BrokenComponentWillUnmount render',\n \/\/ Unmounting throws:\n 'BrokenComponentWillUnmount componentWillUnmount [!]',\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Fiber proceeds with lifecycles despite errors\n- 'BrokenComponentWillUnmount componentDidUpdate',\n- 'Normal componentDidUpdate',\n- 'ErrorBoundary componentDidUpdate',\n- 'Normal componentWillUnmount',\n- 'BrokenComponentWillUnmount componentWillUnmount [!]',\n- \/\/ Now that commit phase is done, Fiber handles errors\n- 'ErrorBoundary componentDidCatch',\n- \/\/ The initial render was aborted, so\n- \/\/ Fiber retries from the root.\n- 'ErrorBoundary componentWillUpdate',\n- \/\/ Render an error now (stack will do it later)\n- 'ErrorBoundary render error',\n- \/\/ Done\n- 'ErrorBoundary componentDidUpdate',\n- ]\n- : [\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Attempt to unmount previous children:\n- 'Normal componentWillUnmount',\n- 'BrokenComponentWillUnmount componentWillUnmount [!]',\n- \/\/ Stack calls lifecycles first, then renders.\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]),\n+ \/\/ Fiber proceeds with lifecycles despite errors\n+ 'BrokenComponentWillUnmount componentDidUpdate',\n+ 'Normal componentDidUpdate',\n+ 'ErrorBoundary componentDidUpdate',\n+ 'Normal componentWillUnmount',\n+ 'BrokenComponentWillUnmount componentWillUnmount [!]',\n+ \/\/ Now that commit phase is done, Fiber handles errors\n+ 'ErrorBoundary componentDidCatch',\n+ \/\/ The initial render was aborted, so\n+ \/\/ Fiber retries from the root.\n+ 'ErrorBoundary componentWillUpdate',\n+ \/\/ Render an error now (stack will do it later)\n+ 'ErrorBoundary render error',\n+ \/\/ Done\n+ 'ErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -1660,31 +1458,19 @@ describe('ReactErrorBoundaries', () => {\n 'InnerErrorBoundary render success',\n \/\/ Try unmounting child\n 'BrokenComponentWillUnmount componentWillUnmount [!]',\n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- \/\/ Fiber proceeds with lifecycles despite errors\n- \/\/ Inner and outer boundaries have updated in this phase\n- 'InnerErrorBoundary componentDidUpdate',\n- 'OuterErrorBoundary componentDidUpdate',\n- \/\/ Now that commit phase is done, Fiber handles errors\n- \/\/ Only inner boundary receives the error:\n- 'InnerErrorBoundary componentDidCatch',\n- 'InnerErrorBoundary componentWillUpdate',\n- \/\/ Render an error now\n- 'InnerErrorBoundary render error',\n- \/\/ In Fiber, this was a local update to the\n- \/\/ inner boundary so only its hook fires\n- 'InnerErrorBoundary componentDidUpdate',\n- ]\n- : [\n- \/\/ Stack will handle error immediately\n- 'InnerErrorBoundary componentDidCatch',\n- 'InnerErrorBoundary render error',\n- \/\/ In stack, this was a part of the update to the\n- \/\/ outer boundary so both lifecycles fire\n- 'InnerErrorBoundary componentDidUpdate',\n- 'OuterErrorBoundary componentDidUpdate',\n- ]),\n+ \/\/ Fiber proceeds with lifecycles despite errors\n+ \/\/ Inner and outer boundaries have updated in this phase\n+ 'InnerErrorBoundary componentDidUpdate',\n+ 'OuterErrorBoundary componentDidUpdate',\n+ \/\/ Now that commit phase is done, Fiber handles errors\n+ \/\/ Only inner boundary receives the error:\n+ 'InnerErrorBoundary componentDidCatch',\n+ 'InnerErrorBoundary componentWillUpdate',\n+ \/\/ Render an error now\n+ 'InnerErrorBoundary render error',\n+ \/\/ In Fiber, this was a local update to the\n+ \/\/ inner boundary so only its hook fires\n+ 'InnerErrorBoundary componentDidUpdate',\n ]);\n \n log.length = 0;\n@@ -1856,374 +1642,371 @@ describe('ReactErrorBoundaries', () => {\n expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n });\n \n- \/\/ The tests below implement new features in Fiber.\n- if (ReactDOMFeatureFlags.useFiber) {\n- it('catches errors originating downstream', () => {\n- var fail = false;\n- class Stateful extends React.Component {\n- state = {shouldThrow: false};\n+ it('catches errors originating downstream', () => {\n+ var fail = false;\n+ class Stateful extends React.Component {\n+ state = {shouldThrow: false};\n \n- render() {\n- if (fail) {\n- log.push('Stateful render [!]');\n- throw new Error('Hello');\n- }\n- return

{this.props.children}<\/div>;\n+ render() {\n+ if (fail) {\n+ log.push('Stateful render [!]');\n+ throw new Error('Hello');\n }\n+ return

{this.props.children}<\/div>;\n }\n+ }\n \n- var statefulInst;\n- var container = document.createElement('div');\n- ReactDOM.render(\n- \n- (statefulInst = inst)} \/>\n- <\/ErrorBoundary>,\n- container,\n- );\n-\n- log.length = 0;\n- expect(() => {\n- fail = true;\n- statefulInst.forceUpdate();\n- }).not.toThrow();\n-\n- expect(log).toEqual([\n- 'Stateful render [!]',\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]);\n-\n- log.length = 0;\n- ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n- });\n-\n- it('catches errors in componentDidMount', () => {\n- var container = document.createElement('div');\n- ReactDOM.render(\n- \n- \n- \n- <\/BrokenComponentWillUnmount>\n- \n- \n- <\/ErrorBoundary>,\n- container,\n- );\n- expect(log).toEqual([\n- 'ErrorBoundary constructor',\n- 'ErrorBoundary componentWillMount',\n- 'ErrorBoundary render success',\n- 'BrokenComponentWillUnmount constructor',\n- 'BrokenComponentWillUnmount componentWillMount',\n- 'BrokenComponentWillUnmount render',\n- 'Normal constructor',\n- 'Normal componentWillMount',\n- 'Normal render',\n- 'BrokenComponentDidMount constructor',\n- 'BrokenComponentDidMount componentWillMount',\n- 'BrokenComponentDidMount render',\n- 'LastChild constructor',\n- 'LastChild componentWillMount',\n- 'LastChild render',\n- \/\/ Start flushing didMount queue\n- 'Normal componentDidMount',\n- 'BrokenComponentWillUnmount componentDidMount',\n- 'BrokenComponentDidMount componentDidMount [!]',\n- \/\/ Continue despite the error\n- 'LastChild componentDidMount',\n- 'ErrorBoundary componentDidMount',\n- \/\/ Now we are ready to handle the error\n- \/\/ Safely unmount every child\n- 'BrokenComponentWillUnmount componentWillUnmount [!]',\n- \/\/ Continue unmounting safely despite any errors\n- 'Normal componentWillUnmount',\n- 'BrokenComponentDidMount componentWillUnmount',\n- 'LastChild componentWillUnmount',\n- \/\/ Handle the error\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- \/\/ The update has finished\n- 'ErrorBoundary componentDidUpdate',\n- ]);\n-\n- log.length = 0;\n- ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n- });\n-\n- it('catches errors in componentDidUpdate', () => {\n- var container = document.createElement('div');\n- ReactDOM.render(\n- \n- \n- <\/ErrorBoundary>,\n- container,\n- );\n-\n- log.length = 0;\n- ReactDOM.render(\n- \n- \n- <\/ErrorBoundary>,\n- container,\n- );\n- expect(log).toEqual([\n- 'ErrorBoundary componentWillReceiveProps',\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render success',\n- 'BrokenComponentDidUpdate componentWillReceiveProps',\n- 'BrokenComponentDidUpdate componentWillUpdate',\n- 'BrokenComponentDidUpdate render',\n- \/\/ All lifecycles run\n- 'BrokenComponentDidUpdate componentDidUpdate [!]',\n- 'ErrorBoundary componentDidUpdate',\n- 'BrokenComponentDidUpdate componentWillUnmount',\n- \/\/ Then, error is handled\n- 'ErrorBoundary componentDidCatch',\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]);\n-\n- log.length = 0;\n- ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n- });\n-\n- it('propagates errors inside boundary during componentDidMount', () => {\n- var container = document.createElement('div');\n- ReactDOM.render(\n- \n- (\n-

\n- We should never catch our own error: {error.message}.\n- <\/div>\n- )}\n- \/>\n- <\/ErrorBoundary>,\n- container,\n- );\n- expect(container.firstChild.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n- 'ErrorBoundary constructor',\n- 'ErrorBoundary componentWillMount',\n- 'ErrorBoundary render success',\n- 'BrokenComponentDidMountErrorBoundary constructor',\n- 'BrokenComponentDidMountErrorBoundary componentWillMount',\n- 'BrokenComponentDidMountErrorBoundary render success',\n- 'BrokenComponentDidMountErrorBoundary componentDidMount [!]',\n- \/\/ Fiber proceeds with the hooks\n- 'ErrorBoundary componentDidMount',\n- 'BrokenComponentDidMountErrorBoundary componentWillUnmount',\n- \/\/ The error propagates to the higher boundary\n- 'ErrorBoundary componentDidCatch',\n- \/\/ Fiber retries from the root\n- 'ErrorBoundary componentWillUpdate',\n- 'ErrorBoundary render error',\n- 'ErrorBoundary componentDidUpdate',\n- ]);\n-\n- log.length = 0;\n- ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n- });\n-\n- it('lets different boundaries catch their own first errors', () => {\n- function renderUnmountError(error) {\n- return

Caught an unmounting error: {error.message}.<\/div>;\n- }\n- function renderUpdateError(error) {\n- return

Caught an updating error: {error.message}.<\/div>;\n- }\n-\n- var container = document.createElement('div');\n- ReactDOM.render(\n- \n- \n- \n- \n- <\/ErrorBoundary>\n- \n- \n- \n- <\/ErrorBoundary>\n- <\/ErrorBoundary>,\n- container,\n- );\n-\n- log.length = 0;\n- ReactDOM.render(\n- \n- \n- \n- \n- \n- <\/ErrorBoundary>\n- <\/ErrorBoundary>,\n- container,\n- );\n-\n- expect(container.firstChild.textContent).toBe(\n- 'Caught an unmounting error: E1.' + 'Caught an updating error: E3.',\n- );\n- expect(log).toEqual([\n- \/\/ Begin update phase\n- 'OuterErrorBoundary componentWillReceiveProps',\n- 'OuterErrorBoundary componentWillUpdate',\n- 'OuterErrorBoundary render success',\n- 'InnerUnmountBoundary componentWillReceiveProps',\n- 'InnerUnmountBoundary componentWillUpdate',\n- 'InnerUnmountBoundary render success',\n- 'InnerUpdateBoundary componentWillReceiveProps',\n- 'InnerUpdateBoundary componentWillUpdate',\n- 'InnerUpdateBoundary render success',\n- \/\/ First come the updates\n- 'BrokenComponentDidUpdate componentWillReceiveProps',\n- 'BrokenComponentDidUpdate componentWillUpdate',\n- 'BrokenComponentDidUpdate render',\n- 'BrokenComponentDidUpdate componentWillReceiveProps',\n- 'BrokenComponentDidUpdate componentWillUpdate',\n- 'BrokenComponentDidUpdate render',\n- \/\/ We're in commit phase now, deleting\n- 'BrokenComponentWillUnmount componentWillUnmount [!]',\n- 'BrokenComponentWillUnmount componentWillUnmount [!]',\n- \/\/ Continue despite errors, handle them after commit is done\n- 'InnerUnmountBoundary componentDidUpdate',\n- \/\/ We're still in commit phase, now calling update lifecycles\n- 'BrokenComponentDidUpdate componentDidUpdate [!]',\n- \/\/ Again, continue despite errors, we'll handle them later\n- 'BrokenComponentDidUpdate componentDidUpdate [!]',\n- 'InnerUpdateBoundary componentDidUpdate',\n- 'OuterErrorBoundary componentDidUpdate',\n- \/\/ After the commit phase, attempt to recover from any errors that\n- \/\/ were captured\n- 'BrokenComponentDidUpdate componentWillUnmount',\n- 'BrokenComponentDidUpdate componentWillUnmount',\n- 'InnerUnmountBoundary componentDidCatch',\n- 'InnerUpdateBoundary componentDidCatch',\n- 'InnerUnmountBoundary componentWillUpdate',\n- 'InnerUnmountBoundary render error',\n- 'InnerUpdateBoundary componentWillUpdate',\n- 'InnerUpdateBoundary render error',\n- 'InnerUnmountBoundary componentDidUpdate',\n- 'InnerUpdateBoundary componentDidUpdate',\n- ]);\n-\n- log.length = 0;\n- ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual([\n- 'OuterErrorBoundary componentWillUnmount',\n- 'InnerUnmountBoundary componentWillUnmount',\n- 'InnerUpdateBoundary componentWillUnmount',\n- ]);\n- });\n-\n- it('discards a bad root if the root component fails', () => {\n- spyOn(console, 'error');\n-\n- const X = null;\n- const Y = undefined;\n- let err1;\n- let err2;\n-\n- try {\n- let container = document.createElement('div');\n- ReactDOM.render(, container);\n- } catch (err) {\n- err1 = err;\n- }\n- try {\n- let container = document.createElement('div');\n- ReactDOM.render(, container);\n- } catch (err) {\n- err2 = err;\n- }\n-\n- expect(err1.message).toMatch(\/got: null\/);\n- expect(err2.message).toMatch(\/got: undefined\/);\n- });\n-\n- it('renders empty output if error boundary does not handle the error', () => {\n- var container = document.createElement('div');\n- ReactDOM.render(\n-

\n- Sibling\n- \n- \n- <\/NoopErrorBoundary>\n- <\/div>,\n- container,\n- );\n- expect(container.firstChild.textContent).toBe('Sibling');\n- expect(log).toEqual([\n- 'NoopErrorBoundary constructor',\n- 'NoopErrorBoundary componentWillMount',\n- 'NoopErrorBoundary render',\n- 'BrokenRender constructor',\n- 'BrokenRender componentWillMount',\n- 'BrokenRender render [!]',\n- \/\/ In Fiber, noop error boundaries render null\n- 'NoopErrorBoundary componentDidMount',\n- 'NoopErrorBoundary componentDidCatch',\n- \/\/ Nothing happens.\n- ]);\n-\n- log.length = 0;\n- ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['NoopErrorBoundary componentWillUnmount']);\n- });\n+ var statefulInst;\n+ var container = document.createElement('div');\n+ ReactDOM.render(\n+ \n+ (statefulInst = inst)} \/>\n+ <\/ErrorBoundary>,\n+ container,\n+ );\n \n- it('passes first error when two errors happen in commit', () => {\n- const errors = [];\n- let caughtError;\n- class Parent extends React.Component {\n- render() {\n- return ;\n- }\n- componentDidMount() {\n- errors.push('parent sad');\n- throw new Error('parent sad');\n- }\n+ log.length = 0;\n+ expect(() => {\n+ fail = true;\n+ statefulInst.forceUpdate();\n+ }).not.toThrow();\n+\n+ expect(log).toEqual([\n+ 'Stateful render [!]',\n+ 'ErrorBoundary componentDidCatch',\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorBoundary componentDidUpdate',\n+ ]);\n+\n+ log.length = 0;\n+ ReactDOM.unmountComponentAtNode(container);\n+ expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ });\n+\n+ it('catches errors in componentDidMount', () => {\n+ var container = document.createElement('div');\n+ ReactDOM.render(\n+ \n+ \n+ \n+ <\/BrokenComponentWillUnmount>\n+ \n+ \n+ <\/ErrorBoundary>,\n+ container,\n+ );\n+ expect(log).toEqual([\n+ 'ErrorBoundary constructor',\n+ 'ErrorBoundary componentWillMount',\n+ 'ErrorBoundary render success',\n+ 'BrokenComponentWillUnmount constructor',\n+ 'BrokenComponentWillUnmount componentWillMount',\n+ 'BrokenComponentWillUnmount render',\n+ 'Normal constructor',\n+ 'Normal componentWillMount',\n+ 'Normal render',\n+ 'BrokenComponentDidMount constructor',\n+ 'BrokenComponentDidMount componentWillMount',\n+ 'BrokenComponentDidMount render',\n+ 'LastChild constructor',\n+ 'LastChild componentWillMount',\n+ 'LastChild render',\n+ \/\/ Start flushing didMount queue\n+ 'Normal componentDidMount',\n+ 'BrokenComponentWillUnmount componentDidMount',\n+ 'BrokenComponentDidMount componentDidMount [!]',\n+ \/\/ Continue despite the error\n+ 'LastChild componentDidMount',\n+ 'ErrorBoundary componentDidMount',\n+ \/\/ Now we are ready to handle the error\n+ \/\/ Safely unmount every child\n+ 'BrokenComponentWillUnmount componentWillUnmount [!]',\n+ \/\/ Continue unmounting safely despite any errors\n+ 'Normal componentWillUnmount',\n+ 'BrokenComponentDidMount componentWillUnmount',\n+ 'LastChild componentWillUnmount',\n+ \/\/ Handle the error\n+ 'ErrorBoundary componentDidCatch',\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ \/\/ The update has finished\n+ 'ErrorBoundary componentDidUpdate',\n+ ]);\n+\n+ log.length = 0;\n+ ReactDOM.unmountComponentAtNode(container);\n+ expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ });\n+\n+ it('catches errors in componentDidUpdate', () => {\n+ var container = document.createElement('div');\n+ ReactDOM.render(\n+ \n+ \n+ <\/ErrorBoundary>,\n+ container,\n+ );\n+\n+ log.length = 0;\n+ ReactDOM.render(\n+ \n+ \n+ <\/ErrorBoundary>,\n+ container,\n+ );\n+ expect(log).toEqual([\n+ 'ErrorBoundary componentWillReceiveProps',\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render success',\n+ 'BrokenComponentDidUpdate componentWillReceiveProps',\n+ 'BrokenComponentDidUpdate componentWillUpdate',\n+ 'BrokenComponentDidUpdate render',\n+ \/\/ All lifecycles run\n+ 'BrokenComponentDidUpdate componentDidUpdate [!]',\n+ 'ErrorBoundary componentDidUpdate',\n+ 'BrokenComponentDidUpdate componentWillUnmount',\n+ \/\/ Then, error is handled\n+ 'ErrorBoundary componentDidCatch',\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorBoundary componentDidUpdate',\n+ ]);\n+\n+ log.length = 0;\n+ ReactDOM.unmountComponentAtNode(container);\n+ expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ });\n+\n+ it('propagates errors inside boundary during componentDidMount', () => {\n+ var container = document.createElement('div');\n+ ReactDOM.render(\n+ \n+ (\n+

\n+ We should never catch our own error: {error.message}.\n+ <\/div>\n+ )}\n+ \/>\n+ <\/ErrorBoundary>,\n+ container,\n+ );\n+ expect(container.firstChild.textContent).toBe('Caught an error: Hello.');\n+ expect(log).toEqual([\n+ 'ErrorBoundary constructor',\n+ 'ErrorBoundary componentWillMount',\n+ 'ErrorBoundary render success',\n+ 'BrokenComponentDidMountErrorBoundary constructor',\n+ 'BrokenComponentDidMountErrorBoundary componentWillMount',\n+ 'BrokenComponentDidMountErrorBoundary render success',\n+ 'BrokenComponentDidMountErrorBoundary componentDidMount [!]',\n+ \/\/ Fiber proceeds with the hooks\n+ 'ErrorBoundary componentDidMount',\n+ 'BrokenComponentDidMountErrorBoundary componentWillUnmount',\n+ \/\/ The error propagates to the higher boundary\n+ 'ErrorBoundary componentDidCatch',\n+ \/\/ Fiber retries from the root\n+ 'ErrorBoundary componentWillUpdate',\n+ 'ErrorBoundary render error',\n+ 'ErrorBoundary componentDidUpdate',\n+ ]);\n+\n+ log.length = 0;\n+ ReactDOM.unmountComponentAtNode(container);\n+ expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ });\n+\n+ it('lets different boundaries catch their own first errors', () => {\n+ function renderUnmountError(error) {\n+ return

Caught an unmounting error: {error.message}.<\/div>;\n+ }\n+ function renderUpdateError(error) {\n+ return

Caught an updating error: {error.message}.<\/div>;\n+ }\n+\n+ var container = document.createElement('div');\n+ ReactDOM.render(\n+ \n+ \n+ \n+ \n+ <\/ErrorBoundary>\n+ \n+ \n+ \n+ <\/ErrorBoundary>\n+ <\/ErrorBoundary>,\n+ container,\n+ );\n+\n+ log.length = 0;\n+ ReactDOM.render(\n+ \n+ \n+ \n+ \n+ \n+ <\/ErrorBoundary>\n+ <\/ErrorBoundary>,\n+ container,\n+ );\n+\n+ expect(container.firstChild.textContent).toBe(\n+ 'Caught an unmounting error: E1.' + 'Caught an updating error: E3.',\n+ );\n+ expect(log).toEqual([\n+ \/\/ Begin update phase\n+ 'OuterErrorBoundary componentWillReceiveProps',\n+ 'OuterErrorBoundary componentWillUpdate',\n+ 'OuterErrorBoundary render success',\n+ 'InnerUnmountBoundary componentWillReceiveProps',\n+ 'InnerUnmountBoundary componentWillUpdate',\n+ 'InnerUnmountBoundary render success',\n+ 'InnerUpdateBoundary componentWillReceiveProps',\n+ 'InnerUpdateBoundary componentWillUpdate',\n+ 'InnerUpdateBoundary render success',\n+ \/\/ First come the updates\n+ 'BrokenComponentDidUpdate componentWillReceiveProps',\n+ 'BrokenComponentDidUpdate componentWillUpdate',\n+ 'BrokenComponentDidUpdate render',\n+ 'BrokenComponentDidUpdate componentWillReceiveProps',\n+ 'BrokenComponentDidUpdate componentWillUpdate',\n+ 'BrokenComponentDidUpdate render',\n+ \/\/ We're in commit phase now, deleting\n+ 'BrokenComponentWillUnmount componentWillUnmount [!]',\n+ 'BrokenComponentWillUnmount componentWillUnmount [!]',\n+ \/\/ Continue despite errors, handle them after commit is done\n+ 'InnerUnmountBoundary componentDidUpdate',\n+ \/\/ We're still in commit phase, now calling update lifecycles\n+ 'BrokenComponentDidUpdate componentDidUpdate [!]',\n+ \/\/ Again, continue despite errors, we'll handle them later\n+ 'BrokenComponentDidUpdate componentDidUpdate [!]',\n+ 'InnerUpdateBoundary componentDidUpdate',\n+ 'OuterErrorBoundary componentDidUpdate',\n+ \/\/ After the commit phase, attempt to recover from any errors that\n+ \/\/ were captured\n+ 'BrokenComponentDidUpdate componentWillUnmount',\n+ 'BrokenComponentDidUpdate componentWillUnmount',\n+ 'InnerUnmountBoundary componentDidCatch',\n+ 'InnerUpdateBoundary componentDidCatch',\n+ 'InnerUnmountBoundary componentWillUpdate',\n+ 'InnerUnmountBoundary render error',\n+ 'InnerUpdateBoundary componentWillUpdate',\n+ 'InnerUpdateBoundary render error',\n+ 'InnerUnmountBoundary componentDidUpdate',\n+ 'InnerUpdateBoundary componentDidUpdate',\n+ ]);\n+\n+ log.length = 0;\n+ ReactDOM.unmountComponentAtNode(container);\n+ expect(log).toEqual([\n+ 'OuterErrorBoundary componentWillUnmount',\n+ 'InnerUnmountBoundary componentWillUnmount',\n+ 'InnerUpdateBoundary componentWillUnmount',\n+ ]);\n+ });\n+\n+ it('discards a bad root if the root component fails', () => {\n+ spyOn(console, 'error');\n+\n+ const X = null;\n+ const Y = undefined;\n+ let err1;\n+ let err2;\n+\n+ try {\n+ let container = document.createElement('div');\n+ ReactDOM.render(, container);\n+ } catch (err) {\n+ err1 = err;\n+ }\n+ try {\n+ let container = document.createElement('div');\n+ ReactDOM.render(, container);\n+ } catch (err) {\n+ err2 = err;\n+ }\n+\n+ expect(err1.message).toMatch(\/got: null\/);\n+ expect(err2.message).toMatch(\/got: undefined\/);\n+ });\n+\n+ it('renders empty output if error boundary does not handle the error', () => {\n+ var container = document.createElement('div');\n+ ReactDOM.render(\n+

\n+ Sibling\n+ \n+ \n+ <\/NoopErrorBoundary>\n+ <\/div>,\n+ container,\n+ );\n+ expect(container.firstChild.textContent).toBe('Sibling');\n+ expect(log).toEqual([\n+ 'NoopErrorBoundary constructor',\n+ 'NoopErrorBoundary componentWillMount',\n+ 'NoopErrorBoundary render',\n+ 'BrokenRender constructor',\n+ 'BrokenRender componentWillMount',\n+ 'BrokenRender render [!]',\n+ \/\/ In Fiber, noop error boundaries render null\n+ 'NoopErrorBoundary componentDidMount',\n+ 'NoopErrorBoundary componentDidCatch',\n+ \/\/ Nothing happens.\n+ ]);\n+\n+ log.length = 0;\n+ ReactDOM.unmountComponentAtNode(container);\n+ expect(log).toEqual(['NoopErrorBoundary componentWillUnmount']);\n+ });\n+\n+ it('passes first error when two errors happen in commit', () => {\n+ const errors = [];\n+ let caughtError;\n+ class Parent extends React.Component {\n+ render() {\n+ return ;\n }\n- class Child extends React.Component {\n- render() {\n- return

;\n- }\n- componentDidMount() {\n- errors.push('child sad');\n- throw new Error('child sad');\n- }\n+ componentDidMount() {\n+ errors.push('parent sad');\n+ throw new Error('parent sad');\n }\n-\n- var container = document.createElement('div');\n- try {\n- \/\/ Here, we test the behavior where there is no error boundary and we\n- \/\/ delegate to the host root.\n- ReactDOM.render(, container);\n- } catch (e) {\n- if (e.message !== 'parent sad' && e.message !== 'child sad') {\n- throw e;\n- }\n- caughtError = e;\n+ }\n+ class Child extends React.Component {\n+ render() {\n+ return

;\n+ }\n+ componentDidMount() {\n+ errors.push('child sad');\n+ throw new Error('child sad');\n }\n+ }\n \n- expect(errors).toEqual(['child sad', 'parent sad']);\n- \/\/ Error should be the first thrown\n- expect(caughtError.message).toBe('child sad');\n- });\n- }\n+ var container = document.createElement('div');\n+ try {\n+ \/\/ Here, we test the behavior where there is no error boundary and we\n+ \/\/ delegate to the host root.\n+ ReactDOM.render(, container);\n+ } catch (e) {\n+ if (e.message !== 'parent sad' && e.message !== 'child sad') {\n+ throw e;\n+ }\n+ caughtError = e;\n+ }\n+\n+ expect(errors).toEqual(['child sad', 'parent sad']);\n+ \/\/ Error should be the first thrown\n+ expect(caughtError.message).toBe('child sad');\n+ });\n });\ndiff --git a\/src\/renderers\/__tests__\/ReactHostOperationHistoryHook-test.js b\/src\/renderers\/__tests__\/ReactHostOperationHistoryHook-test.js\nindex 9eb0d4b6ea..891144b92a 100644\n--- a\/src\/renderers\/__tests__\/ReactHostOperationHistoryHook-test.js\n+++ b\/src\/renderers\/__tests__\/ReactHostOperationHistoryHook-test.js\n@@ -9,12 +9,9 @@\n \n 'use strict';\n \n-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n-var describeStack = ReactDOMFeatureFlags.useFiber ? describe.skip : describe;\n-\n \/\/ This is only used by ReactPerf which is currently not supported on Fiber.\n \/\/ Use browser timeline integration instead.\n-describeStack('ReactHostOperationHistoryHook', () => {\n+describe.skip('ReactHostOperationHistoryHook', () => {\n var React;\n var ReactPerf;\n var ReactDOM;\ndiff --git a\/src\/renderers\/__tests__\/ReactMultiChild-test.js b\/src\/renderers\/__tests__\/ReactMultiChild-test.js\nindex 4217a63561..960e513dcf 100644\n--- a\/src\/renderers\/__tests__\/ReactMultiChild-test.js\n+++ b\/src\/renderers\/__tests__\/ReactMultiChild-test.js\n@@ -16,13 +16,11 @@ describe('ReactMultiChild', () => {\n \n var React;\n var ReactDOM;\n- var ReactDOMFeatureFlags;\n \n beforeEach(() => {\n jest.resetModules();\n React = require('react');\n ReactDOM = require('react-dom');\n- ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n });\n \n describe('reconciliation', () => {\n@@ -280,8 +278,7 @@ describe('ReactMultiChild', () => {\n 'Warning: Using Maps as children is unsupported and will likely yield ' +\n 'unexpected results. Convert it to a sequence\/iterable of keyed ' +\n 'ReactElements instead.\\n' +\n- \/\/ Fiber gives a slightly better stack with the nearest host components\n- (ReactDOMFeatureFlags.useFiber ? ' in div (at **)\\n' : '') +\n+ ' in div (at **)\\n' +\n ' in Parent (at **)',\n );\n });\n@@ -368,23 +365,12 @@ describe('ReactMultiChild', () => {\n 'oneA componentDidMount',\n 'twoA componentDidMount',\n \n- ...(ReactDOMFeatureFlags.useFiber\n- ? [\n- 'oneB componentWillMount',\n- 'oneB render',\n- 'twoB componentWillMount',\n- 'twoB render',\n- 'oneA componentWillUnmount',\n- 'twoA componentWillUnmount',\n- ]\n- : [\n- 'oneB componentWillMount',\n- 'oneB render',\n- 'oneA componentWillUnmount',\n- 'twoB componentWillMount',\n- 'twoB render',\n- 'twoA componentWillUnmount',\n- ]),\n+ 'oneB componentWillMount',\n+ 'oneB render',\n+ 'twoB componentWillMount',\n+ 'twoB render',\n+ 'oneA componentWillUnmount',\n+ 'twoA componentWillUnmount',\n \n 'oneB componentDidMount',\n 'twoB componentDidMount',\ndiff --git a\/src\/renderers\/__tests__\/ReactMultiChildText-test.js b\/src\/renderers\/__tests__\/ReactMultiChildText-test.js\nindex 850c16bb14..2d35886b47 100644\n--- a\/src\/renderers\/__tests__\/ReactMultiChildText-test.js\n+++ b\/src\/renderers\/__tests__\/ReactMultiChildText-test.js\n@@ -11,7 +11,6 @@\n \n var React = require('react');\n var ReactDOM = require('react-dom');\n-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n var ReactTestUtils = require('react-dom\/test-utils');\n \n \/\/ Helpers\n@@ -48,43 +47,16 @@ var expectChildren = function(container, children) {\n expect(textNode.data).toBe('' + children);\n }\n } else {\n- var openingCommentNode;\n- var closingCommentNode;\n var mountIndex = 0;\n \n for (var i = 0; i < children.length; i++) {\n var child = children[i];\n \n if (typeof child === 'string') {\n- if (ReactDOMFeatureFlags.useFiber) {\n- textNode = outerNode.childNodes[mountIndex];\n- expect(textNode.nodeType).toBe(3);\n- expect(textNode.data).toBe('' + child);\n- mountIndex++;\n- } else {\n- openingCommentNode = outerNode.childNodes[mountIndex];\n-\n- expect(openingCommentNode.nodeType).toBe(8);\n- expect(openingCommentNode.nodeValue).toMatch(\/ react-text: [0-9]+ \/);\n-\n- if (child === '') {\n- textNode = null;\n- closingCommentNode = openingCommentNode.nextSibling;\n- mountIndex += 2;\n- } else {\n- textNode = openingCommentNode.nextSibling;\n- closingCommentNode = textNode.nextSibling;\n- mountIndex += 3;\n- }\n-\n- if (textNode) {\n- expect(textNode.nodeType).toBe(3);\n- expect(textNode.data).toBe('' + child);\n- }\n-\n- expect(closingCommentNode.nodeType).toBe(8);\n- expect(closingCommentNode.nodeValue).toBe(' \/react-text ');\n- }\n+ textNode = outerNode.childNodes[mountIndex];\n+ expect(textNode.nodeType).toBe(3);\n+ expect(textNode.data).toBe('' + child);\n+ mountIndex++;\n } else {\n var elementDOMNode = outerNode.childNodes[mountIndex];\n expect(elementDOMNode.tagName).toBe('DIV');\n@@ -189,20 +161,14 @@ describe('ReactMultiChildText', () => {\n [true,

{1.2}{''}{

}{'foo'}<\/div>, true, 1.2], [

, '1.2'],\n ['', 'foo',

{true}{

}{1.2}{''}<\/div>, 'foo'], ['', 'foo',

, 'foo'],\n ]);\n- if (ReactDOMFeatureFlags.useFiber) {\n- expectDev(console.error.calls.count()).toBe(2);\n- expectDev(console.error.calls.argsFor(0)[0]).toContain(\n- 'Warning: Each child in an array or iterator should have a unique \"key\" prop.',\n- );\n- expectDev(console.error.calls.argsFor(1)[0]).toContain(\n- 'Warning: Each child in an array or iterator should have a unique \"key\" prop.',\n- );\n- } else {\n- expectDev(console.error.calls.count()).toBe(1);\n- expectDev(console.error.calls.argsFor(0)[0]).toContain(\n- 'Warning: Each child in an array or iterator should have a unique \"key\" prop.',\n- );\n- }\n+\n+ expectDev(console.error.calls.count()).toBe(2);\n+ expectDev(console.error.calls.argsFor(0)[0]).toContain(\n+ 'Warning: Each child in an array or iterator should have a unique \"key\" prop.',\n+ );\n+ expectDev(console.error.calls.argsFor(1)[0]).toContain(\n+ 'Warning: Each child in an array or iterator should have a unique \"key\" prop.',\n+ );\n });\n \n it('should throw if rendering both HTML and children', () => {\ndiff --git a\/src\/renderers\/__tests__\/ReactPerf-test.js b\/src\/renderers\/__tests__\/ReactPerf-test.js\nindex ac222c0e19..b09519a198 100644\n--- a\/src\/renderers\/__tests__\/ReactPerf-test.js\n+++ b\/src\/renderers\/__tests__\/ReactPerf-test.js\n@@ -9,12 +9,9 @@\n \n 'use strict';\n \n-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n-var describeStack = ReactDOMFeatureFlags.useFiber ? describe.skip : describe;\n-\n \/\/ ReactPerf is currently not supported on Fiber.\n \/\/ Use browser timeline integration instead.\n-describeStack('ReactPerf', () => {\n+describe.skip('ReactPerf', () => {\n var React;\n var ReactDOM;\n var ReactPerf;\ndiff --git a\/src\/renderers\/__tests__\/ReactStatelessComponent-test.js b\/src\/renderers\/__tests__\/ReactStatelessComponent-test.js\nindex 92811c618f..c8d67c7bbf 100644\n--- a\/src\/renderers\/__tests__\/ReactStatelessComponent-test.js\n+++ b\/src\/renderers\/__tests__\/ReactStatelessComponent-test.js\n@@ -14,8 +14,6 @@ var React;\n var ReactDOM;\n var ReactTestUtils;\n \n-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n-\n function StatelessComponent(props) {\n return

{props.name}<\/div>;\n }\n@@ -118,54 +116,22 @@ describe('ReactStatelessComponent', () => {\n \n ReactDOM.render(, container);\n \n- \/\/ Stack and Fiber differ in terms of they show warnings\n- if (ReactDOMFeatureFlags.useFiber) {\n- expectDev(console.error.calls.count()).toBe(1);\n- expectDev(console.error.calls.argsFor(0)[0]).toContain(\n- 'StatelessComponentWithChildContext(...): childContextTypes cannot ' +\n- 'be defined on a functional component.',\n- );\n- } else {\n- expectDev(console.error.calls.count()).toBe(2);\n- expectDev(console.error.calls.argsFor(0)[0]).toContain(\n- 'StatelessComponentWithChildContext(...): childContextTypes cannot ' +\n- 'be defined on a functional component.',\n- );\n- expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(1)[0])).toBe(\n- 'Warning: StatelessComponentWithChildContext.childContextTypes is specified ' +\n- 'but there is no getChildContext() method on the instance. You can either ' +\n- 'define getChildContext() on StatelessComponentWithChildContext or remove ' +\n- 'childContextTypes from it.',\n- );\n- }\n+ expectDev(console.error.calls.count()).toBe(1);\n+ expectDev(console.error.calls.argsFor(0)[0]).toContain(\n+ 'StatelessComponentWithChildContext(...): childContextTypes cannot ' +\n+ 'be defined on a functional component.',\n+ );\n });\n \n- if (!ReactDOMFeatureFlags.useFiber) {\n- \/\/ Stack doesn't support fragments\n- it('should throw when stateless component returns array', () => {\n- function NotAComponent() {\n- return [

];\n- }\n- expect(function() {\n- ReactTestUtils.renderIntoDocument(

<\/div>);\n- }).toThrowError(\n- 'NotAComponent(...): A valid React element (or null) must be returned. ' +\n- 'You may have returned undefined, an array or some other invalid object.',\n- );\n- });\n- }\n-\n- if (ReactDOMFeatureFlags.useFiber) {\n- it('should throw when stateless component returns undefined', () => {\n- function NotAComponent() {}\n- expect(function() {\n- ReactTestUtils.renderIntoDocument(

<\/div>);\n- }).toThrowError(\n- 'NotAComponent(...): Nothing was returned from render. ' +\n- 'This usually means a return statement is missing. Or, to render nothing, return null.',\n- );\n- });\n- }\n+ it('should throw when stateless component returns undefined', () => {\n+ function NotAComponent() {}\n+ expect(function() {\n+ ReactTestUtils.renderIntoDocument(

<\/div>);\n+ }).toThrowError(\n+ 'NotAComponent(...): Nothing was returned from render. ' +\n+ 'This usually means a return statement is missing. Or, to render nothing, return null.',\n+ );\n+ });\n \n it('should throw on string refs in pure functions', () => {\n function Child() {\ndiff --git a\/src\/renderers\/__tests__\/ReactUpdates-test.js b\/src\/renderers\/__tests__\/ReactUpdates-test.js\nindex 0124b20e04..fdfb92c532 100644\n--- a\/src\/renderers\/__tests__\/ReactUpdates-test.js\n+++ b\/src\/renderers\/__tests__\/ReactUpdates-test.js\n@@ -12,13 +12,11 @@\n var React;\n var ReactDOM;\n var ReactTestUtils;\n-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n \n describe('ReactUpdates', () => {\n beforeEach(() => {\n React = require('react');\n ReactDOM = require('react-dom');\n- ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n ReactTestUtils = require('react-dom\/test-utils');\n });\n \n@@ -519,9 +517,7 @@ describe('ReactUpdates', () => {\n render() {\n var portal = null;\n \/\/ If we're using Fiber, we use Portals instead to achieve this.\n- if (ReactDOMFeatureFlags.useFiber) {\n- portal = ReactDOM.createPortal( (b = n)} \/>, bContainer);\n- }\n+ portal = ReactDOM.createPortal( (b = n)} \/>, bContainer);\n return
A{this.state.x}{portal}<\/div>;\n }\n }\n@@ -535,10 +531,6 @@ describe('ReactUpdates', () => {\n }\n \n a = ReactTestUtils.renderIntoDocument();\n- if (!ReactDOMFeatureFlags.useFiber) {\n- ReactDOM.render( (b = n)} \/>, bContainer);\n- }\n-\n ReactDOM.unstable_batchedUpdates(function() {\n a.setState({x: 1});\n b.setState({x: 1});\n@@ -1178,35 +1170,33 @@ describe('ReactUpdates', () => {\n }).toThrow('Maximum');\n });\n \n- if (ReactDOMFeatureFlags.useFiber) {\n- it('does not fall into an infinite error loop', () => {\n- function BadRender() {\n- throw new Error('error');\n- }\n+ it('does not fall into an infinite error loop', () => {\n+ function BadRender() {\n+ throw new Error('error');\n+ }\n \n- class ErrorBoundary extends React.Component {\n- componentDidCatch() {\n- this.props.parent.remount();\n- }\n- render() {\n- return ;\n- }\n+ class ErrorBoundary extends React.Component {\n+ componentDidCatch() {\n+ this.props.parent.remount();\n+ }\n+ render() {\n+ return ;\n }\n+ }\n \n- class NonTerminating extends React.Component {\n- state = {step: 0};\n- remount() {\n- this.setState(state => ({step: state.step + 1}));\n- }\n- render() {\n- return ;\n- }\n+ class NonTerminating extends React.Component {\n+ state = {step: 0};\n+ remount() {\n+ this.setState(state => ({step: state.step + 1}));\n+ }\n+ render() {\n+ return ;\n }\n+ }\n \n- const container = document.createElement('div');\n- expect(() => {\n- ReactDOM.render(, container);\n- }).toThrow('Maximum');\n- });\n- }\n+ const container = document.createElement('div');\n+ expect(() => {\n+ ReactDOM.render(, container);\n+ }).toThrow('Maximum');\n+ });\n });\ndiff --git a\/src\/renderers\/__tests__\/multiple-copies-of-react-test.js b\/src\/renderers\/__tests__\/multiple-copies-of-react-test.js\nindex 0cd96adf0f..9d4d30888a 100644\n--- a\/src\/renderers\/__tests__\/multiple-copies-of-react-test.js\n+++ b\/src\/renderers\/__tests__\/multiple-copies-of-react-test.js\n@@ -10,7 +10,6 @@\n 'use strict';\n \n let React = require('react');\n-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n var ReactTestUtils = require('react-dom\/test-utils');\n \n class TextWithStringRef extends React.Component {\n@@ -27,23 +26,12 @@ class TextWithStringRef extends React.Component {\n \n describe('when different React version is used with string ref', () => {\n it('throws the \"Refs must have owner\" warning', () => {\n- if (ReactDOMFeatureFlags.useFiber) {\n- expect(() => {\n- ReactTestUtils.renderIntoDocument();\n- }).toThrow(\n- 'Element ref was specified as a string (foo) but no owner was set.' +\n- ' You may have multiple copies of React loaded. (details: ' +\n- 'https:\/\/fb.me\/react-refs-must-have-owner).',\n- );\n- } else {\n- expect(() => {\n- ReactTestUtils.renderIntoDocument();\n- }).toThrow(\n- 'Only a ReactOwner can have refs. You might be adding a ref to a ' +\n- \"component that was not created inside a component's `render` \" +\n- 'method, or you have multiple copies of React loaded ' +\n- '(details: https:\/\/fb.me\/react-refs-must-have-owner)',\n- );\n- }\n+ expect(() => {\n+ ReactTestUtils.renderIntoDocument();\n+ }).toThrow(\n+ 'Element ref was specified as a string (foo) but no owner was set.' +\n+ ' You may have multiple copies of React loaded. (details: ' +\n+ 'https:\/\/fb.me\/react-refs-must-have-owner).',\n+ );\n });\n });\ndiff --git a\/src\/renderers\/__tests__\/refs-test.js b\/src\/renderers\/__tests__\/refs-test.js\nindex 424b9667e8..314e5075ca 100644\n--- a\/src\/renderers\/__tests__\/refs-test.js\n+++ b\/src\/renderers\/__tests__\/refs-test.js\n@@ -10,7 +10,6 @@\n 'use strict';\n \n var React = require('react');\n-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n var ReactTestUtils = require('react-dom\/test-utils');\n \n \/**\n@@ -348,40 +347,38 @@ describe('root level refs', () => {\n expect(ref).toHaveBeenCalledTimes(2);\n expect(ref.mock.calls[1][0]).toBe(null);\n \n- if (ReactDOMFeatureFlags.useFiber) {\n- \/\/ fragment\n- inst = null;\n- ref = jest.fn(value => (inst = value));\n- var divInst = null;\n- var ref2 = jest.fn(value => (divInst = value));\n- result = ReactDOM.render(\n- [, 5,
Hello<\/div>],\n- container,\n- );\n+ \/\/ fragment\n+ inst = null;\n+ ref = jest.fn(value => (inst = value));\n+ var divInst = null;\n+ var ref2 = jest.fn(value => (divInst = value));\n+ result = ReactDOM.render(\n+ [, 5,
Hello<\/div>],\n+ container,\n+ );\n \n- \/\/ first call should be `Comp`\n- expect(ref).toHaveBeenCalledTimes(1);\n- expect(ref.mock.calls[0][0]).toBeInstanceOf(Comp);\n- expect(result).toBe(ref.mock.calls[0][0]);\n+ \/\/ first call should be `Comp`\n+ expect(ref).toHaveBeenCalledTimes(1);\n+ expect(ref.mock.calls[0][0]).toBeInstanceOf(Comp);\n+ expect(result).toBe(ref.mock.calls[0][0]);\n \n- expect(ref2).toHaveBeenCalledTimes(1);\n- expect(divInst).toBeInstanceOf(HTMLDivElement);\n- expect(result).not.toBe(divInst);\n+ expect(ref2).toHaveBeenCalledTimes(1);\n+ expect(divInst).toBeInstanceOf(HTMLDivElement);\n+ expect(result).not.toBe(divInst);\n \n- ReactDOM.unmountComponentAtNode(container);\n- expect(ref).toHaveBeenCalledTimes(2);\n- expect(ref.mock.calls[1][0]).toBe(null);\n- expect(ref2).toHaveBeenCalledTimes(2);\n- expect(ref2.mock.calls[1][0]).toBe(null);\n+ ReactDOM.unmountComponentAtNode(container);\n+ expect(ref).toHaveBeenCalledTimes(2);\n+ expect(ref.mock.calls[1][0]).toBe(null);\n+ expect(ref2).toHaveBeenCalledTimes(2);\n+ expect(ref2.mock.calls[1][0]).toBe(null);\n \n- \/\/ null\n- result = ReactDOM.render(null, container);\n- expect(result).toBe(null);\n+ \/\/ null\n+ result = ReactDOM.render(null, container);\n+ expect(result).toBe(null);\n \n- \/\/ primitives\n- result = ReactDOM.render(5, container);\n- expect(result).toBeInstanceOf(Text);\n- }\n+ \/\/ primitives\n+ result = ReactDOM.render(5, container);\n+ expect(result).toBeInstanceOf(Text);\n });\n });\n \n@@ -397,28 +394,6 @@ describe('creating element with ref in constructor', () => {\n }\n }\n \n- var devErrorMessage =\n- 'addComponentAsRefTo(...): Only a ReactOwner can have refs. You might ' +\n- \"be adding a ref to a component that was not created inside a component's \" +\n- '`render` method, or you have multiple copies of React loaded ' +\n- '(details: https:\/\/fb.me\/react-refs-must-have-owner).';\n-\n- var prodErrorMessage =\n- 'Minified React error #119; visit ' +\n- 'http:\/\/facebook.github.io\/react\/docs\/error-decoder.html?invariant=119 for the full message ' +\n- 'or use the non-minified dev environment for full errors and additional helpful warnings.';\n-\n- var fiberDevErrorMessage =\n- 'Element ref was specified as a string (p) but no owner was ' +\n- 'set. You may have multiple copies of React loaded. ' +\n- '(details: https:\/\/fb.me\/react-refs-must-have-owner).';\n-\n- var fiberProdErrorMessage =\n- 'Minified React error #149; visit ' +\n- 'http:\/\/facebook.github.io\/react\/docs\/error-decoder.html?invariant=149&args[]=p ' +\n- 'for the full message or use the non-minified dev environment for full errors and additional ' +\n- 'helpful warnings.';\n-\n it('throws an error when __DEV__ = true', () => {\n ReactTestUtils = require('react-dom\/test-utils');\n \n@@ -429,7 +404,9 @@ describe('creating element with ref in constructor', () => {\n expect(function() {\n ReactTestUtils.renderIntoDocument();\n }).toThrowError(\n- ReactDOMFeatureFlags.useFiber ? fiberDevErrorMessage : devErrorMessage,\n+ 'Element ref was specified as a string (p) but no owner was ' +\n+ 'set. You may have multiple copies of React loaded. ' +\n+ '(details: https:\/\/fb.me\/react-refs-must-have-owner).',\n );\n } finally {\n __DEV__ = originalDev;\n@@ -446,9 +423,10 @@ describe('creating element with ref in constructor', () => {\n expect(function() {\n ReactTestUtils.renderIntoDocument();\n }).toThrowError(\n- ReactDOMFeatureFlags.useFiber\n- ? fiberProdErrorMessage\n- : prodErrorMessage,\n+ 'Minified React error #149; visit ' +\n+ 'http:\/\/facebook.github.io\/react\/docs\/error-decoder.html?invariant=149&args[]=p ' +\n+ 'for the full message or use the non-minified dev environment for full errors and additional ' +\n+ 'helpful warnings.',\n );\n } finally {\n __DEV__ = originalDev;\ndiff --git a\/src\/renderers\/dom\/__tests__\/ReactDOMProduction-test.js b\/src\/renderers\/dom\/__tests__\/ReactDOMProduction-test.js\nindex 74470dc144..570a59a7eb 100644\n--- a\/src\/renderers\/dom\/__tests__\/ReactDOMProduction-test.js\n+++ b\/src\/renderers\/dom\/__tests__\/ReactDOMProduction-test.js\n@@ -9,8 +9,6 @@\n 'use strict';\n \n describe('ReactDOMProduction', () => {\n- var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n-\n var React;\n var ReactDOM;\n var ReactDOMServer;\n@@ -195,7 +193,7 @@ describe('ReactDOMProduction', () => {\n });\n \n it('should throw with an error code in production', () => {\n- const errorCode = ReactDOMFeatureFlags.useFiber ? 152 : 109;\n+ const errorCode = 152;\n expect(function() {\n class Component extends React.Component {\n render() {\n@@ -235,57 +233,55 @@ describe('ReactDOMProduction', () => {\n }\n });\n \n- if (ReactDOMFeatureFlags.useFiber) {\n- \/\/ This test is originally from ReactDOMFiber-test but we replicate it here\n- \/\/ to avoid production-only regressions because of host context differences\n- \/\/ in dev and prod.\n- it('should keep track of namespace across portals in production', () => {\n- var svgEls, htmlEls;\n- var expectSVG = {ref: el => svgEls.push(el)};\n- var expectHTML = {ref: el => htmlEls.push(el)};\n- var usePortal = function(tree) {\n- return ReactDOM.createPortal(tree, document.createElement('div'));\n- };\n- var assertNamespacesMatch = function(tree) {\n- var container = document.createElement('div');\n- svgEls = [];\n- htmlEls = [];\n- ReactDOM.render(tree, container);\n- svgEls.forEach(el => {\n- expect(el.namespaceURI).toBe('http:\/\/www.w3.org\/2000\/svg');\n- });\n- htmlEls.forEach(el => {\n- expect(el.namespaceURI).toBe('http:\/\/www.w3.org\/1999\/xhtml');\n- });\n- ReactDOM.unmountComponentAtNode(container);\n- expect(container.innerHTML).toBe('');\n- };\n+ \/\/ This test is originally from ReactDOMFiber-test but we replicate it here\n+ \/\/ to avoid production-only regressions because of host context differences\n+ \/\/ in dev and prod.\n+ it('should keep track of namespace across portals in production', () => {\n+ var svgEls, htmlEls;\n+ var expectSVG = {ref: el => svgEls.push(el)};\n+ var expectHTML = {ref: el => htmlEls.push(el)};\n+ var usePortal = function(tree) {\n+ return ReactDOM.createPortal(tree, document.createElement('div'));\n+ };\n+ var assertNamespacesMatch = function(tree) {\n+ var container = document.createElement('div');\n+ svgEls = [];\n+ htmlEls = [];\n+ ReactDOM.render(tree, container);\n+ svgEls.forEach(el => {\n+ expect(el.namespaceURI).toBe('http:\/\/www.w3.org\/2000\/svg');\n+ });\n+ htmlEls.forEach(el => {\n+ expect(el.namespaceURI).toBe('http:\/\/www.w3.org\/1999\/xhtml');\n+ });\n+ ReactDOM.unmountComponentAtNode(container);\n+ expect(container.innerHTML).toBe('');\n+ };\n \n- assertNamespacesMatch(\n-
\n-

dillon1000/react

Files changed