Skip to content

Commit 2063190

Browse files
committed
Start adopting React 18
1 parent 1ae3ea5 commit 2063190

File tree

5 files changed

+445
-47
lines changed

5 files changed

+445
-47
lines changed

packages/webamp/demo/js/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ async function main() {
159159
if (backgroundColor != null) {
160160
window.document.body.style.backgroundColor = backgroundColor;
161161
}
162-
ReactDOM.render(
163-
<DemoDesktop webamp={webamp} soundCloudPlaylist={soundcloudPlaylist} />,
164-
document.getElementById("demo-desktop")
162+
const root = ReactDOM.createRoot(document.getElementById("demo-desktop"));
163+
root.render(
164+
<DemoDesktop webamp={webamp} soundCloudPlaylist={soundcloudPlaylist} />
165165
);
166166
}
167167
}

packages/webamp/js/playlistHtml.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { render } from "react-dom";
1+
import { createRoot } from "react-dom";
22

33
interface Props {
44
averageTrackLength: string;
@@ -159,7 +159,8 @@ const Playlist = (props: Props) => (
159159

160160
const createPlaylistHTML = (props: Props): string => {
161161
const node = document.createElement("div");
162-
render(<Playlist {...props} />, node);
162+
const root = createRoot(node);
163+
root.render(<Playlist {...props} />);
163164
return node.innerHTML;
164165
};
165166

packages/webamp/js/webampLazy.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,11 +443,11 @@ class Webamp {
443443
}
444444
});
445445

446-
ReactDOM.render(
446+
const root = ReactDOM.createRoot(node);
447+
root.render(
447448
<Provider store={this.store}>
448449
<App media={this.media} filePickers={this.options.filePickers || []} />
449-
</Provider>,
450-
node
450+
</Provider>
451451
);
452452
}
453453

packages/webamp/package.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@
134134
"trailingComma": "es5"
135135
},
136136
"dependencies": {
137+
"@babel/core": "^7.16.0",
138+
"@types/react": "^17.0.35",
139+
"@types/react-dom": "^17.0.11",
137140
"ani-cursor": "^0.0.4",
138141
"butterchurn": "^3.0.0-beta.3",
139142
"butterchurn-presets": "3.0.0-beta.4",
@@ -144,10 +147,11 @@
144147
"lodash": "^4.17.21",
145148
"milkdrop-preset-converter-aws": "^0.1.6",
146149
"music-metadata-browser": "^0.6.1",
147-
"react": "^18.0.0-alpha-9c8161ba8-20211028",
148-
"react-dom": "^18.0.0-alpha-9c8161ba8-20211028",
149-
"react-redux": "^8.0.0-alpha.0",
150-
"redux": "^4.1.0-alpha.0",
150+
"react": "^18.0.0-beta-149b420f6-20211119",
151+
"react-dom": "^18.0.0-beta-149b420f6-20211119",
152+
"react-redux": "^8.0.0-beta.1",
153+
"redux": "^5.0.0-alpha.0",
154+
"redux-devtools-extension": "^2.13.9",
151155
"redux-thunk": "^2.4.0",
152156
"reselect": "^3.0.1",
153157
"tinyqueue": "^1.2.3",

0 commit comments

Comments
 (0)