From 4adcf3338959647c616eb749348e0d7f77f153b1 Mon Sep 17 00:00:00 2001 From: 11t518s <11t518s20161759@gmail.com> Date: Mon, 4 Apr 2022 23:00:51 +0900 Subject: [PATCH 1/6] fix: camera #70 --- components/camera/CameraAndGallery.tsx | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/components/camera/CameraAndGallery.tsx b/components/camera/CameraAndGallery.tsx index 5ccd00f..c50cbc3 100644 --- a/components/camera/CameraAndGallery.tsx +++ b/components/camera/CameraAndGallery.tsx @@ -14,6 +14,26 @@ interface IProps { function CameraAndGallery({ setOnModal, onModal }: IProps) { const checkListContext = useContext(checkListCtx); + const onPostCameraDataHandler = async (image: any) => { + const imageData = new FormData(); + + imageData.append('image', { + uri: Platform.OS === 'android' ? image.path : image.path.replace('file://', ''), + type: image.mime, + name: image.filename, + }); + + await axios + .post(`/api/check-list/${checkListContext?.checkListId}/image`, imageData) + .then((e) => { + console.log('t'); + console.log(e); + }) + .catch((e) => { + console.log('c'); + console.log(e); + }); + }; const onPostImageDataHandler = async (images: any) => { const imageData = new FormData(); @@ -28,9 +48,11 @@ function CameraAndGallery({ setOnModal, onModal }: IProps) { await axios .post(`/api/check-list/${checkListContext?.checkListId}/image`, imageData) .then((e) => { + console.log('t'); console.log(e); }) .catch((e) => { + console.log('c'); console.log(e); }); }; @@ -46,8 +68,8 @@ function CameraAndGallery({ setOnModal, onModal }: IProps) { const onCamera = () => ImagePicker.openCamera({ cropping: true, - }).then((images: any) => { - onPostImageDataHandler(images); + }).then((image: any) => { + onPostCameraDataHandler(image); setOnModal(!onModal); }); From 90fbe4d17bac810e6e88fa662a425605821df498 Mon Sep 17 00:00:00 2001 From: 11t518s <11t518s20161759@gmail.com> Date: Tue, 5 Apr 2022 02:06:45 +0900 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20QA=20checkList=20=EB=94=94=ED=8F=B4?= =?UTF-8?q?=ED=8A=B8=20=EC=82=AC=EC=A7=84,=20=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=EB=B0=8F=20=EB=B3=B5=EA=B5=AC=20=EB=A1=9C=EC=A7=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20=EC=9E=90=EB=8F=99=20=EC=A0=80=EC=9E=A5=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95=20#70?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Context/CheckListByServer.tsx | 20 +++++++++ .../images/checkList/checkLIstDefaultImg.png | Bin 0 -> 24333 bytes .../BottomSheetsOfDeletedCheckList.tsx | 2 +- .../CheckListComponent/ButtonOfGoToTrash.tsx | 6 +-- .../CheckListSummaryComponenet.tsx | 4 +- components/CheckListComponent/styles.tsx | 12 +++++- components/Home/CheckListHome.tsx | 5 ++- components/Home/PinnedCheckList.tsx | 11 ++--- components/Home/UnPinnedCheckList.tsx | 24 +++++++---- components/Home/styles.tsx | 13 +++++- components/camera/CameraAndGallery.tsx | 2 - .../BasicCheckList/BasiclCheckList.tsx | 9 +--- .../StackNavigationOfCheckList.tsx | 39 ++++-------------- .../BasicInfoOfBasicCheckList.tsx | 8 +++- screens/bottomTab/Home.tsx | 7 +++- 15 files changed, 97 insertions(+), 65 deletions(-) create mode 100644 assets/images/checkList/checkLIstDefaultImg.png diff --git a/Context/CheckListByServer.tsx b/Context/CheckListByServer.tsx index ae6acff..04d5569 100644 --- a/Context/CheckListByServer.tsx +++ b/Context/CheckListByServer.tsx @@ -1,5 +1,6 @@ import React, { createContext, Dispatch, SetStateAction, useState } from 'react'; import { choseCheckListByServerType, deletedCheckListByServerType } from '../types/checkListTypes'; +import axios from 'axios'; interface contextType { deletedCheckListByServer: deletedCheckListByServerType; @@ -8,6 +9,8 @@ interface contextType { setChoseCheckListByServer: Dispatch>; checkListId: number | false; setCheckListId: Dispatch>; + onChoseCheckListHandler: () => void; + onDeleteCheckListHandler: (data: deletedCheckListByServerType) => void; } export const checkListCtx = createContext(null); @@ -22,6 +25,21 @@ const CheckListStore: React.FC = (props) => { typeM: {}, }); const [checkListId, setCheckListId] = useState(false); + const onDeleteCheckListHandler = (data: deletedCheckListByServerType) => { + axios + .put(`/api/check-list/${checkListId}/common/question/status`, data) + .then(() => setDeletedCheckListByServer({ question: [] })); + }; + const onChoseCheckListHandler = () => { + axios.put(`/api/check-list/${checkListId}/common/question`, choseCheckListByServer).then(() => { + setChoseCheckListByServer({ + typeA: [], + typeB: [], + typeD: [], + typeM: {}, + }); + }); + }; return ( { setChoseCheckListByServer, checkListId, setCheckListId, + onChoseCheckListHandler, + onDeleteCheckListHandler, }} > {props.children} diff --git a/assets/images/checkList/checkLIstDefaultImg.png b/assets/images/checkList/checkLIstDefaultImg.png new file mode 100644 index 0000000000000000000000000000000000000000..b46c755ce66ab1a5e03aaef91e4ae42678af859d GIT binary patch literal 24333 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μ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 literal 0 HcmV?d00001 diff --git a/components/CheckListComponent/BottomSheetsOfDeletedCheckList.tsx b/components/CheckListComponent/BottomSheetsOfDeletedCheckList.tsx index b54c923..7de2fee 100644 --- a/components/CheckListComponent/BottomSheetsOfDeletedCheckList.tsx +++ b/components/CheckListComponent/BottomSheetsOfDeletedCheckList.tsx @@ -47,7 +47,7 @@ function BottomSheetsOfDeletedCheckList({ deletedCheckLists.filter((CheckLists: checkListTypes) => !CheckLists.visibility) ); setCheckLists([...checkLists.filter((item) => item.visibility), ...deletedCheckLists]); - checkListContext?.setDeletedCheckListByServer({ + checkListContext?.onDeleteCheckListHandler({ question: [ ...checkListContext?.deletedCheckListByServer.question, ...deletedCheckLists.map((item) => ({ questionId: item.questionId, visibility: true })), diff --git a/components/CheckListComponent/ButtonOfGoToTrash.tsx b/components/CheckListComponent/ButtonOfGoToTrash.tsx index 4f838fb..9601cee 100644 --- a/components/CheckListComponent/ButtonOfGoToTrash.tsx +++ b/components/CheckListComponent/ButtonOfGoToTrash.tsx @@ -36,18 +36,18 @@ function ButtonOfGoToTrash({ isEdit && deletedCheckLists && setTimeout(async () => { - await checkListContext?.setDeletedCheckListByServer({ + await checkListContext?.onDeleteCheckListHandler({ question: [ ...checkListContext?.deletedCheckListByServer.question, { questionId: checkList.questionId, visibility: false }, ], }); - await setCheckLists( + setCheckLists( checkLists.map((item) => item.questionId === checkList.questionId ? { ...item, visibility: false } : { ...item } ) ); - await setDeletedCheckLists([...deletedCheckLists, { ...checkList, visibility: false }]); + setDeletedCheckLists([...deletedCheckLists, { ...checkList, visibility: false }]); }, 500); }; diff --git a/components/CheckListComponent/CheckListSummaryComponenet.tsx b/components/CheckListComponent/CheckListSummaryComponenet.tsx index a1616c6..663c5a4 100644 --- a/components/CheckListComponent/CheckListSummaryComponenet.tsx +++ b/components/CheckListComponent/CheckListSummaryComponenet.tsx @@ -20,7 +20,7 @@ function CheckListSummaryComponenet({ checkListSummary }: IProps) { return ( <> - + diff --git a/components/CheckListComponent/styles.tsx b/components/CheckListComponent/styles.tsx index 79edc94..5921eb6 100644 --- a/components/CheckListComponent/styles.tsx +++ b/components/CheckListComponent/styles.tsx @@ -4,13 +4,23 @@ import { mainBlue, mainLightBlue, mainOrange } from '../../color'; const windowWidth = Dimensions.get('window').width; const styles = StyleSheet.create({ + summaryImageWrapper: { + justifyContent: 'center', + alignItems: 'center', + backgroundColor: '#CFCFCF', + width: windowWidth - 34, + height: 260, + borderRadius: 10, + marginTop: 15, + marginBottom: 15, + }, textWrap: { flexDirection: 'row', flexWrap: 'wrap', }, textWrapWrapper: { flexDirection: 'row', flexWrap: 'wrap' }, summaryPinImg: { position: 'absolute', zIndex: 1000, top: 30, right: 15 }, - summaryMainImg: { width: windowWidth - 34, height: 260, borderRadius: 10, marginTop: 15 }, + summaryMainImg: { marginBottom: 25 }, summaryContentImg: { marginRight: 5 }, distanceImg: { marginRight: 9 }, summaryRightContents: { flexDirection: 'row' }, diff --git a/components/Home/CheckListHome.tsx b/components/Home/CheckListHome.tsx index 3318d7c..1a124d5 100644 --- a/components/Home/CheckListHome.tsx +++ b/components/Home/CheckListHome.tsx @@ -24,8 +24,9 @@ function CheckListHome({ homeCheckList, refreshing, onRefresh }: IProps) { } > - ๐Ÿ“Œ ๊ณ ์ •๋œ ๋ฆฌ์ŠคํŠธ - + {homeCheckList.some((item) => item.pinned) ? ( + ๐Ÿ“Œ ๊ณ ์ •๋œ ๋ฆฌ์ŠคํŠธ + ) : null} {homeCheckList .filter((item) => item.pinned) diff --git a/components/Home/PinnedCheckList.tsx b/components/Home/PinnedCheckList.tsx index 78772eb..62e753a 100644 --- a/components/Home/PinnedCheckList.tsx +++ b/components/Home/PinnedCheckList.tsx @@ -33,11 +33,12 @@ function PinnedCheckList({ pinnedCheckList }: iProps) { resizeMode="cover" /> ) : ( - + + + )} diff --git a/components/Home/UnPinnedCheckList.tsx b/components/Home/UnPinnedCheckList.tsx index a247365..e354cd9 100644 --- a/components/Home/UnPinnedCheckList.tsx +++ b/components/Home/UnPinnedCheckList.tsx @@ -33,11 +33,13 @@ function UnPinnedCheckList({ unPinnedCheckList }: iProps) { resizeMode="cover" /> ) : ( - + + + )} @@ -66,10 +68,14 @@ function UnPinnedCheckList({ unPinnedCheckList }: iProps) { )} - - - {unPinnedCheckList.distance && unPinnedCheckList.distance} - + {unPinnedCheckList.distance && ( + <> + + + {unPinnedCheckList.distance} + + + )} diff --git a/components/Home/styles.tsx b/components/Home/styles.tsx index f0969f6..cf03fb1 100644 --- a/components/Home/styles.tsx +++ b/components/Home/styles.tsx @@ -2,6 +2,17 @@ import { Platform, StyleSheet } from 'react-native'; import { mainBlue, mainLightBlue } from '../../color'; const styles = StyleSheet.create({ + unpinnedDefaultImgWrapper: { backgroundColor: '#F1F1F6', borderRadius: 6 }, + pinnedDefaultImg: { width: 150, height: 100 }, + pinnedDefaultImgWrapper: { + justifyContent: 'center', + alignItems: 'center', + paddingBottom: 45, + backgroundColor: '#CFCFCF', + width: 240, + height: 180, + borderRadius: 10, + }, fullScreenWrapper: { flex: 1, backgroundColor: 'white' }, welcomeTitle: Platform.OS === 'ios' @@ -31,7 +42,7 @@ const styles = StyleSheet.create({ pinnedChecklistWrapper: { height: 260, marginLeft: 17 }, pinnedChecklistCard: { marginRight: 14 }, - pinnedChecklistImg: { width: 240, height: 180, borderRadius: 10 }, + pinnedChecklistImg: {}, pinnedChecklistSummaryCard: { width: 240, height: 110, diff --git a/components/camera/CameraAndGallery.tsx b/components/camera/CameraAndGallery.tsx index c50cbc3..490e7fa 100644 --- a/components/camera/CameraAndGallery.tsx +++ b/components/camera/CameraAndGallery.tsx @@ -26,11 +26,9 @@ function CameraAndGallery({ setOnModal, onModal }: IProps) { await axios .post(`/api/check-list/${checkListContext?.checkListId}/image`, imageData) .then((e) => { - console.log('t'); console.log(e); }) .catch((e) => { - console.log('c'); console.log(e); }); }; diff --git a/navigation/Main/StackNavigation/BasicCheckList/BasiclCheckList.tsx b/navigation/Main/StackNavigation/BasicCheckList/BasiclCheckList.tsx index 53acfdc..0ea7d43 100644 --- a/navigation/Main/StackNavigation/BasicCheckList/BasiclCheckList.tsx +++ b/navigation/Main/StackNavigation/BasicCheckList/BasiclCheckList.tsx @@ -14,13 +14,12 @@ const Tab = createMaterialTopTabNavigator(); interface IProps { setIsEdit: Dispatch>; isEdit: boolean; - onSubmitHandler: () => void; } -function BasicCheckList({ setIsEdit, isEdit, onSubmitHandler }: IProps) { +function BasicCheckList({ setIsEdit, isEdit }: IProps) { const [isBottomSheet, setIsBottomSheet] = useState(true); const [onModal, setOnModal] = useState(false); - const onEditHandler = () => { + const onEditHandler = async () => { setIsEdit(true); }; @@ -28,10 +27,6 @@ function BasicCheckList({ setIsEdit, isEdit, onSubmitHandler }: IProps) { setOnModal(!onModal); }; - setInterval(() => { - onSubmitHandler(); - }, 100000); - return ( <> { - axios - .put( - `/api/check-list/${checkListContext?.checkListId}/common/question/status`, - checkListContext?.deletedCheckListByServer - ) - .then(() => checkListContext?.setDeletedCheckListByServer({ question: [] })); - - axios - .put( - `/api/check-list/${checkListContext?.checkListId}/common/question`, - checkListContext?.choseCheckListByServer - ) - .then(() => { - checkListContext?.setChoseCheckListByServer({ - typeA: [], - typeB: [], - typeD: [], - typeM: {}, - }); - }); - + checkListContext?.onChoseCheckListHandler(); setIsEdit(false); }; @@ -87,6 +66,12 @@ function CheckListStackNav({ setIsLogin }: IProps) { headerShadowVisible: false, }; + useEffect(() => { + setInterval(() => { + onSubmitHandler(); + }, 100000); + }, []); + return ( <> @@ -100,13 +85,7 @@ function CheckListStackNav({ setIsLogin }: IProps) { /> ( - - )} + children={() => } options={() => ({ animationTypeForReplace: 'pop', animation: 'slide_from_bottom', diff --git a/screens/BasicCheckList/BasicInfoOfBasicCheckList.tsx b/screens/BasicCheckList/BasicInfoOfBasicCheckList.tsx index d89ef5f..ae5a0a3 100644 --- a/screens/BasicCheckList/BasicInfoOfBasicCheckList.tsx +++ b/screens/BasicCheckList/BasicInfoOfBasicCheckList.tsx @@ -1,6 +1,7 @@ import React, { Dispatch, SetStateAction, + useCallback, useContext, useEffect, useMemo, @@ -24,6 +25,7 @@ import { ActivityIndicator, View } from 'react-native'; import { checkListCtx } from '../../Context/CheckListByServer'; import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view'; import CheckListSummaryComponenet from '../../components/CheckListComponent/CheckListSummaryComponenet'; +import { useFocusEffect } from '@react-navigation/native'; interface IProps { isEdit: boolean; @@ -40,7 +42,6 @@ function BasicInfoOfBasicCheckList({ isEdit, setIsBottomSheet }: IProps) { const [checkListSummary, setCheckListSummary] = useState({}); const getServerData = async () => { - console.log(checkListContext?.checkListId); try { const serverResponse = await axios.get( `/api/check-list/${checkListContext?.checkListId}/common?mainCategory=๊ธฐ๋ณธ์ •๋ณด` @@ -63,6 +64,11 @@ function BasicInfoOfBasicCheckList({ isEdit, setIsBottomSheet }: IProps) { useEffect(() => { getServerData(); }, [modal]); + useFocusEffect( + useCallback(() => { + getServerData(); + }, [modal]) + ); // setCheckLists(response.data); // ๋ฐ”ํ…€์‹œํŠธ ๋™์ž‘์„ ์œ„ํ•œ ์ฝ”๋“œ const bottomSheetModalRef = useRef(null); diff --git a/screens/bottomTab/Home.tsx b/screens/bottomTab/Home.tsx index e026768..f01eca2 100644 --- a/screens/bottomTab/Home.tsx +++ b/screens/bottomTab/Home.tsx @@ -4,6 +4,7 @@ import EmptyHome from '../../components/Home/EmptyHome'; import CheckListHome from '../../components/Home/CheckListHome'; import axios from 'axios'; import { ActivityIndicator, RefreshControl, ScrollView } from 'react-native'; +import { useFocusEffect } from '@react-navigation/native'; function Home() { const [loading, setLoading] = useState(false); @@ -32,7 +33,11 @@ function Home() { useEffect(() => { getHomeDataHandler(); }, []); - + useFocusEffect( + useCallback(() => { + getHomeDataHandler(); + }, []) + ); return ( <> {loading ? ( From 75178faaaa1d2ec3916c4c286ac5b5bb16b5a049 Mon Sep 17 00:00:00 2001 From: 11t518s <11t518s20161759@gmail.com> Date: Tue, 5 Apr 2022 10:39:34 +0900 Subject: [PATCH 3/6] fix: insert ios key api --- .../myItem/MyItemOfBottomSheets.tsx | 6 +- ios/Podfile.lock | 430 ++++++------- ios/amattang/AppDelegate.m | 2 +- package-lock.json | 579 ++++++------------ package.json | 2 +- 5 files changed, 422 insertions(+), 597 deletions(-) diff --git a/components/CheckListComponent/myItem/MyItemOfBottomSheets.tsx b/components/CheckListComponent/myItem/MyItemOfBottomSheets.tsx index 466316c..3037ca3 100644 --- a/components/CheckListComponent/myItem/MyItemOfBottomSheets.tsx +++ b/components/CheckListComponent/myItem/MyItemOfBottomSheets.tsx @@ -4,7 +4,7 @@ import { BottomSheetModal, BottomSheetTextInput, } from '@gorhom/bottom-sheet'; -import { ScrollView, View } from 'react-native'; +import { ScrollView, TextInput, View } from 'react-native'; import { myItemType } from '../../../types/checkListTypes'; import { BottomSheetModalMethods } from '@gorhom/bottom-sheet/lib/typescript/types'; @@ -78,7 +78,7 @@ function MyItemOfBottomSheets({ onChange={handleSheetChanges} > - ))} - 2.6) - Flipper-RSocket (~> 1.4) @@ -159,203 +159,203 @@ PODS: - fmt (~> 6.2.1) - glog - libevent - - RCTRequired (0.67.2) - - RCTTypeSafety (0.67.2): - - FBLazyVector (= 0.67.2) + - RCTRequired (0.67.4) + - RCTTypeSafety (0.67.4): + - FBLazyVector (= 0.67.4) - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.67.2) - - React-Core (= 0.67.2) - - React (0.67.2): - - React-Core (= 0.67.2) - - React-Core/DevSupport (= 0.67.2) - - React-Core/RCTWebSocket (= 0.67.2) - - React-RCTActionSheet (= 0.67.2) - - React-RCTAnimation (= 0.67.2) - - React-RCTBlob (= 0.67.2) - - React-RCTImage (= 0.67.2) - - React-RCTLinking (= 0.67.2) - - React-RCTNetwork (= 0.67.2) - - React-RCTSettings (= 0.67.2) - - React-RCTText (= 0.67.2) - - React-RCTVibration (= 0.67.2) - - React-callinvoker (0.67.2) - - React-Core (0.67.2): + - RCTRequired (= 0.67.4) + - React-Core (= 0.67.4) + - React (0.67.4): + - React-Core (= 0.67.4) + - React-Core/DevSupport (= 0.67.4) + - React-Core/RCTWebSocket (= 0.67.4) + - React-RCTActionSheet (= 0.67.4) + - React-RCTAnimation (= 0.67.4) + - React-RCTBlob (= 0.67.4) + - React-RCTImage (= 0.67.4) + - React-RCTLinking (= 0.67.4) + - React-RCTNetwork (= 0.67.4) + - React-RCTSettings (= 0.67.4) + - React-RCTText (= 0.67.4) + - React-RCTVibration (= 0.67.4) + - React-callinvoker (0.67.4) + - React-Core (0.67.4): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.67.2) - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsiexecutor (= 0.67.2) - - React-perflogger (= 0.67.2) + - React-Core/Default (= 0.67.4) + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsiexecutor (= 0.67.4) + - React-perflogger (= 0.67.4) - Yoga - - React-Core/CoreModulesHeaders (0.67.2): + - React-Core/CoreModulesHeaders (0.67.4): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsiexecutor (= 0.67.2) - - React-perflogger (= 0.67.2) + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsiexecutor (= 0.67.4) + - React-perflogger (= 0.67.4) - Yoga - - React-Core/Default (0.67.2): + - React-Core/Default (0.67.4): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsiexecutor (= 0.67.2) - - React-perflogger (= 0.67.2) + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsiexecutor (= 0.67.4) + - React-perflogger (= 0.67.4) - Yoga - - React-Core/DevSupport (0.67.2): + - React-Core/DevSupport (0.67.4): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.67.2) - - React-Core/RCTWebSocket (= 0.67.2) - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsiexecutor (= 0.67.2) - - React-jsinspector (= 0.67.2) - - React-perflogger (= 0.67.2) + - React-Core/Default (= 0.67.4) + - React-Core/RCTWebSocket (= 0.67.4) + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsiexecutor (= 0.67.4) + - React-jsinspector (= 0.67.4) + - React-perflogger (= 0.67.4) - Yoga - - React-Core/RCTActionSheetHeaders (0.67.2): + - React-Core/RCTActionSheetHeaders (0.67.4): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsiexecutor (= 0.67.2) - - React-perflogger (= 0.67.2) + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsiexecutor (= 0.67.4) + - React-perflogger (= 0.67.4) - Yoga - - React-Core/RCTAnimationHeaders (0.67.2): + - React-Core/RCTAnimationHeaders (0.67.4): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsiexecutor (= 0.67.2) - - React-perflogger (= 0.67.2) + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsiexecutor (= 0.67.4) + - React-perflogger (= 0.67.4) - Yoga - - React-Core/RCTBlobHeaders (0.67.2): + - React-Core/RCTBlobHeaders (0.67.4): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsiexecutor (= 0.67.2) - - React-perflogger (= 0.67.2) + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsiexecutor (= 0.67.4) + - React-perflogger (= 0.67.4) - Yoga - - React-Core/RCTImageHeaders (0.67.2): + - React-Core/RCTImageHeaders (0.67.4): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsiexecutor (= 0.67.2) - - React-perflogger (= 0.67.2) + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsiexecutor (= 0.67.4) + - React-perflogger (= 0.67.4) - Yoga - - React-Core/RCTLinkingHeaders (0.67.2): + - React-Core/RCTLinkingHeaders (0.67.4): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsiexecutor (= 0.67.2) - - React-perflogger (= 0.67.2) + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsiexecutor (= 0.67.4) + - React-perflogger (= 0.67.4) - Yoga - - React-Core/RCTNetworkHeaders (0.67.2): + - React-Core/RCTNetworkHeaders (0.67.4): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsiexecutor (= 0.67.2) - - React-perflogger (= 0.67.2) + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsiexecutor (= 0.67.4) + - React-perflogger (= 0.67.4) - Yoga - - React-Core/RCTSettingsHeaders (0.67.2): + - React-Core/RCTSettingsHeaders (0.67.4): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsiexecutor (= 0.67.2) - - React-perflogger (= 0.67.2) + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsiexecutor (= 0.67.4) + - React-perflogger (= 0.67.4) - Yoga - - React-Core/RCTTextHeaders (0.67.2): + - React-Core/RCTTextHeaders (0.67.4): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsiexecutor (= 0.67.2) - - React-perflogger (= 0.67.2) + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsiexecutor (= 0.67.4) + - React-perflogger (= 0.67.4) - Yoga - - React-Core/RCTVibrationHeaders (0.67.2): + - React-Core/RCTVibrationHeaders (0.67.4): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsiexecutor (= 0.67.2) - - React-perflogger (= 0.67.2) + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsiexecutor (= 0.67.4) + - React-perflogger (= 0.67.4) - Yoga - - React-Core/RCTWebSocket (0.67.2): + - React-Core/RCTWebSocket (0.67.4): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.67.2) - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsiexecutor (= 0.67.2) - - React-perflogger (= 0.67.2) + - React-Core/Default (= 0.67.4) + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsiexecutor (= 0.67.4) + - React-perflogger (= 0.67.4) - Yoga - - React-CoreModules (0.67.2): - - FBReactNativeSpec (= 0.67.2) + - React-CoreModules (0.67.4): + - FBReactNativeSpec (= 0.67.4) - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.67.2) - - React-Core/CoreModulesHeaders (= 0.67.2) - - React-jsi (= 0.67.2) - - React-RCTImage (= 0.67.2) - - ReactCommon/turbomodule/core (= 0.67.2) - - React-cxxreact (0.67.2): + - RCTTypeSafety (= 0.67.4) + - React-Core/CoreModulesHeaders (= 0.67.4) + - React-jsi (= 0.67.4) + - React-RCTImage (= 0.67.4) + - ReactCommon/turbomodule/core (= 0.67.4) + - React-cxxreact (0.67.4): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsinspector (= 0.67.2) - - React-logger (= 0.67.2) - - React-perflogger (= 0.67.2) - - React-runtimeexecutor (= 0.67.2) - - React-hermes (0.67.2): + - React-callinvoker (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsinspector (= 0.67.4) + - React-logger (= 0.67.4) + - React-perflogger (= 0.67.4) + - React-runtimeexecutor (= 0.67.4) + - React-hermes (0.67.4): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly/Futures (= 2021.06.28.00-v2) - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-jsiexecutor (= 0.67.2) - - React-jsinspector (= 0.67.2) - - React-perflogger (= 0.67.2) - - React-jsi (0.67.2): + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-jsiexecutor (= 0.67.4) + - React-jsinspector (= 0.67.4) + - React-perflogger (= 0.67.4) + - React-jsi (0.67.4): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-jsi/Default (= 0.67.2) - - React-jsi/Default (0.67.2): + - React-jsi/Default (= 0.67.4) + - React-jsi/Default (0.67.4): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-jsiexecutor (0.67.2): + - React-jsiexecutor (0.67.4): - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-perflogger (= 0.67.2) - - React-jsinspector (0.67.2) - - React-logger (0.67.2): + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-perflogger (= 0.67.4) + - React-jsinspector (0.67.4) + - React-logger (0.67.4): - glog - react-native-geolocation-service (5.3.0-beta.4): - React @@ -375,71 +375,71 @@ PODS: - React-Core - react-native-webview (11.17.2): - React-Core - - React-perflogger (0.67.2) - - React-RCTActionSheet (0.67.2): - - React-Core/RCTActionSheetHeaders (= 0.67.2) - - React-RCTAnimation (0.67.2): - - FBReactNativeSpec (= 0.67.2) + - React-perflogger (0.67.4) + - React-RCTActionSheet (0.67.4): + - React-Core/RCTActionSheetHeaders (= 0.67.4) + - React-RCTAnimation (0.67.4): + - FBReactNativeSpec (= 0.67.4) - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.67.2) - - React-Core/RCTAnimationHeaders (= 0.67.2) - - React-jsi (= 0.67.2) - - ReactCommon/turbomodule/core (= 0.67.2) - - React-RCTBlob (0.67.2): - - FBReactNativeSpec (= 0.67.2) + - RCTTypeSafety (= 0.67.4) + - React-Core/RCTAnimationHeaders (= 0.67.4) + - React-jsi (= 0.67.4) + - ReactCommon/turbomodule/core (= 0.67.4) + - React-RCTBlob (0.67.4): + - FBReactNativeSpec (= 0.67.4) - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/RCTBlobHeaders (= 0.67.2) - - React-Core/RCTWebSocket (= 0.67.2) - - React-jsi (= 0.67.2) - - React-RCTNetwork (= 0.67.2) - - ReactCommon/turbomodule/core (= 0.67.2) - - React-RCTImage (0.67.2): - - FBReactNativeSpec (= 0.67.2) + - React-Core/RCTBlobHeaders (= 0.67.4) + - React-Core/RCTWebSocket (= 0.67.4) + - React-jsi (= 0.67.4) + - React-RCTNetwork (= 0.67.4) + - ReactCommon/turbomodule/core (= 0.67.4) + - React-RCTImage (0.67.4): + - FBReactNativeSpec (= 0.67.4) - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.67.2) - - React-Core/RCTImageHeaders (= 0.67.2) - - React-jsi (= 0.67.2) - - React-RCTNetwork (= 0.67.2) - - ReactCommon/turbomodule/core (= 0.67.2) - - React-RCTLinking (0.67.2): - - FBReactNativeSpec (= 0.67.2) - - React-Core/RCTLinkingHeaders (= 0.67.2) - - React-jsi (= 0.67.2) - - ReactCommon/turbomodule/core (= 0.67.2) - - React-RCTNetwork (0.67.2): - - FBReactNativeSpec (= 0.67.2) + - RCTTypeSafety (= 0.67.4) + - React-Core/RCTImageHeaders (= 0.67.4) + - React-jsi (= 0.67.4) + - React-RCTNetwork (= 0.67.4) + - ReactCommon/turbomodule/core (= 0.67.4) + - React-RCTLinking (0.67.4): + - FBReactNativeSpec (= 0.67.4) + - React-Core/RCTLinkingHeaders (= 0.67.4) + - React-jsi (= 0.67.4) + - ReactCommon/turbomodule/core (= 0.67.4) + - React-RCTNetwork (0.67.4): + - FBReactNativeSpec (= 0.67.4) - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.67.2) - - React-Core/RCTNetworkHeaders (= 0.67.2) - - React-jsi (= 0.67.2) - - ReactCommon/turbomodule/core (= 0.67.2) - - React-RCTSettings (0.67.2): - - FBReactNativeSpec (= 0.67.2) + - RCTTypeSafety (= 0.67.4) + - React-Core/RCTNetworkHeaders (= 0.67.4) + - React-jsi (= 0.67.4) + - ReactCommon/turbomodule/core (= 0.67.4) + - React-RCTSettings (0.67.4): + - FBReactNativeSpec (= 0.67.4) - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.67.2) - - React-Core/RCTSettingsHeaders (= 0.67.2) - - React-jsi (= 0.67.2) - - ReactCommon/turbomodule/core (= 0.67.2) - - React-RCTText (0.67.2): - - React-Core/RCTTextHeaders (= 0.67.2) - - React-RCTVibration (0.67.2): - - FBReactNativeSpec (= 0.67.2) + - RCTTypeSafety (= 0.67.4) + - React-Core/RCTSettingsHeaders (= 0.67.4) + - React-jsi (= 0.67.4) + - ReactCommon/turbomodule/core (= 0.67.4) + - React-RCTText (0.67.4): + - React-Core/RCTTextHeaders (= 0.67.4) + - React-RCTVibration (0.67.4): + - FBReactNativeSpec (= 0.67.4) - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/RCTVibrationHeaders (= 0.67.2) - - React-jsi (= 0.67.2) - - ReactCommon/turbomodule/core (= 0.67.2) - - React-runtimeexecutor (0.67.2): - - React-jsi (= 0.67.2) - - ReactCommon/turbomodule/core (0.67.2): + - React-Core/RCTVibrationHeaders (= 0.67.4) + - React-jsi (= 0.67.4) + - ReactCommon/turbomodule/core (= 0.67.4) + - React-runtimeexecutor (0.67.4): + - React-jsi (= 0.67.4) + - ReactCommon/turbomodule/core (0.67.4): - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.67.2) - - React-Core (= 0.67.2) - - React-cxxreact (= 0.67.2) - - React-jsi (= 0.67.2) - - React-logger (= 0.67.2) - - React-perflogger (= 0.67.2) + - React-callinvoker (= 0.67.4) + - React-Core (= 0.67.4) + - React-cxxreact (= 0.67.4) + - React-jsi (= 0.67.4) + - React-logger (= 0.67.4) + - React-perflogger (= 0.67.4) - RNAppleAuthentication (2.1.5): - React-Core - RNCAsyncStorage (1.16.3): @@ -700,8 +700,8 @@ SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 - FBLazyVector: 244195e30d63d7f564c55da4410b9a24e8fbceaa - FBReactNativeSpec: c94002c1d93da3658f4d5119c6994d19961e3d52 + FBLazyVector: f7b0632c6437e312acf6349288d9aa4cb6d59030 + FBReactNativeSpec: 0f4e1f4cfeace095694436e7c7fcc5bf4b03a0ff Flipper: 30e8eeeed6abdc98edaf32af0cda2f198be4b733 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c @@ -712,7 +712,7 @@ SPEC CHECKSUMS: Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85 + glog: 476ee3e89abb49e07f822b48323c51c57124b572 Google-Maps-iOS-Utils: 95d5ca4d2004314eff88c1819b969db6cac37ab6 GoogleMaps: 086ae1dab659eaa7339bdb30fc88e2f44e7c597c hermes-engine: bf7577d12ac6ccf53ab8b5af3c6ccf0dd8458c5c @@ -728,19 +728,19 @@ SPEC CHECKSUMS: KakaoSDKUser: 11955811d99d1ff1f1dfd5428afe69937e31ccef libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b - RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685 - RCTRequired: cd47794163052d2b8318c891a7a14fcfaccc75ab - RCTTypeSafety: 393bb40b3e357b224cde53d3fec26813c52428b1 - React: dec6476bc27155b250eeadfc11ea779265f53ebf - React-callinvoker: e5047929e80aea942e6fdd96482504ef0189ca63 - React-Core: e382655566b2b9a6e3b4f641d777b7bfdbe52358 - React-CoreModules: cf262e82fa101c0aee022b6f90d1a5b612038b64 - React-cxxreact: 69d53de3b30c7c161ba087ca1ecdffed9ccb1039 - React-hermes: 0ce480a2225907bdcf4c8e931f89cf2dc1df8b27 - React-jsi: ce9a2d804adf75809ce2fe2374ba3fbbf5d59b03 - React-jsiexecutor: 52beb652bbc61201bd70cbe4f0b8edb607e8da4f - React-jsinspector: 595f76eba2176ebd8817a1fffd47b84fbdab9383 - React-logger: 23de8ea0f44fa00ee77e96060273225607fd4d78 + RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 + RCTRequired: 0aa6c1c27e1d65920df35ceea5341a5fe76bdb79 + RCTTypeSafety: d76a59d00632891e11ed7522dba3fd1a995e573a + React: ab8c09da2e7704f4b3ebad4baa6cfdfcc852dcb5 + React-callinvoker: 216fb96b482da516b8aba4142b145938f6ea92f0 + React-Core: af99b93aff83599485e0e0879879aafa35ceae32 + React-CoreModules: 137a054ce8c547e81dc3502933b1bc0fd08df05d + React-cxxreact: ec5ee6b08664f5b8ac71d8ad912f54d540c4f817 + React-hermes: 644e034cf9eb99c2f867c325c589c85b5c918ef7 + React-jsi: 3e084c80fd364cee64668d5df46d40c39f7973e1 + React-jsiexecutor: cbdf37cebdc4f5d8b3d0bf5ccaa6147fd9de9f3d + React-jsinspector: f4775ea9118cbe1f72b834f0f842baa7a99508d8 + React-logger: a1f028f6d8639a3f364ef80419e5e862e1115250 react-native-geolocation-service: c0efb872258ed9240f1003a70fca9e9757e5c785 react-native-google-maps: 17432eb7412df3c65d7c7c52ede085d0f5624f77 react-native-image-picker: 4e6008ad8c2321622affa2c85432a5ebd02d480c @@ -749,18 +749,18 @@ SPEC CHECKSUMS: react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9 react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457 react-native-webview: 380c1a03ec94b7ed764dac8db1e7c9952d08c93a - React-perflogger: 3c9bb7372493e49036f07a82c44c8cf65cbe88db - React-RCTActionSheet: 052606483045a408693aa7e864410b4a052f541a - React-RCTAnimation: 08d4cac13222bb1348c687a0158dfd3b577cdb63 - React-RCTBlob: 928ad1df65219c3d9e2ac80983b943a75b5c3629 - React-RCTImage: 524d7313b142a39ee0e20fa312b67277917fe076 - React-RCTLinking: 44036ea6f13a2e46238be07a67566247fee35244 - React-RCTNetwork: 9b6faacf1e0789253e319ca53b1f8d92c2ac5455 - React-RCTSettings: ecd8094f831130a49581d5112a8607220e5d12a5 - React-RCTText: 14ba976fb48ed283cfdb1a754a5d4276471e0152 - React-RCTVibration: 99c7f67fba7a5ade46e98e870c6ff2444484f995 - React-runtimeexecutor: 2450b43df7ffe8e805a0b3dcb2abd4282f1f1836 - ReactCommon: d98c6c96b567f9b3a15f9fd4cc302c1eda8e3cf2 + React-perflogger: 0afaf2f01a47fd0fc368a93bfbb5bd3b26db6e7f + React-RCTActionSheet: 59f35c4029e0b532fc42114241a06e170b7431a2 + React-RCTAnimation: aae4f4bed122e78bdab72f7118d291d70a932ce2 + React-RCTBlob: f6fb23394b4f28cd86fa7e9f5f6ae45c23669fda + React-RCTImage: 638815cf96124386dd296067246d91441932ae3f + React-RCTLinking: 254dd06283dd6fdb784285f95e7cec8053c3270f + React-RCTNetwork: 8a4c2d4f357268e520b060572d02bc69a9b991fb + React-RCTSettings: 35d44cbb9972ab933bd0a59ea3e6646dcb030ba3 + React-RCTText: cc5315df8458cfa7b537e621271ef43273955a97 + React-RCTVibration: 3b52a7dced19cdb025b4f88ab26ceb2d85f30ba2 + React-runtimeexecutor: a9d3c82ddf7ffdad9fbe6a81c6d6f8c06385464d + ReactCommon: 07d0c460b9ba9af3eaf1b8f5abe7daaad28c9c4e RNAppleAuthentication: 63c2127ace11985b94f852fc480eb84145653712 RNCAsyncStorage: 13d3b40c7fae0796d10b23fbec382e7a76807a0f RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489 @@ -769,7 +769,7 @@ SPEC CHECKSUMS: RNReanimated: 32c91e28f5780937b8efc07ddde1bab8d373fe0b RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19 TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863 - Yoga: 9b6696970c3289e8dea34b3eda93f23e61fb8121 + Yoga: d6b6a80659aa3e91aaba01d0012e7edcbedcbecd YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 9e0f7f3debdda237247d1098ba5474a256182282 diff --git a/ios/amattang/AppDelegate.m b/ios/amattang/AppDelegate.m index 1b3a7cc..7faf92b 100644 --- a/ios/amattang/AppDelegate.m +++ b/ios/amattang/AppDelegate.m @@ -35,7 +35,7 @@ @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - [GMSServices provideAPIKey:@"${GOOGLE_MAP_API_KEY}"]; + [GMSServices provideAPIKey:@"AIzaSyBGFopOfPFco5AZoYcqE7cCeYIdD_RknOY"]; #ifdef FB_SONARKIT_ENABLED InitializeFlipper(application); #endif diff --git a/package-lock.json b/package-lock.json index f23439a..fee0fbf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,7 +1,7 @@ { "name": "amattang", "version": "0.0.1", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, "packages": { "": { @@ -27,7 +27,7 @@ "jwt-decode": "^3.1.2", "path": "^0.12.7", "react": "17.0.2", - "react-native": "0.67.2", + "react-native": "^0.67.3", "react-native-axios-jwt": "^1.5.0", "react-native-dotenv": "^3.3.1", "react-native-geolocation-service": "^5.3.0-beta.4", @@ -4379,9 +4379,9 @@ "integrity": "sha512-BUyKJGdDWqvWC5GEhyOiUrGNi9iJUr4CU0O2WxJL6QJhHeeA/NVBalH+FeK0r/x/W0rPymXt5s78TDS7d6lCwg==" }, "node_modules/@sideway/address": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.3.tgz", - "integrity": "sha512-8ncEUtmnTsMmL7z1YPB47kPUq7LpKWJNFPsRzHiIajGC5uXlWGn+AmkYPcHNl8S4tcEGx+cnORnNYaw2wvL+LQ==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", + "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==", "dependencies": { "@hapi/hoek": "^9.0.0" } @@ -6750,9 +6750,9 @@ } }, "node_modules/bplist-parser": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.0.tgz", - "integrity": "sha512-zgmaRvT6AN1JpPPV+S0a1/FAtoxSreYDccZGIqEMSvZl9DMe70mJ7MFzpxa1X+gHVdkToE2haRUHHMiW1OdejA==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz", + "integrity": "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA==", "dependencies": { "big-integer": "1.6.x" }, @@ -16730,9 +16730,9 @@ } }, "node_modules/plist": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz", - "integrity": "sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz", + "integrity": "sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==", "dependencies": { "base64-js": "^1.5.1", "xmlbuilder": "^9.0.7" @@ -18444,9 +18444,9 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "node_modules/react-native": { - "version": "0.67.2", - "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.67.2.tgz", - "integrity": "sha512-grEtpOLLvtSg8Bivg0ffVRCjTkresqMt7Jdog/geF6VAYhb4RnLaaUCWvyrfyB9buf135FKnqg5BIuve/XQNXA==", + "version": "0.67.4", + "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.67.4.tgz", + "integrity": "sha512-NA9d9lNJu9TViEJu2uZxWXUP+QNUilGGA5tdMbVFedNroOH1lnQ3n/FAVoGK1gqGarCgNTtheBxUpEa979Cu8w==", "dependencies": { "@jest/create-cache-key-function": "^27.0.1", "@react-native-community/cli": "^6.0.0", @@ -21434,13 +21434,13 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "node_modules/simple-plist": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.3.0.tgz", - "integrity": "sha512-uYWpeGFtZtVt2NhG4AHgpwx323zxD85x42heMJBan1qAiqqozIlaGrwrEt6kRjXWRWIXsuV1VLCvVmZan2B5dg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.3.1.tgz", + "integrity": "sha512-iMSw5i0XseMnrhtIzRb7XpQEXepa9xhWxGUojHBL43SIpQuDQkh3Wpy67ZbDzZVr6EKxvwVChnVpdl8hEVLDiw==", "dependencies": { "bplist-creator": "0.1.0", - "bplist-parser": "0.3.0", - "plist": "^3.0.4" + "bplist-parser": "0.3.1", + "plist": "^3.0.5" } }, "node_modules/simple-swizzle": { @@ -25764,7 +25764,6 @@ "version": "0.4.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", - "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.1.1", @@ -25781,7 +25780,6 @@ "version": "13.13.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz", "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==", - "dev": true, "requires": { "type-fest": "^0.20.2" } @@ -25789,14 +25787,12 @@ "ignore": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==" }, "type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" } } }, @@ -25836,7 +25832,6 @@ "version": "0.5.0", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", - "dev": true, "requires": { "@humanwhocodes/object-schema": "^1.2.0", "debug": "^4.1.1", @@ -25874,7 +25869,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz", "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==", - "dev": true, "requires": { "@jest/types": "^26.6.2", "@types/node": "*", @@ -25888,7 +25882,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -25897,7 +25890,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -25907,7 +25899,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -25915,26 +25906,22 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -25945,7 +25932,6 @@ "version": "26.6.3", "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz", "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==", - "dev": true, "requires": { "@jest/console": "^26.6.2", "@jest/reporters": "^26.6.2", @@ -25981,7 +25967,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -25990,7 +25975,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -26000,7 +25984,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -26008,26 +25991,22 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -26111,7 +26090,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz", "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==", - "dev": true, "requires": { "@jest/fake-timers": "^26.6.2", "@jest/types": "^26.6.2", @@ -26123,7 +26101,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz", "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==", - "dev": true, "requires": { "@jest/types": "^26.6.2", "@sinonjs/fake-timers": "^6.0.1", @@ -26137,7 +26114,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz", "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==", - "dev": true, "requires": { "@jest/environment": "^26.6.2", "@jest/types": "^26.6.2", @@ -26148,7 +26124,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz", "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==", - "dev": true, "requires": { "@bcoe/v8-coverage": "^0.2.3", "@jest/console": "^26.6.2", @@ -26181,7 +26156,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -26190,7 +26164,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -26200,7 +26173,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -26208,20 +26180,17 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "istanbul-lib-instrument": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", - "dev": true, "requires": { "@babel/core": "^7.7.5", "@istanbuljs/schema": "^0.1.2", @@ -26232,20 +26201,17 @@ "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -26256,7 +26222,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz", "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==", - "dev": true, "requires": { "callsites": "^3.0.0", "graceful-fs": "^4.2.4", @@ -26266,8 +26231,7 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, @@ -26275,7 +26239,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz", "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==", - "dev": true, "requires": { "@jest/console": "^26.6.2", "@jest/types": "^26.6.2", @@ -26287,7 +26250,6 @@ "version": "26.6.3", "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz", "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==", - "dev": true, "requires": { "@jest/test-result": "^26.6.2", "graceful-fs": "^4.2.4", @@ -26300,7 +26262,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz", "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==", - "dev": true, "requires": { "@babel/core": "^7.1.0", "@jest/types": "^26.6.2", @@ -26323,7 +26284,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -26332,7 +26292,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -26342,7 +26301,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -26350,32 +26308,27 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -27275,7 +27228,8 @@ "@react-native-community/masked-view": { "version": "0.1.11", "resolved": "https://registry.npmjs.org/@react-native-community/masked-view/-/masked-view-0.1.11.tgz", - "integrity": "sha512-rQfMIGSR/1r/SyN87+VD8xHHzDYeHaJq6elOSCAD+0iLagXkSI2pfA0LmSXP21uw5i3em7GkkRjfJ8wpqWXZNw==" + "integrity": "sha512-rQfMIGSR/1r/SyN87+VD8xHHzDYeHaJq6elOSCAD+0iLagXkSI2pfA0LmSXP21uw5i3em7GkkRjfJ8wpqWXZNw==", + "requires": {} }, "@react-native-seoul/kakao-login": { "version": "3.4.3", @@ -27325,7 +27279,8 @@ "@react-navigation/elements": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.1.tgz", - "integrity": "sha512-jIDRJaG8YPIinl4hZXJu/W3TnhDe8hLYmGSEdL1mxZ1aoNMiApCBYkgTy11oq0EfK/koZd3DPSkJNbzBAQmPJw==" + "integrity": "sha512-jIDRJaG8YPIinl4hZXJu/W3TnhDe8hLYmGSEdL1mxZ1aoNMiApCBYkgTy11oq0EfK/koZd3DPSkJNbzBAQmPJw==", + "requires": {} }, "@react-navigation/material-top-tabs": { "version": "6.1.1", @@ -27428,9 +27383,9 @@ "integrity": "sha512-BUyKJGdDWqvWC5GEhyOiUrGNi9iJUr4CU0O2WxJL6QJhHeeA/NVBalH+FeK0r/x/W0rPymXt5s78TDS7d6lCwg==" }, "@sideway/address": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.3.tgz", - "integrity": "sha512-8ncEUtmnTsMmL7z1YPB47kPUq7LpKWJNFPsRzHiIajGC5uXlWGn+AmkYPcHNl8S4tcEGx+cnORnNYaw2wvL+LQ==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", + "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==", "requires": { "@hapi/hoek": "^9.0.0" } @@ -27457,7 +27412,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz", "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==", - "dev": true, "requires": { "@sinonjs/commons": "^1.7.0" } @@ -27858,8 +27812,7 @@ "@types/normalize-package-data": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", - "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==", - "dev": true + "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==" }, "@types/parse-json": { "version": "4.0.0", @@ -28373,12 +28326,14 @@ "acorn-import-assertions": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==" + "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "requires": {} }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "requires": {} }, "acorn-node": { "version": "1.8.2", @@ -28466,7 +28421,8 @@ "ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==" + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "requires": {} }, "anser": { "version": "1.4.10", @@ -28476,8 +28432,7 @@ "ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==" }, "ansi-escapes": { "version": "4.3.2", @@ -28733,7 +28688,8 @@ "babel-core": { "version": "7.0.0-bridge.0", "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz", - "integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==" + "integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==", + "requires": {} }, "babel-eslint": { "version": "10.1.0", @@ -28761,7 +28717,6 @@ "version": "26.6.3", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz", "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==", - "dev": true, "requires": { "@jest/transform": "^26.6.2", "@jest/types": "^26.6.2", @@ -28777,7 +28732,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -28786,7 +28740,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -28796,7 +28749,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -28804,26 +28756,22 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -28913,7 +28861,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz", "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==", - "dev": true, "requires": { "@babel/template": "^7.3.3", "@babel/types": "^7.3.3", @@ -28971,7 +28918,8 @@ "babel-plugin-named-asset-import": { "version": "0.3.8", "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz", - "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==" + "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==", + "requires": {} }, "babel-plugin-polyfill-corejs2": { "version": "0.3.1", @@ -29067,7 +29015,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz", "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==", - "dev": true, "requires": { "babel-plugin-jest-hoist": "^26.6.2", "babel-preset-current-node-syntax": "^1.0.0" @@ -29238,9 +29185,9 @@ } }, "bplist-parser": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.0.tgz", - "integrity": "sha512-zgmaRvT6AN1JpPPV+S0a1/FAtoxSreYDccZGIqEMSvZl9DMe70mJ7MFzpxa1X+gHVdkToE2haRUHHMiW1OdejA==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz", + "integrity": "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA==", "requires": { "big-integer": "1.6.x" } @@ -29468,8 +29415,7 @@ "cjs-module-lexer": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz", - "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==", - "dev": true + "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==" }, "class-utils": { "version": "0.3.6", @@ -30039,7 +29985,8 @@ "css-prefers-color-scheme": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz", - "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==" + "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==", + "requires": {} }, "css-select": { "version": "4.2.1", @@ -30138,7 +30085,8 @@ "cssnano-utils": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz", - "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==" + "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", + "requires": {} }, "csso": { "version": "4.2.0", @@ -30430,8 +30378,7 @@ "diff-sequences": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz", - "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==", - "dev": true + "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==" }, "dir-glob": { "version": "3.0.1", @@ -30582,8 +30529,7 @@ "emittery": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz", - "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==", - "dev": true + "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==" }, "emoji-regex": { "version": "9.2.2", @@ -30629,7 +30575,6 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "dev": true, "requires": { "ansi-colors": "^4.1.1" } @@ -30785,7 +30730,6 @@ "version": "7.32.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", - "dev": true, "requires": { "@babel/code-frame": "7.12.11", "@eslint/eslintrc": "^0.4.3", @@ -30833,7 +30777,6 @@ "version": "7.12.11", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, "requires": { "@babel/highlight": "^7.10.4" } @@ -30842,7 +30785,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -30851,7 +30793,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -30861,7 +30802,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -30869,14 +30809,12 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "eslint-utils": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, "requires": { "eslint-visitor-keys": "^1.1.0" }, @@ -30884,22 +30822,19 @@ "eslint-visitor-keys": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==" } } }, "eslint-visitor-keys": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==" }, "globals": { "version": "13.13.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz", "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==", - "dev": true, "requires": { "type-fest": "^0.20.2" } @@ -30907,20 +30842,17 @@ "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "ignore": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==" }, "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, "requires": { "lru-cache": "^6.0.0" } @@ -30929,7 +30861,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -30937,8 +30868,7 @@ "type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" } } }, @@ -31149,7 +31079,8 @@ "version": "22.4.1", "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-22.4.1.tgz", "integrity": "sha512-gcLfn6P2PrFAVx3AobaOzlIEevpAEf9chTpFZz7bYfc7pz8XRv7vuKTIE4hxPKZSha6XWKKplDQ0x9Pq8xX2mg==", - "dev": true + "dev": true, + "requires": {} }, "eslint-plugin-jsx-a11y": { "version": "6.5.1", @@ -31222,7 +31153,8 @@ "eslint-plugin-react-hooks": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz", - "integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==" + "integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==", + "requires": {} }, "eslint-plugin-react-native": { "version": "3.11.0", @@ -31325,7 +31257,6 @@ "version": "7.3.1", "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", - "dev": true, "requires": { "acorn": "^7.4.0", "acorn-jsx": "^5.3.1", @@ -31335,8 +31266,7 @@ "eslint-visitor-keys": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==" } } }, @@ -31405,7 +31335,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", - "dev": true, "requires": { "cross-spawn": "^7.0.0", "get-stream": "^5.0.0", @@ -31528,7 +31457,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz", "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==", - "dev": true, "requires": { "@jest/types": "^26.6.2", "ansi-styles": "^4.0.0", @@ -31542,7 +31470,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -31551,7 +31478,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -31559,8 +31485,7 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" } } }, @@ -32183,7 +32108,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, "requires": { "pump": "^3.0.0" } @@ -32290,7 +32214,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=", - "dev": true, "optional": true }, "gzip-size": { @@ -32435,8 +32358,7 @@ "hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" }, "hpack.js": { "version": "2.1.6", @@ -32584,8 +32506,7 @@ "human-signals": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", - "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", - "dev": true + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==" }, "iconv-lite": { "version": "0.6.3", @@ -32598,7 +32519,8 @@ "icss-utils": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", - "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==" + "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", + "requires": {} }, "idb": { "version": "6.1.5", @@ -33115,7 +33037,6 @@ "version": "26.6.3", "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz", "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==", - "dev": true, "requires": { "@jest/core": "^26.6.3", "import-local": "^3.0.2", @@ -33126,7 +33047,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz", "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==", - "dev": true, "requires": { "@jest/types": "^26.6.2", "execa": "^4.0.0", @@ -33647,7 +33567,6 @@ "version": "26.6.3", "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz", "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==", - "dev": true, "requires": { "@jest/core": "^26.6.3", "@jest/test-result": "^26.6.2", @@ -33668,7 +33587,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -33677,7 +33595,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -33687,7 +33604,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -33695,20 +33611,17 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -33719,7 +33632,6 @@ "version": "26.6.3", "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz", "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==", - "dev": true, "requires": { "@babel/core": "^7.1.0", "@jest/test-sequencer": "^26.6.3", @@ -33745,7 +33657,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -33754,7 +33665,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -33764,7 +33674,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -33772,20 +33681,17 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -33796,7 +33702,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz", "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==", - "dev": true, "requires": { "chalk": "^4.0.0", "diff-sequences": "^26.6.2", @@ -33808,7 +33713,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -33817,7 +33721,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -33827,7 +33730,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -33835,20 +33737,17 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -33859,7 +33758,6 @@ "version": "26.0.0", "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz", "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==", - "dev": true, "requires": { "detect-newline": "^3.0.0" } @@ -33868,7 +33766,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz", "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==", - "dev": true, "requires": { "@jest/types": "^26.6.2", "chalk": "^4.0.0", @@ -33881,7 +33778,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -33890,7 +33786,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -33900,7 +33795,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -33908,20 +33802,17 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -33932,7 +33823,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz", "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==", - "dev": true, "requires": { "@jest/environment": "^26.6.2", "@jest/fake-timers": "^26.6.2", @@ -33947,7 +33837,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz", "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==", - "dev": true, "requires": { "@jest/environment": "^26.6.2", "@jest/fake-timers": "^26.6.2", @@ -33987,7 +33876,6 @@ "version": "26.6.3", "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz", "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==", - "dev": true, "requires": { "@babel/traverse": "^7.1.0", "@jest/environment": "^26.6.2", @@ -34013,7 +33901,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -34022,7 +33909,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -34032,7 +33918,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -34040,20 +33925,17 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -34064,7 +33946,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz", "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==", - "dev": true, "requires": { "jest-get-type": "^26.3.0", "pretty-format": "^26.6.2" @@ -34074,7 +33955,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz", "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==", - "dev": true, "requires": { "chalk": "^4.0.0", "jest-diff": "^26.6.2", @@ -34086,7 +33966,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -34095,7 +33974,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -34105,7 +33983,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -34113,20 +33990,17 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -34137,7 +34011,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz", "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==", - "dev": true, "requires": { "@babel/code-frame": "^7.0.0", "@jest/types": "^26.6.2", @@ -34154,7 +34027,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -34163,7 +34035,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -34173,7 +34044,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -34181,26 +34051,22 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -34211,7 +34077,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz", "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==", - "dev": true, "requires": { "@jest/types": "^26.6.2", "@types/node": "*" @@ -34220,7 +34085,8 @@ "jest-pnp-resolver": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", - "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==" + "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==", + "requires": {} }, "jest-regex-util": { "version": "26.0.0", @@ -34231,7 +34097,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz", "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==", - "dev": true, "requires": { "@jest/types": "^26.6.2", "chalk": "^4.0.0", @@ -34247,7 +34112,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -34256,7 +34120,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -34266,7 +34129,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -34274,26 +34136,22 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -34304,7 +34162,6 @@ "version": "26.6.3", "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz", "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==", - "dev": true, "requires": { "@jest/types": "^26.6.2", "jest-regex-util": "^26.0.0", @@ -34315,7 +34172,6 @@ "version": "26.6.3", "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz", "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==", - "dev": true, "requires": { "@jest/console": "^26.6.2", "@jest/environment": "^26.6.2", @@ -34343,7 +34199,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -34352,7 +34207,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -34362,7 +34216,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -34370,20 +34223,17 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -34394,7 +34244,6 @@ "version": "26.6.3", "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz", "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==", - "dev": true, "requires": { "@jest/console": "^26.6.2", "@jest/environment": "^26.6.2", @@ -34429,7 +34278,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -34438,7 +34286,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -34448,7 +34295,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -34456,26 +34302,22 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -34495,7 +34337,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz", "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==", - "dev": true, "requires": { "@babel/types": "^7.0.0", "@jest/types": "^26.6.2", @@ -34519,7 +34360,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -34528,7 +34368,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -34538,7 +34377,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -34546,20 +34384,17 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, "requires": { "lru-cache": "^6.0.0" } @@ -34568,7 +34403,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -34947,7 +34781,6 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz", "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==", - "dev": true, "requires": { "@jest/test-result": "^26.6.2", "@jest/types": "^26.6.2", @@ -34962,7 +34795,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -34971,7 +34803,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -34981,7 +34812,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -34989,20 +34819,17 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -35440,8 +35267,7 @@ "lodash.truncate": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", - "dev": true + "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=" }, "lodash.uniq": { "version": "4.5.0", @@ -36240,7 +36066,6 @@ "version": "8.0.2", "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz", "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==", - "dev": true, "optional": true, "requires": { "growly": "^1.3.0", @@ -36255,7 +36080,6 @@ "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, "optional": true, "requires": { "lru-cache": "^6.0.0" @@ -36277,7 +36101,6 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, "requires": { "hosted-git-info": "^2.1.4", "resolve": "^1.10.0", @@ -36288,8 +36111,7 @@ "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" } } }, @@ -36616,8 +36438,7 @@ "p-each-series": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz", - "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==", - "dev": true + "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==" }, "p-finally": { "version": "1.0.0", @@ -36825,9 +36646,9 @@ } }, "plist": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz", - "integrity": "sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz", + "integrity": "sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==", "requires": { "base64-js": "^1.5.1", "xmlbuilder": "^9.0.7" @@ -36879,7 +36700,8 @@ "postcss-browser-comments": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz", - "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==" + "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==", + "requires": {} }, "postcss-calc": { "version": "8.2.4", @@ -36936,7 +36758,8 @@ "postcss-custom-media": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz", - "integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==" + "integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==", + "requires": {} }, "postcss-custom-properties": { "version": "12.1.4", @@ -36965,22 +36788,26 @@ "postcss-discard-comments": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz", - "integrity": "sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==" + "integrity": "sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==", + "requires": {} }, "postcss-discard-duplicates": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", - "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==" + "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", + "requires": {} }, "postcss-discard-empty": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz", - "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==" + "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==", + "requires": {} }, "postcss-discard-overridden": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", - "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==" + "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", + "requires": {} }, "postcss-double-position-gradients": { "version": "3.1.1", @@ -37002,7 +36829,8 @@ "postcss-flexbugs-fixes": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz", - "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==" + "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==", + "requires": {} }, "postcss-focus-visible": { "version": "6.0.4", @@ -37023,12 +36851,14 @@ "postcss-font-variant": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz", - "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==" + "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==", + "requires": {} }, "postcss-gap-properties": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.3.tgz", - "integrity": "sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==" + "integrity": "sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==", + "requires": {} }, "postcss-image-set-function": { "version": "4.0.6", @@ -37041,7 +36871,8 @@ "postcss-initial": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz", - "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==" + "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==", + "requires": {} }, "postcss-js": { "version": "4.0.0", @@ -37115,12 +36946,14 @@ "postcss-logical": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz", - "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==" + "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==", + "requires": {} }, "postcss-media-minmax": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz", - "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==" + "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==", + "requires": {} }, "postcss-merge-longhand": { "version": "5.1.2", @@ -37181,7 +37014,8 @@ "postcss-modules-extract-imports": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", - "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==" + "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", + "requires": {} }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -37238,7 +37072,8 @@ "postcss-normalize-charset": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", - "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==" + "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", + "requires": {} }, "postcss-normalize-display-values": { "version": "5.1.0", @@ -37323,12 +37158,14 @@ "postcss-overflow-shorthand": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.3.tgz", - "integrity": "sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==" + "integrity": "sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==", + "requires": {} }, "postcss-page-break": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz", - "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==" + "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==", + "requires": {} }, "postcss-place": { "version": "7.0.4", @@ -37415,7 +37252,8 @@ "postcss-replace-overflow-wrap": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz", - "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==" + "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==", + "requires": {} }, "postcss-selector-not": { "version": "5.0.0", @@ -37582,8 +37420,7 @@ "progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" }, "promise": { "version": "8.1.0", @@ -37914,7 +37751,8 @@ "react-freeze": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.0.tgz", - "integrity": "sha512-yQaiOqDmoKqks56LN9MTgY06O0qQHgV4FUrikH357DydArSZHQhl0BJFqGKIZoTqi8JizF9Dxhuk1FIZD6qCaw==" + "integrity": "sha512-yQaiOqDmoKqks56LN9MTgY06O0qQHgV4FUrikH357DydArSZHQhl0BJFqGKIZoTqi8JizF9Dxhuk1FIZD6qCaw==", + "requires": {} }, "react-is": { "version": "16.13.1", @@ -37922,9 +37760,9 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "react-native": { - "version": "0.67.2", - "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.67.2.tgz", - "integrity": "sha512-grEtpOLLvtSg8Bivg0ffVRCjTkresqMt7Jdog/geF6VAYhb4RnLaaUCWvyrfyB9buf135FKnqg5BIuve/XQNXA==", + "version": "0.67.4", + "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.67.4.tgz", + "integrity": "sha512-NA9d9lNJu9TViEJu2uZxWXUP+QNUilGGA5tdMbVFedNroOH1lnQ3n/FAVoGK1gqGarCgNTtheBxUpEa979Cu8w==", "requires": { "@jest/create-cache-key-function": "^27.0.1", "@react-native-community/cli": "^6.0.0", @@ -38028,17 +37866,20 @@ "react-native-image-crop-picker": { "version": "0.37.3", "resolved": "https://registry.npmjs.org/react-native-image-crop-picker/-/react-native-image-crop-picker-0.37.3.tgz", - "integrity": "sha512-ih+0pWWRUNEFQyaHwGbH9rqJNOb7EBYMwKJhTY0VmsKIA9E+usfwMmQXAFIfOnee7fTn0A2vOXkBCPQZwyvnQw==" + "integrity": "sha512-ih+0pWWRUNEFQyaHwGbH9rqJNOb7EBYMwKJhTY0VmsKIA9E+usfwMmQXAFIfOnee7fTn0A2vOXkBCPQZwyvnQw==", + "requires": {} }, "react-native-image-picker": { "version": "4.7.3", "resolved": "https://registry.npmjs.org/react-native-image-picker/-/react-native-image-picker-4.7.3.tgz", - "integrity": "sha512-eRKm4wlsmZHmsWFyv77kYc2F+ZyEVqe0m7mqhsMzWk6TQT4FBDtEDxmRDDFq+ivCu/1QD+EPhmYcAIpeGr7Ekg==" + "integrity": "sha512-eRKm4wlsmZHmsWFyv77kYc2F+ZyEVqe0m7mqhsMzWk6TQT4FBDtEDxmRDDFq+ivCu/1QD+EPhmYcAIpeGr7Ekg==", + "requires": {} }, "react-native-iphone-x-helper": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz", - "integrity": "sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==" + "integrity": "sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==", + "requires": {} }, "react-native-keyboard-aware-scroll-view": { "version": "0.9.5", @@ -38069,7 +37910,8 @@ "react-native-pager-view": { "version": "5.4.15", "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-5.4.15.tgz", - "integrity": "sha512-5NssD840wFCuOL4B1ZRiRADvt+Vx2Dgify4SmAUqHXCx03yiGPnRWmFjYXyQeK6gq/8VY+gPGE4bTy9ahzBbDw==" + "integrity": "sha512-5NssD840wFCuOL4B1ZRiRADvt+Vx2Dgify4SmAUqHXCx03yiGPnRWmFjYXyQeK6gq/8VY+gPGE4bTy9ahzBbDw==", + "requires": {} }, "react-native-reanimated": { "version": "2.4.1", @@ -38098,7 +37940,8 @@ "react-native-safe-area-context": { "version": "3.4.1", "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-3.4.1.tgz", - "integrity": "sha512-xfpVd0CiZR7oBhuwJ2HcZMehg5bjha1Ohu1XHpcT+9ykula0TgovH2BNU0R5Krzf/jBR1LMjR6VabxdlUjqxcA==" + "integrity": "sha512-xfpVd0CiZR7oBhuwJ2HcZMehg5bjha1Ohu1XHpcT+9ykula0TgovH2BNU0R5Krzf/jBR1LMjR6VabxdlUjqxcA==", + "requires": {} }, "react-native-screens": { "version": "3.13.1", @@ -38121,12 +37964,14 @@ "react-native-splash-screen": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/react-native-splash-screen/-/react-native-splash-screen-3.3.0.tgz", - "integrity": "sha512-rGjt6HkoSXxMqH4SQUJ1gnPQlPJV8+J47+4yhgTIan4bVvAwJhEeJH7wWt9hXSdH4+VfwTS0GTaflj1Tw83IhA==" + "integrity": "sha512-rGjt6HkoSXxMqH4SQUJ1gnPQlPJV8+J47+4yhgTIan4bVvAwJhEeJH7wWt9hXSdH4+VfwTS0GTaflj1Tw83IhA==", + "requires": {} }, "react-native-tab-view": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/react-native-tab-view/-/react-native-tab-view-3.1.1.tgz", - "integrity": "sha512-M5pRN6utQfytKWoKlKVzg5NbkYu308qNoW1khGTtEOTs1k14p2dHJ/BWOJoJYHKbPVUyZldbG9MFT7gUl4YHnw==" + "integrity": "sha512-M5pRN6utQfytKWoKlKVzg5NbkYu308qNoW1khGTtEOTs1k14p2dHJ/BWOJoJYHKbPVUyZldbG9MFT7gUl4YHnw==", + "requires": {} }, "react-native-uuid": { "version": "2.0.1", @@ -39262,7 +39107,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, "requires": { "@types/normalize-package-data": "^2.4.0", "normalize-package-data": "^2.5.0", @@ -39274,7 +39118,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, "requires": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -39285,8 +39128,7 @@ "type-fest": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==" } } }, @@ -39294,7 +39136,6 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", - "dev": true, "requires": { "find-up": "^4.1.0", "read-pkg": "^5.2.0", @@ -39304,8 +39145,7 @@ "type-fest": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" } } }, @@ -40164,7 +40004,6 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==", - "dev": true, "optional": true }, "side-channel": { @@ -40183,13 +40022,13 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "simple-plist": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.3.0.tgz", - "integrity": "sha512-uYWpeGFtZtVt2NhG4AHgpwx323zxD85x42heMJBan1qAiqqozIlaGrwrEt6kRjXWRWIXsuV1VLCvVmZan2B5dg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.3.1.tgz", + "integrity": "sha512-iMSw5i0XseMnrhtIzRb7XpQEXepa9xhWxGUojHBL43SIpQuDQkh3Wpy67ZbDzZVr6EKxvwVChnVpdl8hEVLDiw==", "requires": { "bplist-creator": "0.1.0", - "bplist-parser": "0.3.0", - "plist": "^3.0.4" + "bplist-parser": "0.3.1", + "plist": "^3.0.5" } }, "simple-swizzle": { @@ -40445,7 +40284,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", - "dev": true, "requires": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" @@ -40454,14 +40292,12 @@ "spdx-exceptions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" }, "spdx-expression-parse": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, "requires": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" @@ -40470,8 +40306,7 @@ "spdx-license-ids": { "version": "3.0.11", "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", - "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==", - "dev": true + "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==" }, "spdy": { "version": "4.0.2", @@ -40653,6 +40488,14 @@ "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + }, "string-hash-64": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/string-hash-64/-/string-hash-64-1.0.3.tgz", @@ -40727,14 +40570,6 @@ "define-properties": "^1.1.3" } }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - }, "stringify-object": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", @@ -40781,7 +40616,8 @@ "style-loader": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz", - "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==" + "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==", + "requires": {} }, "stylehacks": { "version": "5.1.0", @@ -40924,7 +40760,6 @@ "version": "6.8.0", "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz", "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==", - "dev": true, "requires": { "ajv": "^8.0.1", "lodash.truncate": "^4.4.2", @@ -40937,7 +40772,6 @@ "version": "8.10.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz", "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==", - "dev": true, "requires": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", @@ -40949,7 +40783,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -40957,14 +40790,12 @@ "astral-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "dev": true + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==" }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -40972,26 +40803,22 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" }, "slice-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, "requires": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -41425,8 +41252,7 @@ "typescript": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz", - "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==", - "dev": true + "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==" }, "ua-parser-js": { "version": "0.7.31", @@ -41657,7 +41483,6 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz", "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==", - "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.1", "convert-source-map": "^1.6.0", @@ -41667,8 +41492,7 @@ "source-map": { "version": "0.7.3", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" } } }, @@ -41676,7 +41500,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, "requires": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" @@ -41946,7 +41769,8 @@ "ws": { "version": "8.5.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", - "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==" + "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", + "requires": {} } } }, @@ -42389,7 +42213,8 @@ "ws": { "version": "7.5.7", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz", - "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==" + "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==", + "requires": {} }, "xcode": { "version": "2.1.0", diff --git a/package.json b/package.json index 6047db4..744ca31 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "jwt-decode": "^3.1.2", "path": "^0.12.7", "react": "17.0.2", - "react-native": "0.67.2", + "react-native": "^0.67.3", "react-native-axios-jwt": "^1.5.0", "react-native-dotenv": "^3.3.1", "react-native-geolocation-service": "^5.3.0-beta.4", From f7c00a6698a15368ecd30b40a1122e38d675f932 Mon Sep 17 00:00:00 2001 From: 11t518s <11t518s20161759@gmail.com> Date: Tue, 5 Apr 2022 11:36:57 +0900 Subject: [PATCH 4/6] fix: default checkList type --- components/CheckListComponent/ButtonsOfTypeB.tsx | 3 +-- ios/Podfile.lock | 4 ++-- types/checkListTypes.ts | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/CheckListComponent/ButtonsOfTypeB.tsx b/components/CheckListComponent/ButtonsOfTypeB.tsx index e349961..40ed080 100644 --- a/components/CheckListComponent/ButtonsOfTypeB.tsx +++ b/components/CheckListComponent/ButtonsOfTypeB.tsx @@ -5,7 +5,6 @@ import { checkListTypes, choseCheckListItemByServerType, } from '../../types/checkListTypes'; -import produce from 'immer'; import styles from './styles'; import { DefaultText } from '../../CustomText'; @@ -96,7 +95,7 @@ function ButtonsOfTypeB({ isEdit, checkList, setCheckLists, checkLists }: IProps autoCorrect={false} onChangeText={onChangeText} onEndEditing={() => onEndEditing(answer)} - placeholder={answer.type ? answer.type : '์ง์ ‘ ์ž…๋ ฅ'} + placeholder={answer.type ? answer.type : answer.setting} placeholderTextColor={'#D6D4D4'} style={[styles.typeDBtnWrapper]} /> diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 4b4b94a..dfe44ed 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -712,7 +712,7 @@ SPEC CHECKSUMS: Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 476ee3e89abb49e07f822b48323c51c57124b572 + glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85 Google-Maps-iOS-Utils: 95d5ca4d2004314eff88c1819b969db6cac37ab6 GoogleMaps: 086ae1dab659eaa7339bdb30fc88e2f44e7c597c hermes-engine: bf7577d12ac6ccf53ab8b5af3c6ccf0dd8458c5c @@ -728,7 +728,7 @@ SPEC CHECKSUMS: KakaoSDKUser: 11955811d99d1ff1f1dfd5428afe69937e31ccef libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b - RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 + RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685 RCTRequired: 0aa6c1c27e1d65920df35ceea5341a5fe76bdb79 RCTTypeSafety: d76a59d00632891e11ed7522dba3fd1a995e573a React: ab8c09da2e7704f4b3ebad4baa6cfdfcc852dcb5 diff --git a/types/checkListTypes.ts b/types/checkListTypes.ts index ba0fc44..5debed3 100644 --- a/types/checkListTypes.ts +++ b/types/checkListTypes.ts @@ -7,6 +7,7 @@ export interface answerButtonType { main?: boolean; url?: string; order?: number; + setting?: string; } export interface answerListType { From 58b06ea031602fd1872e9b06e37d873bfddce884 Mon Sep 17 00:00:00 2001 From: 11t518s <11t518s20161759@gmail.com> Date: Tue, 5 Apr 2022 13:12:56 +0900 Subject: [PATCH 5/6] change RUL --- constant.ts | 2 +- index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/constant.ts b/constant.ts index 9d3fb8c..7526547 100644 --- a/constant.ts +++ b/constant.ts @@ -1 +1 @@ -export const API_HOST = 'http://3.38.93.184:8080'; +export const API_HOST = 'https://www.amattang.shop'; diff --git a/index.js b/index.js index d61a2b4..d5e653c 100644 --- a/index.js +++ b/index.js @@ -8,7 +8,7 @@ import App from './App'; import { name as appName } from './app.json'; // default -axios.defaults.baseURL = 'http://3.38.93.184:8080'; +axios.defaults.baseURL = 'https://www.amattang.shop'; axios.defaults.withCredentials = true; axios.defaults.headers.post['Content-Type'] = 'application/json'; From d414e958a42ec91ae919175099a0b2be2908d5e4 Mon Sep 17 00:00:00 2001 From: 11t518s <11t518s20161759@gmail.com> Date: Wed, 6 Apr 2022 01:36:29 +0900 Subject: [PATCH 6/6] fix: myItem logic --- android/app/build.gradle | 2 +- .../CheckListComponent/CheckListComponent.tsx | 12 ++-- .../myItem/MyItemElementOfBottomSheets.tsx | 15 +++-- .../myItem/MyItemOfBottomSheets.tsx | 65 +++++++++++-------- navigation/Main/BottomNavigation/styles.tsx | 2 +- .../StackNavigationOfCheckList.tsx | 2 +- .../BasicCheckList/MyItemOfBasicCheckList.tsx | 3 +- 7 files changed, 56 insertions(+), 45 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index a4863f8..42d2afc 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -149,7 +149,7 @@ android { applicationId "com.amattang" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 4 + versionCode 6 versionName "1.0" manifestPlaceholders = [GOOGLE_MAP_API_KEY:googleMapApiKey, KAKAO_NATIVE_APP_KEY:kakaoLoginApiKey] // manifestPlaceholders = [KAKAO_NATIVE_APP_KEY:kakaoLoginApiKey] diff --git a/components/CheckListComponent/CheckListComponent.tsx b/components/CheckListComponent/CheckListComponent.tsx index 89d182a..c12d7f8 100644 --- a/components/CheckListComponent/CheckListComponent.tsx +++ b/components/CheckListComponent/CheckListComponent.tsx @@ -94,8 +94,8 @@ function CheckListComponent({ - {checkList.question.split(' ').map((word) => ( - + {checkList.question.split(' ').map((word, index) => ( + {word}{' '} ))} @@ -106,8 +106,8 @@ function CheckListComponent({ ๐Ÿ“˜ - {checkList.rule.split(' ').map((word) => ( - + {checkList.rule.split(' ').map((word, index) => ( + {word}  ))} @@ -119,8 +119,8 @@ function CheckListComponent({ ๐Ÿ‘€ - {checkList.description.split(' ').map((word) => ( - + {checkList.description.split(' ').map((word, index) => ( + {word}  ))} diff --git a/components/CheckListComponent/myItem/MyItemElementOfBottomSheets.tsx b/components/CheckListComponent/myItem/MyItemElementOfBottomSheets.tsx index 3c610e9..de203c1 100644 --- a/components/CheckListComponent/myItem/MyItemElementOfBottomSheets.tsx +++ b/components/CheckListComponent/myItem/MyItemElementOfBottomSheets.tsx @@ -1,4 +1,4 @@ -import React, { Dispatch, SetStateAction } from 'react'; +import React, { Dispatch, SetStateAction, useState } from 'react'; import { myItemElementType, myItemType } from '../../../types/checkListTypes'; import { Image, View } from 'react-native'; import styles from '../styles'; @@ -18,7 +18,8 @@ function MyItemElementOfBottomSheets({ isEdit, clickedMyItemElements, }: IProps) { - const onChangeQuestionElementHandler = (onChangedQuestionElement: string) => { + const [onChangedQuestionElement, setOnChangedQuestionElement] = useState(''); + const onChangeQuestionElementHandler = () => { onChangedQuestionElement === '' ? setClickedMyItem({ ...clickedMyItem, @@ -37,7 +38,7 @@ function MyItemElementOfBottomSheets({ } as myItemType); }; return ( - + {clickedMyItemElements.checked ? ( ) : ( @@ -46,11 +47,11 @@ function MyItemElementOfBottomSheets({ {clickedMyItemElements && ( - onChangeQuestionElementHandler(onChangedQuestionElement) - } + onChangeText={(onChangText: string) => setOnChangedQuestionElement(onChangText)} + onEndEditing={onChangeQuestionElementHandler} /> )} diff --git a/components/CheckListComponent/myItem/MyItemOfBottomSheets.tsx b/components/CheckListComponent/myItem/MyItemOfBottomSheets.tsx index 3037ca3..2412a8b 100644 --- a/components/CheckListComponent/myItem/MyItemOfBottomSheets.tsx +++ b/components/CheckListComponent/myItem/MyItemOfBottomSheets.tsx @@ -1,10 +1,10 @@ -import React, { Dispatch, RefObject, SetStateAction, useState } from 'react'; +import React, { createRef, Dispatch, RefObject, SetStateAction, useState } from 'react'; import { BottomSheetBackgroundProps, BottomSheetModal, BottomSheetTextInput, } from '@gorhom/bottom-sheet'; -import { ScrollView, TextInput, View } from 'react-native'; +import { KeyboardAvoidingViewComponent, ScrollView, Text, TextInput, View } from 'react-native'; import { myItemType } from '../../../types/checkListTypes'; import { BottomSheetModalMethods } from '@gorhom/bottom-sheet/lib/typescript/types'; @@ -12,6 +12,7 @@ import styles from '../styles'; import CreateMyItemButtonOfBottomSheets from './CreateMyItemButtonOfBottomSheets'; import DeleteMyItemButtonOfBottomSheets from './DeleteMyItemButtonOfBottomSheets'; import MyItemElementOfBottomSheets from './MyItemElementOfBottomSheets'; +import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view'; interface IProps { onDismissHandler: () => void; @@ -40,30 +41,27 @@ function MyItemOfBottomSheets({ handleSheetChanges, clickedMyItem, }: IProps) { - const [newElement, setNewElement] = useState(''); - - const onCategoryNameHandler = (newCategoryName: string) => { - setClickedMyItem({ + const [newCategory, setNewCategory] = useState(''); + const onCategoryNameHandler = async () => { + await setClickedMyItem({ ...clickedMyItem, - categoryName: newCategoryName, + categoryName: newCategory, } as myItemType); + setNewCategory(''); }; + const [newElement, setNewElement] = useState(''); const onCreateQuestionElementHandler = async () => { - newElement && clickedMyItem?.questions - ? setClickedMyItem({ + clickedMyItem?.questions + ? await setClickedMyItem({ ...clickedMyItem, questions: [...clickedMyItem?.questions, { content: newElement, checked: false }], } as myItemType) - : setClickedMyItem({ + : await setClickedMyItem({ ...clickedMyItem, questions: [{ content: newElement, checked: false }], } as myItemType); - setNewElement(''); - }; - - const onCreateQuestionElementTextHandler = (elementText: string) => { - setNewElement(elementText); + return null; }; return ( @@ -78,13 +76,13 @@ function MyItemOfBottomSheets({ onChange={handleSheetChanges} > - onCategoryNameHandler(newCategoryName)} + onChangeText={(newCategoryName) => setNewCategory(newCategoryName)} + onEndEditing={onCategoryNameHandler} /> {clickedMyItem?.questions?.map((clickedMyItemElements) => ( @@ -96,15 +94,26 @@ function MyItemOfBottomSheets({ clickedMyItemElements={clickedMyItemElements} /> ))} - onCreateQuestionElementTextHandler(elementText)} - onEndEditing={onCreateQuestionElementHandler} - /> + {newElement ? ( + setNewElement(elementText)} + onEndEditing={onCreateQuestionElementHandler} + /> + ) : ( + setNewElement(elementText)} + onEndEditing={onCreateQuestionElementHandler} + /> + )} { setInterval(() => { - onSubmitHandler(); + checkListContext?.onChoseCheckListHandler(); }, 100000); }, []); diff --git a/screens/BasicCheckList/MyItemOfBasicCheckList.tsx b/screens/BasicCheckList/MyItemOfBasicCheckList.tsx index e771df8..e565a96 100644 --- a/screens/BasicCheckList/MyItemOfBasicCheckList.tsx +++ b/screens/BasicCheckList/MyItemOfBasicCheckList.tsx @@ -8,7 +8,7 @@ import React, { useRef, useState, } from 'react'; -import { ActivityIndicator, ScrollView, View } from 'react-native'; +import { ActivityIndicator, ScrollView, TextInput, View } from 'react-native'; import BlankedMyItem from '../../components/CheckListComponent/myItem/BlankedMyItem'; import ButtonOfAddMyItem from '../../components/CheckListComponent/myItem/ButtonOfAddMyItem'; @@ -133,6 +133,7 @@ function MyItemOfBasicCheckList({ isEdit, setIsBottomSheet }: IProps) { /> ))} + {myItems.length === 0 && }