Skip to content

React 17 to 18 Upgrade Initiative #4

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
rwa-siteimprove wants to merge 1 commit into
base: master
Choose a base branch
from
Open

React 17 to 18 Upgrade Initiative #4

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
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@
"prop-types": "^15.8.1",
"randexp": "^0.5.3",
"randombytes": "^2.1.0",
"react": "=17.0.2",
"react": "^18.2.0",
"react-copy-to-clipboard": "5.1.0",
"react-debounce-input": "=3.3.0",
"react-dom": "=17.0.2",
"react-dom": "^18.2.0",
"react-immutable-proptypes": "2.2.0",
"react-immutable-pure-component": "^2.2.0",
"react-inspector": "^6.0.1",
Expand Down Expand Up @@ -118,7 +118,7 @@
"@jest/globals": "=29.5.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
"@release-it/conventional-changelog": "=5.1.0",
"@wojtekmaj/enzyme-adapter-react-17": "=0.6.6",
"@wojtekmaj/enzyme-adapter-react-18": "=0.7.1",
"autoprefixer": "^10.4.12",
"babel-loader": "^9.1.2",
"babel-plugin-lodash": "=3.3.4",
Expand Down Expand Up @@ -169,7 +169,7 @@
"prettier": "^2.8.7",
"process": "^0.11.10",
"react-refresh": "^0.14.0",
"react-test-renderer": "=17.0.2",
"react-test-renderer": "^18.2.0",
"release-it": "=15.4.2",
"rimraf": "^4.3.1",
"sass": "^1.54.0",
Expand Down
14 changes: 12 additions & 2 deletions src/core/plugins/view/root-injects.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from "react"
import ReactDOM from "react-dom"
import { createRoot } from "react-dom/client"
import { compose } from "redux"
import { connect, Provider } from "react-redux"
import omit from "lodash/omit"
Expand Down Expand Up @@ -80,9 +80,19 @@ export const withMappedContainer = (getSystem, getStore, memGetComponent) => (co
return WithMappedContainer
}

// Store root instances to avoid creating multiple roots on the same DOM node
const rootInstances = new WeakMap()

export const render = (getSystem, getStore, getComponent, getComponents) => (domNode) => {
const App = getComponent(getSystem, getStore, getComponents)("App", "root")
ReactDOM.render(<App/>, domNode)

// Use React 18's createRoot API
let root = rootInstances.get(domNode)
if (!root) {
root = createRoot(domNode)
rootInstances.set(domNode, root)
}
root.render(<App/>)
}

export const getComponent = (getSystem, getStore, getComponents) => (componentName, container, config = {}) => {
Expand Down
2 changes: 1 addition & 1 deletion test/mocha/setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { JSDOM } = require("jsdom")
const Enzyme = require("enzyme")
const Adapter = require("@wojtekmaj/enzyme-adapter-react-17")
const Adapter = require("@wojtekmaj/enzyme-adapter-react-18")

const win = require("../../src/core/window")

Expand Down