Skip to content

Commit 2116bdc

Browse files
Brian Vaughnzhengjitf
Brian Vaughn
authored andcommitted
DevTools imports (facebook#24163)
* Update DevTools imports: react-dom -> react-dom/client * Silence ReactDOM.render warning in DevTools test shell
1 parent 2b16d17 commit 2116bdc

File tree

8 files changed

+12
-14
lines changed

8 files changed

+12
-14
lines changed

packages/react-devtools-core/src/standalone.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
*/
99

1010
import {createElement} from 'react';
11-
import {
12-
// $FlowFixMe Flow does not yet know about flushSync()
13-
flushSync,
14-
} from 'react-dom';
11+
import {flushSync} from 'react-dom';
1512
import {createRoot} from 'react-dom/client';
1613
import Bridge from 'react-devtools-shared/src/bridge';
1714
import Store from 'react-devtools-shared/src/devtools/store';

packages/react-devtools-extensions/src/main.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/* global chrome */
22

33
import {createElement} from 'react';
4-
import {createRoot, flushSync} from 'react-dom';
4+
import {flushSync} from 'react-dom';
5+
import {createRoot} from 'react-dom/client';
56
import Bridge from 'react-devtools-shared/src/bridge';
67
import Store from 'react-devtools-shared/src/devtools/store';
78
import {getBrowserName, getBrowserTheme} from './utils';

packages/react-devtools-shell/src/app/Iframe/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import * as React from 'react';
44
import {Fragment} from 'react';
5-
import * as ReactDOM from 'react-dom';
5+
import {createPortal} from 'react-dom';
66

77
export default function Iframe() {
88
return (
@@ -56,7 +56,7 @@ function Frame(props) {
5656
style={iframeStyle}
5757
/>
5858

59-
{element ? ReactDOM.createPortal(props.children, element) : null}
59+
{element ? createPortal(props.children, element) : null}
6060
</Fragment>
6161
);
6262
}

packages/react-devtools-shell/src/app/devtools.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/** @flow */
22

33
import {createElement} from 'react';
4-
// $FlowFixMe Flow does not yet know about createRoot()
5-
import {createRoot} from 'react-dom';
4+
import {createRoot} from 'react-dom/client';
65
import {
76
activate as activateBackend,
87
initialize as initializeBackend,

packages/react-devtools-shell/src/app/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ ignoreErrors([
2828
'Warning: Legacy context API',
2929
'Warning: Unsafe lifecycle methods',
3030
'Warning: %s is deprecated in StrictMode.', // findDOMNode
31+
'Warning: ReactDOM.render is no longer supported in React 18',
3132
]);
3233
ignoreWarnings(['Warning: componentWillReceiveProps has been renamed']);
3334
ignoreLogs([]);

packages/react-devtools-shell/src/e2e/app.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import * as React from 'react';
66
import * as ReactDOM from 'react-dom';
7-
import * as ReactDOMClient from 'react-dom/client';
7+
import {createRoot} from 'react-dom/client';
88

99
const container = document.createElement('div');
1010

@@ -14,7 +14,7 @@ const container = document.createElement('div');
1414
// so that it can load things other than just ToDoList.
1515
const App = require('./apps/ListApp').default;
1616

17-
const root = ReactDOMClient.createRoot(container);
17+
const root = createRoot(container);
1818
root.render(<App />);
1919

2020
// ReactDOM Test Selector APIs used by Playwright e2e tests

packages/react-devtools-shell/src/e2e/devtools.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import * as ReactDOM from 'react-dom';
3-
import * as ReactDOMClient from 'react-dom/client';
3+
import {createRoot} from 'react-dom/client';
44
import {
55
activate as activateBackend,
66
initialize as initializeBackend,
@@ -34,7 +34,7 @@ function init(appIframe, devtoolsContainer, appSource) {
3434

3535
inject(contentDocument, appSource, () => {
3636
// $FlowFixMe Flow doesn't know about createRoot() yet.
37-
ReactDOMClient.createRoot(devtoolsContainer).render(
37+
createRoot(devtoolsContainer).render(
3838
<DevTools
3939
hookNamesModuleLoaderFunction={hookNamesModuleLoaderFunction}
4040
showTabBar={true}

packages/react-devtools-shell/src/multi/devtools.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import {createRoot} from 'react-dom';
2+
import {createRoot} from 'react-dom/client';
33
import {
44
activate as activateBackend,
55
createBridge as createBackendBridge,

0 commit comments

Comments
 (0)