Skip to content

Commit 643cf07

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/types/jest-26.0.21
2 parents f23aa27 + 9f696d6 commit 643cf07

File tree

2 files changed

+28
-31
lines changed

2 files changed

+28
-31
lines changed

package.json

Lines changed: 7 additions & 7 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",
@@ -36,12 +36,12 @@
3636
"devDependencies": {
3737
"@testing-library/jest-dom": "^4.2.4",
3838
"@testing-library/react": "^9.3.2",
39-
"@testing-library/user-event": "^7.1.2",
39+
"@testing-library/user-event": "^13.0.1",
4040
"@types/axios": "^0.14.0",
4141
"@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",
@@ -51,7 +51,7 @@
5151
"eslint-config-airbnb": "^18.1.0",
5252
"eslint-config-prettier": "^6.10.1",
5353
"eslint-import-resolver-typescript": "^2.0.0",
54-
"eslint-plugin-import": "^2.20.1",
54+
"eslint-plugin-import": "^2.22.1",
5555
"eslint-plugin-jsx-a11y": "^6.2.3",
5656
"eslint-plugin-prettier": "^3.1.3",
5757
"eslint-plugin-react": "^7.19.0",

yarn.lock

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@
966966
dependencies:
967967
regenerator-runtime "^0.13.4"
968968

969-
"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
969+
"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
970970
version "7.13.10"
971971
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d"
972972
integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==
@@ -1405,10 +1405,12 @@
14051405
"@testing-library/dom" "^6.15.0"
14061406
"@types/testing-library__react" "^9.1.2"
14071407

1408-
"@testing-library/user-event@^7.1.2":
1409-
version "7.2.1"
1410-
resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-7.2.1.tgz#2ad4e844175a3738cb9e7064be5ea070b8863a1c"
1411-
integrity sha512-oZ0Ib5I4Z2pUEcoo95cT1cr6slco9WY7yiPpG+RGNkj8YcYgJnM7pXmYmorNOReh8MIGcKSqXyeGjxnr8YiZbA==
1408+
"@testing-library/user-event@^13.0.1":
1409+
version "13.0.1"
1410+
resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-13.0.1.tgz#a1c0727ca3eefa6f9bd0ccce98d02770e6446e8f"
1411+
integrity sha512-7n3Y5Vohib6yVFW60JlCvQOqBDIlE1SRyo78nmoHwePAg3SVhnfyOI30RYNj3yFF7qy7e0uVlewzTyvNxyJjEA==
1412+
dependencies:
1413+
"@babel/runtime" "^7.12.5"
14121414

14131415
"@types/axios@^0.14.0":
14141416
version "0.14.0"
@@ -1537,15 +1539,10 @@
15371539
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
15381540
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
15391541

1540-
"@types/node@*":
1541-
version "13.13.1"
1542-
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.1.tgz#1ba94c5a177a1692518bfc7b41aec0aa1a14354e"
1543-
integrity sha512-uysqysLJ+As9jqI5yqjwP3QJrhOcUwBjHUlUxPxjbplwKoILvXVsmYWEhfmAQlrPfbRZmhJB007o4L9sKqtHqQ==
1544-
1545-
"@types/node@^12.0.0":
1546-
version "12.12.36"
1547-
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.36.tgz#162c8c2a2e659da480049df0e19ae128ad3a1527"
1548-
integrity sha512-hmmypvyO/uTLFYCYu6Hlb3ydeJ11vXRxg8/WJ0E3wvwmPO0y47VqnfmXFVuWlysO0Zyj+je1Y33rQeuYkZ51GQ==
1542+
"@types/node@*", "@types/node@^14.14.35":
1543+
version "14.14.35"
1544+
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.35.tgz#42c953a4e2b18ab931f72477e7012172f4ffa313"
1545+
integrity sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag==
15491546

15501547
"@types/parse-json@^4.0.0":
15511548
version "4.0.0"
@@ -1562,10 +1559,10 @@
15621559
resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
15631560
integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
15641561

1565-
"@types/react-dom@*", "@types/react-dom@^16.9.0":
1566-
version "16.9.6"
1567-
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.6.tgz#9e7f83d90566521cc2083be2277c6712dcaf754c"
1568-
integrity sha512-S6ihtlPMDotrlCJE9ST1fRmYrQNNwfgL61UB4I1W7M6kPulUKx9fXAleW5zpdIjUQ4fTaaog8uERezjsGUj9HQ==
1562+
"@types/react-dom@*", "@types/react-dom@^17.0.2":
1563+
version "17.0.2"
1564+
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.2.tgz#35654cf6c49ae162d5bc90843d5437dc38008d43"
1565+
integrity sha512-Icd9KEgdnFfJs39KyRyr0jQ7EKhq8U6CcHRMGAS45fp5qgUvxL3ujUCfWFttUK2UErqZNj97t9gsVPNAqcwoCg==
15691566
dependencies:
15701567
"@types/react" "*"
15711568

@@ -7939,12 +7936,12 @@ [email protected]:
79397936
dependencies:
79407937
ts-pnp "^1.1.6"
79417938

7942-
polished@^4.1.1:
7943-
version "4.1.1"
7944-
resolved "https://registry.yarnpkg.com/polished/-/polished-4.1.1.tgz#40442cc973348e466f2918cdf647531bb6c29bfb"
7945-
integrity sha512-4MZTrfPMPRLD7ac8b+2JZxei58zw6N1hFkdBDERif5Tlj19y3vPoPusrLG+mJIlPTGnUlKw3+yWz0BazvMx1vg==
7939+
polished@^3.5.2:
7940+
version "3.5.2"
7941+
resolved "https://registry.yarnpkg.com/polished/-/polished-3.5.2.tgz#ca132b8cd68f7ffa95ae9d423f03e7a14fda1062"
7942+
integrity sha512-vWoRDg3gY5RQBtUfcj9MRN10VCIf4EkdUikGxyXItg2Hnwk+eIVtdBiLajN0ldFeT3Vq4r/QNbjrQdhqBKrTug==
79467943
dependencies:
7947-
"@babel/runtime" "^7.12.5"
7944+
"@babel/runtime" "^7.8.7"
79487945

79497946
portfinder@^1.0.25:
79507947
version "1.0.25"
@@ -11365,4 +11362,4 @@ yargs@^13.3.0:
1136511362
string-width "^3.0.0"
1136611363
which-module "^2.0.0"
1136711364
y18n "^4.0.0"
11368-
yargs-parser "^13.1.2"
11365+
yargs-parser "^13.1.2"

0 commit comments

Comments
 (0)