Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-reac…
Browse files Browse the repository at this point in the history
…t-7.22.0
  • Loading branch information
newerton committed Mar 18, 2021
2 parents efbb10a + c098180 commit 80f673d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions package.json
Expand Up @@ -6,14 +6,14 @@
"axios": "^0.21.1",
"filesize": "^6.1.0",
"history": "^4.10.1",
"polished": "^4.1.1",
"react": "^16.13.1",
"polished": "^3.5.2",
"react": "^16.14.0",
"react-dom": "^16.13.1",
"react-dropzone": "^10.2.2",
"react-dropzone": "^11.3.1",
"react-router-dom": "^5.1.2",
"react-scripts": "3.4.1",
"react-scripts": "4.0.3",
"styled-components": "^5.1.0",
"typescript": "~3.7.2"
"typescript": "~3.9.9"
},
"scripts": {
"start": "react-app-rewired start",
Expand All @@ -36,21 +36,21 @@
"devDependencies": {
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"@testing-library/user-event": "^13.0.2",
"@types/axios": "^0.14.0",
"@types/jest": "^24.0.0",
"@types/jest": "^26.0.21",
"@types/node": "^12.0.0",
"@types/react": "^16.9.0",
"@types/react-dom": "^16.9.0",
"@types/react-dom": "^17.0.2",
"@types/react-router-dom": "^5.1.4",
"@types/styled-components": "^5.1.0",
"@typescript-eslint/eslint-plugin": "^2.28.0",
"@typescript-eslint/parser": "^2.28.0",
"@typescript-eslint/parser": "^2.34.0",
"axios-mock-adapter": "^1.18.1",
"eslint": "^6.8.0",
"eslint-config-airbnb": "^18.1.0",
"eslint-config-prettier": "^6.10.1",
"eslint-import-resolver-typescript": "^2.0.0",
"eslint-import-resolver-typescript": "^2.4.0",
"eslint-plugin-import": "^2.20.1",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.3",
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Expand Up @@ -11484,4 +11484,4 @@ yargs@^13.3.0:
string-width "^3.0.0"
which-module "^2.0.0"
y18n "^4.0.0"
yargs-parser "^13.1.2"
yargs-parser "^13.1.2"

0 comments on commit 80f673d

Please sign in to comment.