Skip to content

Commit 5041c37

Browse files
authored
Remove hydrate option from createRoot (#22878)
* remove hydrate: true option * remove missed comment * lint * warning * circumvent flow
1 parent c7917fe commit 5041c37

12 files changed

+149
-251
lines changed

fixtures/ssr/src/index.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from 'react';
2-
import {createRoot} from 'react-dom';
2+
import {hydrateRoot} from 'react-dom';
33

44
import App from './components/App';
55

6-
let root = createRoot(document, {hydrate: true});
7-
root.render(<App assets={window.assetManifest} />);
6+
let root = hydrateRoot(document, <App assets={window.assetManifest} />);

packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js

+5-10
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,7 @@ describe('ReactDOMFizzServer', () => {
465465
expect(loggedErrors).toEqual([]);
466466

467467
// Attempt to hydrate the content.
468-
const root = ReactDOM.createRoot(container, {hydrate: true});
469-
root.render(<App isClient={true} />);
468+
ReactDOM.hydrateRoot(container, <App isClient={true} />);
470469
Scheduler.unstable_flushAll();
471470

472471
// We're still loading because we're waiting for the server to stream more content.
@@ -629,8 +628,7 @@ describe('ReactDOMFizzServer', () => {
629628
expect(loggedErrors).toEqual([]);
630629

631630
// Attempt to hydrate the content.
632-
const root = ReactDOM.createRoot(container, {hydrate: true});
633-
root.render(<App />);
631+
ReactDOM.hydrateRoot(container, <App />);
634632
Scheduler.unstable_flushAll();
635633

636634
// We're still loading because we're waiting for the server to stream more content.
@@ -701,8 +699,7 @@ describe('ReactDOMFizzServer', () => {
701699
pipe(writable);
702700
});
703701

704-
const root = ReactDOM.createRoot(container, {hydrate: true});
705-
root.render(<App showMore={false} />);
702+
const root = ReactDOM.hydrateRoot(container, <App showMore={false} />);
706703
Scheduler.unstable_flushAll();
707704

708705
// We're not hydrated yet.
@@ -769,8 +766,7 @@ describe('ReactDOMFizzServer', () => {
769766
// We're still showing a fallback.
770767

771768
// Attempt to hydrate the content.
772-
const root = ReactDOM.createRoot(container, {hydrate: true});
773-
root.render(<App />);
769+
ReactDOM.hydrateRoot(container, <App />);
774770
Scheduler.unstable_flushAll();
775771

776772
// We're still loading because we're waiting for the server to stream more content.
@@ -1459,8 +1455,7 @@ describe('ReactDOMFizzServer', () => {
14591455
// We're still showing a fallback.
14601456

14611457
// Attempt to hydrate the content.
1462-
const root = ReactDOM.createRoot(container, {hydrate: true});
1463-
root.render(<App isClient={true} />);
1458+
ReactDOM.hydrateRoot(container, <App isClient={true} />);
14641459
Scheduler.unstable_flushAll();
14651460

14661461
// We're still loading because we're waiting for the server to stream more content.

0 commit comments

Comments
 (0)