Skip to content

Commit fde66a2

Browse files
authored
Merge pull request #13738 from MatanBobi/chores/update-rtl-version-rtl-16
fix: upgrade RTL version to avoid peer-deps mismatch
2 parents dd420a6 + 32652a5 commit fde66a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+211
-136
lines changed

docusaurus/docs/running-tests.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ Different projects choose different testing tradeoffs based on how often compone
7272

7373
```js
7474
import React from 'react';
75-
import ReactDOM from 'react-dom';
75+
import ReactDOMClient from 'react-dom/client';
7676
import App from './App';
7777

7878
it('renders without crashing', () => {
7979
const div = document.createElement('div');
80-
ReactDOM.render(<App />, div);
80+
ReactDOMClient.createRoot(div).render(<App />);
8181
});
8282
```
8383

@@ -92,13 +92,13 @@ If you’d like to test components in isolation from the child components they r
9292
To install `react-testing-library` and `jest-dom`, you can run:
9393

9494
```sh
95-
npm install --save @testing-library/react @testing-library/jest-dom
95+
npm install --save @testing-library/react @testing-library/dom @testing-library/jest-dom
9696
```
9797

9898
Alternatively you may use `yarn`:
9999

100100
```sh
101-
yarn add @testing-library/react @testing-library/jest-dom
101+
yarn add @testing-library/react @testing-library/dom @testing-library/jest-dom
102102
```
103103

104104
If you want to avoid boilerplate in your test files, you can create a [`src/setupTests.js`](#initializing-test-environment) file:

package-lock.json

Lines changed: 28 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/cra-template-typescript/template.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"package": {
33
"dependencies": {
4-
"@testing-library/jest-dom": "^5.14.1",
5-
"@testing-library/react": "^13.0.0",
4+
"@testing-library/dom": "^10.4.0",
5+
"@testing-library/jest-dom": "^6.6.3",
6+
"@testing-library/react": "^16.1.0",
67
"@testing-library/user-event": "^13.2.1",
78
"@types/jest": "^27.0.1",
89
"@types/node": "^16.7.13",
9-
"@types/react": "^18.0.0",
10-
"@types/react-dom": "^18.0.0",
10+
"@types/react": "^19.0.0",
11+
"@types/react-dom": "^19.0.0",
1112
"typescript": "^4.4.2",
1213
"web-vitals": "^2.1.0"
1314
},

packages/cra-template/template.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
"package": {
33
"dependencies": {
4-
"@testing-library/jest-dom": "^5.14.1",
5-
"@testing-library/react": "^13.0.0",
4+
"@testing-library/dom": "^10.4.0",
5+
"@testing-library/jest-dom": "^6.6.3",
6+
"@testing-library/react": "^16.1.0",
67
"@testing-library/user-event": "^13.2.1",
78
"web-vitals": "^2.1.0"
89
},

packages/react-scripts/fixtures/kitchensink/template/src/features/config/BaseUrl.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
*/
77

88
import React from 'react';
9-
import ReactDOM from 'react-dom';
9+
import ReactDOMClient from 'react-dom/client';
1010
import NodePath from './BaseUrl';
1111

1212
describe('BASE_URL', () => {
1313
it('renders without crashing', () => {
1414
const div = document.createElement('div');
1515
return new Promise(resolve => {
16-
ReactDOM.render(<NodePath onReady={resolve} />, div);
16+
ReactDOMClient.createRoot(div).render(<NodePath onReady={resolve} />);
1717
});
1818
});
1919
});

packages/react-scripts/fixtures/kitchensink/template/src/features/env/ExpandEnvVariables.test.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@
66
*/
77

88
import React from 'react';
9-
import ReactDOM from 'react-dom';
9+
import ReactDOMClient from 'react-dom/client';
1010
import ExpandEnvVariables from './ExpandEnvVariables';
11+
import { flushSync } from 'react-dom';
1112

1213
describe('expand .env variables', () => {
1314
it('renders without crashing', () => {
1415
const div = document.createElement('div');
15-
ReactDOM.render(<ExpandEnvVariables />, div);
16+
flushSync(() => {
17+
ReactDOMClient.createRoot(div).render(<ExpandEnvVariables />);
18+
});
1619
});
1720
});

packages/react-scripts/fixtures/kitchensink/template/src/features/env/FileEnvVariables.test.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@
66
*/
77

88
import React from 'react';
9-
import ReactDOM from 'react-dom';
109
import FileEnvVariables from './FileEnvVariables';
10+
import ReactDOMClient from 'react-dom/client';
11+
import { flushSync } from 'react-dom';
1112

1213
describe('.env variables', () => {
1314
it('renders without crashing', () => {
1415
const div = document.createElement('div');
15-
ReactDOM.render(<FileEnvVariables />, div);
16+
flushSync(() => {
17+
ReactDOMClient.createRoot(div).render(<FileEnvVariables />);
18+
});
1619
});
1720
});

packages/react-scripts/fixtures/kitchensink/template/src/features/env/PublicUrl.test.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@
66
*/
77

88
import React from 'react';
9-
import ReactDOM from 'react-dom';
109
import PublicUrl from './PublicUrl';
10+
import ReactDOMClient from 'react-dom/client';
11+
import { flushSync } from 'react-dom';
1112

1213
describe('PUBLIC_URL', () => {
1314
it('renders without crashing', () => {
1415
const div = document.createElement('div');
15-
ReactDOM.render(<PublicUrl />, div);
16+
flushSync(() => {
17+
ReactDOMClient.createRoot(div).render(<PublicUrl />);
18+
});
1619
});
1720
});

packages/react-scripts/fixtures/kitchensink/template/src/features/env/ShellEnvVariables.test.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@
66
*/
77

88
import React from 'react';
9-
import ReactDOM from 'react-dom';
109
import ShellEnvVariables from './ShellEnvVariables';
10+
import ReactDOMClient from 'react-dom/client';
11+
import { flushSync } from 'react-dom';
1112

1213
describe('shell env variables', () => {
1314
it('renders without crashing', () => {
1415
const div = document.createElement('div');
15-
ReactDOM.render(<ShellEnvVariables />, div);
16+
flushSync(() => {
17+
ReactDOMClient.createRoot(div).render(<ShellEnvVariables />);
18+
});
1619
});
1720
});

packages/react-scripts/fixtures/kitchensink/template/src/features/syntax/ArrayDestructuring.test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@
66
*/
77

88
import React from 'react';
9-
import ReactDOM from 'react-dom';
109
import ArrayDestructuring from './ArrayDestructuring';
10+
import ReactDOMClient from 'react-dom/client';
1111

1212
describe('array destructuring', () => {
1313
it('renders without crashing', () => {
1414
const div = document.createElement('div');
1515
return new Promise(resolve => {
16-
ReactDOM.render(<ArrayDestructuring onReady={resolve} />, div);
16+
ReactDOMClient.createRoot(div).render(
17+
<ArrayDestructuring onReady={resolve} />
18+
);
1719
});
1820
});
1921
});

packages/react-scripts/fixtures/kitchensink/template/src/features/syntax/ArraySpread.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
*/
77

88
import React from 'react';
9-
import ReactDOM from 'react-dom';
109
import ArraySpread from './ArraySpread';
10+
import ReactDOMClient from 'react-dom/client';
1111

1212
describe('array spread', () => {
1313
it('renders without crashing', () => {
1414
const div = document.createElement('div');
1515
return new Promise(resolve => {
16-
ReactDOM.render(<ArraySpread onReady={resolve} />, div);
16+
ReactDOMClient.createRoot(div).render(<ArraySpread onReady={resolve} />);
1717
});
1818
});
1919
});

packages/react-scripts/fixtures/kitchensink/template/src/features/syntax/AsyncAwait.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
*/
77

88
import React from 'react';
9-
import ReactDOM from 'react-dom';
109
import AsyncAwait from './AsyncAwait';
10+
import ReactDOMClient from 'react-dom/client';
1111

1212
describe('async/await', () => {
1313
it('renders without crashing', () => {
1414
const div = document.createElement('div');
1515
return new Promise(resolve => {
16-
ReactDOM.render(<AsyncAwait onReady={resolve} />, div);
16+
ReactDOMClient.createRoot(div).render(<AsyncAwait onReady={resolve} />);
1717
});
1818
});
1919
});

packages/react-scripts/fixtures/kitchensink/template/src/features/syntax/ClassProperties.test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@
66
*/
77

88
import React from 'react';
9-
import ReactDOM from 'react-dom';
109
import ClassProperties from './ClassProperties';
10+
import ReactDOMClient from 'react-dom/client';
1111

1212
describe('class properties', () => {
1313
it('renders without crashing', () => {
1414
const div = document.createElement('div');
1515
return new Promise(resolve => {
16-
ReactDOM.render(<ClassProperties onReady={resolve} />, div);
16+
ReactDOMClient.createRoot(div).render(
17+
<ClassProperties onReady={resolve} />
18+
);
1719
});
1820
});
1921
});

packages/react-scripts/fixtures/kitchensink/template/src/features/syntax/ComputedProperties.test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@
66
*/
77

88
import React from 'react';
9-
import ReactDOM from 'react-dom';
109
import ComputedProperties from './ComputedProperties';
10+
import ReactDOMClient from 'react-dom/client';
1111

1212
describe('computed properties', () => {
1313
it('renders without crashing', () => {
1414
const div = document.createElement('div');
1515
return new Promise(resolve => {
16-
ReactDOM.render(<ComputedProperties onReady={resolve} />, div);
16+
ReactDOMClient.createRoot(div).render(
17+
<ComputedProperties onReady={resolve} />
18+
);
1719
});
1820
});
1921
});

packages/react-scripts/fixtures/kitchensink/template/src/features/syntax/CustomInterpolation.test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@
66
*/
77

88
import React from 'react';
9-
import ReactDOM from 'react-dom';
109
import CustomInterpolation from './CustomInterpolation';
10+
import ReactDOMClient from 'react-dom/client';
1111

1212
describe('custom interpolation', () => {
1313
it('renders without crashing', () => {
1414
const div = document.createElement('div');
1515
return new Promise(resolve => {
16-
ReactDOM.render(<CustomInterpolation onReady={resolve} />, div);
16+
ReactDOMClient.createRoot(div).render(
17+
<CustomInterpolation onReady={resolve} />
18+
);
1719
});
1820
});
1921
});

packages/react-scripts/fixtures/kitchensink/template/src/features/syntax/DefaultParameters.test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@
66
*/
77

88
import React from 'react';
9-
import ReactDOM from 'react-dom';
109
import DefaultParameters from './DefaultParameters';
10+
import ReactDOMClient from 'react-dom/client';
1111

1212
describe('default parameters', () => {
1313
it('renders without crashing', () => {
1414
const div = document.createElement('div');
1515
return new Promise(resolve => {
16-
ReactDOM.render(<DefaultParameters onReady={resolve} />, div);
16+
ReactDOMClient.createRoot(div).render(
17+
<DefaultParameters onReady={resolve} />
18+
);
1719
});
1820
});
1921
});

0 commit comments

Comments
 (0)