Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/babel-jest-26.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
newerton committed Mar 18, 2021
2 parents 6d97889 + 8015e63 commit db935a7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"lint": "eslint . --ext .js,.jsx,.ts,.tsx"
},
"dependencies": {
"@react-native-community/async-storage": "^1.9.0",
"@react-native-community/async-storage": "^1.12.1",
"@react-native-community/masked-view": "^0.1.10",
"@react-navigation/native": "^5.1.5",
"@react-navigation/native": "^5.9.3",
"@react-navigation/stack": "^5.2.10",
"axios": "^0.21.1",
"intl": "^1.2.5",
Expand All @@ -24,7 +24,7 @@
"react-native-reanimated": "^2.0.0",
"react-native-safe-area-context": "^0.7.3",
"react-native-screens": "^2.4.0",
"react-native-vector-icons": "^6.6.0",
"react-native-vector-icons": "^8.1.0",
"styled-components": "^5.1.0"
},
"devDependencies": {
Expand All @@ -33,29 +33,29 @@
"@react-native-community/eslint-config": "^1.0.0",
"@testing-library/jest-native": "^3.1.0",
"@testing-library/react-native": "^5.0.3",
"@types/jest": "^24.0.24",
"@types/jest": "^26.0.21",
"@types/react-native": "^0.62.0",
"@types/react-native-vector-icons": "^6.4.5",
"@types/react-native-vector-icons": "^6.4.6",
"@types/react-test-renderer": "16.9.2",
"@types/styled-components": "^5.1.0",
"@typescript-eslint/eslint-plugin": "^2.27.0",
"@typescript-eslint/parser": "^2.27.0",
"@typescript-eslint/parser": "^2.34.0",
"axios-mock-adapter": "^1.18.1",
"babel-jest": "^26.6.3",
"eslint": "^6.8.0",
"eslint-config-airbnb": "^18.1.0",
"eslint-config-airbnb-typescript": "^7.2.1",
"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",
"eslint-plugin-react": "^7.19.0",
"eslint-plugin-react-hooks": "^3.0.0",
"eslint-plugin-react-hooks": "^4.2.0",
"jest": "^24.9.0",
"metro-react-native-babel-preset": "^0.58.0",
"metro-react-native-babel-preset": "^0.65.2",
"prettier": "^2.0.4",
"react-test-renderer": "16.11.0",
"react-test-renderer": "16.13.0",
"ts-jest": "^25.4.0",
"typescript": "^3.8.3"
}
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8601,4 +8601,4 @@ yargs@^15.1.0:
string-width "^4.2.0"
which-module "^2.0.0"
y18n "^4.0.0"
yargs-parser "^18.1.1"
yargs-parser "^18.1.1"

0 comments on commit db935a7

Please sign in to comment.