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.

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

Jump to bottom

Conditionally require react-dom/client in reactHydrate/reactRender if React version >= 18 #1448

Closed
wants to merge 4 commits into from
Closed

Conditionally require react-dom/client in reactHydrate/reactRender if React version >= 18 #1448

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
112d152
Conditionally require react-dom/client in reactHydrate/reactRender if…
summera Apr 23, 2022
1825db3
Store modules in variables to force webpack dynamic require
summera May 3, 2022
c9028fb
Merge branch 'master' into fix-react-dom-client-warnings
justin808 Jun 4, 2022
e68ad9b
Switch require to use string interpolation
summera Jun 16, 2022
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
1 change: 1 addition & 0 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ overrides:
rules:
"@typescript-eslint/no-namespace": 0
"@typescript-eslint/no-shadow": ["error"]
"@typescript-eslint/no-var-requires": 0

rules:
no-shadow: 0
Expand Down
7 changes: 5 additions & 2 deletions node_package/src/reactHydrate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import ReactDOM from 'react-dom';
import { ReactElement, Component } from 'react';
import supportsReactCreateRoot from './supportsReactCreateRoot';

const reactDomClient = "react-dom/client";
const reactDom = "react-dom";
// eslint-disable-next-line import/no-dynamic-require
const ReactDOM = require(supportsReactCreateRoot ? reactDomClient : reactDom);
summera marked this conversation as resolved.
Show resolved Hide resolved

export default function reactHydrate(domNode: Element, reactElement: ReactElement): void | Element | Component {
if (supportsReactCreateRoot) {
// @ts-expect-error potentially present if React 18 or greater
return ReactDOM.hydrateRoot(domNode, reactElement);
}

Expand Down
7 changes: 5 additions & 2 deletions node_package/src/reactRender.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import ReactDOM from 'react-dom';
import { ReactElement, Component } from 'react';
import supportsReactCreateRoot from './supportsReactCreateRoot';

const reactDomClient = "react-dom/client";
const reactDom = "react-dom";
// eslint-disable-next-line import/no-dynamic-require
const ReactDOM = require(supportsReactCreateRoot ? reactDomClient : reactDom);

export default function reactRender(domNode: Element, reactElement: ReactElement): void | Element | Component {
if (supportsReactCreateRoot) {
// @ts-expect-error potentially present if React 18 or greater
const root = ReactDOM.createRoot(domNode);
root.render(reactElement);
return root
Expand Down