Skip to content

Commit df8da3d

Browse files
ariscriptariscript
committed
deps: update to react 18
1 parent 01116c0 commit df8da3d

File tree

6 files changed

+84
-85
lines changed

6 files changed

+84
-85
lines changed

‎package.json‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@
3333
"@electron-forge/maker-zip": "^6.0.0-beta.63",
3434
"@electron-forge/plugin-webpack": "6.0.0-beta.63",
3535
"@electron-forge/publisher-github": "^6.0.0-beta.63",
36-
"@types/react": "^17.0.45",
37-
"@types/react-dom": "^17.0.17",
38-
"@types/react-helmet": "^6.1.5",
36+
"@types/react": "^18.0.12",
37+
"@types/react-dom": "^18.0.5",
3938
"@types/semver-compare": "^1.0.1",
4039
"@typescript-eslint/eslint-plugin": "^5.27.1",
4140
"@typescript-eslint/parser": "^5.27.1",
@@ -73,9 +72,9 @@
7372
"jimp": "^0.16.1",
7473
"minecraft-server-util": "^5.2.9",
7574
"node-fetch": "^3.2.5",
76-
"react": "^17.0.2",
77-
"react-dom": "^17.0.2",
78-
"react-helmet": "^6.1.0",
75+
"react": "^18.1.0",
76+
"react-dom": "^18.1.0",
77+
"react-helmet-async": "^1.3.0",
7978
"sanitize-filename": "^1.6.3",
8079
"semver-compare": "^1.0.0"
8180
}

‎src/lib/render.tsx‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import React, { useState, useEffect, useMemo } from "react";
2-
import ReactDOM from "react-dom";
2+
import { createRoot } from "react-dom/client";
33
import { createTheme, ThemeProvider } from "@mui/material/styles";
44
import CSSBaseline from "@mui/material/CssBaseline";
5+
import { HelmetProvider } from "react-helmet-async";
56

67
interface ThemifyProps {
78
children: React.ReactChild;
@@ -48,12 +49,15 @@ const Themify = ({ children }: ThemifyProps) => {
4849
};
4950

5051
export function render(Component: () => JSX.Element): void {
51-
ReactDOM.render(
52+
const container = document.getElementById("root");
53+
const root = createRoot(container!);
54+
root.render(
5255
<React.StrictMode>
53-
<Themify>
54-
<Component />
55-
</Themify>
56-
</React.StrictMode>,
57-
document.getElementById("root")
56+
<HelmetProvider>
57+
<Themify>
58+
<Component />
59+
</Themify>
60+
</HelmetProvider>
61+
</React.StrictMode>
5862
);
5963
}

‎src/windows/EditInstanceWindow.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useState, useEffect, type FormEvent } from "react";
2-
import Helmet from "react-helmet";
2+
import { Helmet } from "react-helmet-async";
33
import { Button, TextField } from "@mui/material";
44

55
import { render } from "#lib/render";

‎src/windows/ModsWindow.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import "#app.global.css";
22
import { InstanceInfo } from "#types";
33
import { DragEventHandler, useEffect, useState } from "react";
4-
import { Helmet } from "react-helmet";
4+
import { Helmet } from "react-helmet-async";
55
import { render } from "#lib/render";
66
import { Delete, Extension } from "@mui/icons-material";
77
import { Button } from "@mui/material";

‎src/windows/RunWindow.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useState, useEffect, useRef } from "react";
2-
import Helmet from "react-helmet";
2+
import { Helmet } from "react-helmet-async";
33

44
import Repl from "#components/Repl";
55
import Player from "#components/Player";

‎yarn.lock‎

Lines changed: 65 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -86,21 +86,21 @@ __metadata:
8686
languageName: node
8787
linkType: hard
8888

89-
"@babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.7":
90-
version: 7.16.5
91-
resolution: "@babel/runtime@npm:7.16.5"
89+
"@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.17.2":
90+
version: 7.18.3
91+
resolution: "@babel/runtime@npm:7.18.3"
9292
dependencies:
9393
regenerator-runtime: ^0.13.4
94-
checksum: b96e67280efe581c6147b4fe984dfe08a8fbea048934a092f3cbf4dcf61725f6b221cb0c879b6e6e98671f83a104c9e8cfbd24c683e5ebcc886a731aa8984ad0
94+
checksum: db8526226aa02cfa35a5a7ac1a34b5f303c62a1f000c7db48cb06c6290e616483e5036ab3c4e7a84d0f3be6d4e2148d5fe5cec9564bf955f505c3e764b83d7f1
9595
languageName: node
9696
linkType: hard
9797

98-
"@babel/runtime@npm:^7.17.2":
99-
version: 7.18.3
100-
resolution: "@babel/runtime@npm:7.18.3"
98+
"@babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.7":
99+
version: 7.16.5
100+
resolution: "@babel/runtime@npm:7.16.5"
101101
dependencies:
102102
regenerator-runtime: ^0.13.4
103-
checksum: db8526226aa02cfa35a5a7ac1a34b5f303c62a1f000c7db48cb06c6290e616483e5036ab3c4e7a84d0f3be6d4e2148d5fe5cec9564bf955f505c3e764b83d7f1
103+
checksum: b96e67280efe581c6147b4fe984dfe08a8fbea048934a092f3cbf4dcf61725f6b221cb0c879b6e6e98671f83a104c9e8cfbd24c683e5ebcc886a731aa8984ad0
104104
languageName: node
105105
linkType: hard
106106

@@ -1748,21 +1748,12 @@ __metadata:
17481748
languageName: node
17491749
linkType: hard
17501750

1751-
"@types/react-dom@npm:^17.0.17":
1752-
version: 17.0.17
1753-
resolution: "@types/react-dom@npm:17.0.17"
1754-
dependencies:
1755-
"@types/react": ^17
1756-
checksum: 23caf98aa03e968811560f92a2c8f451694253ebe16b670929b24eaf0e7fa62ba549abe9db0ac028a9d8a9086acd6ab9c6c773f163fa21224845edbc00ba6232
1757-
languageName: node
1758-
linkType: hard
1759-
1760-
"@types/react-helmet@npm:^6.1.5":
1761-
version: 6.1.5
1762-
resolution: "@types/react-helmet@npm:6.1.5"
1751+
"@types/react-dom@npm:^18.0.5":
1752+
version: 18.0.5
1753+
resolution: "@types/react-dom@npm:18.0.5"
17631754
dependencies:
17641755
"@types/react": "*"
1765-
checksum: d059cc084d3b3071cce3421bb1170dd42819cf39b81afe60d4fbd66c5ef9ffeaadf1802df80efd9553258f621678f69ceb5a21d73df0d8539d40ae9a0f995485
1756+
checksum: cd48b81950f499b52a3f0c08261f00046f9b7c96699fa249c9664e257e820daf6ecac815cd1028cebc9d105094adc39d047d1efd79214394b8b2d515574c0787
17661757
languageName: node
17671758
linkType: hard
17681759

@@ -1795,14 +1786,14 @@ __metadata:
17951786
languageName: node
17961787
linkType: hard
17971788

1798-
"@types/react@npm:^17, @types/react@npm:^17.0.45":
1799-
version: 17.0.45
1800-
resolution: "@types/react@npm:17.0.45"
1789+
"@types/react@npm:^18.0.12":
1790+
version: 18.0.12
1791+
resolution: "@types/react@npm:18.0.12"
18011792
dependencies:
18021793
"@types/prop-types": "*"
18031794
"@types/scheduler": "*"
18041795
csstype: ^3.0.2
1805-
checksum: 3cc13a02824c13f6fa4807a83abd065ac1d9943359e76bd995cc7cd2b4148c1176ebd54a30a9f4eb8a0f141ff359d712876f256c4fee707e4290607ef8410b3e
1796+
checksum: 526ea13b3adf7fe4b475e55b7426510a7861ef2910664a9014ef42cba0c699d5167dc378eb161e2ec26c07a3b6fde9b6bdcbbb6f4b5580612246bc289395ef03
18061797
languageName: node
18071798
linkType: hard
18081799

@@ -6480,6 +6471,15 @@ __metadata:
64806471
languageName: node
64816472
linkType: hard
64826473

6474+
"invariant@npm:^2.2.4":
6475+
version: 2.2.4
6476+
resolution: "invariant@npm:2.2.4"
6477+
dependencies:
6478+
loose-envify: ^1.0.0
6479+
checksum: cc3182d793aad82a8d1f0af697b462939cb46066ec48bbf1707c150ad5fad6406137e91a262022c269702e01621f35ef60269f6c0d7fd178487959809acdfb14
6480+
languageName: node
6481+
linkType: hard
6482+
64836483
"ip-regex@npm:^4.0.0":
64846484
version: 4.3.0
64856485
resolution: "ip-regex@npm:4.3.0"
@@ -7377,7 +7377,7 @@ __metadata:
73777377
languageName: node
73787378
linkType: hard
73797379

7380-
"loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0":
7380+
"loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0":
73817381
version: 1.4.0
73827382
resolution: "loose-envify@npm:1.4.0"
73837383
dependencies:
@@ -7872,9 +7872,8 @@ __metadata:
78727872
"@emotion/styled": ^11.8.1
78737873
"@mui/icons-material": ^5.8.3
78747874
"@mui/material": ^5.8.3
7875-
"@types/react": ^17.0.45
7876-
"@types/react-dom": ^17.0.17
7877-
"@types/react-helmet": ^6.1.5
7875+
"@types/react": ^18.0.12
7876+
"@types/react-dom": ^18.0.5
78787877
"@types/semver-compare": ^1.0.1
78797878
"@typescript-eslint/eslint-plugin": ^5.27.1
78807879
"@typescript-eslint/parser": ^5.27.1
@@ -7899,9 +7898,9 @@ __metadata:
78997898
postcss: ^8.4.14
79007899
postcss-loader: ^7.0.0
79017900
prettier: ^2.6.2
7902-
react: ^17.0.2
7903-
react-dom: ^17.0.2
7904-
react-helmet: ^6.1.0
7901+
react: ^18.1.0
7902+
react-dom: ^18.1.0
7903+
react-helmet-async: ^1.3.0
79057904
sanitize-filename: ^1.6.3
79067905
semver-compare: ^1.0.0
79077906
style-loader: ^3.3.1
@@ -9276,7 +9275,7 @@ __metadata:
92769275
languageName: node
92779276
linkType: hard
92789277

9279-
"prop-types@npm:^15.6.2, prop-types@npm:^15.7.2":
9278+
"prop-types@npm:^15.6.2":
92809279
version: 15.8.0
92819280
resolution: "prop-types@npm:15.8.0"
92829281
dependencies:
@@ -9287,7 +9286,7 @@ __metadata:
92879286
languageName: node
92889287
linkType: hard
92899288

9290-
"prop-types@npm:^15.8.1":
9289+
"prop-types@npm:^15.7.2, prop-types@npm:^15.8.1":
92919290
version: 15.8.1
92929291
resolution: "prop-types@npm:15.8.1"
92939292
dependencies:
@@ -9442,37 +9441,38 @@ __metadata:
94429441
languageName: node
94439442
linkType: hard
94449443

9445-
"react-dom@npm:^17.0.2":
9446-
version: 17.0.2
9447-
resolution: "react-dom@npm:17.0.2"
9444+
"react-dom@npm:^18.1.0":
9445+
version: 18.1.0
9446+
resolution: "react-dom@npm:18.1.0"
94489447
dependencies:
94499448
loose-envify: ^1.1.0
9450-
object-assign: ^4.1.1
9451-
scheduler: ^0.20.2
9449+
scheduler: ^0.22.0
94529450
peerDependencies:
9453-
react: 17.0.2
9454-
checksum: 1c1eaa3bca7c7228d24b70932e3d7c99e70d1d04e13bb0843bbf321582bc25d7961d6b8a6978a58a598af2af496d1cedcfb1bf65f6b0960a0a8161cb8dab743c
9451+
react: ^18.1.0
9452+
checksum: bb0d48eeb0b297c79c2a03978baa29f5b3ff7ba3d070b21e34c9af1a6e7fdf0ca8b8d73e41f9214d91ad40eeb6d1f3559f884cbbc338713374a51320637c23df
94559453
languageName: node
94569454
linkType: hard
94579455

9458-
"react-fast-compare@npm:^3.1.1":
9456+
"react-fast-compare@npm:^3.2.0":
94599457
version: 3.2.0
94609458
resolution: "react-fast-compare@npm:3.2.0"
94619459
checksum: 8ef272c825ae329f61633ce4ce7f15aa5b84e5214d88bc0823880236e03e985a13195befa2c7a4eda7db3b017dc7985729152d88445823f652403cf36c2b86aa
94629460
languageName: node
94639461
linkType: hard
94649462

9465-
"react-helmet@npm:^6.1.0":
9466-
version: 6.1.0
9467-
resolution: "react-helmet@npm:6.1.0"
9463+
"react-helmet-async@npm:^1.3.0":
9464+
version: 1.3.0
9465+
resolution: "react-helmet-async@npm:1.3.0"
94689466
dependencies:
9469-
object-assign: ^4.1.1
9467+
"@babel/runtime": ^7.12.5
9468+
invariant: ^2.2.4
94709469
prop-types: ^15.7.2
9471-
react-fast-compare: ^3.1.1
9472-
react-side-effect: ^2.1.0
9470+
react-fast-compare: ^3.2.0
9471+
shallowequal: ^1.1.0
94739472
peerDependencies:
9474-
react: ">=16.3.0"
9475-
checksum: a4998479dab7fc1c2799eddefb1870a9d881b5f71cfdf97979a9882e42f4bb50402d55335f308f461e735e01a06f46b16cc7b4e6bcb22c7a4a6f85a753c5c106
9473+
react: ^16.6.0 || ^17.0.0 || ^18.0.0
9474+
react-dom: ^16.6.0 || ^17.0.0 || ^18.0.0
9475+
checksum: 7ca7e47f8af14ea186688b512a87ab912bf6041312b297f92516341b140b3f0f8aedf5a44d226d99e69ed067b0cc106e38aeb9c9b738ffcc63d10721c844db90
94769476
languageName: node
94779477
linkType: hard
94789478

@@ -9490,15 +9490,6 @@ __metadata:
94909490
languageName: node
94919491
linkType: hard
94929492

9493-
"react-side-effect@npm:^2.1.0":
9494-
version: 2.1.1
9495-
resolution: "react-side-effect@npm:2.1.1"
9496-
peerDependencies:
9497-
react: ^16.3.0 || ^17.0.0
9498-
checksum: 324511ea8f6669555e166b4af280cdf46034bf0e33c486711e3ce17f88f6f21fed17055098408be1347657d0cbcd614bca944cf9f8e4ecfa96a21d13893fe9fc
9499-
languageName: node
9500-
linkType: hard
9501-
95029493
"react-transition-group@npm:^4.4.2":
95039494
version: 4.4.2
95049495
resolution: "react-transition-group@npm:4.4.2"
@@ -9514,13 +9505,12 @@ __metadata:
95149505
languageName: node
95159506
linkType: hard
95169507

9517-
"react@npm:^17.0.2":
9518-
version: 17.0.2
9519-
resolution: "react@npm:17.0.2"
9508+
"react@npm:^18.1.0":
9509+
version: 18.1.0
9510+
resolution: "react@npm:18.1.0"
95209511
dependencies:
95219512
loose-envify: ^1.1.0
9522-
object-assign: ^4.1.1
9523-
checksum: b254cc17ce3011788330f7bbf383ab653c6848902d7936a87b09d835d091e3f295f7e9dd1597c6daac5dc80f90e778c8230218ba8ad599f74adcc11e33b9d61b
9513+
checksum: 5bb296b561b43ef2220395da4faac86c14a087c8c80e1a7598a5740f01ee605c11eaf249985c1e2000971c4cd32ccb46d40f00479bbd9fb6b1c7cf857393b7d4
95249514
languageName: node
95259515
linkType: hard
95269516

@@ -10038,13 +10028,12 @@ __metadata:
1003810028
languageName: node
1003910029
linkType: hard
1004010030

10041-
"scheduler@npm:^0.20.2":
10042-
version: 0.20.2
10043-
resolution: "scheduler@npm:0.20.2"
10031+
"scheduler@npm:^0.22.0":
10032+
version: 0.22.0
10033+
resolution: "scheduler@npm:0.22.0"
1004410034
dependencies:
1004510035
loose-envify: ^1.1.0
10046-
object-assign: ^4.1.1
10047-
checksum: c4b35cf967c8f0d3e65753252d0f260271f81a81e427241295c5a7b783abf4ea9e905f22f815ab66676f5313be0a25f47be582254db8f9241b259213e999b8fc
10036+
checksum: a8ef5cab769c020cd6382ad9ecc3f72dbde56a50a36639b3a42ad9c11f7724f03700bcad373044059b8067d4a6365154dc7c0ca8027ef20ff4900cf58a0fc2c5
1004810037
languageName: node
1004910038
linkType: hard
1005010039

@@ -10230,6 +10219,13 @@ __metadata:
1023010219
languageName: node
1023110220
linkType: hard
1023210221

10222+
"shallowequal@npm:^1.1.0":
10223+
version: 1.1.0
10224+
resolution: "shallowequal@npm:1.1.0"
10225+
checksum: f4c1de0837f106d2dbbfd5d0720a5d059d1c66b42b580965c8f06bb1db684be8783538b684092648c981294bf817869f743a066538771dbecb293df78f765e00
10226+
languageName: node
10227+
linkType: hard
10228+
1023310229
"shebang-command@npm:^1.2.0":
1023410230
version: 1.2.0
1023510231
resolution: "shebang-command@npm:1.2.0"

0 commit comments

Comments
 (0)