Skip to content

Commit b97bf3c

Browse files
MuYunyunMuYunyun
committed
docs: update react version
1 parent e02f0fe commit b97bf3c

File tree

3 files changed

+60
-27
lines changed

3 files changed

+60
-27
lines changed

‎packages/crd-scripts/src/web/index.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1-
import ReactDOM from 'react-dom'
2-
import ReactDOMServer from 'react-dom/server'
1+
import { renderToPipeableStream } from 'react-dom'
2+
import { hydrateRoot } from 'react-dom/client'
3+
import ReactDOMServer from 'react-dom/server';
34
import '@babel/polyfill'
45
import { ifDev, ifPrerender } from 'crd-client-utils'
56
import RouterRoot from './Router'
67

78
if (ifDev) {
89
// dev render
9-
document.getElementById('root').innerHTML = ReactDOMServer.renderToString(<RouterRoot />)
10-
ReactDOM.hydrate(
11-
<RouterRoot />,
10+
document.getElementById('root').innerHTML = renderToPipeableStream(<RouterRoot />)
11+
hydrateRoot(
1212
document.getElementById('root'),
13+
<RouterRoot />,
1314
)
1415
} else if (ifPrerender) {
1516
// prerender
16-
document.getElementById('root').innerHTML = ReactDOMServer.renderToString(<RouterRoot />)
17+
document.getElementById('root').innerHTML = renderToPipeableStream(<RouterRoot />)
1718
} else {
1819
// prod render:
19-
ReactDOM.hydrate(
20-
<RouterRoot />,
20+
hydrateRoot(
2121
document.getElementById('root'),
22+
<RouterRoot />,
2223
)
2324
}

‎packages/crd-theme/package.json‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"diana": "^1.0.2",
1010
"less": "^3.0.2",
1111
"prism-react-renderer": "^1.2.1",
12-
"react": "^17.0.1",
13-
"react-dom": "^17.0.1",
12+
"react": "^18.0.0",
13+
"react-dom": "^18.0.0",
1414
"react-helmet": "^6.1.0",
1515
"react-hot-loader": "^4.1.1",
1616
"react-markdown": "^3.3.0"
@@ -26,5 +26,9 @@
2626
},
2727
"author": "muyunyun",
2828
"license": "MIT",
29-
"gitHead": "ffc5e4cbc94a7356da558c2dbf46e2f39bb8b199"
29+
"gitHead": "ffc5e4cbc94a7356da558c2dbf46e2f39bb8b199",
30+
"devDependencies": {
31+
"@types/react": "^17.0.43",
32+
"@types/react-dom": "^17.0.14"
33+
}
3034
}

‎yarn.lock‎

Lines changed: 44 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2260,6 +2260,11 @@
22602260
resolved "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109"
22612261
integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==
22622262

2263+
"@types/prop-types@*":
2264+
version "15.7.4"
2265+
resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
2266+
integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
2267+
22632268
"@types/puppeteer@^2.0.0":
22642269
version "2.1.5"
22652270
resolved "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-2.1.5.tgz#9137aa87dca21450820bfd6fa4fe747bc8176381"
@@ -2272,6 +2277,27 @@
22722277
resolved "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
22732278
integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==
22742279

2280+
"@types/react-dom@^17.0.14":
2281+
version "17.0.14"
2282+
resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.14.tgz#c8f917156b652ddf807711f5becbd2ab018dea9f"
2283+
integrity sha512-H03xwEP1oXmSfl3iobtmQ/2dHF5aBHr8aUMwyGZya6OW45G+xtdzmq6HkncefiBt5JU8DVyaWl/nWZbjZCnzAQ==
2284+
dependencies:
2285+
"@types/react" "*"
2286+
2287+
"@types/react@*", "@types/react@^17.0.43":
2288+
version "17.0.43"
2289+
resolved "https://registry.npmjs.org/@types/react/-/react-17.0.43.tgz#4adc142887dd4a2601ce730bc56c3436fdb07a55"
2290+
integrity sha512-8Q+LNpdxf057brvPu1lMtC5Vn7J119xrP1aq4qiaefNioQUYANF/CYeK4NsKorSZyUGJ66g0IM+4bbjwx45o2A==
2291+
dependencies:
2292+
"@types/prop-types" "*"
2293+
"@types/scheduler" "*"
2294+
csstype "^3.0.2"
2295+
2296+
"@types/scheduler@*":
2297+
version "0.16.2"
2298+
resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
2299+
integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
2300+
22752301
"@types/source-list-map@*":
22762302
version "0.1.2"
22772303
resolved "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
@@ -4375,6 +4401,11 @@ csso@~2.3.1:
43754401
clap "^1.0.9"
43764402
source-map "^0.5.3"
43774403

4404+
csstype@^3.0.2:
4405+
version "3.0.11"
4406+
resolved "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"
4407+
integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==
4408+
43784409
currently-unhandled@^0.4.1:
43794410
version "0.4.1"
43804411
resolved "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -10091,14 +10122,13 @@ raw-body@2.4.0:
1009110122
iconv-lite "0.4.24"
1009210123
unpipe "1.0.0"
1009310124

10094-
react-dom@^17.0.1:
10095-
version "17.0.1"
10096-
resolved "https://registry.npmjs.org/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6"
10097-
integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==
10125+
react-dom@^18.0.0:
10126+
version "18.0.0"
10127+
resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.0.0.tgz#26b88534f8f1dbb80853e1eabe752f24100d8023"
10128+
integrity sha512-XqX7uzmFo0pUceWFCt7Gff6IyIMzFUn7QMZrbrQfGxtaxXZIcGQzoNpRLE3fQLnS4XzLLPMZX2T9TRcSrasicw==
1009810129
dependencies:
1009910130
loose-envify "^1.1.0"
10100-
object-assign "^4.1.1"
10101-
scheduler "^0.20.1"
10131+
scheduler "^0.21.0"
1010210132

1010310133
react-error-overlay@^4.0.0:
1010410134
version "4.0.1"
@@ -10193,13 +10223,12 @@ react-switch@^5.0.1:
1019310223
dependencies:
1019410224
prop-types "^15.6.2"
1019510225

10196-
react@^17.0.1:
10197-
version "17.0.1"
10198-
resolved "https://registry.npmjs.org/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
10199-
integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==
10226+
react@^18.0.0:
10227+
version "18.0.0"
10228+
resolved "https://registry.npmjs.org/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96"
10229+
integrity sha512-x+VL6wbT4JRVPm7EGxXhZ8w8LTROaxPXOqhlGyVSrv0sB1jkyFGgXxJ8LVoPRLvPR6/CIZGFmfzqUa2NYeMr2A==
1020010230
dependencies:
1020110231
loose-envify "^1.1.0"
10202-
object-assign "^4.1.1"
1020310232

1020410233
read-cmd-shim@^1.0.1:
1020510234
version "1.0.5"
@@ -10829,13 +10858,12 @@ sax@~1.2.1, sax@~1.2.4:
1082910858
resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
1083010859
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
1083110860

10832-
scheduler@^0.20.1:
10833-
version "0.20.1"
10834-
resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c"
10835-
integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw==
10861+
scheduler@^0.21.0:
10862+
version "0.21.0"
10863+
resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.21.0.tgz#6fd2532ff5a6d877b6edb12f00d8ab7e8f308820"
10864+
integrity sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ==
1083610865
dependencies:
1083710866
loose-envify "^1.1.0"
10838-
object-assign "^4.1.1"
1083910867

1084010868
schema-utils@^0.3.0:
1084110869
version "0.3.0"

0 commit comments

Comments
 (0)