Skip to content

Commit 6184a25

Browse files
authored
Merge pull request #56 from react-native-jp/upgrade-202003
Upgrade 202003
2 parents f4bde34 + f3e3669 commit 6184a25

7 files changed

Lines changed: 615 additions & 608 deletions

File tree

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.15.0
1+
12.16.1

‎ios/Podfile.lock‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,9 @@ PODS:
470470
- React-cxxreact (= 0.61.5)
471471
- React-jsi (= 0.61.5)
472472
- React-jsinspector (0.61.5)
473-
- react-native-safe-area-context (0.7.2):
473+
- react-native-get-random-values (1.3.0):
474+
- React
475+
- react-native-safe-area-context (0.7.3):
474476
- React
475477
- React-RCTActionSheet (0.61.5):
476478
- React-Core/RCTActionSheetHeaders (= 0.61.5)
@@ -509,35 +511,35 @@ PODS:
509511
- ReactCommon/jscallinvoker (= 0.61.5)
510512
- RNCAsyncStorage (1.6.3):
511513
- React
512-
- RNCMaskedView (0.1.6):
514+
- RNCMaskedView (0.1.7):
513515
- React
514-
- RNFBAnalytics (6.3.1):
516+
- RNFBAnalytics (6.3.4):
515517
- Firebase/Core (~> 6.13.0)
516518
- React
517519
- RNFBApp
518-
- RNFBApp (6.3.1):
520+
- RNFBApp (6.3.4):
519521
- Firebase/Core (~> 6.13.0)
520522
- React
521-
- RNFBAuth (6.3.1):
523+
- RNFBAuth (6.3.4):
522524
- Firebase/Auth (~> 6.13.0)
523525
- Firebase/Core (~> 6.13.0)
524526
- React
525527
- RNFBApp
526-
- RNFBFirestore (6.3.1):
528+
- RNFBFirestore (6.3.4):
527529
- Firebase/Core (~> 6.13.0)
528530
- Firebase/Firestore (~> 6.13.0)
529531
- React
530532
- RNFBApp
531-
- RNGestureHandler (1.5.2):
533+
- RNGestureHandler (1.6.0):
532534
- React
533-
- RNGoogleSignin (3.0.4):
535+
- RNGoogleSignin (4.0.0):
534536
- GoogleSignIn (~> 5.0.0)
535537
- React
536-
- RNReanimated (1.4.0):
538+
- RNReanimated (1.7.0):
537539
- React
538-
- RNScreens (2.0.0-beta.2):
540+
- RNScreens (2.3.0):
539541
- React
540-
- RNSVG (9.13.3):
542+
- RNSVG (12.0.3):
541543
- React
542544
- RNVectorIcons (6.6.0):
543545
- React
@@ -560,6 +562,7 @@ DEPENDENCIES:
560562
- React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
561563
- React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
562564
- React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
565+
- react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
563566
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
564567
- React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
565568
- React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
@@ -642,6 +645,8 @@ EXTERNAL SOURCES:
642645
:path: "../node_modules/react-native/ReactCommon/jsiexecutor"
643646
React-jsinspector:
644647
:path: "../node_modules/react-native/ReactCommon/jsinspector"
648+
react-native-get-random-values:
649+
:path: "../node_modules/react-native-get-random-values"
645650
react-native-safe-area-context:
646651
:path: "../node_modules/react-native-safe-area-context"
647652
React-RCTActionSheet:
@@ -730,7 +735,8 @@ SPEC CHECKSUMS:
730735
React-jsi: cb2cd74d7ccf4cffb071a46833613edc79cdf8f7
731736
React-jsiexecutor: d5525f9ed5f782fdbacb64b9b01a43a9323d2386
732737
React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0
733-
react-native-safe-area-context: 4b3d1b9ebb040a4814a222703e7434b20c95fcf5
738+
react-native-get-random-values: 6f638190cfaa202576b43ea9534d5cf88181f139
739+
react-native-safe-area-context: e200d4433aba6b7e60b52da5f37af11f7a0b0392
734740
React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
735741
React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
736742
React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72
@@ -742,16 +748,16 @@ SPEC CHECKSUMS:
742748
React-RCTVibration: a49a1f42bf8f5acf1c3e297097517c6b3af377ad
743749
ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
744750
RNCAsyncStorage: 3c304d1adfaea02ec732ac218801cb13897aa8c0
745-
RNCMaskedView: a88953beefbd347a29072d9eba90e42945fe291e
746-
RNFBAnalytics: 48a97c6e4bd8a9ad173990e95ef1311c486630d8
747-
RNFBApp: 279ec5c4bb43b8fc7b8031eed90ad7d2bea7a048
748-
RNFBAuth: b631f0e98cebd098ddf8f6b7facda2a5ba1a6bef
749-
RNFBFirestore: 1b5be285c76247a8c78aa85b53202647db7541fa
750-
RNGestureHandler: 946a7691e41df61e2c4b1884deab41a4cdc3afff
751-
RNGoogleSignin: a00f87261ea13df9a5cea8deafa6927d6f2c3562
752-
RNReanimated: b2ab0b693dddd2339bd2f300e770f6302d2e960c
753-
RNScreens: 5e4758109c6d35f9a009ce72af873df907548020
754-
RNSVG: f6177f8d7c095fada7cfee2e4bb7388ba426064c
751+
RNCMaskedView: 76c40a1d41c3e2535df09246a2b5487f04de0814
752+
RNFBAnalytics: b8bad44e6653af73219b1a7af24bf3452cb02c1b
753+
RNFBApp: 7d4006751de8bb5cafa2e8d2e7d94ee250df81db
754+
RNFBAuth: ed8b865db45f7ded9dbf535e390cba2ba672aede
755+
RNFBFirestore: 04c1eb90463c208ee072988d463c74bec09d08c1
756+
RNGestureHandler: dde546180bf24af0b5f737c8ad04b6f3fa51609a
757+
RNGoogleSignin: 068788c1e83e5e05ef0bad090ba67fd8f963a2a3
758+
RNReanimated: 031fe8d9ea93c2bd689a40f05320ef9d96f74d7f
759+
RNScreens: 03bf608b92ac0acf323f47d8f5b63a8f829340c8
760+
RNSVG: 7e16ddfc6e00d5aa69c9eb83e699bcce5dcb85d4
755761
RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4
756762
Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
757763

‎package.json‎

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,70 +17,71 @@
1717
"dependencies": {
1818
"@januswel/object-utilities": "1.0.1",
1919
"@react-native-community/async-storage": "https://github.com/januswel/async-storage.git#add-typings-of-mock",
20-
"@react-native-community/google-signin": "3.0.4",
21-
"@react-native-community/masked-view": "0.1.6",
22-
"@react-native-firebase/analytics": "6.3.1",
23-
"@react-native-firebase/app": "6.3.1",
24-
"@react-native-firebase/auth": "6.3.1",
25-
"@react-native-firebase/firestore": "6.3.`",
26-
"@react-navigation/bottom-tabs": "^5.0.0",
27-
"@react-navigation/drawer": "5.0.0",
28-
"@react-navigation/native": "5.0.0",
29-
"@react-navigation/routers": "5.0.0",
30-
"@react-navigation/stack": "5.0.0",
20+
"@react-native-community/google-signin": "4.0.0",
21+
"@react-native-community/masked-view": "0.1.7",
22+
"@react-native-firebase/analytics": "6.3.4",
23+
"@react-native-firebase/app": "6.3.4",
24+
"@react-native-firebase/auth": "6.3.4",
25+
"@react-native-firebase/firestore": "6.3.4",
26+
"@react-navigation/bottom-tabs": "5.2.1",
27+
"@react-navigation/drawer": "5.3.1",
28+
"@react-navigation/native": "5.1.0",
29+
"@react-navigation/routers": "5.1.1",
30+
"@react-navigation/stack": "5.2.1",
3131
"@react-navigation/tabs": "0.0.0-alpha.12",
32-
"@types/react-native-svg-charts": "^5.0.3",
33-
"color": "^3.1.2",
32+
"@types/react-native-svg-charts": "5.0.3",
33+
"color": "3.1.2",
3434
"react": "16.9.0",
3535
"react-native": "0.61.5",
36-
"react-native-gesture-handler": "1.5.2",
37-
"react-native-paper": "3.3.0",
38-
"react-native-reanimated": "1.4.0",
39-
"react-native-safe-area-context": "0.7.2",
36+
"react-native-gesture-handler": "1.6.0",
37+
"react-native-get-random-values": "1.3.0",
38+
"react-native-paper": "3.6.0",
39+
"react-native-reanimated": "1.7.0",
40+
"react-native-safe-area-context": "0.7.3",
4041
"react-native-safe-area-view": "1.0.0",
41-
"react-native-screens": "2.0.0-beta.2",
42+
"react-native-screens": "2.3.0",
4243
"react-native-snap-carousel": "3.8.4",
43-
"react-native-svg": "9.13.3",
44+
"react-native-svg": "12.0.3",
4445
"react-native-svg-charts": "5.3.0",
45-
"react-native-swipe-list-view": "2.0.6",
46+
"react-native-swipe-list-view": "2.4.0",
4647
"react-native-vector-icons": "6.6.0",
47-
"react-redux": "7.1.3",
48+
"react-redux": "7.2.0",
4849
"redux": "4.0.5",
4950
"redux-thunk": "2.3.0",
5051
"reselect": "4.0.0",
51-
"uuid": "3.4.0"
52+
"uuid": "7.0.2"
5253
},
5354
"devDependencies": {
54-
"@babel/core": "7.8.4",
55-
"@babel/runtime": "7.8.4",
55+
"@babel/core": "7.8.7",
56+
"@babel/runtime": "7.8.7",
5657
"@react-native-community/eslint-config": "0.0.7",
57-
"@types/color": "^3.0.1",
58-
"@types/jest": "25.1.2",
59-
"@types/react": "16.9.15",
60-
"@types/react-native": "0.61.12",
61-
"@types/react-native-snap-carousel": "3.7.4",
58+
"@types/color": "3.0.1",
59+
"@types/jest": "25.1.4",
60+
"@types/react": "16.9.23",
61+
"@types/react-native": "0.61.23",
62+
"@types/react-native-snap-carousel": "3.8.0",
6263
"@types/react-native-vector-icons": "6.4.5",
6364
"@types/react-navigation": "3.4.0",
6465
"@types/react-redux": "7.1.7",
6566
"@types/react-test-renderer": "16.9.2",
6667
"@types/redux-mock-store": "1.0.2",
67-
"@types/uuid": "3.4.7",
68-
"@typescript-eslint/eslint-plugin": "2.19.0",
69-
"@typescript-eslint/parser": "2.19.0",
68+
"@types/uuid": "7.0.2",
69+
"@typescript-eslint/eslint-plugin": "2.24.0",
70+
"@typescript-eslint/parser": "2.24.0",
7071
"babel-jest": "25.1.0",
7172
"detox": "15.1.4",
7273
"eslint": "6.8.0",
7374
"eslint-config-prettier": "6.10.0",
74-
"eslint-plugin-jest": "23.7.0",
75+
"eslint-plugin-jest": "23.8.2",
7576
"eslint-plugin-prettier": "3.1.2",
76-
"eslint-plugin-react": "7.18.3",
77+
"eslint-plugin-react": "7.19.0",
7778
"jest": "25.1.0",
7879
"js-yaml": "3.13.1",
7980
"metro-react-native-babel-preset": "0.58.0",
8081
"prettier": "1.19.1",
81-
"react-test-renderer": "16.12.0",
82+
"react-test-renderer": "16.13.0",
8283
"redux-mock-store": "1.5.4",
83-
"typescript": "3.7.5"
84+
"typescript": "3.8.3"
8485
},
8586
"jest": {
8687
"preset": "react-native"

‎src/components/atoms/Pagination.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ export default function Pagination(props: Props) {
3131
dotStyle={styles.dot}
3232
inactiveDotOpacity={0.4}
3333
inactiveDotScale={0.6}
34+
animatedDuration={250}
35+
animatedFriction={4}
36+
animatedTension={50}
37+
delayPressInDot={0}
3438
/>
3539
)
3640
}

‎src/domain/models/todo.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import generateUuid from 'uuid/v4'
1+
import 'react-native-get-random-values'
2+
import { v4 as generateUuid } from 'uuid'
23

34
import { assertIsDefined } from '../../lib/assert'
45

‎src/routes/Main/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'
3-
import { createDrawerNavigator } from '@react-navigation/drawer'
3+
import { createDrawerNavigator, DrawerContentComponentProps } from '@react-navigation/drawer'
44
import {
55
CHOOSE_LOGIN,
66
HOME,
@@ -37,7 +37,7 @@ function HomeWithDrawer() {
3737
drawerStyle={drawerStyle}
3838
drawerContentOptions={drawerContentOptions}
3939
initialRouteName={HOME}
40-
drawerContent={props => <DrawerComponent {...props} />}
40+
drawerContent={(props: DrawerContentComponentProps) => <DrawerComponent {...props} />}
4141
>
4242
<Drawer.Screen name={HOME} component={Home} />
4343
<Drawer.Screen name={USER_INFO} component={UserInfo} />
@@ -50,7 +50,7 @@ function StatisticsWithDrawer() {
5050
drawerStyle={drawerStyle}
5151
drawerContentOptions={drawerContentOptions}
5252
initialRouteName={STATISTICS}
53-
drawerContent={props => <DrawerComponent {...props} />}
53+
drawerContent={(props: DrawerContentComponentProps) => <DrawerComponent {...props} />}
5454
>
5555
<Drawer.Screen name={STATISTICS} component={Statistics} />
5656
<Drawer.Screen name={USER_INFO} component={UserInfo} />

0 commit comments

Comments
 (0)