Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support new hydrate API in latest react 18 alpha release #26664

Merged
merged 8 commits into from
Jun 30, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
compat latest react only, fix resolved version
  • Loading branch information
huozhi committed Jun 28, 2021
commit bcffc8376f97a8a6eef9c8617da0aac09d9362e5
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -115,9 +115,9 @@
"pretty-bytes": "5.3.0",
"pretty-ms": "7.0.0",
"react": "17.0.2",
"react-18": "npm:react@18.0.0-alpha-e6be2d531",
"react-18": "npm:react@next",
"react-dom": "17.0.2",
"react-dom-18": "npm:react-dom@18.0.0-alpha-e6be2d531",
"react-dom-18": "npm:react-dom@next",
"react-ssr-prepass": "1.0.8",
"release": "6.3.0",
"request-promise-core": "1.1.2",
4 changes: 2 additions & 2 deletions packages/next/client/index.tsx
Original file line number Diff line number Diff line change
@@ -510,10 +510,10 @@ function renderReactElement(
const reactEl = fn(shouldHydrate ? markHydrateComplete : markRenderComplete)
if (process.env.__NEXT_REACT_ROOT) {
if (!reactRoot) {
if (shouldHydrate && typeof ReactDOM18.hydrateRoot === 'function') {
if (shouldHydrate) {
reactRoot = ReactDOM18.hydrateRoot(domEl, reactEl)
huozhi marked this conversation as resolved.
Show resolved Hide resolved
} else {
reactRoot = ReactDOM18.createRoot(domEl, { hydrate: shouldHydrate })
reactRoot = ReactDOM18.createRoot(domEl)
reactRoot.render(reactEl)
}
}
26 changes: 13 additions & 13 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -15632,22 +15632,22 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8:
minimist "^1.2.0"
strip-json-comments "~2.0.1"

"react-18@npm:react@18.0.0-alpha-e6be2d531":
version "18.0.0-alpha-e6be2d531"
resolved "https://registry.yarnpkg.com/react/-/react-18.0.0-alpha-e6be2d531.tgz#c5cf6d5706f7b6411d36848b483a7937c94fc5c9"
integrity sha512-roZmm4MYfuGN65PiagPvhumBb3Da1FAgyj6Ti2sHwQDIxhi40PMq5V90gBSKXl7qXbaXHrtpuAtG5R+XkqpDYA==
"react-18@npm:react@next":
version "18.0.0-alpha-73ffce1b6-20210624"
resolved "https://registry.yarnpkg.com/react/-/react-18.0.0-alpha-73ffce1b6-20210624.tgz#d9fb8700c6fad8de752ec0427f2ae3a941eea951"
integrity sha512-Qaj2vhrMlYc169Yh0gXBB7WeKWMeIVx99JnuouuT71Jku2Cly9TxAWurc+h6PSgz/qjjmDA2NOtHCb6mGlmzGA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"

"react-dom-18@npm:react-dom@18.0.0-alpha-e6be2d531":
version "18.0.0-alpha-e6be2d531"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.0.0-alpha-e6be2d531.tgz#89b1aef488a56ceac7cc0169ae02d7fbb58cbbb6"
integrity sha512-mMGiX/kyhxaUTRDt+Q5oIbpU6cPvO8Sp/kHz3cdNFviwVTHHF2YrnnD70BD2F1R0b7wAdfVVit9EfE+Rqt0sJA==
"react-dom-18@npm:react-dom@next":
version "18.0.0-alpha-73ffce1b6-20210624"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.0.0-alpha-73ffce1b6-20210624.tgz#3d789e4f3446abc685a7754c8dc74dea0ffb4247"
integrity sha512-TgA+VhVas3mJdhy6AQLXnPzBN2JeNKC7EGhLKU11XOxUODCGQ94nyT04i1ta2R3Fv0QevMLp0Wb5hccan0wMEg==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
scheduler "0.21.0-alpha-e6be2d531"
scheduler "0.21.0-alpha-73ffce1b6-20210624"

[email protected]:
version "17.0.2"
@@ -16666,10 +16666,10 @@ saxes@^5.0.1:
dependencies:
xmlchars "^2.2.0"

[email protected]e6be2d531:
version "0.21.0-alpha-e6be2d531"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.21.0-alpha-e6be2d531.tgz#fd895f7426e15166f1b16ed1d54de48243c78002"
integrity sha512-1GSnBp3em+oMz93ncjqR/7qeGArhgKaOWluZUrQW2JgHEGYISXAhGTVQhUYAiKc3F9jiq94CE1WrO0vaVzgReQ==
[email protected]73ffce1b6-20210624:
version "0.21.0-alpha-73ffce1b6-20210624"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.21.0-alpha-73ffce1b6-20210624.tgz#6fff95e26af73cfaa365b68fa3b68c4c66dfe347"
integrity sha512-7SXTiepGRo63F5Yp/fxLhZDYi5TInsqjnMTYF6GwtunUGAwyuK4V/AFiF0Q1gtB32U/e+C+OE4SSj9LtBYBjYw==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"