Skip to content

Commit 8940bbe

Browse files
authored
Merge branch 'facebook:main' into devtools-release-script
2 parents 7515b0d + e7fc04b commit 8940bbe

File tree

64 files changed

+431
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+431
-231
lines changed

fixtures/flight/src/index.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import {Suspense} from 'react';
3-
import ReactDOM from 'react-dom';
3+
import ReactDOM from 'react-dom/client';
44
import ReactServerDOMReader from 'react-server-dom-webpack';
55

66
let data = ReactServerDOMReader.createFromFetch(fetch('http://localhost:3001'));
@@ -9,9 +9,8 @@ function Content() {
99
return React.experimental_use(data);
1010
}
1111

12-
ReactDOM.render(
12+
ReactDOM.createRoot(document.getElementById('root')).render(
1313
<Suspense fallback={<h1>Loading...</h1>}>
1414
<Content />
15-
</Suspense>,
16-
document.getElementById('root')
15+
</Suspense>
1716
);

packages/react-devtools-shared/src/Logger.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export const logEvent: LogFunction =
7474
}
7575
: function logEvent() {};
7676

77-
export const registerEventLogger =
77+
export const registerEventLogger: (logFunction: LogFunction) => () => void =
7878
enableLogger === true
7979
? function registerEventLogger(logFunction: LogFunction): () => void {
8080
if (enableLogger) {

0 commit comments

Comments
 (0)