Skip to content

Commit 347a8f9

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/testing-library/react-11.2.5
2 parents 19faff9 + 65dfdbd commit 347a8f9

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
"axios": "^0.21.1",
77
"filesize": "^6.1.0",
88
"history": "^4.10.1",
9-
"polished": "^4.1.1",
10-
"react": "^16.13.1",
9+
"polished": "^3.5.2",
10+
"react": "^16.14.0",
1111
"react-dom": "^16.13.1",
12-
"react-dropzone": "^10.2.2",
12+
"react-dropzone": "^11.3.1",
1313
"react-router-dom": "^5.1.2",
1414
"react-scripts": "3.4.1",
1515
"styled-components": "^5.1.0",
16-
"typescript": "~3.7.2"
16+
"typescript": "~3.9.9"
1717
},
1818
"scripts": {
1919
"start": "react-app-rewired start",
@@ -38,22 +38,22 @@
3838
"@testing-library/react": "^11.2.5",
3939
"@testing-library/user-event": "^7.1.2",
4040
"@types/axios": "^0.14.0",
41-
"@types/jest": "^24.0.0",
41+
"@types/jest": "^26.0.21",
4242
"@types/node": "^12.0.0",
4343
"@types/react": "^16.9.0",
44-
"@types/react-dom": "^16.9.0",
44+
"@types/react-dom": "^17.0.2",
4545
"@types/react-router-dom": "^5.1.4",
4646
"@types/styled-components": "^5.1.0",
4747
"@typescript-eslint/eslint-plugin": "^2.28.0",
48-
"@typescript-eslint/parser": "^2.28.0",
48+
"@typescript-eslint/parser": "^2.34.0",
4949
"axios-mock-adapter": "^1.18.1",
5050
"eslint": "^6.8.0",
5151
"eslint-config-airbnb": "^18.1.0",
5252
"eslint-config-prettier": "^6.10.1",
53-
"eslint-import-resolver-typescript": "^2.0.0",
53+
"eslint-import-resolver-typescript": "^2.4.0",
5454
"eslint-plugin-import": "^2.20.1",
5555
"eslint-plugin-jsx-a11y": "^6.2.3",
56-
"eslint-plugin-prettier": "^3.1.3",
56+
"eslint-plugin-prettier": "^3.3.1",
5757
"eslint-plugin-react": "^7.19.0",
5858
"eslint-plugin-react-hooks": "^2.5.0",
5959
"prettier": "^2.0.4",

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11330,4 +11330,4 @@ yargs@^13.3.0:
1133011330
string-width "^3.0.0"
1133111331
which-module "^2.0.0"
1133211332
y18n "^4.0.0"
11333-
yargs-parser "^13.1.2"
11333+
yargs-parser "^13.1.2"

0 commit comments

Comments
 (0)