{"patch":"diff --git a\/packages\/react-cs-renderer\/src\/__tests__\/ReactNativeCS-test.internal.js b\/packages\/react-cs-renderer\/src\/__tests__\/ReactNativeCS-test.internal.js\nindex cd6ac7d2d5..7f172c57cc 100644\n--- a\/packages\/react-cs-renderer\/src\/__tests__\/ReactNativeCS-test.internal.js\n+++ b\/packages\/react-cs-renderer\/src\/__tests__\/ReactNativeCS-test.internal.js\n@@ -5,6 +5,7 @@\n * LICENSE file in the root directory of this source tree.\n *\n * @emails react-core\n+ * @jest-environment node\n *\/\n \n 'use strict';\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js b\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js\nindex 1cb2915b7d..642d950f22 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js\n@@ -5,15 +5,14 @@\n * LICENSE file in the root directory of this source tree.\n *\n * @emails react-core\n+ * @jest-environment node\n *\/\n \n 'use strict';\n \n let React;\n let ReactCallReturn;\n-let ReactDOM;\n let ReactDOMServer;\n-let ReactTestUtils;\n let PropTypes;\n \n function normalizeCodeLocInfo(str) {\n@@ -25,8 +24,6 @@ describe('ReactDOMServer', () => {\n jest.resetModules();\n React = require('react');\n ReactCallReturn = require('react-call-return');\n- ReactDOM = require('react-dom');\n- ReactTestUtils = require('react-dom\/test-utils');\n PropTypes = require('prop-types');\n ReactDOMServer = require('react-dom\/server');\n });\n@@ -157,243 +154,6 @@ describe('ReactDOMServer', () => {\n runTest();\n });\n \n- it('should have the correct mounting behavior (old hydrate API)', () => {\n- spyOnDev(console, 'warn');\n- spyOnDev(console, 'error');\n-\n- let mountCount = 0;\n- let numClicks = 0;\n-\n- class TestComponent extends React.Component {\n- componentDidMount() {\n- mountCount++;\n- }\n-\n- click = () => {\n- numClicks++;\n- };\n-\n- render() {\n- return (\n- \n- Name: {this.props.name}\n- <\/span>\n- );\n- }\n- }\n-\n- const element = document.createElement('div');\n- ReactDOM.render(, element);\n-\n- let lastMarkup = element.innerHTML;\n-\n- \/\/ Exercise the update path. Markup should not change,\n- \/\/ but some lifecycle methods should be run again.\n- ReactDOM.render(, element);\n- expect(mountCount).toEqual(1);\n-\n- \/\/ Unmount and remount. We should get another mount event and\n- \/\/ we should get different markup, as the IDs are unique each time.\n- ReactDOM.unmountComponentAtNode(element);\n- expect(element.innerHTML).toEqual('');\n- ReactDOM.render(, element);\n- expect(mountCount).toEqual(2);\n- expect(element.innerHTML).not.toEqual(lastMarkup);\n-\n- \/\/ Now kill the node and render it on top of server-rendered markup, as if\n- \/\/ we used server rendering. We should mount again, but the markup should\n- \/\/ be unchanged. We will append a sentinel at the end of innerHTML to be\n- \/\/ sure that innerHTML was not changed.\n- ReactDOM.unmountComponentAtNode(element);\n- expect(element.innerHTML).toEqual('');\n-\n- lastMarkup = ReactDOMServer.renderToString();\n- element.innerHTML = lastMarkup;\n-\n- let instance = ReactDOM.render(, element);\n- expect(mountCount).toEqual(3);\n- if (__DEV__) {\n- expect(console.warn.calls.count()).toBe(1);\n- expect(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- console.warn.calls.reset();\n- }\n- expect(element.innerHTML).toBe(lastMarkup);\n-\n- \/\/ Ensure the events system works after mount into server markup\n- expect(numClicks).toEqual(0);\n- ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(instance.refs.span));\n- expect(numClicks).toEqual(1);\n-\n- ReactDOM.unmountComponentAtNode(element);\n- expect(element.innerHTML).toEqual('');\n-\n- \/\/ Now simulate a situation where the app is not idempotent. React should\n- \/\/ warn but do the right thing.\n- element.innerHTML = lastMarkup;\n- instance = ReactDOM.render(, element);\n- expect(mountCount).toEqual(4);\n- if (__DEV__) {\n- expect(console.error.calls.count()).toBe(1);\n- expect(console.error.calls.argsFor(0)[0]).toContain(\n- 'Text content did not match. Server: \"x\" Client: \"y\"',\n- );\n- console.error.calls.reset();\n- }\n- expect(element.innerHTML.length > 0).toBe(true);\n- expect(element.innerHTML).not.toEqual(lastMarkup);\n-\n- \/\/ Ensure the events system works after markup mismatch.\n- expect(numClicks).toEqual(1);\n- ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(instance.refs.span));\n- expect(numClicks).toEqual(2);\n- if (__DEV__) {\n- expect(console.warn.calls.count()).toBe(0);\n- expect(console.error.calls.count()).toBe(0);\n- }\n- });\n-\n- it('should have the correct mounting behavior (new hydrate API)', () => {\n- spyOnDev(console, 'error');\n-\n- let mountCount = 0;\n- let numClicks = 0;\n-\n- class TestComponent extends React.Component {\n- componentDidMount() {\n- mountCount++;\n- }\n-\n- click = () => {\n- numClicks++;\n- };\n-\n- render() {\n- return (\n- \n- Name: {this.props.name}\n- <\/span>\n- );\n- }\n- }\n-\n- const element = document.createElement('div');\n- ReactDOM.render(, element);\n-\n- let lastMarkup = element.innerHTML;\n-\n- \/\/ Exercise the update path. Markup should not change,\n- \/\/ but some lifecycle methods should be run again.\n- ReactDOM.render(, element);\n- expect(mountCount).toEqual(1);\n-\n- \/\/ Unmount and remount. We should get another mount event and\n- \/\/ we should get different markup, as the IDs are unique each time.\n- ReactDOM.unmountComponentAtNode(element);\n- expect(element.innerHTML).toEqual('');\n- ReactDOM.render(, element);\n- expect(mountCount).toEqual(2);\n- expect(element.innerHTML).not.toEqual(lastMarkup);\n-\n- \/\/ Now kill the node and render it on top of server-rendered markup, as if\n- \/\/ we used server rendering. We should mount again, but the markup should\n- \/\/ be unchanged. We will append a sentinel at the end of innerHTML to be\n- \/\/ sure that innerHTML was not changed.\n- ReactDOM.unmountComponentAtNode(element);\n- expect(element.innerHTML).toEqual('');\n-\n- lastMarkup = ReactDOMServer.renderToString();\n- element.innerHTML = lastMarkup;\n-\n- let instance = ReactDOM.hydrate(, element);\n- expect(mountCount).toEqual(3);\n- expect(element.innerHTML).toBe(lastMarkup);\n-\n- \/\/ Ensure the events system works after mount into server markup\n- expect(numClicks).toEqual(0);\n- ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(instance.refs.span));\n- expect(numClicks).toEqual(1);\n-\n- ReactDOM.unmountComponentAtNode(element);\n- expect(element.innerHTML).toEqual('');\n-\n- \/\/ Now simulate a situation where the app is not idempotent. React should\n- \/\/ warn but do the right thing.\n- element.innerHTML = lastMarkup;\n- instance = ReactDOM.hydrate(, element);\n- expect(mountCount).toEqual(4);\n- if (__DEV__) {\n- expect(console.error.calls.count()).toBe(1);\n- }\n- expect(element.innerHTML.length > 0).toBe(true);\n- expect(element.innerHTML).not.toEqual(lastMarkup);\n-\n- \/\/ Ensure the events system works after markup mismatch.\n- expect(numClicks).toEqual(1);\n- ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(instance.refs.span));\n- expect(numClicks).toEqual(2);\n- });\n-\n- \/\/ We have a polyfill for autoFocus on the client, but we intentionally don't\n- \/\/ want it to call focus() when hydrating because this can mess up existing\n- \/\/ focus before the JS has loaded.\n- it('should emit autofocus on the server but not focus() when hydrating', () => {\n- const element = document.createElement('div');\n- element.innerHTML = ReactDOMServer.renderToString(\n- ,\n- );\n- expect(element.firstChild.autofocus).toBe(true);\n-\n- \/\/ It should not be called on mount.\n- element.firstChild.focus = jest.fn();\n- ReactDOM.hydrate(, element);\n- expect(element.firstChild.focus).not.toHaveBeenCalled();\n-\n- \/\/ Or during an update.\n- ReactDOM.render(, element);\n- expect(element.firstChild.focus).not.toHaveBeenCalled();\n- });\n-\n- it('should not focus on either server or client with autofocus={false}', () => {\n- const element = document.createElement('div');\n- element.innerHTML = ReactDOMServer.renderToString(\n- ,\n- );\n- expect(element.firstChild.autofocus).toBe(false);\n-\n- element.firstChild.focus = jest.fn();\n- ReactDOM.hydrate(, element);\n- expect(element.firstChild.focus).not.toHaveBeenCalled();\n-\n- ReactDOM.render(, element);\n- expect(element.firstChild.focus).not.toHaveBeenCalled();\n- });\n-\n- \/\/ Regression test for https:\/\/github.com\/facebook\/react\/issues\/11726\n- it('should not focus on either server or client with autofocus={false} even if there is a markup mismatch', () => {\n- spyOnDev(console, 'error');\n-\n- const element = document.createElement('div');\n- element.innerHTML = ReactDOMServer.renderToString(\n-

dillon1000/react

Files changed