Skip to content

Commit e58910f

Browse files
authored
Merge pull request #19 from wellcometrust/task/8978-upgrade-to-react-17
8978 task: Upgraded to React 17
2 parents 3259754 + 02a49ea commit e58910f

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

package-lock.json

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

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
"license": "MIT",
4545
"homepage": "https://github.com/wellcometrust/design-system#readme",
4646
"peerDependencies": {
47-
"react": "^16.12.0 || ^17.0.2",
48-
"react-dom": "^16.12.0 || ^17.0.2"
47+
"react": "^17.0.2",
48+
"react-dom": "^17.0.2"
4949
},
5050
"dependencies": {
5151
"@babel/runtime": "^7.8.4",
@@ -79,8 +79,8 @@
7979
"@types/jest": "^26.0.23",
8080
"@types/lodash": "^4.14.171",
8181
"@types/node": "^12.12.22",
82-
"@types/react": "^16.9.17",
83-
"@types/react-dom": "^16.9.4",
82+
"@types/react": "^17.0.34",
83+
"@types/react-dom": "^17.0.11",
8484
"@types/testing-library__jest-dom": "^5.9.5",
8585
"@typescript-eslint/eslint-plugin": "^4.26.1",
8686
"@typescript-eslint/parser": "^4.26.1",
@@ -108,10 +108,10 @@
108108
"postcss": "^8.0.9",
109109
"postcss-calc": "^7.0.4",
110110
"prettier": "^1.18.2",
111-
"react": "16.12.0",
111+
"react": "^17.0.2",
112112
"react-docgen-typescript": "^1.22.0",
113113
"react-docgen-typescript-loader": "^3.6.0",
114-
"react-dom": "16.12.0",
114+
"react-dom": "^17.0.2",
115115
"rollup": "^2.28.2",
116116
"rollup-plugin-copy": "^3.4.0",
117117
"rollup-plugin-ignore-import": "^1.3.2",

src/components/Button/Button.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ test('Disabled Button component is not accessible', () => {
2121
});
2222

2323
expect(button).toBeInTheDocument();
24-
expect(button).toHaveAttribute('disabled');
24+
expect(button).toBeDisabled();
2525
});

0 commit comments

Comments
 (0)