Skip to content

Commit 13c5c9a

Browse files
committed
feat: Upgrade React to v18
- Remove unused enzyme-adapter-react-16 package - Upgrade testing-library packages
1 parent 3ac1a8c commit 13c5c9a

File tree

4 files changed

+122
-370
lines changed

4 files changed

+122
-370
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@
4040
"devDependencies": {
4141
"@babel/eslint-parser": "7.19.1",
4242
"@babel/polyfill": "7.12.1",
43-
"@testing-library/jest-dom": "5.16.5",
44-
"@testing-library/react": "11.2.7",
43+
"@testing-library/dom": "10.4.0",
44+
"@testing-library/jest-dom": "6.6.2",
45+
"@testing-library/react": "16.0.1",
4546
"@testing-library/react-hooks": "8.0.1",
4647
"@typescript-eslint/eslint-plugin": "5.54.0",
4748
"@typescript-eslint/parser": "5.54.0",
@@ -50,7 +51,6 @@
5051
"compare-versions": "5.0.1",
5152
"cozy-scripts": "^8.3.0",
5253
"cozy-tsconfig": "1.2.0",
53-
"enzyme-adapter-react-16": "1.15.6",
5454
"eslint": "8.35.0",
5555
"eslint-config-cozy-app": "^6.1.0",
5656
"eslint-config-prettier": "8.6.0",
@@ -67,7 +67,7 @@
6767
"prop-types": "15.8.1",
6868
"raw-loader": "3.1.0",
6969
"react-hot-loader": "4.13.1",
70-
"react-test-renderer": "16.14.0",
70+
"react-test-renderer": "18.3.1",
7171
"redux-mock-store": "1.5.4",
7272
"stylint": "2.0.0",
7373
"typescript": "4.9.5"
@@ -101,8 +101,8 @@
101101
"lodash": "4.17.21",
102102
"node-fetch": "2.6.1",
103103
"pdf-lib": "1.17.1",
104-
"react": "17.0.2",
105-
"react-dom": "17.0.2",
104+
"react": "18.3.1",
105+
"react-dom": "18.3.1",
106106
"react-input-mask": "3.0.0-alpha.2",
107107
"react-inspector": "5.1.1",
108108
"react-router-dom": "6.23.1",

src/targets/browser/index.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* eslint-disable import/order */
22
import React from 'react'
3-
import { render } from 'react-dom'
43

54
import 'cozy-ui/transpiled/react/stylesheet.css'
65
import 'cozy-ui/dist/cozy-ui.utils.min.css'
@@ -15,7 +14,7 @@ import { AppRouter } from 'src/components/AppRouter'
1514
const init = () => {
1615
const { root, ...rest } = setupApp()
1716

18-
render(<AppRouter {...rest} />, root)
17+
root.render(<AppRouter {...rest} />)
1918
}
2019

2120
registerServiceWorker()

src/targets/browser/setupApp.jsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { CaptureConsole } from '@sentry/integrations'
22
import * as Sentry from '@sentry/react'
33
import memoize from 'lodash/memoize'
4+
import { createRoot } from 'react-dom/client'
45
import { makeClient } from 'src/targets/browser/makeClient'
56

67
import flag from 'cozy-flags'
@@ -16,8 +17,9 @@ const getDataOrDefault = (data, defaultData) =>
1617
* Memoize this function in its own file so that it is correctly memoized
1718
*/
1819
const setupApp = memoize(() => {
19-
const root = document.querySelector('[role=application]')
20-
const locale = JSON.parse(root.dataset.cozy)?.locale
20+
const container = document.querySelector('[role=application]')
21+
const root = createRoot(container)
22+
const locale = JSON.parse(container.dataset.cozy)?.locale
2123
const lang = getDataOrDefault(locale, 'en')
2224
const polyglot = initTranslation(lang, lang => require(`locales/${lang}`))
2325
const client = makeClient()

0 commit comments

Comments
 (0)