Skip to content

feat: use hydrateRoot for production and clean up ErrorBoundary #3183

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.

Sign up for GitHub

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

Open
Zyreny wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: use hydrateRoot for production and clean up ErrorBoundary #3183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions src/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { BrowserRouter, Route } from 'react-router-dom'
import App from './app'
import { loadableReady } from '@loadable/component'
import React, { Fragment } from 'react'
import { createRoot } from 'react-dom/client'
import { createRoot, hydrateRoot } from 'react-dom/client'
import TagManager from 'react-gtm-module'
import globalEnv from './global-env'
import hashLinkScroll from './utils/hash-link-scroll'
Expand Down Expand Up @@ -144,9 +144,11 @@ const jsx = (

loadableReady(() => {
const container = document.getElementById('root')
const root = createRoot(container)
// todo: use `hydrateRoot` after resolving react issue #418 & #423
root.render(jsx)
if (globalEnv.isProduction) {
hydrateRoot(container, jsx)
} else {
createRoot(container).render(jsx)
}

if (globalEnv.isDevelopment) {
// FPS meter
Expand Down
7 changes: 0 additions & 7 deletions src/components/ErrorBoundary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,6 @@ class ErrorBoundary extends React.Component {
}

componentDidCatch(error, info) {
// eslint-disable-next-line no-undef
if (error instanceof DOMException) {
// todo: remove it after resolving react hydrateRoot issue #418 & #423
// react-transition-group might throw domException on ssr
// catch it with error report only
this.hide()
}
logger.errorReport({
message: 'An error was catched in React ErrorBoundary.',
report: error,
Expand Down