{"patch":"diff --git a\/src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiber-test.js b\/src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiber-test.js\nindex 21131897a5..61efde7c9b 100644\n--- a\/src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiber-test.js\n+++ b\/src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiber-test.js\n@@ -1014,20 +1014,25 @@ describe('ReactDOMFiber', () => {\n ReactFeatureFlags.disableNewFiberFeatures = false;\n });\n \n+ it('throws if non-element passed to top-level render', () => {\n+ const message = 'render(): Invalid component element.';\n+\n+ expect(() => ReactDOM.render(null, container)).toThrow(message, container);\n+ expect(() => ReactDOM.render(undefined, container)).toThrow(message, container);\n+ expect(() => ReactDOM.render(false, container)).toThrow(message, container);\n+ expect(() => ReactDOM.render('Hi', container)).toThrow(message, container);\n+ expect(() => ReactDOM.render(999, container)).toThrow(message, container);\n+ expect(() => ReactDOM.render([

], container)).toThrow(message, container);\n+ });\n+\n it('throws if something other than false, null, or an element is returned from render', () => {\n function Render(props) {\n return props.children;\n }\n \n- const message = (\n- 'Warning: Render.render(): A valid React element (or null) must ' +\n- 'be returned. You may have returned undefined, an array or some ' +\n- 'other invalid object.'\n- );\n-\n- expect(() => ReactDOM.render(Hi<\/Render>, container)).toThrow(message);\n- expect(() => ReactDOM.render({999}<\/Render>, container)).toThrow(message);\n- expect(() => ReactDOM.render([

]<\/Render>, container)).toThrow(message);\n+ expect(() => ReactDOM.render(Hi<\/Render>, container)).toThrow(\/Render\\.render\/);\n+ expect(() => ReactDOM.render({999}<\/Render>, container)).toThrow(\/Render\\.render\/);\n+ expect(() => ReactDOM.render([

]<\/Render>, container)).toThrow(\/Render\\.render\/);\n });\n });\n }\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\nindex 52cc90f57d..d74d16226f 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n@@ -17,6 +17,10 @@ import type { FiberRoot } from 'ReactFiberRoot';\n import type { PriorityLevel } from 'ReactPriorityLevel';\n import type { ReactNodeList } from 'ReactTypes';\n \n+var { isValidElement } = require('ReactElement');\n+var invariant = require('invariant');\n+var ReactFeatureFlags = require('ReactFeatureFlags');\n+\n var {\n addTopLevelUpdate,\n } = require('ReactFiberUpdateQueue');\n@@ -134,6 +138,11 @@ module.exports = function(config : HostConfig, callback: ?Function) : void {\n+ invariant(\n+ !ReactFeatureFlags.disableNewFiberFeatures || isValidElement(element),\n+ 'render(): Invalid component element.'\n+ );\n+\n \/\/ TODO: If this is a nested container, this won't be the root.\n const root : FiberRoot = (container.stateNode : any);\n const current = root.current;\n","body":"","parents":["80cf21cae49d370cd8df07c9c354c251c924376a"],"files":[{"status":"M","path":"src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiber-test.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiberReconciler.js"}],"commit":{"subject":"Top-level render only accepts a React element if feature flag is on","revision":"397810f844661288b22de4cf645999195993d51e","shortRevision":"397810f844","authorName":"Andrew Clark","authorEmail":"acdlite@fb.com","authoredAt":"2017-01-11T18:08:16-08:00"}}

dillon1000/react

Files changed