From 021c032ba8c31e53a6ee6541a42b516549dc0c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Perttu=20L=C3=A4hteenlahti?= Date: Sun, 23 Aug 2020 20:12:33 +0300 Subject: [PATCH 1/9] Adding existing changes and refactorings --- assets/svgs.tsx | 8 + babel.config.js | 4 +- ios/Podfile.lock | 6 - package.json | 2 +- src/components/Buttons/RatingButton.tsx | 2 +- .../Charts/SleepTimeChart/SleepBars.tsx | 41 ++- .../Charts/SleepTimeChart/XTicks.tsx | 13 +- src/components/Charts/SleepTimesChart.tsx | 272 ------------------ src/components/Charts/sleepTimeChart.tsx | 81 +++--- src/components/{sleepclock.tsx => Clock.tsx} | 72 ++--- .../CoachingSpecific/WeekCarousel.tsx | 1 - src/components/HabitCard/HabitCard.tsx | 2 +- src/components/HabitCard/HabitCardManage.tsx | 2 +- .../IAPComponents/SubscriptionItem.tsx | 2 +- .../MainScreenSpecific/ClockCarousel.tsx | 12 +- .../MainScreenSpecific/EditNightHeader.tsx | 2 +- .../MainScreenSpecific/EnablePushCheck.tsx | 2 +- .../MainScreenSpecific/HelpInfo.tsx | 2 +- src/components/Primitives/Primitives.tsx | 6 +- .../SettingsSpecific/Sources/AddSources.tsx | 8 +- src/components/TabBarIcon.tsx | 9 +- src/components/TabBarLabel.tsx | 21 +- src/components/TextField.tsx | 55 ++-- src/components/clock/AddNightButton.tsx | 37 +++ .../{sleepClock => clock}/CircularSlider.tsx | 5 +- .../{sleepClock => clock}/ClockEmpty.tsx | 0 .../clockTimes.tsx => clock/ClockTimes.tsx} | 10 +- .../CoachingProgressToday.tsx | 0 .../{sleepClock => clock}/CurrentTime.tsx | 0 .../{sleepClock => clock}/Cursor.tsx | 0 .../{sleepClock => clock}/CurvedActions.tsx | 0 .../CurvedEditButton.tsx | 0 src/components/{sleepClock => clock}/Date.tsx | 0 .../{sleepClock => clock}/EditableArc.tsx | 0 .../FallAsleepWindow.tsx | 0 .../{sleepClock => clock}/InfoButton.tsx | 0 .../{sleepClock => clock}/MinuteSticks.tsx | 0 .../{sleepClock => clock}/NightRating.tsx | 2 +- .../{sleepClock => clock}/NoDataInfo.tsx | 0 .../{sleepClock => clock}/SleepArc.tsx | 0 .../{sleepClock => clock}/SleepTime.tsx | 0 .../{sleepClock => clock}/SleepTimesArc.tsx | 0 .../{sleepClock => clock}/Slider.tsx | 2 +- .../{sleepClock => clock}/TimePath.tsx | 0 .../{sleepClock => clock}/TimerText.tsx | 0 .../{sleepClock => clock}/TrackerName.tsx | 0 src/components/modals/ExplanationsModal.tsx | 2 +- src/components/sleep/InsightsCard.tsx | 138 +++++++++ src/config/routes/JournalNavigator.tsx | 13 +- src/config/routes/TabNavigator.tsx | 31 +- src/helpers/time.ts | 53 ++-- src/screens/Auth/ConfirmUser.tsx | 2 +- src/screens/Auth/ForgotPasswordScreen.tsx | 2 +- src/screens/Auth/Login.tsx | 2 +- src/screens/Auth/RegisterScreen.tsx | 2 +- src/screens/Shared/HabitView.tsx | 17 +- src/screens/Welcome/Welcome.tsx | 2 +- src/screens/coaching/CoachingView.tsx | 2 +- src/screens/coaching/LessonView.tsx | 2 +- src/screens/main/DetailView.tsx | 227 --------------- src/screens/main/main.tsx | 6 +- src/screens/settings/CloudSettings.tsx | 2 +- src/screens/settings/DevelopmentMenu.tsx | 2 +- src/screens/settings/ManageSubscription.tsx | 2 +- src/screens/settings/Notifications.tsx | 2 +- src/screens/settings/settings.tsx | 14 +- src/screens/sleep/SleepView.tsx | 110 +++++++ .../Reducers/api-reducer/api-reducer.spec.ts | 2 +- src/store/Reducers/api-reducer/api-reducer.ts | 69 ++--- src/store/Reducers/sleepclockReducer.ts | 4 +- src/store/Selectors/SleepDataSelectors.ts | 104 +++++-- src/store/Selectors/SmartActionsSelectors.ts | 15 +- .../Selectors/insight-selectors/Insights.ts | 9 + src/translations/en.json | 12 +- src/translations/fi.json | 12 +- tsconfig.json | 5 +- yarn.lock | 11 +- 77 files changed, 689 insertions(+), 868 deletions(-) delete mode 100644 src/components/Charts/SleepTimesChart.tsx rename src/components/{sleepclock.tsx => Clock.tsx} (63%) create mode 100644 src/components/clock/AddNightButton.tsx rename src/components/{sleepClock => clock}/CircularSlider.tsx (98%) rename src/components/{sleepClock => clock}/ClockEmpty.tsx (100%) rename src/components/{sleepClock/clockTimes.tsx => clock/ClockTimes.tsx} (84%) rename src/components/{sleepClock => clock}/CoachingProgressToday.tsx (100%) rename src/components/{sleepClock => clock}/CurrentTime.tsx (100%) rename src/components/{sleepClock => clock}/Cursor.tsx (100%) rename src/components/{sleepClock => clock}/CurvedActions.tsx (100%) rename src/components/{sleepClock => clock}/CurvedEditButton.tsx (100%) rename src/components/{sleepClock => clock}/Date.tsx (100%) rename src/components/{sleepClock => clock}/EditableArc.tsx (100%) rename src/components/{sleepClock => clock}/FallAsleepWindow.tsx (100%) rename src/components/{sleepClock => clock}/InfoButton.tsx (100%) rename src/components/{sleepClock => clock}/MinuteSticks.tsx (100%) rename src/components/{sleepClock => clock}/NightRating.tsx (95%) rename src/components/{sleepClock => clock}/NoDataInfo.tsx (100%) rename src/components/{sleepClock => clock}/SleepArc.tsx (100%) rename src/components/{sleepClock => clock}/SleepTime.tsx (100%) rename src/components/{sleepClock => clock}/SleepTimesArc.tsx (100%) rename src/components/{sleepClock => clock}/Slider.tsx (97%) rename src/components/{sleepClock => clock}/TimePath.tsx (100%) rename src/components/{sleepClock => clock}/TimerText.tsx (100%) rename src/components/{sleepClock => clock}/TrackerName.tsx (100%) create mode 100644 src/components/sleep/InsightsCard.tsx delete mode 100644 src/screens/main/DetailView.tsx create mode 100644 src/screens/sleep/SleepView.tsx diff --git a/assets/svgs.tsx b/assets/svgs.tsx index 4b36e36..68d5f3c 100644 --- a/assets/svgs.tsx +++ b/assets/svgs.tsx @@ -789,6 +789,14 @@ export const icons = { + ), + doubleBedAdd: ( + + + + + + ) } diff --git a/babel.config.js b/babel.config.js index 8414a6d..485b161 100644 --- a/babel.config.js +++ b/babel.config.js @@ -25,7 +25,9 @@ module.exports = { ], alias: { '@actions': './src/actions/', - '@reducers': './src/store/Reducers' + '@reducers': './src/store/Reducers', + '@selectors': './src/store/Selectors', + '@components': './src/components' } } ] diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 097204b..ad3b649 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -502,8 +502,6 @@ PODS: - React - RNSVG (12.1.0): - React - - RNWatch (0.2.0): - - React - SDWebImage (5.8.2): - SDWebImage/Core (= 5.8.2) - SDWebImage/Core (5.8.2) @@ -625,7 +623,6 @@ DEPENDENCIES: - "RNSentry (from `../node_modules/@sentry/react-native`)" - RNSha256 (from `../node_modules/react-native-sha256`) - RNSVG (from `../node_modules/react-native-svg`) - - RNWatch (from `../node_modules/react-native-watch-connectivity`) - UMAppLoader (from `../node_modules/unimodules-app-loader/ios`) - UMBarCodeScannerInterface (from `../node_modules/unimodules-barcode-scanner-interface/ios`) - UMCameraInterface (from `../node_modules/unimodules-camera-interface/ios`) @@ -811,8 +808,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-sha256" RNSVG: :path: "../node_modules/react-native-svg" - RNWatch: - :path: "../node_modules/react-native-watch-connectivity" UMAppLoader: :path: "../node_modules/unimodules-app-loader/ios" UMBarCodeScannerInterface: @@ -942,7 +937,6 @@ SPEC CHECKSUMS: RNSentry: edba19169f665609fb092ba5eaf4be3c0776f50a RNSha256: c6f68c850bf8315c95e2508667e8c908bd9f8487 RNSVG: ce9d996113475209013317e48b05c21ee988d42e - RNWatch: 58e446b663580d84c8b7e98fec7f06da35ff7547 SDWebImage: f923a89d7344af399ba77b87a523ae747408207a SDWebImageWebPCoder: 36f8f47bd9879a8aea6044765c1351120fd8e3a8 Sentry: e5796ec31a481474d2f94553213278470f9e302d diff --git a/package.json b/package.json index c7664be..605eb05 100644 --- a/package.json +++ b/package.json @@ -175,7 +175,7 @@ "contentful": "^7.13.1", "countdown": "^2.6.0", "d3": "^5.12.0", - "d3-interpolate": "^1.3.2", + "date-fns": "^2.15.0", "debug": "^4.1.1", "escape-string-regexp": "^4.0.0", "expo-blur": "^8.1.0", diff --git a/src/components/Buttons/RatingButton.tsx b/src/components/Buttons/RatingButton.tsx index 249036a..6b72566 100644 --- a/src/components/Buttons/RatingButton.tsx +++ b/src/components/Buttons/RatingButton.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react' import { useDispatch } from 'react-redux' import styled from 'styled-components/native' -import { rateDay } from '../../actions/sleep/sleep-data-actions' +import { rateDay } from '@actions/sleep/sleep-data-actions' import { fonts } from '../../styles/themes' import IconBold from '../iconBold' import TranslatedText from '../TranslatedText' diff --git a/src/components/Charts/SleepTimeChart/SleepBars.tsx b/src/components/Charts/SleepTimeChart/SleepBars.tsx index c5c8308..2f43af0 100644 --- a/src/components/Charts/SleepTimeChart/SleepBars.tsx +++ b/src/components/Charts/SleepTimeChart/SleepBars.tsx @@ -1,6 +1,6 @@ import { ScaleTime } from 'd3' import moment from 'moment' -import React, { memo, useMemo } from 'react' +import React, { FC, memo, useMemo } from 'react' import { G, Rect } from 'react-native-svg' import { Day, Night, Value } from 'Types/Sleepdata' import colors from '../../../styles/colors' @@ -8,36 +8,31 @@ import colors from '../../../styles/colors' interface Props { data: Day[] type: Value - scaleX: ScaleTime - scaleY: ScaleTime + scaleX: ScaleTime + scaleY: ScaleTime barWidth: number - select: Function } -const SleepBars = (props: Props) => { - const color = - props.type === Value.Asleep ? colors.radiantBlue : colors.inBedColor +const SleepBars: FC = ({ data, type, scaleX, scaleY, barWidth }) => { + const color = type === Value.Asleep ? colors.radiantBlue : colors.inBedColor const { bars } = useMemo( () => ({ - bars: props.data.map((datum, index) => { - const select = () => { - props.select(datum) - } - + bars: data.map((datum) => { const dayBars = datum.night - .filter((night) => night.value === props.type) - .map((item: Night, i: number) => { - const y = props.scaleY(moment(item.startDate).valueOf()) + .filter((night) => night.value === type) + .map((item: Night) => { + const y = scaleY(moment(item.startDate).valueOf()) + const x = scaleX(new Date(datum.date)) const height = - props.scaleY(moment(item.endDate).valueOf()) - - props.scaleY(moment(item.startDate).valueOf()) + scaleY(moment(item.endDate).valueOf()) - + scaleY(moment(item.startDate).valueOf()) return ( - + { ) }) - return {dayBars} + return {dayBars} }) }), - [props.data] + [data] ) return {bars} } -export default memo(SleepBars) +export default SleepBars diff --git a/src/components/Charts/SleepTimeChart/XTicks.tsx b/src/components/Charts/SleepTimeChart/XTicks.tsx index 742d378..ff44eec 100644 --- a/src/components/Charts/SleepTimeChart/XTicks.tsx +++ b/src/components/Charts/SleepTimeChart/XTicks.tsx @@ -1,26 +1,23 @@ import { ScaleTime } from 'd3' import moment from 'moment' -import React, { memo } from 'react' +import React, { memo, FC } from 'react' import { G, Text } from 'react-native-svg' -import { useSelector } from 'react-redux' import styled from 'styled-components/native' -import { getTextColorOnTheme } from '../../../store/Selectors/UserSelectors' import { fonts } from '../../../styles/themes' type Props = { - scaleX: ScaleTime + scaleX: ScaleTime chartHeight: number barWidth: number ticks: Date[] } -const XTicks = ({ scaleX, chartHeight, barWidth, ticks }: Props) => { - const color = useSelector(getTextColorOnTheme) - const tickElements = ticks.map((tick, index) => { +const XTicks: FC = ({ scaleX, chartHeight, barWidth, ticks }) => { + const tickElements = ticks.map((tick) => { const x = scaleX(tick) + barWidth / 2 return ( - + day.inBedDuration) - const yDomainScore = d3.extent(this.props.sleepScores, (item) => item.score) - const xDomain = d3.extent(this.props.days, (day) => new Date(day.date)) - - this.axisXScale = d3.scaleLinear().domain([0, 6]).range([0, linesWidth]) - - this.axisYScale = d3.scaleLinear().domain(yDomainBed).range([0, height]) - - this.scaleX = d3.scaleLinear().domain(xDomain).range([0, linesWidth]) - - this.scaleY = d3 - .scaleTime() - .domain(yDomainBed) - .range([height - verticalPadding, verticalPadding]) - - this.scoreScaleY = d3 - .scaleTime() - .domain(yDomainScore) - .range([height - verticalPadding, verticalPadding]) - - this.scaleLabel = d3.scaleLinear().domain(yDomainBed).range(yDomainBed) - - this.line = d3 - .line() - .x((d) => this.scaleX(new Date(d.date))) - .y((d) => this.scaleY(d.inBedDuration ? d.inBedDuration : 0))( - this.props.days - ) - - this.sleepLine = d3 - .line() - .x((d) => this.scaleX(new Date(d.date))) - .y((d) => this.scaleY(d.asleepDuration ? d.asleepDuration : 0))( - this.props.days - ) - - this.scoreLine = d3 - .line() - .x((d) => this.scaleX(new Date(d.date))) - .y((d) => this.scoreScaleY(d.score ? d.score : 0))(this.props.sleepScores) - - this.properties = path.svgPathProperties(this.line) - this.lineLength = this.properties.getTotalLength() - } - - componentDidMount() { - this.calculateScales() - this.state.x.addListener(({ value }) => this.moveCursor(value)) - this.moveCursor(0) - } - - shouldComponentUpdate(nextProps, nextState) { - return true - } - - render() { - if (!this.props.days || this.props.sleepScores) return null - this.calculateScales() - const { x } = this.state - const translateX = x.interpolate({ - inputRange: [0, this.lineLength], - outputRange: [cardWidth, 0], - extrapolate: 'clamp' - }) - - const xAxis = this.props.days.map((item, key) => ( - - )) - - const yAxis = this.props.days.map((item, key) => ( - - )) - - return ( - - - Sleep Goal Trend - - - - {xAxis} - {yAxis} - - - - - - - - - - - - - - - - - - - - - - This here is a chart of your time in bed and asleep. In optimal case - the lines should be the same. - - - - ) - } -} - -export default SleepTimesChart - -const cStyles = StyleSheet.create({ - root: { - flex: 1 - }, - container: { - alignItems: 'center', - height - }, - cursor: { - position: 'absolute', - zIndex: 4, - width: cursorRadius * 2, - height: cursorRadius * 2, - borderRadius: cursorRadius, - borderColor: '#367be2', - borderWidth: 3 - }, - label: { - position: 'absolute', - bottom: 0, - left: 0, - backgroundColor: 'red' - }, - labelText: { - textAlign: 'center' - }, - sectionContainer: { - borderRadius: 5, - marginHorizontal: 20, - marginBottom: 50, - backgroundColor: 'white', - ...shadowStyle - }, - chart: { - height: 200 - }, - subTitle: { - marginLeft: 20, - fontSize: 15, - color: colors.gray2 - }, - - dateContainer: { - flex: 1, - justifyContent: 'space-between' - }, - legend: { - marginVertical: 20, - marginHorizontal: 10 - } -}) diff --git a/src/components/Charts/sleepTimeChart.tsx b/src/components/Charts/sleepTimeChart.tsx index 8385f35..f1d1d73 100644 --- a/src/components/Charts/sleepTimeChart.tsx +++ b/src/components/Charts/sleepTimeChart.tsx @@ -1,18 +1,14 @@ -import * as d3 from 'd3' +import { extent, max, min, scaleTime } from 'd3' import moment from 'moment' -import React, { memo, useMemo, useState } from 'react' +import React, { useMemo, useState } from 'react' import { Dimensions, View } from 'react-native' import { ScrollView } from 'react-native-gesture-handler' import Svg from 'react-native-svg' import { useSelector } from 'react-redux' import styled from 'styled-components/native' -import { constants, StyleProps } from '../../styles/themes' import { getAllDays } from '../../store/Selectors/SleepDataSelectors' -import { getIsDarkMode } from '../../store/Selectors/UserSelectors' import { Day, Value } from '../../Types/Sleepdata' import { Container, H3 } from '../Primitives/Primitives' -import BottomInfo from './SleepTimeChart/BottomInfo' -import DayInfo from './SleepTimeChart/DayInfo' import SleepBars from './SleepTimeChart/SleepBars' import XTicks from './SleepTimeChart/XTicks' import YTicks from './SleepTimeChart/YTicks' @@ -30,46 +26,46 @@ const SleepTimeChart = () => { const chartWidth = (barWidth + 10) * days.length + paddingLeft + paddingRight - const { normalizedSleepData }: any = useMemo( + const { normalizedSleepData } = useMemo( () => ({ normalizedSleepData: normalizeSleepData(days, Value.InBed) }), - [] + [days] ) const select = (day: Day) => { setSelectedDay(day) } - const xDomain = d3.extent( + const xDomain: Date[] = extent( normalizedSleepData, (day: Day) => new Date(day.date) - ) - const yDomain: any = [ - d3.min(normalizedSleepData, (datum: Day) => - d3.min(datum.night, (night) => + ) as Date[] + + const yDomain: number[] = [ + min(normalizedSleepData, (datum: Day) => + min(datum.night, (night) => moment(night.startDate).subtract(1, 'hour').valueOf() ) - ), - d3.max(normalizedSleepData, (datum: Day) => - d3.max(datum.night, (night) => + ) as number, + max(normalizedSleepData, (datum: Day) => + max(datum.night, (night) => moment(night.endDate).add(1, 'hour').valueOf() ) - ) + ) as number ] + const scaleX = scaleTime().domain(xDomain).range([paddingLeft, chartWidth]) - const scaleX = d3.scaleTime().domain(xDomain).range([paddingLeft, chartWidth]) - - const scaleY = d3 - .scaleTime() + const scaleY = scaleTime() .domain(yDomain) .nice() - .range([0, chartHeight - 50]) - const yTicks = scaleY.ticks(4) - const xTicks = scaleX.ticks(d3.timeDay.every(1)) + .range([10, chartHeight - 80]) + + const yTicks = scaleY.ticks(5) + const xTicks = scaleX.ticks(days.length) return ( - <> +

Sleep Goal Trend

 @@ -81,7 +77,6 @@ const SleepTimeChart = () => { { data={normalizedSleepData} /> { - - {selectedDay ? : } - - + ) } -export default memo(SleepTimeChart) - -const Stats = styled.View` - padding: 10px 20px; - height: 60px; - border-top-color: ${(props: StyleProps) => props.theme.HAIRLINE_COLOR}; - border-top-width: ${constants.hairlineWidth}px; - border-bottom-color: ${(props: StyleProps) => props.theme.HAIRLINE_COLOR}; - border-bottom-width: ${constants.hairlineWidth}px; -` +export default SleepTimeChart const ScrollContainer = styled.View`` @@ -133,7 +115,22 @@ const YTicksContainer = styled(Svg)` position: absolute; ` -const normalizeSleepData = (days: Day[], value: Value) => { +const Card = styled.View` + margin-top: 10px; + background-color: ${({ theme }) => theme.SECONDARY_BACKGROUND_COLOR}; + padding: 10px; + margin: 8px; + border-radius: 7px; +` + +type NormalizedDay = Day & { + night: Night & { + startDate: number + endDate: number + } +} + +const normalizeSleepData = (days: Day[]): NormalizedDay[] => { const normalized = days.map((day) => { const normalizedNights = day.night.map((night) => { const trueDate = moment(day.date) diff --git a/src/components/sleepclock.tsx b/src/components/Clock.tsx similarity index 63% rename from src/components/sleepclock.tsx rename to src/components/Clock.tsx index 115daa4..0b8f497 100644 --- a/src/components/sleepclock.tsx +++ b/src/components/Clock.tsx @@ -10,21 +10,20 @@ import { getGoToSleepWindowStart } from '../store/Selectors/insight-selectors/Insights' import { getEditMode } from '../store/Selectors/ManualDataSelectors' -import { getSelectedItem } from '../store/Selectors/SleepDataSelectors' -import { getIsDarkMode } from '../store/Selectors/UserSelectors' +import { getSelectedDay } from '../store/Selectors/SleepDataSelectors' import colors from '../styles/colors' -import { Day, Value } from '../Types/Sleepdata' -import ClockTimes from './sleepClock/clockTimes' -import CurvedEditButton from './sleepClock/CurvedEditButton' -import Date from './sleepClock/Date' -import FallAsleepWindow from './sleepClock/FallAsleepWindow' -import InfoButton from './sleepClock/InfoButton' -import MinuteSticks from './sleepClock/MinuteSticks' -import NightRating from './sleepClock/NightRating' -import SleepArc from './sleepClock/SleepArc' -import SleepTime from './sleepClock/SleepTime' -import Bedtime from './sleepClock/Slider' -import TrackerName from './sleepClock/TrackerName' +import { Value } from '../Types/Sleepdata' +import AddNightButton from './clock/AddNightButton' +import ClockTimes from './clock/ClockTimes' +import Date from './clock/Date' +import FallAsleepWindow from './clock/FallAsleepWindow' +import InfoButton from './clock/InfoButton' +import MinuteSticks from './clock/MinuteSticks' +import NightRating from './clock/NightRating' +import SleepArc from './clock/SleepArc' +import SleepTime from './clock/SleepTime' +import Bedtime from './clock/Slider' +import TrackerName from './clock/TrackerName' const { width } = Dimensions.get('window') const clockSize = width - 40 @@ -34,15 +33,10 @@ const radius: number = clockSize / 2 - 10 const inBedRadius: number = clockSize / 2 - 15 const fallAsleepRadius: number = clockSize / 2 - 5 -type Props = { - selectedDay: Day - shouldAnimate: boolean -} - -const Clock: FC = ({ selectedDay, shouldAnimate }: Props) => { +const Clock: FC = () => { const goToSleepWindowStart = useSelector(getGoToSleepWindowStart) const goToSleepWindowEnd = useSelector(getGoToSleepWindowEnd) - const selectedItem = useSelector(getSelectedItem) + const selectedDay = useSelector(getSelectedDay) const editMode = useSelector(getEditMode) const dispatch = useDispatch() @@ -52,21 +46,17 @@ const Clock: FC = ({ selectedDay, shouldAnimate }: Props) => { const hasData = selectedDay.night ? selectedDay.night.length !== 0 : false - const isDarkMode = useSelector(getIsDarkMode) - return ( - + = ({ selectedDay, shouldAnimate }: Props) => { y={y} radius={inBedRadius} /> - - + + {!editMode && ( = ({ selectedDay, shouldAnimate }: Props) => { date={selectedDay.date} /> )} - - - {!editMode && ( - - )} - + ) @@ -150,9 +122,11 @@ const ClockContainer = styled(Animated.View)` flex-direction: column; align-items: center; justify-content: center; - border-radius: 300px; - background-color: ${({ theme }) => theme.PRIMARY_BACKGROUND_COLOR}; + background-color: ${({ theme }) => theme.SECONDARY_BACKGROUND_COLOR}; padding: 5px; + border-radius: 7px; + flex: 1; + margin-top: 8px; ` const StyledSvg = styled(Svg)` diff --git a/src/components/CoachingSpecific/WeekCarousel.tsx b/src/components/CoachingSpecific/WeekCarousel.tsx index 9d233aa..ecc34d9 100644 --- a/src/components/CoachingSpecific/WeekCarousel.tsx +++ b/src/components/CoachingSpecific/WeekCarousel.tsx @@ -57,7 +57,6 @@ const WeekCarousel: FC = () => { directionalLockEnabled initialScrollIndex={activeWeekIndex} snapToOffsets={snapOffets} - debug getItemLayout={(_: CombinedWeek[], index: number) => ({ index, length: cardWidth, diff --git a/src/components/HabitCard/HabitCard.tsx b/src/components/HabitCard/HabitCard.tsx index f89dcfe..9f5a4f1 100644 --- a/src/components/HabitCard/HabitCard.tsx +++ b/src/components/HabitCard/HabitCard.tsx @@ -11,7 +11,7 @@ import Swipeable from 'react-native-gesture-handler/Swipeable' import { useDispatch } from 'react-redux' import styled from 'styled-components/native' import { Habit } from 'Types/State/habit-state' -import { toggleEditHabitModal } from '../../actions/modal/modal-actions' +import { toggleEditHabitModal } from '@actions/modal/modal-actions' import { isCompletedToday } from '../../helpers/habits' import colors from '../../styles/colors' import { fonts, StyleProps } from '../../styles/themes' diff --git a/src/components/HabitCard/HabitCardManage.tsx b/src/components/HabitCard/HabitCardManage.tsx index d6498a1..8c46a12 100644 --- a/src/components/HabitCard/HabitCardManage.tsx +++ b/src/components/HabitCard/HabitCardManage.tsx @@ -8,7 +8,7 @@ import { archiveMicrotask, deleteMicroTaskById, markTodayAsCompleted -} from '../../actions/habit/habit-actions' +} from '@actions/habit/habit-actions' import { fonts, StyleProps } from '../../styles/themes' import { MicroTask } from '../../Types/Microtask' import TranslatedText from '../TranslatedText' diff --git a/src/components/IAPComponents/SubscriptionItem.tsx b/src/components/IAPComponents/SubscriptionItem.tsx index 1a9196b..39e4494 100644 --- a/src/components/IAPComponents/SubscriptionItem.tsx +++ b/src/components/IAPComponents/SubscriptionItem.tsx @@ -2,7 +2,7 @@ import React from 'react' import { PurchasesPackage } from 'react-native-purchases' import { useDispatch } from 'react-redux' import styled from 'styled-components/native' -import { purchaseSubscription } from '../../actions/subscription/subscription-actions' +import { purchaseSubscription } from '@actions/subscription/subscription-actions' import colors from '../../styles/colors' import { fonts, StyleProps } from '../../styles/themes' import TranslatedText from '../TranslatedText' diff --git a/src/components/MainScreenSpecific/ClockCarousel.tsx b/src/components/MainScreenSpecific/ClockCarousel.tsx index 40363b5..ea2833d 100644 --- a/src/components/MainScreenSpecific/ClockCarousel.tsx +++ b/src/components/MainScreenSpecific/ClockCarousel.tsx @@ -5,17 +5,16 @@ import styled from 'styled-components/native' import { setActiveIndex, setSelectedDay -} from '../../actions/sleep/sleep-data-actions' +} from '@actions/sleep/sleep-data-actions' import { WIDTH } from '../../helpers/Dimensions' import keyExtractor from '../../helpers/KeyExtractor' -import { StyleProps } from '../../src/styles/themes' import { getEditMode } from '../../store/Selectors/ManualDataSelectors' import { getActiveIndex, getWeekReversedSelector } from '../../store/Selectors/SleepDataSelectors' -import SCClock from '../sleepclock' -import ClockEmpty from '../sleepClock/ClockEmpty' +import SCClock from '../Clock' +import ClockEmpty from '../clock/ClockEmpty' const ClockCarousel = () => { const dispatch = useDispatch() @@ -135,10 +134,9 @@ const transitionAnimation = (index: number) => ({ ] }) -const Clocks = styled(Animated.FlatList).attrs((props: StyleProps) => ({ +const Clocks = styled(Animated.FlatList).attrs(() => ({ contentContainerStyle: {} }))` height: ${WIDTH}px; - background-color: ${(props: StyleProps) => - props.theme.PRIMARY_BACKGROUND_COLOR}; + background-color: ${({ theme }) => theme.PRIMARY_BACKGROUND_COLOR}; ` diff --git a/src/components/MainScreenSpecific/EditNightHeader.tsx b/src/components/MainScreenSpecific/EditNightHeader.tsx index c0c8df9..c44f718 100644 --- a/src/components/MainScreenSpecific/EditNightHeader.tsx +++ b/src/components/MainScreenSpecific/EditNightHeader.tsx @@ -4,7 +4,7 @@ import styled from 'styled-components/native' import { addManualDataToNight, toggleEditMode -} from '../../actions/manual-sleep/manual-sleep-actions' +} from '@actions/manual-sleep/manual-sleep-actions' import { SMART_TOP_PADDING } from '../../helpers/Dimensions' import colors from '../../styles/colors' import { fonts, StyleProps } from '../../styles/themes' diff --git a/src/components/MainScreenSpecific/EnablePushCheck.tsx b/src/components/MainScreenSpecific/EnablePushCheck.tsx index 76325be..969ee10 100644 --- a/src/components/MainScreenSpecific/EnablePushCheck.tsx +++ b/src/components/MainScreenSpecific/EnablePushCheck.tsx @@ -1,7 +1,7 @@ import NotificationCard from 'components/NotificationCenter/NotificationCard' import React from 'react' import { useDispatch, useSelector } from 'react-redux' -import { askForPush } from '../../actions/NotificationActions' +import { askForPush } from '@actions/NotificationActions' import { actionCreators } from '../../store/Reducers/NotificationReducer' import { getShouldAskForPermission } from '../../store/Selectors/NotificationSelectors' diff --git a/src/components/MainScreenSpecific/HelpInfo.tsx b/src/components/MainScreenSpecific/HelpInfo.tsx index 74fccbd..4419371 100644 --- a/src/components/MainScreenSpecific/HelpInfo.tsx +++ b/src/components/MainScreenSpecific/HelpInfo.tsx @@ -1,7 +1,7 @@ import NotificationCard from 'components/NotificationCenter/NotificationCard' import React, { memo } from 'react' import { useDispatch, useSelector } from 'react-redux' -import { markIntercomHelpAsRead } from '../../actions/onboarding/onboarding-actions' +import { markIntercomHelpAsRead } from '@actions/onboarding/onboarding-actions' import { getIntercomNeedHelpRead } from '../../store/Selectors/OnboardingSelectors' const HelpInfo = () => { diff --git a/src/components/Primitives/Primitives.tsx b/src/components/Primitives/Primitives.tsx index 0febed5..1600af9 100644 --- a/src/components/Primitives/Primitives.tsx +++ b/src/components/Primitives/Primitives.tsx @@ -36,6 +36,10 @@ export const Row = styled.View` justify-content: space-between; ` +export const Column = styled.View` + flex-direction: column; +` + export const BGContainer = styled.View` flex: 1; background-color: ${(props: StyleProps) => @@ -209,7 +213,7 @@ interface CheckBoxProps { readonly checked: boolean size: number | string } -export const CheckBox = ({ checked, size }: CheckBoxProps) => { +export const CheckBox: FC = ({ checked, size }) => { return ( { const dispatch = useDispatch() diff --git a/src/components/TabBarIcon.tsx b/src/components/TabBarIcon.tsx index 9e742d7..6c119aa 100644 --- a/src/components/TabBarIcon.tsx +++ b/src/components/TabBarIcon.tsx @@ -1,11 +1,11 @@ -import React, { memo } from 'react' +import React, { memo, FC } from 'react' import { View } from 'react-native' import styled from 'styled-components/native' import colors from '../styles/colors' import { fonts } from '../styles/themes' import { IconBold } from './iconRegular' -export interface TabBarIconProps { +export type TabBarIconProps = { focused: boolean tintColor: string routeName: string @@ -15,12 +15,13 @@ export interface TabBarIconProps { const tabBarIcons = { Sleep: 'clockBold', Coaching: 'schoolPhysicalBold', + Habits: 'checklist', Feed: 'multiUsers', Profile: 'userBold', Settings: 'settingsBold' } -const SCTabBarIcon = ({ +const TabBarIcon: FC = ({ focused, tintColor, routeName, @@ -43,7 +44,7 @@ const SCTabBarIcon = ({ ) } -export default memo(SCTabBarIcon) +export default TabBarIcon const Badge = styled.View` position: absolute; diff --git a/src/components/TabBarLabel.tsx b/src/components/TabBarLabel.tsx index fac875e..1762b0d 100644 --- a/src/components/TabBarLabel.tsx +++ b/src/components/TabBarLabel.tsx @@ -1,18 +1,18 @@ -import * as React from 'react' +import React, { FC } from 'react' import styled from 'styled-components/native' import translate from '../config/i18n' import colors from '../styles/colors' -import { fonts, StyleProps } from '../styles/themes' +import { StyleProps } from '../styles/themes' -export interface TabBarLabelProps { +type Props = { focused: boolean tintColor: string - children: any + label: string } -const TabBarLabel = (props: TabBarLabelProps) => ( - - {translate(props.children)} +const TabBarLabel: FC = ({ focused, label }) => ( + + {translate(label.toUpperCase())} ) @@ -25,8 +25,7 @@ interface TextProps extends StyleProps { const Text = styled.Text` font-size: 12px; text-align: center; - color: ${(props: TextProps) => - props.focused ? colors.radiantBlue : props.theme.PRIMARY_TEXT_COLOR}; - font-family: ${(props: TextProps) => - props.focused ? fonts.bold : fonts.medium}; + color: ${({ focused, theme }) => + focused ? colors.radiantBlue : theme.SECONDARY_TEXT_COLOR}; + font-family: ${({ theme }) => theme.FONT_MEDIUM}; ` diff --git a/src/components/TextField.tsx b/src/components/TextField.tsx index 149b2a2..957355f 100644 --- a/src/components/TextField.tsx +++ b/src/components/TextField.tsx @@ -1,4 +1,4 @@ -import React, { useRef } from 'react' +import React, { useRef, FC } from 'react' import { NativeSyntheticEvent, TextInputProps } from 'react-native' import styled from 'styled-components/native' import translate from '../config/i18n' @@ -7,7 +7,7 @@ import { constants, fonts, StyleProps } from '../styles/themes' import { IconBold } from './iconRegular' import TranslatedText from './TranslatedText' -interface SCTextInputProps extends TextInputProps { +interface Props extends TextInputProps { value?: string error?: string fieldName: string @@ -15,38 +15,40 @@ interface SCTextInputProps extends TextInputProps { ref?: any } -const TextField = (props: SCTextInputProps) => { - const { - value, - onBlur, - onEndEditing, - onSubmitEditing, - error, - fieldName, - icon, - ref, - keyboardType, - autoCorrect, - autoCompleteType, - textContentType, - autoCapitalize, - returnKeyType, - enablesReturnKeyAutomatically, - placeholder, - secureTextEntry - } = props - +const TextField: FC = ({ + value, + onBlur, + onEndEditing, + onSubmitEditing, + error, + fieldName, + icon, + ref, + keyboardType, + autoCorrect, + autoCompleteType, + textContentType, + autoCapitalize, + returnKeyType, + enablesReturnKeyAutomatically, + placeholder, + secureTextEntry +}) => { const inputRef: any = useRef(ref) const onFocus = () => { inputRef.current.focus() } - const handleOnBlur = (event: NativeSyntheticEvent) => { + const handleOnBlur = ( + event: NativeSyntheticEvent + ) => { onBlur && onBlur(event) } - const handleOnEndEditing = (event: NativeSyntheticEvent) => { + const handleOnEndEditing = ( + event: NativeSyntheticEvent + ) => { onEndEditing && onEndEditing(event) } @@ -59,10 +61,9 @@ const TextField = (props: SCTextInputProps) => { - + { + const dispatch = useDispatch() + const onPress = () => { + dispatch(toggleEditMode()) + } + return ( + + + + + + ) +} + +export default AddNightButton + +const Container = styled.View` + position: absolute; + bottom: 25px; + left: 35px; +` + +const Touchable = styled.TouchableOpacity` + padding: 5px; +` diff --git a/src/components/sleepClock/CircularSlider.tsx b/src/components/clock/CircularSlider.tsx similarity index 98% rename from src/components/sleepClock/CircularSlider.tsx rename to src/components/clock/CircularSlider.tsx index dbebf06..0403446 100644 --- a/src/components/sleepClock/CircularSlider.tsx +++ b/src/components/clock/CircularSlider.tsx @@ -1,4 +1,4 @@ -import { interpolateHcl as interpolateGradient } from 'd3-interpolate' +import { interpolateHcl as interpolateGradient } from 'd3' import range from 'lodash/range' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' @@ -256,7 +256,8 @@ export default class CircularSlider extends PureComponent { fill={gradientColorTo} transform={{ translate: `${stop.toX}, ${stop.toY}` }} onPressIn={() => - this.setState({ angleLength: angleLength + Math.PI / 2 })} + this.setState({ angleLength: angleLength + Math.PI / 2 }) + } {...this._wakePanResponder.panHandlers}> { - const sticks = range(12).map((hour, index) => { +const ClockTimes: FC = ({ x, y, radius }) => { + const sticks = range(12).map((hour) => { const stickStart = polarToCartesian(x, y, radius - 20, hour * 30) const stickEnd = polarToCartesian(x, y, radius, hour * 30) const time = polarToCartesian(x, y, radius - 35, hour * 30) return ( - + { + const { bedStart, bedEnd } = useSelector(getSelectedDay) + const goToSleepWindowStart = useSelector(getGoToSleepWindowStart) + const goToSleepWindowEnd = useSelector(getGoToSleepWindowEnd) + + const wentToBed = getFormattedDateOrPlaceholder(bedStart, 'H:m') + const wokeUp = getFormattedDateOrPlaceholder(bedEnd, 'H:m') + const windowStart = getFormattedDateOrPlaceholder(goToSleepWindowStart, 'H:m') + const windowEnd = getFormattedDateOrPlaceholder(goToSleepWindowEnd, 'H:m') + + return ( + + Insights + + +
+ + + {wentToBed} + STAT.WENT_TO_BED + +
+ +
+ + + {wokeUp} + Woke up + +
+ + + +
+ + + 4:00 + WOKE_UP + +
+ +
+ + + + {windowStart} - {windowEnd} + + STAT.WINDOW + +
+ + + ) +} + +export default InsightsCard + +const Row = styled.View` + flex-direction: row; + margin: 15px 0px; +` + +const Container = styled.View` + flex: 1; + background-color: ${({ theme }) => theme.SECONDARY_BACKGROUND_COLOR}; + border-radius: 7px; + margin-top: 8px; + padding: 10px 20px; +` + +const Title = styled.Text` + font-family: ${({ theme }) => theme.FONT_BOLD}; + font-size: 15px; + color: ${({ theme }) => theme.PRIMARY_TEXT_COLOR}; + margin-bottom: 10px; +` + +const Figure = styled.View` + flex-direction: row; + align-items: center; + flex: 1; + margin-right: 30px; +` + +const Icon = styled(IconBold).attrs(() => ({}))` + margin-right: 10px; +` + +const Value = styled.Text` + color: ${({ theme }) => theme.PRIMARY_TEXT_COLOR}; + font-family: ${({ theme }) => theme.FONT_MEDIUM}; + font-size: 20px; +` + +const Description = styled(TranslatedText)` + color: ${({ theme }) => theme.SECONDARY_TEXT_COLOR}; + font-family: ${({ theme }) => theme.FONT_REGULAR}; + font-size: 13px; +` diff --git a/src/config/routes/JournalNavigator.tsx b/src/config/routes/JournalNavigator.tsx index a4cf94d..1bd04d5 100644 --- a/src/config/routes/JournalNavigator.tsx +++ b/src/config/routes/JournalNavigator.tsx @@ -1,15 +1,14 @@ import { createNativeStackNavigator } from '@react-navigation/native-stack' -import React from 'react' -import { JournalStackParamList } from 'Types/navigation/navigation' +import React, { FC } from 'react' import NotificationCenter from 'screens/main/NotificationCenter' -import Details from '../../screens/main/DetailView' +import { JournalStackParamList } from 'Types/navigation/navigation' import Main from '../../screens/main/main' import Habits from '../../screens/Shared/HabitView' import ROUTE from './Routes' const Stack = createNativeStackNavigator() -const JournalNavigator = () => { +const JournalNavigator: FC = () => { return ( { component={Main} options={{ headerShown: false }} /> - + { +const TabNavigator: FC = () => { const intercomNotifications = useSelector(getIntercomNotificationCount) return ( ({ + screenOptions={({ route }) => ({ tabBarLabel: ({ focused, tintColor }: TabBarIconProps) => { return ( @@ -30,7 +31,7 @@ const TabNavigator = () => { }, tabBarIcon: ({ focused, tintColor }: TabBarIconProps) => { return ( - { /> ) } - })} - tabBarOptions={{ - inactiveTintColor: 'gray' - }}> + })}> { tabBarVisible: getTabBarVisible(route) })} /> + @@ -71,6 +70,8 @@ const getTabBarVisible = (route: RouteProp) => { return false case ROUTE.LESSON: return false + default: + return true } } diff --git a/src/helpers/time.ts b/src/helpers/time.ts index d8eead3..f70ba4a 100644 --- a/src/helpers/time.ts +++ b/src/helpers/time.ts @@ -1,14 +1,15 @@ import Moment from 'moment' +import { format, parseISO, isValid } from 'date-fns' import translate from '../config/i18n' import { Day } from '../Types/Sleepdata' type Moment = typeof Moment -export function to12hClock(hour: number) { +export function to12hClock(hour: number): number { return hour > 12 ? hour - 12 : hour } -export function momentTimeToPolar(time: string) { +export function momentTimeToPolar(time: string): number { const momentTime = Moment(time) const angle = ((to12hClock(momentTime.hour()) + momentTime.minute() / 60) / 12) * 360 @@ -19,7 +20,7 @@ export function momentTimeToPolar(time: string) { export function minutesToHoursString( minutes: number | undefined, longFormat?: boolean -) { +): string { if (!minutes) { return '-' } @@ -34,7 +35,7 @@ export function minutesToHoursString( return `${(minutes / 60).toFixed(1)} h` } -export function getTimeInString(minutes: number) { +export function getTimeInString(minutes: number): string { if (!minutes) { return '-' } @@ -43,22 +44,22 @@ export function getTimeInString(minutes: number) { return `${time.format('H')} h ${time.format('mm')} ` } -export function returnNightString(date: string) { +export function returnNightString(date: string): string { const startDate = Moment(date) const endDate = startDate.add(1, 'day') } -export function formatDate(date: string) { +export function formatDate(date: string): string { return Moment(date).format('dddd Do MMMM') } -export function formatMinutesToHours(minutes: number) { +export function formatMinutesToHours(minutes: number): number { const value = Moment.duration(minutes, 'minutes').humanize() return value } -export function isWeekend(day: Day) { +export function isWeekend(day: Day): boolean { if (Moment(day.date).day() === 0 || Moment(day.date).day() === 6) { return true } @@ -69,7 +70,7 @@ export function isWeekend(day: Day) { * * @param {*} dateString */ -export function getStartTimeInMinutes(date: string) { +export function getStartTimeInMinutes(date: string): number { const timeMoment = Moment(date) const timeInPureMinutes = timeMoment.hours() * 60 + timeMoment.minutes() const periodEnd = 360 // 6 in the morning @@ -82,7 +83,7 @@ export function getStartTimeInMinutes(date: string) { return timeInPureMinutes } -export function toNightTime(date: string) { +export function toNightTime(date: string): string { const nightEnd = Moment(date) const nightStart = Moment(nightEnd).subtract(1, 'days').startOf('day') return `${nightStart.format('DD.MM.')} – ${nightEnd.format('DD.MM.')}` @@ -103,13 +104,13 @@ export const getTitle = () => { return { title: 'Good Night', subtitle: 'NIGHT_SUBTITLE' } } -export function nearestMinutes(interval: number, someMoment: any) { +export function nearestMinutes(interval: number, someMoment: any): string { const roundedMinutes = Math.round(someMoment.clone().minute() / interval) * interval return someMoment.clone().minute(roundedMinutes).second(0) } -export const formatTimer = (numberOfSeconds: number) => { +export const formatTimer = (numberOfSeconds: number): number => { const hours = Math.floor(numberOfSeconds / 3600) const minutes = Math.floor((numberOfSeconds - hours * 3600) / 60) const seconds = numberOfSeconds - hours * 3600 - minutes * 60 @@ -143,11 +144,14 @@ export function sameDay( return s1.isSame(s2, 'day') } -export function calculateMinutesFromAngle(angle: number) { +export function calculateMinutesFromAngle(angle: number): number { return Math.round(angle / ((2 * Math.PI) / (12 * 12))) * 5 } -export function calculateTimeFromAngle(angle: number, start: boolean) { +export function calculateTimeFromAngle( + angle: number, + start: boolean +): { h: number; m: number } { if (start) { const minutes = calculateMinutesFromAngle(angle) const h = Math.floor(minutes / 60) @@ -166,7 +170,7 @@ export function calculateTimeFromAngle(angle: number, start: boolean) { export function calculateEndTimeFromAngle( startAngle: number, endAngle: number -) { +): { h: number; m: number } { const startMinutes = calculateMinutesFromAngle(startAngle) const startHours = Math.floor(startMinutes / 60) const startCorrected = startHours >= 6 ? startHours + 12 : startHours @@ -182,7 +186,9 @@ export function calculateEndTimeFromAngle( return { m, h: endCorrected } } -export function calculateTimeFromAngleAM(angle: number) { +export function calculateTimeFromAngleAM( + angle: number +): { h: number; m: number } { const minutes = calculateMinutesFromAngle(angle) const h = Math.floor(minutes / 60) + 12 const m = minutes - h * 60 @@ -190,16 +196,27 @@ export function calculateTimeFromAngleAM(angle: number) { return { h, m } } -export function roundAngleToFives(angle: number) { +export function roundAngleToFives(angle: number): number { const fiveMinuteAngle = (2 * Math.PI) / 144 return Math.round(angle / fiveMinuteAngle) * fiveMinuteAngle } -export function padMinutes(min: number) { +export function padMinutes(min: number): number { if (`${min}`.length < 2) { return `0${min}` } return min } + +export const getFormattedDateOrPlaceholder = ( + value: string | null | undefined, + formatter: string +): string => { + if (value && isValid(value)) { + return format(parseISO(value), formatter) + } + + return '-' +} diff --git a/src/screens/Auth/ConfirmUser.tsx b/src/screens/Auth/ConfirmUser.tsx index 09f711f..7c35ea8 100644 --- a/src/screens/Auth/ConfirmUser.tsx +++ b/src/screens/Auth/ConfirmUser.tsx @@ -1,7 +1,7 @@ import React from 'react' import { useDispatch, useSelector } from 'react-redux' import styled from 'styled-components/native' -import { resendEmail } from '../../actions/auth/auth-actions' +import { resendEmail } from '@actions/auth/auth-actions' import BackToAppButton from '../../components/Buttons/BackToAppButton' import BottomButton from '../../components/Buttons/BottomButton' import { PrimaryButton } from '../../components/Buttons/PrimaryButton' diff --git a/src/screens/Auth/ForgotPasswordScreen.tsx b/src/screens/Auth/ForgotPasswordScreen.tsx index 040e518..31ca879 100644 --- a/src/screens/Auth/ForgotPasswordScreen.tsx +++ b/src/screens/Auth/ForgotPasswordScreen.tsx @@ -6,7 +6,7 @@ import { ConfirmationSchema } from 'config/Validation' import { requestNewPassword, submitNewPassword -} from '../../actions/auth/auth-actions' +} from '@actions/auth/auth-actions' import BottomButton from '../../components/Buttons/BottomButton' import TextButton from '../../components/Buttons/TextButton' import { Container, H1, H4 } from '../../components/Primitives/Primitives' diff --git a/src/screens/Auth/Login.tsx b/src/screens/Auth/Login.tsx index 546d91a..700cab6 100644 --- a/src/screens/Auth/Login.tsx +++ b/src/screens/Auth/Login.tsx @@ -5,7 +5,7 @@ import { ScrollView } from 'react-native' import { useDispatch, useSelector } from 'react-redux' import { getLoading } from 'store/Selectors/auth-selectors/auth-selectors' import styled from 'styled-components/native' -import { login } from '../../actions/auth/auth-actions' +import { login } from '@actions/auth/auth-actions' import BackToAppButton from '../../components/Buttons/BackToAppButton' import BottomButton from '../../components/Buttons/BottomButton' import MergingDialog from '../../components/modals/MergeHabitsModal/MergeHabitsModal' diff --git a/src/screens/Auth/RegisterScreen.tsx b/src/screens/Auth/RegisterScreen.tsx index e76c682..d8e9598 100644 --- a/src/screens/Auth/RegisterScreen.tsx +++ b/src/screens/Auth/RegisterScreen.tsx @@ -4,7 +4,7 @@ import React, { memo } from 'react' import { ActivityIndicator, Dimensions, ScrollView } from 'react-native' import { useDispatch, useSelector } from 'react-redux' import styled from 'styled-components/native' -import { register } from '../../actions/auth/auth-actions' +import { register } from '@actions/auth/auth-actions' import Disclaimer from '../../components/AuthSpecific/Disclaimer' import BackToAppButton from '../../components/Buttons/BackToAppButton' import BottomButton from '../../components/Buttons/BottomButton' diff --git a/src/screens/Shared/HabitView.tsx b/src/screens/Shared/HabitView.tsx index e7c3703..7c0486b 100644 --- a/src/screens/Shared/HabitView.tsx +++ b/src/screens/Shared/HabitView.tsx @@ -1,25 +1,23 @@ -import React, { memo } from 'react' -import { SectionList, Text } from 'react-native' +import React, { FC } from 'react' +import { SectionList } from 'react-native' import { useSelector } from 'react-redux' import { getActiveHabits, getArchivedHabits } from 'store/Selectors/habit-selectors/habit-selectors' import { Habit } from 'Types/State/habit-state' -import GoBack, { GoBackContainer } from '../../components/Buttons/GoBack' import CoachingSectionHeader from '../../components/CoachingSpecific/CoachingSectionHeader' import EmptyState from '../../components/EmptyState' import HabitCard from '../../components/HabitCard/HabitCard' import EditHabitModal from '../../components/modals/HabitModal/EditHabitModal' import { Container, - H1, P, + PageTitle, SafeAreaView } from '../../components/Primitives/Primitives' -import keyExtractor from '../../helpers/KeyExtractor' -const HabitView = () => { +const HabitView: FC = () => { const activeHabits = useSelector(getActiveHabits) const archivedHabits = useSelector(getArchivedHabits) @@ -32,7 +30,7 @@ const HabitView = () => { { title: 'HABIT.ARCHIVED', data: archivedHabits } ] - const habitKeyExtractor = (item: Habit, index: number) => { + const habitKeyExtractor = (item: Habit) => { return item.id } @@ -41,11 +39,8 @@ const HabitView = () => { ( <> - - - + HABIT.HABIT_TITLE -

HABIT.HABIT_TITLE

HABIT.EXPLANATION_1

HABIT.EXPLANATION_2

 diff --git a/src/screens/Welcome/Welcome.tsx b/src/screens/Welcome/Welcome.tsx index 1b06e07..bb01e16 100644 --- a/src/screens/Welcome/Welcome.tsx +++ b/src/screens/Welcome/Welcome.tsx @@ -3,7 +3,7 @@ import { Platform, View } from 'react-native' import { useDispatch } from 'react-redux' import styled from 'styled-components/native' import { prepareSleepDataFetching } from '@actions/sleep/health-kit-actions' -import { markIntroductionCompleted } from '../../actions/user/user-actions' +import { markIntroductionCompleted } from '@actions/user/user-actions' import AnimationContainer from '../../components/animationContainer' import ScalingButton from '../../components/Buttons/ScalingButton' import TranslatedText from '../../components/TranslatedText' diff --git a/src/screens/coaching/CoachingView.tsx b/src/screens/coaching/CoachingView.tsx index 63b6890..64c7f84 100644 --- a/src/screens/coaching/CoachingView.tsx +++ b/src/screens/coaching/CoachingView.tsx @@ -3,7 +3,7 @@ import { RefreshControl } from 'react-native' import { useDispatch, useSelector } from 'react-redux' import { getCoachingNotStarted } from 'store/Selectors/coaching-selectors/coaching-selectors' import { getLoadingContent } from 'store/Selectors/content-selectors/content-selectors' -import { getAllWeeks } from '../../actions/coaching/content-actions' +import { getAllWeeks } from '@actions/coaching/content-actions' import BuyCoachingButton from '../../components/CoachingSpecific/BuyCoachingButton' import CoachingHeader from '../../components/CoachingSpecific/CoachingHeader' import CoachingNotStarted from '../../components/CoachingSpecific/CoachingNotStarted' diff --git a/src/screens/coaching/LessonView.tsx b/src/screens/coaching/LessonView.tsx index ccb7156..92eb516 100644 --- a/src/screens/coaching/LessonView.tsx +++ b/src/screens/coaching/LessonView.tsx @@ -15,7 +15,7 @@ import Tags from 'components/LessonComponents/Tags' import { popFromIncompleteLessons, pushInteractedLesson -} from '../../actions/CoachingNotification/CoachingNotificationActions' +} from '@actions/CoachingNotification/CoachingNotificationActions' import Authors from '../../components/CoachingSpecific/Authors' import TopHeader from '../../components/CoachingSpecific/TopHeader' import WeekViewHeader from '../../components/CoachingSpecific/WeekViewHeader' diff --git a/src/screens/main/DetailView.tsx b/src/screens/main/DetailView.tsx deleted file mode 100644 index 302999f..0000000 --- a/src/screens/main/DetailView.tsx +++ /dev/null @@ -1,227 +0,0 @@ -import Moment from 'moment' -import React, { memo } from 'react' -import { FlatList } from 'react-native' -import Animated from 'react-native-reanimated' -import { useDispatch } from 'react-redux' -import styled from 'styled-components/native' -import BackButton from '../../components/Buttons/backButton' -// import HeartRateChart from '../../components/Charts/HeartRateChart'; -// import MapView, { Marker } from 'react-native-maps'; -import SleepTimeChart from '../../components/Charts/sleepTimeChart' -import SampleRow from '../../components/DetailView/SampleRow' -// import HeartRateChart from '../../components/Charts/HeartRateChart'; -import EmptyState from '../../components/EmptyState' -import { Container, H2 } from '../../components/Primitives/Primitives' -import TinyCard from '../../components/TinyCard' -import { HEADER_MAX_HEIGHT, HEADER_MIN_HEIGHT } from '../../helpers/Dimensions' -import { getTimeInString, toNightTime } from '../../helpers/time' -import { colorPairs } from '../../styles/colors' -import { Night } from '../../Types/Sleepdata' - -const yOffset = new Animated.Value(0) - -const headerHeight = () => { - return { - height: yOffset.interpolate({ - inputRange: [0, HEADER_MAX_HEIGHT - HEADER_MIN_HEIGHT], - outputRange: [HEADER_MAX_HEIGHT, HEADER_MIN_HEIGHT], - extrapolateRight: Animated.Extrapolate.CLAMP - }) - } -} - -interface DetailViewProps { - navigation: any -} - -const DetailView = (props: DetailViewProps) => { - const { navigation } = props - const currentDay = navigation.getParam('selectedDay', '') - // const heartRateData = navigation.getParam('heartRateData', ''); - const dispatch = useDispatch() - - const renderNightDataItems = () => { - const noData = - currentDay && currentDay.night && currentDay.night.length !== 0 - - return currentDay.night.map((sample: Night, index: number) => ( - - )) - } - - const getFallAsleep = () => { - const { bedStart } = currentDay - const { sleepStart } = currentDay - if (bedStart || sleepStart) { - const startTime = sleepStart || bedStart - return Moment(startTime).format('HH:mm') - } - return '-' - } - - const getWakeUp = () => { - const { bedEnd } = currentDay - const { sleepEnd } = currentDay - if (bedEnd || sleepEnd) { - const startTime = bedEnd || sleepEnd - return Moment(startTime).format('HH:mm') - } - return '-' - } - - const renderUnfilteredNightDataItems = () => { - const noData = - currentDay && - currentDay.unfilteredNight && - currentDay.unfilteredNight.length !== 0 - - return noData ? ( - currentDay.unfilteredNight.map((sample: Night, index: number) => ( - - )) - ) : ( - - ) - } - - const renderRow = ({ item, index }: any) => { - return ( - - ) - } - - const cardsData = [ - { - title: 'Fell asleep', - figure: getFallAsleep(), - iconColor: colorPairs.fallAsleep, - iconBg: colorPairs.fallAsleepBg, - icon: 'daySunset' - }, - { - title: 'Wake up', - figure: getWakeUp(), - iconColor: colorPairs.wakeUp, - iconBg: colorPairs.wakeUpBg, - icon: 'daySunrise' - }, - { - title: 'Time in bed', - figure: getTimeInString(currentDay.inBedDuration), - iconColor: colorPairs.inBed, - iconBg: colorPairs.inBedBg, - icon: 'bedDoubleBold' - }, - - { - title: 'Time asleep', - figure: getTimeInString(currentDay.asleepDuration), - iconColor: colorPairs.asleep, - iconBg: colorPairs.asleepBg, - icon: 'bedDoubleBold' - } - // { - // title: 'Bedtime', - // figure: '600', - // iconColor: colorPairs.sleepWindow, - // iconBg: colorPairs.sleepWindowBg, - // icon: 'bedWindow', - // }, - - // { - // title: 'Social Jetlag', - // figure: '600', - // iconColor: colorPairs.inBed, - // iconBg: colorPairs.inBedBg, - // icon: 'scale', - // }, - ] - - const includeSample = () => { - // await dispatch - } - - const ItemSeparatorComponent = () => { - return - } - - const cards = cardsData.map((item, index) => ( - - )) - return ( - -
- - - - {toNightTime(currentDay.date)} - -
- - - {cards} - -

Analysis samples

- } - data={currentDay.night} - renderItem={renderRow} - /> -

All data samples

- } - data={currentDay.unfilteredNight} - renderItem={renderRow} - /> - {/* Notes */} - - - - - ) -} - -export default memo(DetailView) - -const Header = styled(Animated.View)`` - -const BackButtonContainer = styled.View`` - -const Title = styled.Text`` - -const SubTitle = styled.Text`` - -const CardContainer = styled.View` - flex-direction: row; - flex-wrap: wrap; - padding: 20px; - margin: 200px 0px 20px; -` diff --git a/src/screens/main/main.tsx b/src/screens/main/main.tsx index a5e1c64..c323f49 100644 --- a/src/screens/main/main.tsx +++ b/src/screens/main/main.tsx @@ -14,8 +14,8 @@ import { getHealthKitLoading } from 'store/Selectors/health-kit-selectors/health import { fetchSleepData, updateCalendar -} from '../../actions/sleep/sleep-data-actions' -import { backgroundAction, startup } from '../../actions/StartupActions' +} from '@actions/sleep/sleep-data-actions' +import { backgroundAction, startup } from '@actions/StartupActions' import DayStrip from '../../components/DayStrip' import Habits from '../../components/HabitList/HabitList' import ClockCarousel from '../../components/MainScreenSpecific/ClockCarousel' @@ -28,6 +28,7 @@ import TopInfo from '../../components/TopInfo' import useBackgroundFetch from '../../Hooks/UseBackgroundFetch' import useNotificationEventHandlers from '../../Hooks/UseNotificationEventHandlers' import colors from '../../styles/colors' +import SleepTimeChart from 'components/Charts/sleepTimeChart' const MainScreen = () => { const isLoadingSleepData = useSelector(getHealthKitLoading) @@ -64,6 +65,7 @@ const MainScreen = () => { } + footer={} refreshControl={ { const dispatch = useDispatch() diff --git a/src/screens/settings/ManageSubscription.tsx b/src/screens/settings/ManageSubscription.tsx index 99381ab..08aa8ee 100644 --- a/src/screens/settings/ManageSubscription.tsx +++ b/src/screens/settings/ManageSubscription.tsx @@ -7,7 +7,7 @@ import Purchases, { PurchasesEntitlementInfos } from 'react-native-purchases' import { useDispatch, useSelector } from 'react-redux' import styled from 'styled-components/native' import colors from 'styles/colors' -import { restorePurchase } from '../../actions/subscription/subscription-actions' +import { restorePurchase } from '@actions/subscription/subscription-actions' import GoBack, { GoBackContainer } from '../../components/Buttons/GoBack' import TextButton from '../../components/Buttons/TextButton' import { diff --git a/src/screens/settings/Notifications.tsx b/src/screens/settings/Notifications.tsx index 7004b51..6896aa7 100644 --- a/src/screens/settings/Notifications.tsx +++ b/src/screens/settings/Notifications.tsx @@ -20,7 +20,7 @@ import { getScheduledNotifications } from '../../store/Selectors/NotificationSelectors' import { State } from '../../Types/State' -import { setNotification } from '../../actions/NotificationActions' +import { setNotification } from '@actions/NotificationActions' export interface NotificationDataItemProps { enabled: boolean diff --git a/src/screens/settings/settings.tsx b/src/screens/settings/settings.tsx index b900986..29a29be 100644 --- a/src/screens/settings/settings.tsx +++ b/src/screens/settings/settings.tsx @@ -1,32 +1,32 @@ +import ROUTE from 'config/routes/Routes' import React, { memo, useMemo } from 'react' import { Linking, SectionList } from 'react-native' import Intercom from 'react-native-intercom' import Rate, { AndroidMarket } from 'react-native-rate' import { useDispatch, useSelector } from 'react-redux' import styled from 'styled-components/native' -import ROUTE from 'config/routes/Routes' -import { setTheme } from '../../actions/user/user-actions' +import { setTheme } from '@actions/user/user-actions' import { Title } from '../../components/InfoRow' -import IntercomProfilePictures from '../../components/SettingsSpecific/IntercomProfilePictures' import { H2, PageTitle, SafeAreaView } from '../../components/Primitives/Primitives' +import IntercomProfilePictures from '../../components/SettingsSpecific/IntercomProfilePictures' import SettingRow from '../../components/SettingsSpecific/settingRow' import VersionInformation from '../../components/SettingsSpecific/versionInformation' import TopInfo from '../../components/TopInfo' +import CONFIG from '../../config/Config' import keyExtractor from '../../helpers/KeyExtractor' +import { getIntercomNotificationCount } from '../../store/Selectors/NotificationSelectors' +import { getActiveCoaching } from '../../store/Selectors/subscription-selectors/SubscriptionSelectors' +import { getTheme } from '../../store/Selectors/UserSelectors' import { darkTheme, lightTheme, StyleProps, ThemeProps } from '../../styles/themes' -import { getIntercomNotificationCount } from '../../store/Selectors/NotificationSelectors' -import { getActiveCoaching } from '../../store/Selectors/subscription-selectors/SubscriptionSelectors' -import { getTheme } from '../../store/Selectors/UserSelectors' -import CONFIG from '../../config/Config' const options = { AppleAppID: '1440417031', diff --git a/src/screens/sleep/SleepView.tsx b/src/screens/sleep/SleepView.tsx new file mode 100644 index 0000000..6e52b86 --- /dev/null +++ b/src/screens/sleep/SleepView.tsx @@ -0,0 +1,110 @@ +import { + fetchSleepData, + updateCalendar +} from 'actions/sleep/sleep-data-actions' +import { backgroundAction, startup } from 'actions/StartupActions' +import SleepTimeChart from 'components/Charts/sleepTimeChart' +import Clock from 'components/Clock' +import DayStrip from 'components/DayStrip' +import { EditNightHeader } from 'components/MainScreenSpecific/EditNightHeader' +import InitializeSource from 'components/MainScreenSpecific/InitializeSources' +import ExplanationsModal from 'components/modals/ExplanationsModal' +import EditHabitModal from 'components/modals/HabitModal/EditHabitModal' +import NewHabitModal from 'components/modals/HabitModal/NewHabitModal' +import MergeHabitsModal from 'components/modals/MergeHabitsModal/MergeHabitsModal' +import RatingModal from 'components/RatingModal' +import InsightsCard from 'components/sleep/InsightsCard' +import useBackgroundFetch from 'Hooks/UseBackgroundFetch' +import useNotificationEventHandlers from 'Hooks/UseNotificationEventHandlers' +import moment from 'moment' +import React, { FC, useEffect } from 'react' +import { ScrollView } from 'react-native-gesture-handler' +import { useDispatch, useSelector } from 'react-redux' +import { getEditMode } from 'store/Selectors/ManualDataSelectors' +import { getSelectedDay } from 'store/Selectors/SleepDataSelectors' +import styled from 'styled-components/native' +import { SafeAreaView } from '../../components/Primitives/Primitives' + +const Sleep: FC = () => { + const today = useSelector(getSelectedDay) + const editModeOn = useSelector(getEditMode) + const dispatch = useDispatch() + + useNotificationEventHandlers() + + useEffect(() => { + dispatch(startup()) + }, []) + + useBackgroundFetch(15, async () => { + dispatch(backgroundAction()) + }) + + const checkSleepData = async () => { + await dispatch(fetchSleepData()) + await dispatch(updateCalendar()) + } + + return ( + + + }> + + + {moment(today.date).format('dddd')} + {moment(today.date).format('DD MMMM yyyy')} + + + + + + + + + + + + + + + + + + + + ) +} + +export default Sleep + +const Row = styled.View` + flex: 1; + flex-direction: row; + padding: 0px 8px; +` + +const Title = styled.Text` + text-transform: capitalize; + font-family: ${({ theme }) => theme.FONT_MEDIUM}; + color: ${({ theme }) => theme.PRIMARY_TEXT_COLOR}; + font-size: 28px; + margin-bottom: 5px; +` + +const Subtitle = styled.Text` + text-transform: capitalize; + font-family: ${({ theme }) => theme.FONT_MEDIUM}; + font-size: 13px; + color: ${({ theme }) => theme.SECONDARY_TEXT_COLOR}; +` + +const TitleRow = styled.View` + padding: 16px; + margin-bottom: 20px; +` + +const RefreshControl = styled.RefreshControl.attrs(({ theme }) => ({ + tintColor: theme.SECONDARY_TEXT_COLOR +}))`` diff --git a/src/store/Reducers/api-reducer/api-reducer.spec.ts b/src/store/Reducers/api-reducer/api-reducer.spec.ts index 4f4756d..6888b24 100644 --- a/src/store/Reducers/api-reducer/api-reducer.spec.ts +++ b/src/store/Reducers/api-reducer/api-reducer.spec.ts @@ -1,7 +1,7 @@ import { FITBIT_AUTHORIZE_SUCCESS, FITBIT_REVOKE_SUCCESS -} from '../../../actions/api-actions/fitbit-actions' +} from '@actions/api-actions/fitbit-actions' import reducer, { initialState } from './api-reducer' import { ResponseBase } from '../../../Types/State/api-state' diff --git a/src/store/Reducers/api-reducer/api-reducer.ts b/src/store/Reducers/api-reducer/api-reducer.ts index a5b4d6d..91ce213 100644 --- a/src/store/Reducers/api-reducer/api-reducer.ts +++ b/src/store/Reducers/api-reducer/api-reducer.ts @@ -5,7 +5,15 @@ import { FITBIT_AUTHORIZE_SUCCESS, FITBIT_REVOKE_SUCCESS, FITBIT_UPDATE_TOKEN -} from '../../../actions/api-actions/fitbit-actions' +} from '@actions/api-actions/fitbit-actions' +import { + FETCH_SLEEP_GARMIN_FAILURE, + FETCH_SLEEP_GARMIN_START, + FETCH_SLEEP_GARMIN_SUCCESS, + GARMIN_AUTHORIZE_SUCCESS, + GARMIN_REVOKE_SUCCESS, + GARMIN_UPDATE_TOKEN +} from '@actions/api-actions/garmin-actions' import { FETCH_GOOGLE_FIT_FAILURE, FETCH_GOOGLE_FIT_START, @@ -13,42 +21,33 @@ import { GOOGLE_FIT_AUTHORIZE_SUCCESS, GOOGLE_FIT_REVOKE_SUCCESS, GOOGLE_FIT_UPDATE_TOKEN -} from '../../../actions/api-actions/google-fit-actions' -import ReduxAction from '../../../Types/ReduxActions' -import { ApiState } from '../../../Types/State/api-state' +} from '@actions/api-actions/google-fit-actions' import { - OURA_AUTHORIZE_SUCCESS, - OURA_UPDATE_TOKEN, - OURA_REVOKE_SUCCESS, + FETCH_SLEEP_OURA_FAILURE, FETCH_SLEEP_OURA_START, FETCH_SLEEP_OURA_SUCCESS, - FETCH_SLEEP_OURA_FAILURE + OURA_AUTHORIZE_SUCCESS, + OURA_REVOKE_SUCCESS, + OURA_UPDATE_TOKEN } from '@actions/api-actions/oura-actions' import { - WITHINGS_AUTHORIZE_SUCCESS, - WITHINGS_REVOKE_SUCCESS, + FETCH_SLEEP_POLAR_FAILURE, + FETCH_SLEEP_POLAR_START, + FETCH_SLEEP_POLAR_SUCCESS, + POLAR_AUTHORIZE_SUCCESS, + POLAR_REVOKE_SUCCESS, + POLAR_UPDATE_TOKEN +} from '@actions/api-actions/polar-actions' +import { + FETCH_SLEEP_WITHINGS_FAILURE, FETCH_SLEEP_WITHINGS_START, FETCH_SLEEP_WITHINGS_SUCCESS, - FETCH_SLEEP_WITHINGS_FAILURE, + WITHINGS_AUTHORIZE_SUCCESS, + WITHINGS_REVOKE_SUCCESS, WITHINGS_UPDATE_TOKEN } from '@actions/api-actions/withings-actions' - -import { - GARMIN_AUTHORIZE_SUCCESS, - GARMIN_REVOKE_SUCCESS, - GARMIN_UPDATE_TOKEN, - FETCH_SLEEP_GARMIN_SUCCESS, - FETCH_SLEEP_GARMIN_FAILURE, - FETCH_SLEEP_GARMIN_START -} from '@actions/api-actions/garmin-actions' -import { - POLAR_AUTHORIZE_SUCCESS, - POLAR_UPDATE_TOKEN, - POLAR_REVOKE_SUCCESS, - FETCH_SLEEP_POLAR_START, - FETCH_SLEEP_POLAR_SUCCESS, - FETCH_SLEEP_POLAR_FAILURE -} from '@actions/api-actions/polar-actions' +import ReduxAction from '../../../Types/ReduxActions' +import { ApiState } from '../../../Types/State/api-state' export const initialState: ApiState = { loadingFitbit: false, @@ -97,9 +96,10 @@ const reducer = (state = initialState, action: ReduxAction): ApiState => { case OURA_UPDATE_TOKEN: return { ...state, oura: payload } - case OURA_REVOKE_SUCCESS: + case OURA_REVOKE_SUCCESS: { const oura = state.oura && { ...state.oura, enabled: false } return { ...state, oura } + } case WITHINGS_AUTHORIZE_SUCCESS: return { ...state, withings: payload } @@ -107,19 +107,20 @@ const reducer = (state = initialState, action: ReduxAction): ApiState => { case WITHINGS_UPDATE_TOKEN: return { ...state, withings: payload } - case WITHINGS_REVOKE_SUCCESS: + case WITHINGS_REVOKE_SUCCESS: { const withings = state.withings && { ...state.withings, enabled: false } return { ...state, withings } - + } case GARMIN_AUTHORIZE_SUCCESS: return { ...state, garmin: payload } case GARMIN_UPDATE_TOKEN: return { ...state, garmin: payload } - case GARMIN_REVOKE_SUCCESS: + case GARMIN_REVOKE_SUCCESS: { const garmin = state.garmin && { ...state.garmin, enabled: false } return { ...state, garmin } + } case POLAR_AUTHORIZE_SUCCESS: return { ...state, polar: payload } @@ -127,10 +128,10 @@ const reducer = (state = initialState, action: ReduxAction): ApiState => { case POLAR_UPDATE_TOKEN: return { ...state, polar: payload } - case POLAR_REVOKE_SUCCESS: + case POLAR_REVOKE_SUCCESS: { const polar = state.polar && { ...state.polar, enabled: false } return { ...state, polar } - + } case FETCH_SLEEP_FITBIT_START: return { ...state, loadingFitbit: true } case FETCH_SLEEP_FITBIT_SUCCESS: diff --git a/src/store/Reducers/sleepclockReducer.ts b/src/store/Reducers/sleepclockReducer.ts index 1c2263f..f413705 100644 --- a/src/store/Reducers/sleepclockReducer.ts +++ b/src/store/Reducers/sleepclockReducer.ts @@ -1,7 +1,7 @@ import { CREATE_SUCCESS } from '@actions/sleep/sleep-to-cloud-actions' import moment from 'moment' import ReduxAction from 'Types/ReduxActions' -import { RESET_APP } from '../../actions/shared' +import { RESET_APP } from '@actions/shared' import { CREATE_NEW_CALENDAR, PUSH_NEW_DAYS_TO_CALENDAR, @@ -13,7 +13,7 @@ import { SET_TODAY_AS_SELECTED, UPDATE_DAY, UPDATE_SLEEP_DATA -} from '../../actions/sleep/sleep-data-actions' +} from '@actions/sleep/sleep-data-actions' import { sortDays } from '../../helpers/sleep' import { sameDay } from '../../helpers/time' import { SleepClockState } from '../../Types/SleepClockState' diff --git a/src/store/Selectors/SleepDataSelectors.ts b/src/store/Selectors/SleepDataSelectors.ts index 5d65f16..9b43cfe 100644 --- a/src/store/Selectors/SleepDataSelectors.ts +++ b/src/store/Selectors/SleepDataSelectors.ts @@ -1,4 +1,5 @@ -import { deviation, min, max, mean } from 'd3' +import { deviation, max, mean, min } from 'd3' +import { clockTimeToAngle } from 'helpers/geometry' import Moment from 'moment' import { createSelector } from 'reselect' import { SleepClockState } from '../../Types/SleepClockState' @@ -8,7 +9,6 @@ import { State } from '../../Types/State' const getState = (state: State) => state.sleepclock const getDays = (state: State) => state.sleepclock.days const getToday = (state: State) => state.sleepclock.today -const activeIndex = (state: State) => state.sleepclock.activeIndex export const getInsights = createSelector( getState, @@ -30,30 +30,35 @@ export const getSelectedDayRating = createSelector( (state: SleepClockState) => state.selectedDay.rating ) -export const getTotalTrackedNights = createSelector(getDays, (days: Day[]) => - days ? days.filter((day: Day) => day.night.length !== 0) : [] +export const getTotalTrackedNights = createSelector( + getDays, + (daysWithNights: Day[]) => + daysWithNights + ? daysWithNights.filter((day: Day) => day.night.length !== 0) + : [] ) export const getBedTimeNights = createSelector( getTotalTrackedNights, - (days: Day[]) => - days ? days.filter((day: Day) => day.inBedDuration > 0) : [] + (daysWithNights: Day[]) => + daysWithNights + ? daysWithNights.filter((day: Day) => day.inBedDuration > 0) + : [] ) export const getAsleepNights = createSelector( getTotalTrackedNights, - (days: Day[]) => - days ? days.filter((day: Day) => day?.asleepDuration > 0) : [] + (daysWithNights: Day[]) => + daysWithNights + ? daysWithNights.filter((day: Day) => day.asleepDuration > 0) + : [] ) export const getAverageBedTime = createSelector( getBedTimeNights, (longestNight: Day[]) => - longestNight.reduce( - (currentValue, night) => - currentValue + night?.inBedDuration ? night?.inBedDuration : 0, - 0 - ) / longestNight.length + longestNight.reduce((acc, n) => acc + n.inBedDuration, 0) / + longestNight.length ) export const getAverageSleepTime = createSelector( @@ -73,18 +78,17 @@ export const deviationSleep = createSelector(getAsleepNights, (days: Day[]) => export const getShortestBedTime = createSelector( getBedTimeNights, - (shortestNight: Day[]) => - min(shortestNight, (item: Day) => item.inBedDuration) + (days: Day[]) => min(days, (item: Day) => item.inBedDuration) ) export const getShortestSleepTime = createSelector( getAsleepNights, - (shortestNight: Day[]) => - min(shortestNight, (item: Day) => item.asleepDuration) + (days: Day[]) => min(days, (item: Day) => item.asleepDuration) ) -export const getLongestBedTime = createSelector(getBedTimeNights, (days) => - max(days, (day) => day.inBedDuration) +export const getLongestBedTime = createSelector( + getBedTimeNights, + (longestNight) => max(longestNight, (item) => item.inBedDuration) ) export const getLongestSleepTime = createSelector( @@ -94,22 +98,48 @@ export const getLongestSleepTime = createSelector( export const getNightsWithOver8HoursBedTime = createSelector( getBedTimeNights, - (days: Day[]) => days.filter((day: Day) => day.inBedDuration >= 480) + (nightsOver8: Day[]) => + nightsOver8.filter((night: Day) => night.inBedDuration >= 480) ) export const getNightsWithOver8HoursSleep = createSelector( getAsleepNights, - (days: Day[]) => days.filter((day: Day) => day.asleepDuration >= 480) + (nightsOver8: Day[]) => + nightsOver8.filter((night: Day) => night.asleepDuration >= 480) ) -export const getWeek = createSelector(getDays, (days: Day[]) => - days.filter((day: Day) => day.night.length !== 0) +export const getWeek = createSelector(getDays, (daysWithNights: Day[]) => + daysWithNights.filter((day: Day) => day.night.length !== 0) ) export const getAllDays = createSelector(getDays, (days: Day[]) => { return days }) +export const getAllDaysInMonthSections = createSelector( + getAllDays, + (allDays) => { + const sections: { title: number; data: Array }[] = [] + + allDays.forEach((day) => { + const month = Moment(day.date).month() + const existingSectionIndex = sections.findIndex( + (section) => section.title === month + ) + if (existingSectionIndex !== -1) { + sections[existingSectionIndex].data = [ + ...sections[existingSectionIndex].data, + day + ] + } else { + sections.push({ title: month, data: [day] }) + } + }) + + return sections + } +) + export const getWeekSelector = createSelector( [getDays, getToday], (days, today) => { @@ -127,8 +157,8 @@ export const getWeekSelector = createSelector( ) export const getActiveIndex = createSelector( - activeIndex, - (index: number | null) => index + getState, + (state) => state.activeIndex ) export const getWakeUpTime = createSelector( @@ -203,11 +233,6 @@ export const getSelectedDayAsleepDuration = createSelector( (selectedDay) => selectedDay.asleepDuration ) -// export const getSelectedDayEfficiency = createSelector( -// getSday, -// selectedDay =>( selectedDay.asleepDuration / selectedDay.inBedDuration) -// ); - export const getSleepDataUpdated = createSelector( getSleepclock, (updated) => updated.sleepDataUpdated @@ -222,3 +247,22 @@ export const getStartDate = createSelector( getSleepclock, (sleepclock: SleepClockState) => sleepclock.startDate ) + +export const getNightInAngles = createSelector(getSelectedDay, (day) => { + if (day.bedEnd && day.bedStart) { + return { + startAngle: clockTimeToAngle(day.bedStart), + endAngle: clockTimeToAngle(day.bedEnd) + } + } + if (day.sleepEnd && day.sleepStart) { + return { + startAngle: clockTimeToAngle(day.sleepStart), + endAngle: clockTimeToAngle(day.sleepEnd) + } + } + return { + startAngle: 0, + endAngle: 0 + } +}) diff --git a/src/store/Selectors/SmartActionsSelectors.ts b/src/store/Selectors/SmartActionsSelectors.ts index 0d855cf..487a24a 100644 --- a/src/store/Selectors/SmartActionsSelectors.ts +++ b/src/store/Selectors/SmartActionsSelectors.ts @@ -1,12 +1,6 @@ import { createSelector } from 'reselect' import { State } from '../../Types/State' - -const getState = (state: State) => state.sleepclock - -export const getSelectedDay = createSelector( - getState, - (state) => state.selectedDay -) +import { getSelectedDay } from './SleepDataSelectors' export const getCurrentDaySuggestOtherSource = createSelector( getSelectedDay, @@ -16,13 +10,10 @@ export const getCurrentDaySuggestOtherSource = createSelector( : false if (day.night.length === 0 && otherSourcesExist) { return 'MAYBE_CHANGE_SOURCE' - } - if (day.night.length === 0 && !otherSourcesExist) { + } else if (day.night.length === 0 && !otherSourcesExist) { return 'ADD_DATA_MANUALLY' - } - if (day.night.length !== 0 && !day.rating) { + } else if (day.night.length !== 0 && !day.rating) { return 'MAYBE_ADD_RATING' } - return 'ALL_GOOD' } ) diff --git a/src/store/Selectors/insight-selectors/Insights.ts b/src/store/Selectors/insight-selectors/Insights.ts index 399ded2..dc9a787 100644 --- a/src/store/Selectors/insight-selectors/Insights.ts +++ b/src/store/Selectors/insight-selectors/Insights.ts @@ -1,3 +1,4 @@ +import { clockTimeToAngle } from 'helpers/geometry' import { createSelector } from 'reselect' import { InsightState } from 'Types/State/insight-state' import { State } from 'Types/State' @@ -39,3 +40,11 @@ export const getGoToSleepWindowEnd = createSelector(getInsights, (insights) => { } return insights.bedTimeWindow.end }) + +export const getBedtimeWindowArc = createSelector( + [getGoToSleepWindowStart, getGoToSleepWindowEnd], + (start, end) => ({ + startAngle: clockTimeToAngle(start), + endAngle: clockTimeToAngle(end) + }) +) diff --git a/src/translations/en.json b/src/translations/en.json index 6942831..9575b9d 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -11,10 +11,6 @@ "HealthKit Connected": "HealthKit Connected!", "Enable notifications": "Allow notifications", - "HeadsUpIntro": "Heads up!", - "HeadsUpText": "Your bed time is approaching. We have prepared a relaxing breathing exercise just for you for tonight.", - "HeadsUpStart": "Start exercise", - "Allow reading Apple Health": "Allow reading from Apple Health", "EnableHealthKit": "Allow", @@ -667,5 +663,13 @@ "WINDOW_EXPLANATION": "The Bedtime window is an estimate of your circadian homeostatic rhythm's 'optimal period falling asleep', which is calculated from your last seven nights. To minimize the time spent in bed awake, and fall asleep faster, aim to fall asleep during your bedtime window.", "RATING": "Rating", "RATING_EXPLANATION": "Your rating for the night." + }, + + "TAB": { + "SLEEP": "Sleep", + "COACHING": "Coaching", + "HABITS": "Habits", + "PROFILE": "Profile", + "SETTINGS": "Settings" } } diff --git a/src/translations/fi.json b/src/translations/fi.json index 399f616..9a08d56 100644 --- a/src/translations/fi.json +++ b/src/translations/fi.json @@ -9,10 +9,6 @@ "IntroSlideText4": "Salli Nyxon lähettää ilmoituksia esimerkiksi uni-ikkunaan liittyen.", "Enable notifications": "Salli ilmoitukset", - "HeadsUpIntro": "Heads up!", - "HeadsUpText": "Uni-ikkunasi lähestyy. Olemme valmistelleet sinulle rentouttavan hengitysharjoituksen tälle illalle.", - "HeadsUpStart": "Aloita harjoitus", - "Allow reading Apple Health": "Salli yhdistäminen Apple Terveyteen", "EnableHealthKit": "Salli", @@ -661,5 +657,13 @@ "WINDOW_EXPLANATION": "Uni-ikkuna on arvio sirkkadiaanisen ja homeostaattisen rytmisi määrittelemästä 'optimaalisesta nukahtamisajasta'. Uni-ikkuna lasketaan seitsemän viimeisen yön perusteella. Nukahtaaksesi helpommin, pyri ajoittamaan nukahtaminen uni-ikkunan sisälle.", "RATING": "Oma arvio", "RATING_EXPLANATION": "Oma arviosi viime yön unen laadusta. " + }, + + "TAB": { + "SLEEP": "Uni", + "COACHING": "Valmennus", + "HABITS": "Tavoitteet", + "PROFILE": "Profiili", + "SETTINGS": "Asetukset" } } diff --git a/tsconfig.json b/tsconfig.json index 3c44d2e..3fc7f9c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,7 +17,10 @@ "baseUrl": ".", "paths": { "*": ["./src/*"], - "@actions/*": ["./src/actions/*"] + "@actions/*": ["./src/actions/*"], + "@reducers/*": ["./src/store/Reducers/*"], + "@selectors/*": ["./src/store/selectors/*"], + "@components/*": ["./src/components/*"] } }, "exclude": [ diff --git a/yarn.lock b/yarn.lock index 2ed178e..2be803f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6706,7 +6706,7 @@ d3-hierarchy@1: resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83" integrity sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ== -d3-interpolate@1, d3-interpolate@^1.3.2: +d3-interpolate@1: version "1.4.0" resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987" integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA== @@ -6885,6 +6885,11 @@ data-urls@^2.0.0: whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" +date-fns@^2.15.0: + version "2.15.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.15.0.tgz#424de6b3778e4e69d3ff27046ec136af58ae5d5f" + integrity sha512-ZCPzAMJZn3rNUvvQIMlXhDr4A+Ar07eLeGsGREoWU19a3Pqf5oYa+ccd+B3F6XVtQY6HANMFdOQ8A+ipFnvJdQ== + dayjs@^1.8.15: version "1.8.28" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.28.tgz#37aa6201df483d089645cb6c8f6cef6f0c4dbc07" @@ -12738,10 +12743,6 @@ react-native-view-overflow@0.0.5: resolved "https://registry.yarnpkg.com/react-native-view-overflow/-/react-native-view-overflow-0.0.5.tgz#56c49f0f7cdb9fd145de241d6f6bf4cfe5660915" integrity sha512-p/peyU3IC7M84bZEz2K7hpLrKBPUT3W7/+wnXjGw40hX/Iaj0OmOqJI6mJcBUlpcHJvGYbx2OOpPZa4+hwJC6w== -"react-native-watch-connectivity@git+https://github.com/plahteenlahti/react-native-watch-connectivity.git": - version "0.2.0" - resolved "git+https://github.com/plahteenlahti/react-native-watch-connectivity.git#4b99da7c9ecb7058dd97cca77a24eef1301f8f05" - react-native-webview@^9.4.0: version "9.4.0" resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-9.4.0.tgz#108da34a6c7e1c032dcabc942b7e4947ca1d8028" From 1db330ac586ae918fb840b5cc6c2b238072b1dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Perttu=20L=C3=A4hteenlahti?= Date: Sun, 23 Aug 2020 20:37:46 +0300 Subject: [PATCH 2/9] Add @selectors --- .../CoachingNotificationActions.ts | 2 +- src/actions/StartupActions.ts | 4 ++-- src/actions/api-actions/garmin-actions.ts | 2 +- src/actions/api-actions/google-fit-actions.ts | 4 ++-- src/actions/api-actions/oura-actions.ts | 2 +- src/actions/coaching/coaching-actions.ts | 4 ++-- src/actions/habit/habit-actions.ts | 6 +++--- src/actions/insight-actions/insight-actions.ts | 2 +- .../sleep-source-actions/revoke-previous-source.ts | 2 +- .../sleep-source-actions/sleep-source-actions.ts | 2 +- src/actions/sleep/health-kit-actions.ts | 2 +- src/actions/sleep/night-cloud-actions.ts | 4 ++-- src/actions/sleep/sleep-data-actions.ts | 4 ++-- src/actions/sleep/sleep-to-cloud-actions.ts | 4 ++-- .../CoachingSpecific/CoachingNotStarted.tsx | 4 ++-- src/components/CoachingSpecific/StartCoaching.tsx | 2 +- src/components/CoachingSpecific/WeekCard.tsx | 2 +- src/components/CoachingSpecific/WeekCardTitle.tsx | 2 +- src/components/CoachingSpecific/WeekCarousel.tsx | 2 +- src/components/CoachingSpecific/WeekCompleted.tsx | 2 +- src/components/HabitList/HabitList.tsx | 2 +- src/components/LessonComponents/LessonListItem.tsx | 2 +- .../MainScreenSpecific/InitializeSources.tsx | 2 +- .../NotificationCenter/NotificationCenterLink.tsx | 2 +- src/components/SettingsSpecific/LinkModule.tsx | 2 +- src/components/clock/CurvedEditButton.tsx | 2 +- src/components/modals/ExplanationsModal.tsx | 6 +++--- .../modals/HabitModal/EditHabitModal.tsx | 4 ++-- src/components/modals/HabitModal/NewHabitModal.tsx | 2 +- .../modals/MergeHabitsModal/MergeHabitsModal.tsx | 6 +++--- src/components/sources/FitbitSection.tsx | 4 ++-- src/components/sources/GarminSection.tsx | 4 ++-- src/components/sources/GoogleFitSection.tsx | 14 +++++++------- src/components/sources/HealthKitSection.tsx | 12 ++++++------ src/components/sources/OuraSection.tsx | 4 ++-- src/components/sources/PolarSection.tsx | 2 +- src/components/sources/WithingsSection.tsx | 4 ++-- src/screens/Auth/Login.tsx | 2 +- src/screens/Shared/HabitView.tsx | 2 +- src/screens/Terveystalo/Welcome.tsx | 2 +- src/screens/coaching/CoachingView.tsx | 4 ++-- src/screens/coaching/LessonView.tsx | 2 +- src/screens/coaching/Lessons.tsx | 2 +- src/screens/coaching/WeekView.tsx | 2 +- src/screens/main/NotificationCenter.tsx | 2 +- src/screens/main/main.tsx | 4 ++-- src/screens/settings/CloudSettings.tsx | 2 +- src/screens/settings/CoachingSettings.tsx | 2 +- src/screens/sleep/SleepView.tsx | 14 +++++++++++--- .../Reducers/coaching-reducer/coaching-reducer.ts | 2 +- src/typings/state/coaching-state.ts | 2 +- 51 files changed, 92 insertions(+), 84 deletions(-) diff --git a/src/actions/CoachingNotification/CoachingNotificationActions.ts b/src/actions/CoachingNotification/CoachingNotificationActions.ts index fca11a1..f002569 100644 --- a/src/actions/CoachingNotification/CoachingNotificationActions.ts +++ b/src/actions/CoachingNotification/CoachingNotificationActions.ts @@ -1,4 +1,4 @@ -import { getStateWeeks } from 'store/Selectors/coaching-selectors' +import { getStateWeeks } from '@selectors/coaching-selectors' import { InteractedLesson } from '../../Types/CoachingNotificationState' import { GetState } from '../../Types/GetState' diff --git a/src/actions/StartupActions.ts b/src/actions/StartupActions.ts index 9e0beb5..5728f03 100644 --- a/src/actions/StartupActions.ts +++ b/src/actions/StartupActions.ts @@ -1,6 +1,6 @@ import { Platform } from 'react-native' -import { getIsHealthKitMainSource } from 'store/Selectors/sleep-source-selectors/sleep-source-selectors' -import { getWeek } from 'store/Selectors/SleepDataSelectors' +import { getIsHealthKitMainSource } from '@selectors/sleep-source-selectors/sleep-source-selectors' +import { getWeek } from '@selectors/SleepDataSelectors' import { Dispatch, Thunk } from 'Types/ReduxActions' import { getAuthState } from '../store/Selectors/auth-selectors/auth-selectors' import { GetState } from '../Types/GetState' diff --git a/src/actions/api-actions/garmin-actions.ts b/src/actions/api-actions/garmin-actions.ts index d054dd1..3a0ab3f 100644 --- a/src/actions/api-actions/garmin-actions.ts +++ b/src/actions/api-actions/garmin-actions.ts @@ -1,5 +1,5 @@ /* eslint-disable camelcase */ -import { getGarminEnabled } from 'store/Selectors/api-selectors/api-selectors' +import { getGarminEnabled } from '@selectors/api-selectors/api-selectors' import CONFIG from 'config/Config' import moment from 'moment' import ReduxAction, { Dispatch, Thunk } from 'Types/ReduxActions' diff --git a/src/actions/api-actions/google-fit-actions.ts b/src/actions/api-actions/google-fit-actions.ts index 85db2fa..79116bc 100644 --- a/src/actions/api-actions/google-fit-actions.ts +++ b/src/actions/api-actions/google-fit-actions.ts @@ -13,8 +13,8 @@ import { formatGoogleFitData } from 'helpers/sleep/google-fit-helper' import moment from 'moment' import { Platform } from 'react-native' import { authorize, refresh, revoke } from 'react-native-app-auth' -import { getGoogleFitEnabled } from 'store/Selectors/api-selectors/api-selectors' -import { getGoogleFitSource } from 'store/Selectors/sleep-source-selectors/sleep-source-selectors' +import { getGoogleFitEnabled } from '@selectors/api-selectors/api-selectors' +import { getGoogleFitSource } from '@selectors/sleep-source-selectors/sleep-source-selectors' import { Dispatch, Thunk } from 'Types/ReduxActions' import { SleepDataSource } from 'Types/SleepClockState' import { Night } from 'Types/Sleepdata' diff --git a/src/actions/api-actions/oura-actions.ts b/src/actions/api-actions/oura-actions.ts index 07eccd8..7b4ce8a 100644 --- a/src/actions/api-actions/oura-actions.ts +++ b/src/actions/api-actions/oura-actions.ts @@ -4,7 +4,7 @@ import { authorize, refresh } from 'react-native-app-auth' import CONFIG from 'config/Config' import { setMainSource } from '@actions/sleep-source-actions/sleep-source-actions' import { SOURCE } from 'typings/state/sleep-source-state' -import { getOuraEnabled } from 'store/Selectors/api-selectors/api-selectors' +import { getOuraEnabled } from '@selectors/api-selectors/api-selectors' import moment from 'moment' import { formatOuraSamples } from 'helpers/sleep/oura-helper' import { formatSleepData } from '@actions/sleep/sleep-data-actions' diff --git a/src/actions/coaching/coaching-actions.ts b/src/actions/coaching/coaching-actions.ts index 8b2b3b3..95a88b7 100644 --- a/src/actions/coaching/coaching-actions.ts +++ b/src/actions/coaching/coaching-actions.ts @@ -8,13 +8,13 @@ import { Auth } from 'aws-amplify' import { createCoachingData, updateCoachingData } from 'graphql/mutations' import { listCoachingDatas } from 'graphql/queries' import moment from 'moment' -import { getAuthState } from 'store/Selectors/auth-selectors/auth-selectors' +import { getAuthState } from '@selectors/auth-selectors/auth-selectors' import { getActiveWeekWithContent, getCoachingMonth, getCurrentWeekAll, WEEK_STAGE -} from 'store/Selectors/coaching-selectors' +} from '@selectors/coaching-selectors' import { GetState } from 'Types/GetState' import { CoachingMonth, STAGE, StateWeek } from 'typings/state/coaching-state' import { v4 } from 'uuid' diff --git a/src/actions/habit/habit-actions.ts b/src/actions/habit/habit-actions.ts index cb0b843..7a20e76 100644 --- a/src/actions/habit/habit-actions.ts +++ b/src/actions/habit/habit-actions.ts @@ -3,13 +3,13 @@ import produce from 'immer' import moment from 'moment' import 'react-native-get-random-values' import * as Sentry from '@sentry/react-native' -import { getAuthState } from 'store/Selectors/auth-selectors/auth-selectors' +import { getAuthState } from '@selectors/auth-selectors/auth-selectors' import { getHabits, getUnsyncedHabits, getHabitsMap -} from 'store/Selectors/habit-selectors/habit-selectors' -import { getUsername } from 'store/Selectors/UserSelectors' +} from '@selectors/habit-selectors/habit-selectors' +import { getUsername } from '@selectors/UserSelectors' import { GetState } from 'Types/GetState' import ReduxAction, { Thunk, ThunkResult, Dispatch } from 'Types/ReduxActions' import { Habit, MutationType, UnsyncedHabit } from 'Types/State/habit-state' diff --git a/src/actions/insight-actions/insight-actions.ts b/src/actions/insight-actions/insight-actions.ts index 913349b..e17d1db 100644 --- a/src/actions/insight-actions/insight-actions.ts +++ b/src/actions/insight-actions/insight-actions.ts @@ -1,4 +1,4 @@ -import { getWeek } from 'store/Selectors/SleepDataSelectors' +import { getWeek } from '@selectors/SleepDataSelectors' import { Day } from 'Types/Sleepdata' import { GetState } from 'Types/GetState' import moment from 'moment' diff --git a/src/actions/sleep-source-actions/revoke-previous-source.ts b/src/actions/sleep-source-actions/revoke-previous-source.ts index 907f0c1..4955f89 100644 --- a/src/actions/sleep-source-actions/revoke-previous-source.ts +++ b/src/actions/sleep-source-actions/revoke-previous-source.ts @@ -4,7 +4,7 @@ import { toggleGoogleFit } from '@actions/api-actions/google-fit-actions' import { toggleFitbit } from '@actions/api-actions/fitbit-actions' import { Thunk, Dispatch } from 'Types/ReduxActions' import { GetState } from 'Types/GetState' -import { getMainSource } from 'store/Selectors/sleep-source-selectors/sleep-source-selectors' +import { getMainSource } from '@selectors/sleep-source-selectors/sleep-source-selectors' import { toggleOura } from '@actions/api-actions/oura-actions' import { toggleWithings } from '@actions/api-actions/withings-actions' import { toggleGarmin } from '@actions/api-actions/garmin-actions' diff --git a/src/actions/sleep-source-actions/sleep-source-actions.ts b/src/actions/sleep-source-actions/sleep-source-actions.ts index 4d0779d..8785cd3 100644 --- a/src/actions/sleep-source-actions/sleep-source-actions.ts +++ b/src/actions/sleep-source-actions/sleep-source-actions.ts @@ -2,7 +2,7 @@ import { revokePreviousSource } from '@actions/sleep-source-actions/revoke-previ import { setHealthKitStatus } from '@actions/sleep/health-kit-actions' import { fetchSleepData } from '@actions/sleep/sleep-data-actions' import AppleHealthKit from 'react-native-healthkit' -import { getIsHealthKitMainSource } from 'store/Selectors/sleep-source-selectors/sleep-source-selectors' +import { getIsHealthKitMainSource } from '@selectors/sleep-source-selectors/sleep-source-selectors' import { GetState } from 'Types/GetState' import { Dispatch, Thunk } from 'Types/ReduxActions' import { SOURCE, SUB_SOURCE } from 'typings/state/sleep-source-state' diff --git a/src/actions/sleep/health-kit-actions.ts b/src/actions/sleep/health-kit-actions.ts index 56cd241..a7b90d8 100644 --- a/src/actions/sleep/health-kit-actions.ts +++ b/src/actions/sleep/health-kit-actions.ts @@ -6,7 +6,7 @@ import { formatHealthKitResponse } from 'helpers/sleep/sleep-data-helper' import moment from 'moment' import { Platform } from 'react-native' import AppleHealthKit, { SleepSample } from 'react-native-healthkit' -import { getHealthKitSource } from 'store/Selectors/sleep-source-selectors/sleep-source-selectors' +import { getHealthKitSource } from '@selectors/sleep-source-selectors/sleep-source-selectors' import { SUB_SOURCE } from 'typings/state/sleep-source-state' import ReduxAction, { Dispatch, Thunk } from 'Types/ReduxActions' import { GetState } from 'Types/GetState' diff --git a/src/actions/sleep/night-cloud-actions.ts b/src/actions/sleep/night-cloud-actions.ts index 9eca1aa..9aeebe2 100644 --- a/src/actions/sleep/night-cloud-actions.ts +++ b/src/actions/sleep/night-cloud-actions.ts @@ -2,8 +2,8 @@ import { API, graphqlOperation } from 'aws-amplify' import { Dispatch, Thunk } from 'Types/ReduxActions' import { GetState } from 'Types/GetState' import { Night, Value } from 'Types/Sleepdata' -import { getUsername } from 'store/Selectors/UserSelectors' -import { getAuthState } from 'store/Selectors/auth-selectors/auth-selectors' +import { getUsername } from '@selectors/UserSelectors' +import { getAuthState } from '@selectors/auth-selectors/auth-selectors' import { CreateNightInput, NightValue } from 'API' import * as Sentry from '@sentry/react-native' import { createNight } from 'graphql/mutations' diff --git a/src/actions/sleep/sleep-data-actions.ts b/src/actions/sleep/sleep-data-actions.ts index d3b2977..c72931f 100644 --- a/src/actions/sleep/sleep-data-actions.ts +++ b/src/actions/sleep/sleep-data-actions.ts @@ -14,8 +14,8 @@ import moment from 'moment' import { getMainSource, getSharedSource -} from 'store/Selectors/sleep-source-selectors/sleep-source-selectors' -import { getAllDays } from 'store/Selectors/SleepDataSelectors' +} from '@selectors/sleep-source-selectors/sleep-source-selectors' +import { getAllDays } from '@selectors/SleepDataSelectors' import { GetState } from 'Types/GetState' import { Dispatch, Thunk } from 'Types/ReduxActions' import { SOURCE } from 'typings/state/sleep-source-state' diff --git a/src/actions/sleep/sleep-to-cloud-actions.ts b/src/actions/sleep/sleep-to-cloud-actions.ts index 5f3706c..43b0191 100644 --- a/src/actions/sleep/sleep-to-cloud-actions.ts +++ b/src/actions/sleep/sleep-to-cloud-actions.ts @@ -1,7 +1,7 @@ import API from '@aws-amplify/api' import { graphqlOperation } from 'aws-amplify' -import { getAllDays } from 'store/Selectors/SleepDataSelectors' -import { getUsername } from 'store/Selectors/UserSelectors' +import { getAllDays } from '@selectors/SleepDataSelectors' +import { getUsername } from '@selectors/UserSelectors' import { GetState } from 'Types/GetState' import { v4 } from 'uuid' import { ListSleepDatasQuery, UpdateSleepDataInput } from '../../API' diff --git a/src/components/CoachingSpecific/CoachingNotStarted.tsx b/src/components/CoachingSpecific/CoachingNotStarted.tsx index 190d421..473b901 100644 --- a/src/components/CoachingSpecific/CoachingNotStarted.tsx +++ b/src/components/CoachingSpecific/CoachingNotStarted.tsx @@ -1,8 +1,8 @@ import React from 'react' import styled from 'styled-components/native' import { useSelector } from 'react-redux' -import { getCoachingNotStarted } from 'store/Selectors/coaching-selectors' -import { getActiveCoaching } from 'store/Selectors/subscription-selectors/SubscriptionSelectors' +import { getCoachingNotStarted } from '@selectors/coaching-selectors' +import { getActiveCoaching } from '@selectors/subscription-selectors/SubscriptionSelectors' import colors from '../../styles/colors' import { fonts } from '../../styles/themes' import TranslatedText from '../TranslatedText' diff --git a/src/components/CoachingSpecific/StartCoaching.tsx b/src/components/CoachingSpecific/StartCoaching.tsx index cc98d15..5cb3251 100644 --- a/src/components/CoachingSpecific/StartCoaching.tsx +++ b/src/components/CoachingSpecific/StartCoaching.tsx @@ -13,7 +13,7 @@ import { getSelectedWeekOngoing, WEEK_STAGE, getCoachingNotStarted -} from 'store/Selectors/coaching-selectors/coaching-selectors' +} from '@selectors/coaching-selectors/coaching-selectors' import styled from 'styled-components/native' import { getActiveCoaching } from '../../store/Selectors/subscription-selectors/SubscriptionSelectors' import { PrimaryButton } from '../Buttons/PrimaryButton' diff --git a/src/components/CoachingSpecific/WeekCard.tsx b/src/components/CoachingSpecific/WeekCard.tsx index c8ca7ae..71c5900 100644 --- a/src/components/CoachingSpecific/WeekCard.tsx +++ b/src/components/CoachingSpecific/WeekCard.tsx @@ -8,7 +8,7 @@ import FastImage from 'react-native-fast-image' import LinearGradient from 'react-native-linear-gradient' import Animated from 'react-native-reanimated' import { useDispatch } from 'react-redux' -import { CombinedWeek } from 'store/Selectors/coaching-selectors/coaching-selectors' +import { CombinedWeek } from '@selectors/coaching-selectors/coaching-selectors' import styled from 'styled-components/native' import colors from '../../styles/colors' import { constants, fonts } from '../../styles/themes' diff --git a/src/components/CoachingSpecific/WeekCardTitle.tsx b/src/components/CoachingSpecific/WeekCardTitle.tsx index 5d14d82..774e2e9 100644 --- a/src/components/CoachingSpecific/WeekCardTitle.tsx +++ b/src/components/CoachingSpecific/WeekCardTitle.tsx @@ -1,6 +1,6 @@ import React from 'react' import { View } from 'react-native' -import { WEEK_STAGE } from 'store/Selectors/coaching-selectors' +import { WEEK_STAGE } from '@selectors/coaching-selectors' import styled from 'styled-components/native' import colors from '../../styles/colors' import { fonts } from '../../styles/themes' diff --git a/src/components/CoachingSpecific/WeekCarousel.tsx b/src/components/CoachingSpecific/WeekCarousel.tsx index ecc34d9..645423a 100644 --- a/src/components/CoachingSpecific/WeekCarousel.tsx +++ b/src/components/CoachingSpecific/WeekCarousel.tsx @@ -6,7 +6,7 @@ import { CombinedWeek, getCombinedWeeks, getCurrentWeek -} from 'store/Selectors/coaching-selectors' +} from '@selectors/coaching-selectors' import styled from 'styled-components/native' import { WIDTH } from '../../helpers/Dimensions' import { H3 } from '../Primitives/Primitives' diff --git a/src/components/CoachingSpecific/WeekCompleted.tsx b/src/components/CoachingSpecific/WeekCompleted.tsx index fd9425e..5d0a0b4 100644 --- a/src/components/CoachingSpecific/WeekCompleted.tsx +++ b/src/components/CoachingSpecific/WeekCompleted.tsx @@ -1,6 +1,6 @@ import React from 'react' import { useSelector } from 'react-redux' -import { getSelectedWeekCompleted } from 'store/Selectors/coaching-selectors/coaching-selectors' +import { getSelectedWeekCompleted } from '@selectors/coaching-selectors/coaching-selectors' import styled from 'styled-components/native' import { fonts, StyleProps } from '../../styles/themes' import TranslatedText from '../TranslatedText' diff --git a/src/components/HabitList/HabitList.tsx b/src/components/HabitList/HabitList.tsx index 1f9362d..d7b7754 100644 --- a/src/components/HabitList/HabitList.tsx +++ b/src/components/HabitList/HabitList.tsx @@ -4,7 +4,7 @@ import React, { memo, ReactElement } from 'react' import { SectionList } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' import { useDispatch, useSelector } from 'react-redux' -import { getHabitSections } from 'store/Selectors/habit-selectors/habit-selectors' +import { getHabitSections } from '@selectors/habit-selectors/habit-selectors' import styled from 'styled-components/native' import HabitCard from '../HabitCard/HabitCard' import { H3 } from '../Primitives/Primitives' diff --git a/src/components/LessonComponents/LessonListItem.tsx b/src/components/LessonComponents/LessonListItem.tsx index 17b1ee5..93a0ec4 100644 --- a/src/components/LessonComponents/LessonListItem.tsx +++ b/src/components/LessonComponents/LessonListItem.tsx @@ -9,7 +9,7 @@ import FastImage from 'react-native-fast-image' import { BorderlessButton } from 'react-native-gesture-handler' import Swipeable from 'react-native-gesture-handler/Swipeable' import { useDispatch, useSelector } from 'react-redux' -import { CombinedLesson } from 'store/Selectors/coaching-selectors/coaching-selectors' +import { CombinedLesson } from '@selectors/coaching-selectors/coaching-selectors' import styled from 'styled-components/native' import ROUTE from 'config/routes/Routes' import { useNavigation } from '@react-navigation/core' diff --git a/src/components/MainScreenSpecific/InitializeSources.tsx b/src/components/MainScreenSpecific/InitializeSources.tsx index b2c00ce..56a3a49 100644 --- a/src/components/MainScreenSpecific/InitializeSources.tsx +++ b/src/components/MainScreenSpecific/InitializeSources.tsx @@ -7,7 +7,7 @@ import { useNavigation } from '@react-navigation/core' import ROUTE from 'config/routes/Routes' import { IconBold } from 'components/iconRegular' import { useSelector, useDispatch } from 'react-redux' -import { getDataOnboardingCompleted } from 'store/Selectors/OnboardingSelectors' +import { getDataOnboardingCompleted } from '@selectors/OnboardingSelectors' import { markDataOnboardingCompleted } from '@actions/onboarding/onboarding-actions' const InitializeSource: FC<{}> = () => { diff --git a/src/components/NotificationCenter/NotificationCenterLink.tsx b/src/components/NotificationCenter/NotificationCenterLink.tsx index 884928b..9ab1915 100644 --- a/src/components/NotificationCenter/NotificationCenterLink.tsx +++ b/src/components/NotificationCenter/NotificationCenterLink.tsx @@ -4,7 +4,7 @@ import { IconBold } from 'components/iconRegular' import { useNavigation } from '@react-navigation/core' import ROUTE from 'config/routes/Routes' import colors from 'styles/colors' -import { getStaticNotificationsCount } from 'store/Selectors/notification-selectors/notification-selectors' +import { getStaticNotificationsCount } from '@selectors/notification-selectors/notification-selectors' import { useSelector } from 'react-redux' const NotificationCenterLink = () => { diff --git a/src/components/SettingsSpecific/LinkModule.tsx b/src/components/SettingsSpecific/LinkModule.tsx index af8cf1b..0ca0603 100644 --- a/src/components/SettingsSpecific/LinkModule.tsx +++ b/src/components/SettingsSpecific/LinkModule.tsx @@ -3,7 +3,7 @@ import { Alert } from 'react-native' import { useDispatch, useSelector } from 'react-redux' import styled from 'styled-components/native' import { Formik } from 'formik' -import { getLinkingCode } from 'store/Selectors/linking-selectors' +import { getLinkingCode } from '@selectors/linking-selectors' import { linkAccount, removeLink } from '@actions/linking/linking-actions' import translate from '../../config/i18n' import colors from '../../styles/colors' diff --git a/src/components/clock/CurvedEditButton.tsx b/src/components/clock/CurvedEditButton.tsx index 8afb22c..0f1e51e 100644 --- a/src/components/clock/CurvedEditButton.tsx +++ b/src/components/clock/CurvedEditButton.tsx @@ -2,7 +2,7 @@ import React, { memo, FC } from 'react' import Reanimated from 'react-native-reanimated' import { Defs, G, Path, Text, TextPath, TSpan } from 'react-native-svg' import { useDispatch, useSelector } from 'react-redux' -import { getIsHealthKitMainSource } from 'store/Selectors/sleep-source-selectors/sleep-source-selectors' +import { getIsHealthKitMainSource } from '@selectors/sleep-source-selectors/sleep-source-selectors' import translate from '../../config/i18n' import { describeArc } from '../../helpers/geometry' import colors from '../../styles/colors' diff --git a/src/components/modals/ExplanationsModal.tsx b/src/components/modals/ExplanationsModal.tsx index 01cbcc5..cfc0672 100644 --- a/src/components/modals/ExplanationsModal.tsx +++ b/src/components/modals/ExplanationsModal.tsx @@ -12,14 +12,14 @@ import { useDispatch, useSelector } from 'react-redux' import { getGoToSleepWindowEnd, getGoToSleepWindowStart -} from 'store/Selectors/insight-selectors/Insights' -import { getExplanationsModal } from 'store/Selectors/ModalSelectors' +} from '@selectors/insight-selectors/Insights' +import { getExplanationsModal } from '@selectors/ModalSelectors' import { getSelectedDay, getSelectedDayAsleepDuration, getSelectedDayInBedDuration, getSelectedDayRating -} from 'store/Selectors/SleepDataSelectors' +} from '@selectors/SleepDataSelectors' import styled from 'styled-components/native' import colors from 'styles/colors' import { fonts } from 'styles/themes' diff --git a/src/components/modals/HabitModal/EditHabitModal.tsx b/src/components/modals/HabitModal/EditHabitModal.tsx index a14021c..0f46aaf 100644 --- a/src/components/modals/HabitModal/EditHabitModal.tsx +++ b/src/components/modals/HabitModal/EditHabitModal.tsx @@ -6,8 +6,8 @@ import React, { memo } from 'react' import { ScrollView } from 'react-native' import Modal from 'react-native-modal' import { useDispatch, useSelector } from 'react-redux' -import { getDraftEditHabit } from 'store/Selectors/habit-selectors/habit-selectors' -import { getEditHabitModal } from 'store/Selectors/ModalSelectors' +import { getDraftEditHabit } from '@selectors/habit-selectors/habit-selectors' +import { getEditHabitModal } from '@selectors/ModalSelectors' import styled from 'styled-components/native' import { Habit } from 'Types/State/habit-state' import { Period } from 'Types/State/Periods' diff --git a/src/components/modals/HabitModal/NewHabitModal.tsx b/src/components/modals/HabitModal/NewHabitModal.tsx index 6325bee..3c5045f 100644 --- a/src/components/modals/HabitModal/NewHabitModal.tsx +++ b/src/components/modals/HabitModal/NewHabitModal.tsx @@ -6,7 +6,7 @@ import React, { memo, useState } from 'react' import { ScrollView } from 'react-native' import Modal from 'react-native-modal' import { useDispatch, useSelector } from 'react-redux' -import { getNewHabitModal } from 'store/Selectors/ModalSelectors' +import { getNewHabitModal } from '@selectors/ModalSelectors' import styled from 'styled-components/native' import { Period } from 'Types/State/Periods' import { StyleProps } from '../../../styles/themes' diff --git a/src/components/modals/MergeHabitsModal/MergeHabitsModal.tsx b/src/components/modals/MergeHabitsModal/MergeHabitsModal.tsx index 62eba1c..7a5b4b1 100644 --- a/src/components/modals/MergeHabitsModal/MergeHabitsModal.tsx +++ b/src/components/modals/MergeHabitsModal/MergeHabitsModal.tsx @@ -7,9 +7,9 @@ import { WIDTH } from 'helpers/Dimensions' import React, { memo, useState } from 'react' import { ActivityIndicator } from 'react-native' import { useDispatch, useSelector } from 'react-redux' -import { getAuthState } from 'store/Selectors/auth-selectors/auth-selectors' -import { getMergingDialogDisplayed } from 'store/Selectors/habit-selectors/habit-selectors' -import { getUsername } from 'store/Selectors/UserSelectors' +import { getAuthState } from '@selectors/auth-selectors/auth-selectors' +import { getMergingDialogDisplayed } from '@selectors/habit-selectors/habit-selectors' +import { getUsername } from '@selectors/UserSelectors' import styled from 'styled-components/native' import ROUTE from 'config/routes/Routes' import TranslatedText from 'components/TranslatedText' diff --git a/src/components/sources/FitbitSection.tsx b/src/components/sources/FitbitSection.tsx index eace053..4c998b1 100644 --- a/src/components/sources/FitbitSection.tsx +++ b/src/components/sources/FitbitSection.tsx @@ -2,8 +2,8 @@ import { toggleFitbit } from '@actions/api-actions/fitbit-actions' import TranslatedText from 'components/TranslatedText' import React from 'react' import { useDispatch, useSelector } from 'react-redux' -import { getFitbitEnabled } from 'store/Selectors/api-selectors/api-selectors' -import { getIsFitbitMainSource } from 'store/Selectors/sleep-source-selectors/sleep-source-selectors' +import { getFitbitEnabled } from '@selectors/api-selectors/api-selectors' +import { getIsFitbitMainSource } from '@selectors/sleep-source-selectors/sleep-source-selectors' import styled from 'styled-components/native' import colors from 'styles/colors' diff --git a/src/components/sources/GarminSection.tsx b/src/components/sources/GarminSection.tsx index ff35c76..18b810b 100644 --- a/src/components/sources/GarminSection.tsx +++ b/src/components/sources/GarminSection.tsx @@ -1,8 +1,8 @@ import TranslatedText from 'components/TranslatedText' import React, { useState } from 'react' import { useDispatch, useSelector } from 'react-redux' -import { getFitbitEnabled } from 'store/Selectors/api-selectors/api-selectors' -import { getIsGarminMainSource } from 'store/Selectors/sleep-source-selectors/sleep-source-selectors' +import { getFitbitEnabled } from '@selectors/api-selectors/api-selectors' +import { getIsGarminMainSource } from '@selectors/sleep-source-selectors/sleep-source-selectors' import styled from 'styled-components/native' import { constants } from 'styles/themes' import { toggleGarmin } from '@actions/api-actions/garmin-actions' diff --git a/src/components/sources/GoogleFitSection.tsx b/src/components/sources/GoogleFitSection.tsx index db9f200..1b608c3 100644 --- a/src/components/sources/GoogleFitSection.tsx +++ b/src/components/sources/GoogleFitSection.tsx @@ -5,12 +5,12 @@ import SourceRow from 'components/SettingsSpecific/SourceRow' import TranslatedText from 'components/TranslatedText' import React from 'react' import { useDispatch, useSelector } from 'react-redux' -import { getGoogleFitEnabled } from 'store/Selectors/api-selectors/api-selectors' +import { getGoogleFitEnabled } from '@selectors/api-selectors/api-selectors' import { getAllGoogleFitSources, getGoogleFitSource, getIsGoogleFitMainSource -} from 'store/Selectors/sleep-source-selectors/sleep-source-selectors' +} from '@selectors/sleep-source-selectors/sleep-source-selectors' import styled from 'styled-components/native' import colors from 'styles/colors' import { constants } from 'styles/themes' @@ -36,11 +36,11 @@ const GoogleFitSection = () => { const mapped = sources ? sources.map((item, key) => ( )) : [] diff --git a/src/components/sources/HealthKitSection.tsx b/src/components/sources/HealthKitSection.tsx index e0d8a96..9c26e2b 100644 --- a/src/components/sources/HealthKitSection.tsx +++ b/src/components/sources/HealthKitSection.tsx @@ -11,7 +11,7 @@ import { getAllHealthKitSources, getHealthKitSource, getIsHealthKitMainSource -} from 'store/Selectors/sleep-source-selectors/sleep-source-selectors' +} from '@selectors/sleep-source-selectors/sleep-source-selectors' import styled from 'styled-components/native' import { constants } from 'styles/themes' @@ -35,11 +35,11 @@ const HealthKitSection = () => { const mapped = sources ? sources.map((item, key) => ( )) : [] diff --git a/src/components/sources/OuraSection.tsx b/src/components/sources/OuraSection.tsx index 94ada9d..4f92d80 100644 --- a/src/components/sources/OuraSection.tsx +++ b/src/components/sources/OuraSection.tsx @@ -2,8 +2,8 @@ import { authorizeOura } from '@actions/api-actions/oura-actions' import TranslatedText from 'components/TranslatedText' import React from 'react' import { useDispatch, useSelector } from 'react-redux' -import { getOuraEnabled } from 'store/Selectors/api-selectors/api-selectors' -import { getIsOuraMainSource } from 'store/Selectors/sleep-source-selectors/sleep-source-selectors' +import { getOuraEnabled } from '@selectors/api-selectors/api-selectors' +import { getIsOuraMainSource } from '@selectors/sleep-source-selectors/sleep-source-selectors' import styled from 'styled-components/native' import colors from 'styles/colors' import { constants } from 'styles/themes' diff --git a/src/components/sources/PolarSection.tsx b/src/components/sources/PolarSection.tsx index 707aea0..f9d20e3 100644 --- a/src/components/sources/PolarSection.tsx +++ b/src/components/sources/PolarSection.tsx @@ -1,7 +1,7 @@ import TranslatedText from 'components/TranslatedText' import React from 'react' import { useDispatch, useSelector } from 'react-redux' -import { getIsPolarMainSource } from 'store/Selectors/sleep-source-selectors/sleep-source-selectors' +import { getIsPolarMainSource } from '@selectors/sleep-source-selectors/sleep-source-selectors' import styled from 'styled-components/native' import { constants } from 'styles/themes' import { togglePolar } from '@actions/api-actions/polar-actions' diff --git a/src/components/sources/WithingsSection.tsx b/src/components/sources/WithingsSection.tsx index 75f04ad..4ac98fd 100644 --- a/src/components/sources/WithingsSection.tsx +++ b/src/components/sources/WithingsSection.tsx @@ -1,8 +1,8 @@ import TranslatedText from 'components/TranslatedText' import React from 'react' import { useDispatch, useSelector } from 'react-redux' -import { getFitbitEnabled } from 'store/Selectors/api-selectors/api-selectors' -import { getIsWithingsMainSource } from 'store/Selectors/sleep-source-selectors/sleep-source-selectors' +import { getFitbitEnabled } from '@selectors/api-selectors/api-selectors' +import { getIsWithingsMainSource } from '@selectors/sleep-source-selectors/sleep-source-selectors' import styled from 'styled-components/native' import { toggleWithings } from '@actions/api-actions/withings-actions' import { constants } from 'styles/themes' diff --git a/src/screens/Auth/Login.tsx b/src/screens/Auth/Login.tsx index 700cab6..4fb2890 100644 --- a/src/screens/Auth/Login.tsx +++ b/src/screens/Auth/Login.tsx @@ -3,7 +3,7 @@ import { WIDTH } from 'helpers/Dimensions' import React, { memo } from 'react' import { ScrollView } from 'react-native' import { useDispatch, useSelector } from 'react-redux' -import { getLoading } from 'store/Selectors/auth-selectors/auth-selectors' +import { getLoading } from '@selectors/auth-selectors/auth-selectors' import styled from 'styled-components/native' import { login } from '@actions/auth/auth-actions' import BackToAppButton from '../../components/Buttons/BackToAppButton' diff --git a/src/screens/Shared/HabitView.tsx b/src/screens/Shared/HabitView.tsx index 7c0486b..a2d7ef2 100644 --- a/src/screens/Shared/HabitView.tsx +++ b/src/screens/Shared/HabitView.tsx @@ -4,7 +4,7 @@ import { useSelector } from 'react-redux' import { getActiveHabits, getArchivedHabits -} from 'store/Selectors/habit-selectors/habit-selectors' +} from '@selectors/habit-selectors/habit-selectors' import { Habit } from 'Types/State/habit-state' import CoachingSectionHeader from '../../components/CoachingSpecific/CoachingSectionHeader' import EmptyState from '../../components/EmptyState' diff --git a/src/screens/Terveystalo/Welcome.tsx b/src/screens/Terveystalo/Welcome.tsx index 80f5528..a2972ee 100644 --- a/src/screens/Terveystalo/Welcome.tsx +++ b/src/screens/Terveystalo/Welcome.tsx @@ -5,7 +5,7 @@ import { useSelector, useDispatch } from 'react-redux' import Intercom from 'react-native-intercom' import { Alert, Button } from 'react-native' import { linkAccount } from '@actions/linking/linking-actions' -import { getLinkingCode, getLoading } from 'store/Selectors/linking-selectors' +import { getLinkingCode, getLoading } from '@selectors/linking-selectors' import { NativeStackNavigationProp } from '@react-navigation/native-stack' import { JournalStackParamList } from 'Types/navigation/navigation' import LinkingButton from 'components/Buttons/LinkingButton' diff --git a/src/screens/coaching/CoachingView.tsx b/src/screens/coaching/CoachingView.tsx index 64c7f84..f1e939a 100644 --- a/src/screens/coaching/CoachingView.tsx +++ b/src/screens/coaching/CoachingView.tsx @@ -1,8 +1,8 @@ import React, { memo, useEffect } from 'react' import { RefreshControl } from 'react-native' import { useDispatch, useSelector } from 'react-redux' -import { getCoachingNotStarted } from 'store/Selectors/coaching-selectors/coaching-selectors' -import { getLoadingContent } from 'store/Selectors/content-selectors/content-selectors' +import { getCoachingNotStarted } from '@selectors/coaching-selectors/coaching-selectors' +import { getLoadingContent } from '@selectors/content-selectors/content-selectors' import { getAllWeeks } from '@actions/coaching/content-actions' import BuyCoachingButton from '../../components/CoachingSpecific/BuyCoachingButton' import CoachingHeader from '../../components/CoachingSpecific/CoachingHeader' diff --git a/src/screens/coaching/LessonView.tsx b/src/screens/coaching/LessonView.tsx index 92eb516..750ff9f 100644 --- a/src/screens/coaching/LessonView.tsx +++ b/src/screens/coaching/LessonView.tsx @@ -8,7 +8,7 @@ import { useDispatch, useSelector } from 'react-redux' import { CombinedLesson, getContentForSelectedLesson -} from 'store/Selectors/coaching-selectors/coaching-selectors' +} from '@selectors/coaching-selectors/coaching-selectors' import styled from 'styled-components/native' import { completeLesson } from '@actions/coaching/coaching-actions' import Tags from 'components/LessonComponents/Tags' diff --git a/src/screens/coaching/Lessons.tsx b/src/screens/coaching/Lessons.tsx index 91ec481..c7c69f5 100644 --- a/src/screens/coaching/Lessons.tsx +++ b/src/screens/coaching/Lessons.tsx @@ -8,7 +8,7 @@ import { CombinedLessonArray, getCoachingLessonsForCurrentWeek, getCoachingLessonsForWeek -} from 'store/Selectors/coaching-selectors/coaching-selectors' +} from '@selectors/coaching-selectors/coaching-selectors' import styled from 'styled-components/native' import LessonListItem from '../../components/LessonComponents/LessonListItem' import SectionFooter from '../../components/LessonComponents/SectionFooter' diff --git a/src/screens/coaching/WeekView.tsx b/src/screens/coaching/WeekView.tsx index 23a4e42..80db022 100644 --- a/src/screens/coaching/WeekView.tsx +++ b/src/screens/coaching/WeekView.tsx @@ -1,7 +1,7 @@ import React, { memo } from 'react' import Animated from 'react-native-reanimated' import { useSelector } from 'react-redux' -import { CombinedWeek } from 'store/Selectors/coaching-selectors' +import { CombinedWeek } from '@selectors/coaching-selectors' import styled from 'styled-components/native' import Copyright from '../../components/CoachingSpecific/Copyright' import StartCoaching from '../../components/CoachingSpecific/StartCoaching' diff --git a/src/screens/main/NotificationCenter.tsx b/src/screens/main/NotificationCenter.tsx index cfb5984..11c8fe4 100644 --- a/src/screens/main/NotificationCenter.tsx +++ b/src/screens/main/NotificationCenter.tsx @@ -11,7 +11,7 @@ import { } from 'components/Primitives/Primitives' import React from 'react' import { useSelector } from 'react-redux' -import { getStaticNotificationsCount } from 'store/Selectors/notification-selectors/notification-selectors' +import { getStaticNotificationsCount } from '@selectors/notification-selectors/notification-selectors' import styled from 'styled-components/native' const NotificationCenter = () => { diff --git a/src/screens/main/main.tsx b/src/screens/main/main.tsx index c323f49..068535f 100644 --- a/src/screens/main/main.tsx +++ b/src/screens/main/main.tsx @@ -9,8 +9,8 @@ import { useDispatch, useSelector } from 'react-redux' import { getLoadingFitbit, getLoadingGoogleFit -} from 'store/Selectors/api-selectors/api-selectors' -import { getHealthKitLoading } from 'store/Selectors/health-kit-selectors/health-kit-selectors' +} from '@selectors/api-selectors/api-selectors' +import { getHealthKitLoading } from '@selectors/health-kit-selectors/health-kit-selectors' import { fetchSleepData, updateCalendar diff --git a/src/screens/settings/CloudSettings.tsx b/src/screens/settings/CloudSettings.tsx index 68dcd65..8345e37 100644 --- a/src/screens/settings/CloudSettings.tsx +++ b/src/screens/settings/CloudSettings.tsx @@ -1,7 +1,7 @@ import React, { memo, useState } from 'react' import { RefreshControl, ScrollView } from 'react-native' import { useDispatch, useSelector } from 'react-redux' -import { getLoading as getCodeLoading } from 'store/Selectors/linking-selectors' +import { getLoading as getCodeLoading } from '@selectors/linking-selectors' import { getConnectionId } from '@actions/linking/linking-actions' import { logout } from '@actions/auth/auth-actions' import GoBack, { diff --git a/src/screens/settings/CoachingSettings.tsx b/src/screens/settings/CoachingSettings.tsx index 8e31568..54551af 100644 --- a/src/screens/settings/CoachingSettings.tsx +++ b/src/screens/settings/CoachingSettings.tsx @@ -7,7 +7,7 @@ import { getActiveCoachingMonth, getCoachingMonths, getCoachingStage -} from 'store/Selectors/coaching-selectors/coaching-selectors' +} from '@selectors/coaching-selectors/coaching-selectors' import styled from 'styled-components/native' import GoBack, { GoBackContainer } from '../../components/Buttons/GoBack' import TextButton from '../../components/Buttons/TextButton' diff --git a/src/screens/sleep/SleepView.tsx b/src/screens/sleep/SleepView.tsx index 6e52b86..f158b78 100644 --- a/src/screens/sleep/SleepView.tsx +++ b/src/screens/sleep/SleepView.tsx @@ -1,3 +1,6 @@ +import { getHealthKitLoading } from '@selectors/health-kit-selectors/health-kit-selectors' +import { getEditMode } from '@selectors/ManualDataSelectors' +import { getSelectedDay } from '@selectors/SleepDataSelectors' import { fetchSleepData, updateCalendar @@ -20,14 +23,14 @@ import moment from 'moment' import React, { FC, useEffect } from 'react' import { ScrollView } from 'react-native-gesture-handler' import { useDispatch, useSelector } from 'react-redux' -import { getEditMode } from 'store/Selectors/ManualDataSelectors' -import { getSelectedDay } from 'store/Selectors/SleepDataSelectors' import styled from 'styled-components/native' import { SafeAreaView } from '../../components/Primitives/Primitives' const Sleep: FC = () => { const today = useSelector(getSelectedDay) const editModeOn = useSelector(getEditMode) + const isLoadingSleepData = useSelector(getHealthKitLoading) + const dispatch = useDispatch() useNotificationEventHandlers() @@ -50,7 +53,12 @@ const Sleep: FC = () => { }> + refreshControl={ + + }> {moment(today.date).format('dddd')} diff --git a/src/store/Reducers/coaching-reducer/coaching-reducer.ts b/src/store/Reducers/coaching-reducer/coaching-reducer.ts index 6a97554..a3de98f 100644 --- a/src/store/Reducers/coaching-reducer/coaching-reducer.ts +++ b/src/store/Reducers/coaching-reducer/coaching-reducer.ts @@ -21,7 +21,7 @@ import { CoachingMonth, StateWeek } from 'typings/state/coaching-state' -import { WEEK_STAGE } from 'store/Selectors/coaching-selectors' +import { WEEK_STAGE } from '@selectors/coaching-selectors' const initialState: CoachingState = { stage: STAGE.NOT_ALLOWED, diff --git a/src/typings/state/coaching-state.ts b/src/typings/state/coaching-state.ts index f9ebab8..c512632 100644 --- a/src/typings/state/coaching-state.ts +++ b/src/typings/state/coaching-state.ts @@ -1,4 +1,4 @@ -import { WEEK_STAGE } from 'store/Selectors/coaching-selectors' +import { WEEK_STAGE } from '@selectors/coaching-selectors' export enum STAGE { NOT_ALLOWED = 'NOT_ALLOWED', From 1766800219edc5d1e7a65af35ae4ce0da4abd89f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Perttu=20L=C3=A4hteenlahti?= Date: Sun, 23 Aug 2020 21:41:13 +0300 Subject: [PATCH 3/9] Adding more changes --- src/actions/api-actions/fitbit-actions.ts | 2 +- src/actions/api-actions/polar-actions.ts | 2 +- src/actions/api-actions/withings-actions.ts | 2 +- .../Charts/SleepTimeChart/SleepBars.tsx | 2 +- src/components/Charts/sleepTimeChart.tsx | 30 ++++---- src/components/Clock.tsx | 14 ++-- .../CoachingSpecific/IntroduceCoaching.tsx | 2 +- .../CoachingSpecific/StartCoaching.tsx | 2 +- src/components/DayStrip.tsx | 72 ++++++++----------- src/components/HabitList/HabitList.tsx | 2 +- .../LessonComponents/LessonListItem.tsx | 2 +- .../MainScreenSpecific/ClockCarousel.tsx | 4 +- .../MainScreenSpecific/EditNightHeader.tsx | 31 ++++---- .../MainScreenSpecific/EnablePushCheck.tsx | 2 +- .../MainScreenSpecific/Explanations.tsx | 4 +- .../MainScreenSpecific/HelpInfo.tsx | 2 +- .../MainScreenSpecific/InitializeSources.tsx | 16 ++--- .../MainScreenSpecific/TodayView.tsx | 2 +- src/components/ProfileSpecific/Userinfo.tsx | 2 +- .../SettingsSpecific/CodeDisclaimer.tsx | 2 +- src/components/Timeline/Timeline.tsx | 2 +- src/components/clock/FallAsleepWindow.tsx | 61 +++++++--------- src/components/clock/InfoButton.tsx | 8 +-- src/components/clock/TrackerName.tsx | 26 +++---- src/components/modals/AskAboutDataModal.tsx | 4 +- src/config/routes/JournalNavigator.tsx | 4 +- src/helpers/Dimensions.ts | 2 +- src/screens/Auth/ConfirmUser.tsx | 2 +- src/screens/Auth/ForgotPasswordScreen.tsx | 2 +- src/screens/Auth/RegisterScreen.tsx | 2 +- src/screens/Terveystalo/Welcome.tsx | 2 +- src/screens/coaching/CoachingView.tsx | 2 +- src/screens/coaching/Lessons.tsx | 2 +- src/screens/coaching/WeekView.tsx | 2 +- src/screens/coaching/challenges.tsx | 2 +- src/screens/main/main.tsx | 22 +++--- src/screens/profile/BedStatsView.tsx | 2 +- src/screens/profile/ChallengeView.tsx | 2 +- src/screens/profile/SleepStatsView.tsx | 2 +- src/screens/profile/profile.tsx | 32 ++++----- src/screens/settings/CloudSettings.tsx | 2 +- src/screens/settings/DevelopmentMenu.tsx | 2 +- src/screens/settings/ManageSubscription.tsx | 2 +- src/screens/settings/Notifications.tsx | 2 +- src/screens/settings/settings.tsx | 6 +- src/screens/sleep/SleepView.tsx | 4 +- 46 files changed, 186 insertions(+), 212 deletions(-) diff --git a/src/actions/api-actions/fitbit-actions.ts b/src/actions/api-actions/fitbit-actions.ts index 17efed7..afb1901 100644 --- a/src/actions/api-actions/fitbit-actions.ts +++ b/src/actions/api-actions/fitbit-actions.ts @@ -7,7 +7,7 @@ import moment from 'moment' import { authorize, refresh, revoke } from 'react-native-app-auth' import ReduxAction, { Dispatch, Thunk } from 'Types/ReduxActions' import { SOURCE } from 'typings/state/sleep-source-state' -import { getFitbitEnabled } from '../../store/Selectors/api-selectors/api-selectors' +import { getFitbitEnabled } from '@selectors/api-selectors/api-selectors' import { GetState } from '../../Types/GetState' import { FitbitAuthorizeResult, diff --git a/src/actions/api-actions/polar-actions.ts b/src/actions/api-actions/polar-actions.ts index 42a2531..8ca032b 100644 --- a/src/actions/api-actions/polar-actions.ts +++ b/src/actions/api-actions/polar-actions.ts @@ -11,7 +11,7 @@ import ReduxAction, { Dispatch, Thunk } from 'Types/ReduxActions' import { PolarSleepObject } from 'Types/Sleep/Polar' import { PolarAuthorizeResult, ResponseBase } from 'Types/State/api-state' import { SOURCE } from 'typings/state/sleep-source-state' -import { getPolarEnabled } from '../../store/Selectors/api-selectors/api-selectors' +import { getPolarEnabled } from '@selectors/api-selectors/api-selectors' import { GetState } from '../../Types/GetState' export const POLAR_AUTHORIZE_SUCCESS = 'POLAR_AUTHORIZE_SUCCESS' diff --git a/src/actions/api-actions/withings-actions.ts b/src/actions/api-actions/withings-actions.ts index 05b75a3..f1e7a3f 100644 --- a/src/actions/api-actions/withings-actions.ts +++ b/src/actions/api-actions/withings-actions.ts @@ -8,7 +8,7 @@ import moment from 'moment' import { authorize, refresh, RefreshResult } from 'react-native-app-auth' import ReduxAction, { Dispatch, Thunk } from 'Types/ReduxActions' import { SOURCE } from 'typings/state/sleep-source-state' -import { getWithingsEnabled } from '../../store/Selectors/api-selectors/api-selectors' +import { getWithingsEnabled } from '@selectors/api-selectors/api-selectors' import { GetState } from '../../Types/GetState' import { syncNightsToCloud } from '@actions/sleep/night-cloud-actions' import { SetKeychainKeyValue, GetKeychainParsedValue } from 'helpers/Keychain' diff --git a/src/components/Charts/SleepTimeChart/SleepBars.tsx b/src/components/Charts/SleepTimeChart/SleepBars.tsx index 2f43af0..ab2ba27 100644 --- a/src/components/Charts/SleepTimeChart/SleepBars.tsx +++ b/src/components/Charts/SleepTimeChart/SleepBars.tsx @@ -1,6 +1,6 @@ import { ScaleTime } from 'd3' import moment from 'moment' -import React, { FC, memo, useMemo } from 'react' +import React, { FC, useMemo } from 'react' import { G, Rect } from 'react-native-svg' import { Day, Night, Value } from 'Types/Sleepdata' import colors from '../../../styles/colors' diff --git a/src/components/Charts/sleepTimeChart.tsx b/src/components/Charts/sleepTimeChart.tsx index f1d1d73..ef18009 100644 --- a/src/components/Charts/sleepTimeChart.tsx +++ b/src/components/Charts/sleepTimeChart.tsx @@ -1,14 +1,15 @@ +import TranslatedText from '@components/TranslatedText' +import { setSelectedDay } from '@actions/sleep/sleep-data-actions' import { extent, max, min, scaleTime } from 'd3' import moment from 'moment' -import React, { useMemo, useState } from 'react' +import React, { useMemo, FC } from 'react' import { Dimensions, View } from 'react-native' import { ScrollView } from 'react-native-gesture-handler' import Svg from 'react-native-svg' -import { useSelector } from 'react-redux' +import { useDispatch, useSelector } from 'react-redux' import styled from 'styled-components/native' import { getAllDays } from '../../store/Selectors/SleepDataSelectors' -import { Day, Value } from '../../Types/Sleepdata' -import { Container, H3 } from '../Primitives/Primitives' +import { Day, Night, Value } from '../../Types/Sleepdata' import SleepBars from './SleepTimeChart/SleepBars' import XTicks from './SleepTimeChart/XTicks' import YTicks from './SleepTimeChart/YTicks' @@ -20,21 +21,20 @@ export const paddingLeft = 100 export const paddingRight = 100 export const chartHeight = height / 3 -const SleepTimeChart = () => { +const SleepTimeChart: FC = () => { const days = useSelector(getAllDays) - const [selectedDay, setSelectedDay] = useState() - + const dispatch = useDispatch() const chartWidth = (barWidth + 10) * days.length + paddingLeft + paddingRight const { normalizedSleepData } = useMemo( () => ({ - normalizedSleepData: normalizeSleepData(days, Value.InBed) + normalizedSleepData: normalizeSleepData(days) }), [days] ) const select = (day: Day) => { - setSelectedDay(day) + dispatch(setSelectedDay(day)) } const xDomain: Date[] = extent( @@ -66,9 +66,8 @@ const SleepTimeChart = () => { return ( - -

Sleep Goal Trend

- + Sleep Goal Trend + theme.FONT_BOLD}; + font-size: 15px; + color: ${({ theme }) => theme.PRIMARY_TEXT_COLOR}; + margin-bottom: 10px; +` + const YTicksContainer = styled(Svg)` position: absolute; ` diff --git a/src/components/Clock.tsx b/src/components/Clock.tsx index 0b8f497..c63cda6 100644 --- a/src/components/Clock.tsx +++ b/src/components/Clock.tsx @@ -1,16 +1,16 @@ +import { toggleEditMode } from '@actions/manual-sleep/manual-sleep-actions' +import { + getGoToSleepWindowEnd, + getGoToSleepWindowStart +} from '@selectors/insight-selectors/Insights' +import { getEditMode } from '@selectors/ManualDataSelectors' +import { getSelectedDay } from '@selectors/SleepDataSelectors' import React, { FC } from 'react' import { Dimensions } from 'react-native' import Animated from 'react-native-reanimated' import Svg from 'react-native-svg' import { useDispatch, useSelector } from 'react-redux' import styled from 'styled-components/native' -import { toggleEditMode } from '../actions/manual-sleep/manual-sleep-actions' -import { - getGoToSleepWindowEnd, - getGoToSleepWindowStart -} from '../store/Selectors/insight-selectors/Insights' -import { getEditMode } from '../store/Selectors/ManualDataSelectors' -import { getSelectedDay } from '../store/Selectors/SleepDataSelectors' import colors from '../styles/colors' import { Value } from '../Types/Sleepdata' import AddNightButton from './clock/AddNightButton' diff --git a/src/components/CoachingSpecific/IntroduceCoaching.tsx b/src/components/CoachingSpecific/IntroduceCoaching.tsx index 5e28931..43f8e6f 100644 --- a/src/components/CoachingSpecific/IntroduceCoaching.tsx +++ b/src/components/CoachingSpecific/IntroduceCoaching.tsx @@ -2,7 +2,7 @@ import React, { memo } from 'react' import { useSelector } from 'react-redux' import styled from 'styled-components/native' import { fonts, StyleProps } from '../../styles/themes' -import { getActiveCoaching } from '../../store/Selectors/subscription-selectors/SubscriptionSelectors' +import { getActiveCoaching } from '@selectors/subscription-selectors/SubscriptionSelectors' import { Container } from '../Primitives/Primitives' import TranslatedText from '../TranslatedText' diff --git a/src/components/CoachingSpecific/StartCoaching.tsx b/src/components/CoachingSpecific/StartCoaching.tsx index 5cb3251..ef7c4c0 100644 --- a/src/components/CoachingSpecific/StartCoaching.tsx +++ b/src/components/CoachingSpecific/StartCoaching.tsx @@ -15,7 +15,7 @@ import { getCoachingNotStarted } from '@selectors/coaching-selectors/coaching-selectors' import styled from 'styled-components/native' -import { getActiveCoaching } from '../../store/Selectors/subscription-selectors/SubscriptionSelectors' +import { getActiveCoaching } from '@selectors/subscription-selectors/SubscriptionSelectors' import { PrimaryButton } from '../Buttons/PrimaryButton' import BuyCoachingButton from './BuyCoachingButton' import WeekCompleted from './WeekCompleted' diff --git a/src/components/DayStrip.tsx b/src/components/DayStrip.tsx index b9119b8..2bd44be 100644 --- a/src/components/DayStrip.tsx +++ b/src/components/DayStrip.tsx @@ -1,73 +1,58 @@ -import { default as Moment, default as moment } from 'moment' -import React, { memo } from 'react' -import { SectionList, Text, View } from 'react-native' +import { setSelectedDay } from '@actions/sleep/sleep-data-actions' +import { getAllDays, getSelectedDay } from '@selectors/SleepDataSelectors' +import moment from 'moment' +import React, { FC } from 'react' +import { FlatList } from 'react-native' import { useDispatch, useSelector } from 'react-redux' import styled from 'styled-components/native' -import { setActiveIndex } from '../actions/sleep/sleep-data-actions' +import { Day } from 'Types/Sleepdata' import { WIDTH } from '../helpers/Dimensions' import keyExtractor from '../helpers/KeyExtractor' import { fonts, StyleProps } from '../styles/themes' -import { - getActiveIndex, - getWeekSelector -} from '../store/Selectors/SleepDataSelectors' -import { Day } from '../Types/Sleepdata' const dayWidth = WIDTH / 7 const cardMargin = 5 -const DayStrip = () => { - const days: Day[] = useSelector(getWeekSelector) - const activeIndex = useSelector(getActiveIndex) +const DayStrip: FC = () => { + const days = useSelector(getAllDays) const dispatch = useDispatch() - - const renderItem = ({ item, index }: { item: any; index: number }) => { + const { date } = useSelector(getSelectedDay) + const renderItem = ({ item }: { item: Day }) => { const isToday = moment(item.date).isSame(new Date(), 'day') const handleOnPress = () => { - dispatch(setActiveIndex(index)) + dispatch(setSelectedDay(item)) } return ( - - {Moment(item.date).format('ddd')} + + {moment(item.date).format('ddd')} - - {Moment(item.date).format('DD')} + + {moment(item.date).format('DD.MM.')} ) } - const snapOffets: number[] = days.map( - (item, index) => index * (dayWidth + cardMargin * 2) - ) - - const renderSectionHeader = ({ index, section }: any) => { - return ( - - {section.title} - - ) - } + const snapOffets: number[] = days.map((_, index) => index * 30) return ( ({ + getItemLayout={(_, index) => ({ index, length: dayWidth, offset: (dayWidth + cardMargin) * index })} - snapToAlignment="center" - snapToEnd={false} keyExtractor={keyExtractor} showsHorizontalScrollIndicator={false} renderItem={renderItem} @@ -76,11 +61,11 @@ const DayStrip = () => { ) } -export default memo(DayStrip) +export default DayStrip -const Segments = styled(SectionList)` +const Segments = styled(FlatList)` width: ${WIDTH}px; - height: ${dayWidth}px; + height: ${dayWidth + 30}px; margin: 20px 0px; ` @@ -96,6 +81,7 @@ const Segment = styled.TouchableOpacity` justify-content: center; align-items: center; z-index: 5; + margin-top: 30px; border-radius: 5px; background-color: ${(props: SegmentProps) => props.active @@ -111,13 +97,13 @@ const DateText = styled.Text` : props.theme.SECONDARY_TEXT_COLOR}; font-family: ${fonts.bold}; margin-bottom: 5px; + text-transform: uppercase; text-align: center; ` const DateNumber = styled.Text` - font-size: 15px; - font-weight: bold; - font-family: ${fonts.bold}; + font-size: 13px; + font-family: ${fonts.medium}; text-align: center; color: ${(props: SegmentProps) => props.active diff --git a/src/components/HabitList/HabitList.tsx b/src/components/HabitList/HabitList.tsx index d7b7754..5c1b4af 100644 --- a/src/components/HabitList/HabitList.tsx +++ b/src/components/HabitList/HabitList.tsx @@ -9,7 +9,7 @@ import styled from 'styled-components/native' import HabitCard from '../HabitCard/HabitCard' import { H3 } from '../Primitives/Primitives' import TranslatedText from '../TranslatedText' -import { getEditMode } from '../../store/Selectors/ManualDataSelectors' +import { getEditMode } from '@selectors/ManualDataSelectors' import colors from '../../styles/colors' import { fonts, StyleProps } from '../../styles/themes' import { IconBold } from '../iconRegular' diff --git a/src/components/LessonComponents/LessonListItem.tsx b/src/components/LessonComponents/LessonListItem.tsx index 93a0ec4..b560f19 100644 --- a/src/components/LessonComponents/LessonListItem.tsx +++ b/src/components/LessonComponents/LessonListItem.tsx @@ -14,7 +14,7 @@ import styled from 'styled-components/native' import ROUTE from 'config/routes/Routes' import { useNavigation } from '@react-navigation/core' import { getReadingTime } from '../../helpers/reading-time' -import { getActiveCoaching } from '../../store/Selectors/subscription-selectors/SubscriptionSelectors' +import { getActiveCoaching } from '@selectors/subscription-selectors/SubscriptionSelectors' import colors from '../../styles/colors' import { fonts, StyleProps } from '../../styles/themes' import IconBold from '../iconBold' diff --git a/src/components/MainScreenSpecific/ClockCarousel.tsx b/src/components/MainScreenSpecific/ClockCarousel.tsx index ea2833d..1bd281e 100644 --- a/src/components/MainScreenSpecific/ClockCarousel.tsx +++ b/src/components/MainScreenSpecific/ClockCarousel.tsx @@ -8,11 +8,11 @@ import { } from '@actions/sleep/sleep-data-actions' import { WIDTH } from '../../helpers/Dimensions' import keyExtractor from '../../helpers/KeyExtractor' -import { getEditMode } from '../../store/Selectors/ManualDataSelectors' +import { getEditMode } from '@selectors/ManualDataSelectors' import { getActiveIndex, getWeekReversedSelector -} from '../../store/Selectors/SleepDataSelectors' +} from '@selectors/SleepDataSelectors' import SCClock from '../Clock' import ClockEmpty from '../clock/ClockEmpty' diff --git a/src/components/MainScreenSpecific/EditNightHeader.tsx b/src/components/MainScreenSpecific/EditNightHeader.tsx index c44f718..609fb30 100644 --- a/src/components/MainScreenSpecific/EditNightHeader.tsx +++ b/src/components/MainScreenSpecific/EditNightHeader.tsx @@ -1,25 +1,26 @@ -import React, { memo } from 'react' -import { useDispatch, useSelector } from 'react-redux' -import styled from 'styled-components/native' import { addManualDataToNight, toggleEditMode } from '@actions/manual-sleep/manual-sleep-actions' -import { SMART_TOP_PADDING } from '../../helpers/Dimensions' -import colors from '../../styles/colors' -import { fonts, StyleProps } from '../../styles/themes' import { getEditMode, getEndTime, getStartTime -} from '../../store/Selectors/ManualDataSelectors' -import { getSelectedDay } from '../../store/Selectors/SleepDataSelectors' +} from '@selectors/ManualDataSelectors' +import { getSelectedDay } from '@selectors/SleepDataSelectors' +import React, { memo, FC } from 'react' +import { useDispatch, useSelector } from 'react-redux' +import styled from 'styled-components/native' +import { SMART_TOP_PADDING } from '../../helpers/Dimensions' +import colors from '../../styles/colors' +import { fonts, StyleProps } from '../../styles/themes' import { P } from '../Primitives/Primitives' import TranslatedText from '../TranslatedText' -export const EditNightHeader = () => { - const editMode = useSelector(getEditMode) +export const EditNightHeader: FC = () => { const dispatch = useDispatch() + + const editMode = useSelector(getEditMode) const currentDay = useSelector(getSelectedDay) const startTime = useSelector(getStartTime) const endTime = useSelector(getEndTime) @@ -34,9 +35,10 @@ export const EditNightHeader = () => { } if (!editMode) return null + return (
- {editMode ? ( + {editMode && ( <> Cancel @@ -46,7 +48,7 @@ export const EditNightHeader = () => { Save - ) : null} + )}
) } @@ -59,14 +61,13 @@ const Header = styled.View` props.theme.SECONDARY_BACKGROUND_COLOR}; left: 0px; right: 0px; - top: ${SMART_TOP_PADDING}px; - height: 80px; + top: 0; z-index: 30; box-shadow: ${(props: StyleProps) => props.theme.SHADOW}; flex-direction: row; align-items: center; justify-content: space-between; - padding: 0px 20px 0px; + padding: ${SMART_TOP_PADDING}px 20px 0px; ` const Text = styled(P)` diff --git a/src/components/MainScreenSpecific/EnablePushCheck.tsx b/src/components/MainScreenSpecific/EnablePushCheck.tsx index 969ee10..42d9d42 100644 --- a/src/components/MainScreenSpecific/EnablePushCheck.tsx +++ b/src/components/MainScreenSpecific/EnablePushCheck.tsx @@ -3,7 +3,7 @@ import React from 'react' import { useDispatch, useSelector } from 'react-redux' import { askForPush } from '@actions/NotificationActions' import { actionCreators } from '../../store/Reducers/NotificationReducer' -import { getShouldAskForPermission } from '../../store/Selectors/NotificationSelectors' +import { getShouldAskForPermission } from '@selectors/NotificationSelectors' const EnablePushCheck = () => { const show = useSelector(getShouldAskForPermission) diff --git a/src/components/MainScreenSpecific/Explanations.tsx b/src/components/MainScreenSpecific/Explanations.tsx index 4b4b4eb..4e75a29 100644 --- a/src/components/MainScreenSpecific/Explanations.tsx +++ b/src/components/MainScreenSpecific/Explanations.tsx @@ -5,11 +5,11 @@ import styled from 'styled-components/native' import { minutesToHoursString } from '../../helpers/time' import colors from '../../styles/colors' import { fonts, StyleProps } from '../../styles/themes' -import { getGoToSleepWindowCenter } from '../../store/Selectors/insight-selectors/Insights' +import { getGoToSleepWindowCenter } from '@selectors/insight-selectors/Insights' import { getSelectedDayAsleepDuration, getSelectedDayInBedDuration -} from '../../store/Selectors/SleepDataSelectors' +} from '@selectors/SleepDataSelectors' const Explanations = () => { const inbed = minutesToHoursString(useSelector(getSelectedDayInBedDuration)) diff --git a/src/components/MainScreenSpecific/HelpInfo.tsx b/src/components/MainScreenSpecific/HelpInfo.tsx index 4419371..5e689cd 100644 --- a/src/components/MainScreenSpecific/HelpInfo.tsx +++ b/src/components/MainScreenSpecific/HelpInfo.tsx @@ -2,7 +2,7 @@ import NotificationCard from 'components/NotificationCenter/NotificationCard' import React, { memo } from 'react' import { useDispatch, useSelector } from 'react-redux' import { markIntercomHelpAsRead } from '@actions/onboarding/onboarding-actions' -import { getIntercomNeedHelpRead } from '../../store/Selectors/OnboardingSelectors' +import { getIntercomNeedHelpRead } from '@selectors/OnboardingSelectors' const HelpInfo = () => { const dispatch = useDispatch() diff --git a/src/components/MainScreenSpecific/InitializeSources.tsx b/src/components/MainScreenSpecific/InitializeSources.tsx index 56a3a49..a87bb75 100644 --- a/src/components/MainScreenSpecific/InitializeSources.tsx +++ b/src/components/MainScreenSpecific/InitializeSources.tsx @@ -7,19 +7,20 @@ import { useNavigation } from '@react-navigation/core' import ROUTE from 'config/routes/Routes' import { IconBold } from 'components/iconRegular' import { useSelector, useDispatch } from 'react-redux' -import { getDataOnboardingCompleted } from '@selectors/OnboardingSelectors' -import { markDataOnboardingCompleted } from '@actions/onboarding/onboarding-actions' +import { getDataOnboardingCompleted } from 'store/Selectors/OnboardingSelectors' +import { markDataOnboardingCompleted } from 'actions/onboarding/onboarding-actions' -const InitializeSource: FC<{}> = () => { +const InitializeSource: FC = () => { const { navigate } = useNavigation() const dispatch = useDispatch() const onboardingCompleted = useSelector(getDataOnboardingCompleted) + const handlePress = () => { navigate(ROUTE.SETTINGS, { screen: ROUTE.SOURCE_SETTINGS }) dispatch(markDataOnboardingCompleted()) } - if (onboardingCompleted) return <> + if (onboardingCompleted) return null return ( @@ -44,12 +45,9 @@ const InitializeSource: FC<{}> = () => { export default InitializeSource const Container = styled.View` + margin: 8px 0px; padding: 20px 20px; - position: absolute; - bottom: 0px; - left: 0px; - right: 0px; - background-color: ${colors.evening}; + background-color: ${({ theme }) => theme.SECONDARY_BACKGROUND_COLOR}; border-radius: 5px; box-shadow: ${({ theme }) => theme.SHADOW}; ` diff --git a/src/components/MainScreenSpecific/TodayView.tsx b/src/components/MainScreenSpecific/TodayView.tsx index 3c1d5eb..354b36b 100644 --- a/src/components/MainScreenSpecific/TodayView.tsx +++ b/src/components/MainScreenSpecific/TodayView.tsx @@ -2,7 +2,7 @@ import React, { memo } from 'react' import styled from 'styled-components/native' import { useSelector } from 'react-redux' import { H2, P, Container, Bordered } from '../Primitives/Primitives' -import { getCurrentDaySuggestOtherSource } from '../../store/Selectors/SmartActionsSelectors' +import { getCurrentDaySuggestOtherSource } from '@selectors/SmartActionsSelectors' import { getTitle } from '../../helpers/time' export const TodayView = () => { diff --git a/src/components/ProfileSpecific/Userinfo.tsx b/src/components/ProfileSpecific/Userinfo.tsx index d3cca8c..e06b21c 100644 --- a/src/components/ProfileSpecific/Userinfo.tsx +++ b/src/components/ProfileSpecific/Userinfo.tsx @@ -1,7 +1,7 @@ import React, { memo } from 'react' import { useSelector } from 'react-redux' import styled from 'styled-components/native' -import { getEmail, getIntercomId } from '../../store/Selectors/UserSelectors' +import { getEmail, getIntercomId } from '@selectors/UserSelectors' import { fonts, StyleProps } from '../../styles/themes' import { Container } from '../Primitives/Primitives' diff --git a/src/components/SettingsSpecific/CodeDisclaimer.tsx b/src/components/SettingsSpecific/CodeDisclaimer.tsx index c089a97..c301d47 100644 --- a/src/components/SettingsSpecific/CodeDisclaimer.tsx +++ b/src/components/SettingsSpecific/CodeDisclaimer.tsx @@ -1,7 +1,7 @@ import React, { memo } from 'react' import { useSelector } from 'react-redux' import styled from 'styled-components/native' -import { getAuthState } from '../../store/Selectors/auth-selectors/auth-selectors' +import { getAuthState } from '@selectors/auth-selectors/auth-selectors' import { constants, fonts, StyleProps } from '../../styles/themes' import TranslatedText from '../TranslatedText' diff --git a/src/components/Timeline/Timeline.tsx b/src/components/Timeline/Timeline.tsx index 6d4967c..2b61e67 100644 --- a/src/components/Timeline/Timeline.tsx +++ b/src/components/Timeline/Timeline.tsx @@ -5,7 +5,7 @@ import { SectionList, StyleSheet, Text, View } from 'react-native' import { useSelector } from 'react-redux' import colors from '../../styles/colors' import { fonts } from '../../styles/themes' -import { getGoToSleepWindowStart } from '../../store/Selectors/insight-selectors/Insights' +import { getGoToSleepWindowStart } from '@selectors/insight-selectors/Insights' import { MicroTask } from '../../Types/Microtask' import MicrotaskCard from '../HabitCard/HabitCard' diff --git a/src/components/clock/FallAsleepWindow.tsx b/src/components/clock/FallAsleepWindow.tsx index 2638630..ea818bb 100644 --- a/src/components/clock/FallAsleepWindow.tsx +++ b/src/components/clock/FallAsleepWindow.tsx @@ -1,6 +1,7 @@ import moment from 'moment' -import React, { memo, useRef, useState } from 'react' +import React, { FC, memo, useRef } from 'react' import { Defs, G, Path, Text, TextPath, TSpan } from 'react-native-svg' +import styled from 'styled-components/native' import { clockTimeToAngle, describeArc, @@ -9,26 +10,27 @@ import { import colors from '../../styles/colors' import { fonts } from '../../styles/themes' -interface FallAsleepWindowProps { - goToSleepWindowStart: string - goToSleepWindowEnd: string - +type FallAsleepWindowProps = { + goToSleepWindowStart?: string + goToSleepWindowEnd?: string x: number y: number radius: number - selected: boolean - darkTheme: boolean } -const FallAsleepWindow = (props: FallAsleepWindowProps) => { - const startAngle = clockTimeToAngle(props.goToSleepWindowStart) - const endAngle = clockTimeToAngle(props.goToSleepWindowEnd) - const [strokeWidth, setStrokeWidth] = useState(5) +const FallAsleepWindow: FC = ({ + goToSleepWindowStart, + goToSleepWindowEnd, + x, + y, + radius +}) => { + const startAngle = clockTimeToAngle(goToSleepWindowStart) + const endAngle = clockTimeToAngle(goToSleepWindowEnd) - const startTime = moment(props.goToSleepWindowStart).format('HH:mm') - const endTime = moment(props.goToSleepWindowEnd).format('HH:mm') + const startTime = moment(goToSleepWindowStart).format('HH:mm') + const endTime = moment(goToSleepWindowEnd).format('HH:mm') - const ref: any = useRef() if ( startAngle === undefined || endAngle === undefined || @@ -38,14 +40,8 @@ const FallAsleepWindow = (props: FallAsleepWindowProps) => { return null } - const path = describeArc(props.x, props.y, props.radius, startAngle, endAngle) - const textPath = describeReverseArc( - props.x, - props.y, - props.radius - 10, - startAngle, - endAngle - ) + const path = describeArc(x, y, radius, startAngle, endAngle) + const textPath = describeReverseArc(x, y, radius - 10, startAngle, endAngle) const time = `${startTime} - ${endTime}` return ( @@ -60,25 +56,13 @@ const FallAsleepWindow = (props: FallAsleepWindowProps) => { strokeWidth="1" /> - + - {/* - - */} { ) } export default memo(FallAsleepWindow) + +const Backdrop = styled(Path).attrs(({ theme }) => ({ + stroke: theme.SECONDARY_BACKGROUND_COLOR +}))`` diff --git a/src/components/clock/InfoButton.tsx b/src/components/clock/InfoButton.tsx index c81ac76..acc89c5 100644 --- a/src/components/clock/InfoButton.tsx +++ b/src/components/clock/InfoButton.tsx @@ -1,4 +1,4 @@ -import { toggleExplanationsModal } from '@actions/modal/modal-actions' +import { toggleExplanationsModal } from 'actions/modal/modal-actions' import React, { memo } from 'react' import { useDispatch } from 'react-redux' import styled from 'styled-components/native' @@ -14,8 +14,8 @@ const InfoButton = () => { @@ -28,7 +28,7 @@ export default memo(InfoButton) const Container = styled.View` position: absolute; - bottom: 35px; + bottom: 25px; right: 35px; ` diff --git a/src/components/clock/TrackerName.tsx b/src/components/clock/TrackerName.tsx index be26554..e2a9b67 100644 --- a/src/components/clock/TrackerName.tsx +++ b/src/components/clock/TrackerName.tsx @@ -1,30 +1,30 @@ -import React from 'react' -import { Text, G, TextPath, Defs, Path } from 'react-native-svg' +import React, { FC } from 'react' +import { Text } from 'react-native-svg' +import styled from 'styled-components/native' import { fonts } from '../../styles/themes' -interface TrackerNameProps { +type Props = { x: number y: number - darkTheme: boolean - radius: number } -const TrackerName = (props: TrackerNameProps) => { - const color = props.darkTheme ? 'white' : 'black' - +const TrackerName: FC = ({ x, y }) => { return ( - + x={x} + y={y + 90}> Nyxo - + ) } export default React.memo(TrackerName) + +const ThemedText = styled(Text).attrs(({ theme }) => ({ + fill: theme.SECONDARY_TEXT_COLOR +}))`` diff --git a/src/components/modals/AskAboutDataModal.tsx b/src/components/modals/AskAboutDataModal.tsx index e65d853..4592239 100644 --- a/src/components/modals/AskAboutDataModal.tsx +++ b/src/components/modals/AskAboutDataModal.tsx @@ -3,8 +3,8 @@ import { Dimensions, Platform } from 'react-native' import Modal from 'react-native-modal' import { useDispatch, useSelector } from 'react-redux' import styled from 'styled-components/native' -import { getHealthKitEnabled } from '../../store/Selectors/SleepDataSelectors' -import { getIntroductionCompleted } from '../../store/Selectors/UserSelectors' +import { getHealthKitEnabled } from '@selectors/SleepDataSelectors' +import { getIntroductionCompleted } from '@selectors/UserSelectors' import { StyleProps } from '../../styles/themes' import GoogleFit from './AskAboutDataModal/GoogleFit' import HealthKit from './AskAboutDataModal/HealthKit' diff --git a/src/config/routes/JournalNavigator.tsx b/src/config/routes/JournalNavigator.tsx index 1bd04d5..db6df9b 100644 --- a/src/config/routes/JournalNavigator.tsx +++ b/src/config/routes/JournalNavigator.tsx @@ -1,8 +1,8 @@ import { createNativeStackNavigator } from '@react-navigation/native-stack' import React, { FC } from 'react' import NotificationCenter from 'screens/main/NotificationCenter' +import Sleep from 'screens/sleep/SleepView' import { JournalStackParamList } from 'Types/navigation/navigation' -import Main from '../../screens/main/main' import Habits from '../../screens/Shared/HabitView' import ROUTE from './Routes' @@ -13,7 +13,7 @@ const JournalNavigator: FC = () => { diff --git a/src/helpers/Dimensions.ts b/src/helpers/Dimensions.ts index 3aba37f..aa73819 100644 --- a/src/helpers/Dimensions.ts +++ b/src/helpers/Dimensions.ts @@ -6,6 +6,6 @@ export const { width: WIDTH, height: HEIGHT } = Dimensions.get('window') export const HEADER_MAX_HEIGHT = 300 export const HEADER_MIN_HEIGHT = 80 export const HEADER_HALF = 150 -export const SMART_TOP_PADDING = `${isIphoneX() ? getStatusBarHeight() : 0}` +export const SMART_TOP_PADDING = `${isIphoneX() ? getStatusBarHeight(true) : 0}` export const cardWidth = WIDTH - 64 + 20 export const STATUS_BAR_HEIGHT = statusBarHeight diff --git a/src/screens/Auth/ConfirmUser.tsx b/src/screens/Auth/ConfirmUser.tsx index 7c35ea8..ea5b49b 100644 --- a/src/screens/Auth/ConfirmUser.tsx +++ b/src/screens/Auth/ConfirmUser.tsx @@ -13,7 +13,7 @@ import { StyledScrollView } from '../../components/Primitives/Primitives' import TopInfo from '../../components/TopInfo' -import { getEmail } from '../../store/Selectors/UserSelectors' +import { getEmail } from '@selectors/UserSelectors' interface ConfirmationScreenProps { navigation: any diff --git a/src/screens/Auth/ForgotPasswordScreen.tsx b/src/screens/Auth/ForgotPasswordScreen.tsx index 31ca879..7ac877a 100644 --- a/src/screens/Auth/ForgotPasswordScreen.tsx +++ b/src/screens/Auth/ForgotPasswordScreen.tsx @@ -12,7 +12,7 @@ import TextButton from '../../components/Buttons/TextButton' import { Container, H1, H4 } from '../../components/Primitives/Primitives' import SCTextInput from '../../components/TextField' import TopInfo from '../../components/TopInfo' -import { getEmail } from '../../store/Selectors/UserSelectors' +import { getEmail } from '@selectors/UserSelectors' const ForgotPasswordScreen = () => { const emailFromState = useSelector(getEmail) diff --git a/src/screens/Auth/RegisterScreen.tsx b/src/screens/Auth/RegisterScreen.tsx index d8e9598..bb73188 100644 --- a/src/screens/Auth/RegisterScreen.tsx +++ b/src/screens/Auth/RegisterScreen.tsx @@ -17,7 +17,7 @@ import SCTextInput from '../../components/TextField' import TopInfo from '../../components/TopInfo' import TranslatedText from '../../components/TranslatedText' import { RegisterSchema } from '../../config/Validation' -import { getLoading } from '../../store/Selectors/auth-selectors/auth-selectors' +import { getLoading } from '@selectors/auth-selectors/auth-selectors' import colors from '../../styles/colors' import { fonts, StyleProps } from '../../styles/themes' diff --git a/src/screens/Terveystalo/Welcome.tsx b/src/screens/Terveystalo/Welcome.tsx index a2972ee..16ed559 100644 --- a/src/screens/Terveystalo/Welcome.tsx +++ b/src/screens/Terveystalo/Welcome.tsx @@ -12,7 +12,7 @@ import LinkingButton from 'components/Buttons/LinkingButton' import LoginButton from '../../components/Buttons/LoginButton' import TerveystaloLogo from '../../../assets/terveystalo-logo.svg' import TerveystaloButton from '../../components/Buttons/TerveystaloButton' -import { getAuthState } from '../../store/Selectors/auth-selectors/auth-selectors' +import { getAuthState } from '@selectors/auth-selectors/auth-selectors' import translate from '../../config/i18n' import { PrimaryButton } from '../../components/Buttons/PrimaryButton' import GoBack, { GoBackContainer } from '../../components/Buttons/GoBack' diff --git a/src/screens/coaching/CoachingView.tsx b/src/screens/coaching/CoachingView.tsx index f1e939a..813ecbf 100644 --- a/src/screens/coaching/CoachingView.tsx +++ b/src/screens/coaching/CoachingView.tsx @@ -11,7 +11,7 @@ import NewHabitModal from '../../components/modals/HabitModal/NewHabitModal' import { SafeAreaView } from '../../components/Primitives/Primitives' import TopInfo from '../../components/TopInfo' import { WIDTH } from '../../helpers/Dimensions' -import { getActiveCoaching } from '../../store/Selectors/subscription-selectors/SubscriptionSelectors' +import { getActiveCoaching } from '@selectors/subscription-selectors/SubscriptionSelectors' import colors from '../../styles/colors' import Lessons from './Lessons' diff --git a/src/screens/coaching/Lessons.tsx b/src/screens/coaching/Lessons.tsx index c7c69f5..3f267bd 100644 --- a/src/screens/coaching/Lessons.tsx +++ b/src/screens/coaching/Lessons.tsx @@ -15,7 +15,7 @@ import SectionFooter from '../../components/LessonComponents/SectionFooter' import SectionHeader from '../../components/LessonComponents/SectionHeader' import Separator from '../../components/LessonComponents/Separator' import keyExtractor from '../../helpers/KeyExtractor' -import { getActiveCoaching } from '../../store/Selectors/subscription-selectors/SubscriptionSelectors' +import { getActiveCoaching } from '@selectors/subscription-selectors/SubscriptionSelectors' import { StyleProps } from '../../styles/themes' const AnimatedSectionList = Animated.createAnimatedComponent(SectionList) diff --git a/src/screens/coaching/WeekView.tsx b/src/screens/coaching/WeekView.tsx index 80db022..1ad2507 100644 --- a/src/screens/coaching/WeekView.tsx +++ b/src/screens/coaching/WeekView.tsx @@ -11,7 +11,7 @@ import WeekIntro from '../../components/CoachingSpecific/WeekIntro' import WeekViewHeader from '../../components/CoachingSpecific/WeekViewHeader' import NewHabitModal from '../../components/modals/HabitModal/NewHabitModal' import { BGContainer } from '../../components/Primitives/Primitives' -import { getActiveCoaching } from '../../store/Selectors/subscription-selectors/SubscriptionSelectors' +import { getActiveCoaching } from '@selectors/subscription-selectors/SubscriptionSelectors' import Lessons from './Lessons' const yOffset = new Animated.Value(0) diff --git a/src/screens/coaching/challenges.tsx b/src/screens/coaching/challenges.tsx index 1aced77..e20ff5b 100644 --- a/src/screens/coaching/challenges.tsx +++ b/src/screens/coaching/challenges.tsx @@ -3,7 +3,7 @@ import { View, FlatList } from 'react-native' import { useSelector } from 'react-redux' import Achievement from './Components/Achievement' import TranslatedText from '../../components/TranslatedText' -import { getVisibleChallenges } from '../../store/Selectors/ChallengeSelectors' +import { getVisibleChallenges } from '@selectors/ChallengeSelectors' import { H2, P } from '../../components/Primitives/Primitives' interface ChallengesProps {} diff --git a/src/screens/main/main.tsx b/src/screens/main/main.tsx index 068535f..e11958d 100644 --- a/src/screens/main/main.tsx +++ b/src/screens/main/main.tsx @@ -1,3 +1,13 @@ +import { + fetchSleepData, + updateCalendar +} from '@actions/sleep/sleep-data-actions' +import { backgroundAction, startup } from '@actions/StartupActions' +import { + getLoadingFitbit, + getLoadingGoogleFit +} from '@selectors/api-selectors/api-selectors' +import { getHealthKitLoading } from '@selectors/health-kit-selectors/health-kit-selectors' import InitializeSource from 'components/MainScreenSpecific/InitializeSources' import ExplanationsModal from 'components/modals/ExplanationsModal' import MergeHabitsModal from 'components/modals/MergeHabitsModal/MergeHabitsModal' @@ -6,16 +16,6 @@ import RatingModal from 'components/RatingModal' import React, { memo, useEffect } from 'react' import { RefreshControl, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' -import { - getLoadingFitbit, - getLoadingGoogleFit -} from '@selectors/api-selectors/api-selectors' -import { getHealthKitLoading } from '@selectors/health-kit-selectors/health-kit-selectors' -import { - fetchSleepData, - updateCalendar -} from '@actions/sleep/sleep-data-actions' -import { backgroundAction, startup } from '@actions/StartupActions' import DayStrip from '../../components/DayStrip' import Habits from '../../components/HabitList/HabitList' import ClockCarousel from '../../components/MainScreenSpecific/ClockCarousel' @@ -28,7 +28,6 @@ import TopInfo from '../../components/TopInfo' import useBackgroundFetch from '../../Hooks/UseBackgroundFetch' import useNotificationEventHandlers from '../../Hooks/UseNotificationEventHandlers' import colors from '../../styles/colors' -import SleepTimeChart from 'components/Charts/sleepTimeChart' const MainScreen = () => { const isLoadingSleepData = useSelector(getHealthKitLoading) @@ -65,7 +64,6 @@ const MainScreen = () => { } - footer={} refreshControl={ { diff --git a/src/screens/profile/profile.tsx b/src/screens/profile/profile.tsx index 0b544af..dc83bf4 100644 --- a/src/screens/profile/profile.tsx +++ b/src/screens/profile/profile.tsx @@ -1,8 +1,22 @@ +import { getAuthState } from '@selectors/auth-selectors/auth-selectors' +import { + deviationBedTime, + deviationSleep, + getAsleepNights, + getAverageBedTime, + getAverageSleepTime, + getBedTimeNights, + getLongestBedTime, + getLongestSleepTime, + getNightsWithOver8HoursBedTime, + getNightsWithOver8HoursSleep, + getShortestBedTime, + getShortestSleepTime +} from '@selectors/SleepDataSelectors' import React, { memo } from 'react' import { SectionList } from 'react-native' import { useSelector } from 'react-redux' import styled from 'styled-components/native' -import SleepTimeChart from '../../components/Charts/sleepTimeChart' import Inforow from '../../components/InfoRow' import { H3, @@ -16,21 +30,6 @@ import TopInfo from '../../components/TopInfo' import keyExtractor from '../../helpers/KeyExtractor' import { minutesToHoursString } from '../../helpers/time' import { StyleProps } from '../../styles/themes' -import { - deviationBedTime, - deviationSleep, - getAsleepNights, - getAverageBedTime, - getAverageSleepTime, - getBedTimeNights, - getLongestBedTime, - getLongestSleepTime, - getNightsWithOver8HoursBedTime, - getNightsWithOver8HoursSleep, - getShortestBedTime, - getShortestSleepTime -} from '../../store/Selectors/SleepDataSelectors' -import { getAuthState } from '../../store/Selectors/auth-selectors/auth-selectors' const ProfileScreen = () => { const nights = useSelector(getBedTimeNights) @@ -122,7 +121,6 @@ const ProfileScreen = () => { renderSectionHeader={renderSectionHeader} keyExtractor={keyExtractor} renderItem={renderItem} - ListFooterComponent={} /> ) diff --git a/src/screens/settings/CloudSettings.tsx b/src/screens/settings/CloudSettings.tsx index 8345e37..12de9e3 100644 --- a/src/screens/settings/CloudSettings.tsx +++ b/src/screens/settings/CloudSettings.tsx @@ -22,7 +22,7 @@ import ROUTE from '../../config/routes/Routes' import { getAuthState, getLoading -} from '../../store/Selectors/auth-selectors/auth-selectors' +} from '@selectors/auth-selectors/auth-selectors' import colors from '../../styles/colors' const CloudView = ({ navigation, route }) => { diff --git a/src/screens/settings/DevelopmentMenu.tsx b/src/screens/settings/DevelopmentMenu.tsx index aeb52ff..8d95ea4 100644 --- a/src/screens/settings/DevelopmentMenu.tsx +++ b/src/screens/settings/DevelopmentMenu.tsx @@ -4,7 +4,7 @@ import { useDispatch, useSelector } from 'react-redux' import IconButton from '../../components/Buttons/IconButton' import { Container, H1, P, Row } from '../../components/Primitives/Primitives' import colors from '../../styles/colors' -import { getActiveCoaching } from '../../store/Selectors/subscription-selectors/SubscriptionSelectors' +import { getActiveCoaching } from '@selectors/subscription-selectors/SubscriptionSelectors' import { disableCoaching, purchaseCoachingForAWeek diff --git a/src/screens/settings/ManageSubscription.tsx b/src/screens/settings/ManageSubscription.tsx index 08aa8ee..ef163fe 100644 --- a/src/screens/settings/ManageSubscription.tsx +++ b/src/screens/settings/ManageSubscription.tsx @@ -22,7 +22,7 @@ import CONFIG from '../../config/Config' import { getActiveCoaching, getLoadingPurchase -} from '../../store/Selectors/subscription-selectors/SubscriptionSelectors' +} from '@selectors/subscription-selectors/SubscriptionSelectors' const ManageSubscription = () => { const isCoachingActive = useSelector(getActiveCoaching) diff --git a/src/screens/settings/Notifications.tsx b/src/screens/settings/Notifications.tsx index 6896aa7..e709618 100644 --- a/src/screens/settings/Notifications.tsx +++ b/src/screens/settings/Notifications.tsx @@ -18,7 +18,7 @@ import { import { makeGetNotificationEnabled, getScheduledNotifications -} from '../../store/Selectors/NotificationSelectors' +} from '@selectors/NotificationSelectors' import { State } from '../../Types/State' import { setNotification } from '@actions/NotificationActions' diff --git a/src/screens/settings/settings.tsx b/src/screens/settings/settings.tsx index 29a29be..949768b 100644 --- a/src/screens/settings/settings.tsx +++ b/src/screens/settings/settings.tsx @@ -18,9 +18,9 @@ import VersionInformation from '../../components/SettingsSpecific/versionInforma import TopInfo from '../../components/TopInfo' import CONFIG from '../../config/Config' import keyExtractor from '../../helpers/KeyExtractor' -import { getIntercomNotificationCount } from '../../store/Selectors/NotificationSelectors' -import { getActiveCoaching } from '../../store/Selectors/subscription-selectors/SubscriptionSelectors' -import { getTheme } from '../../store/Selectors/UserSelectors' +import { getIntercomNotificationCount } from '@selectors/NotificationSelectors' +import { getActiveCoaching } from '@selectors/subscription-selectors/SubscriptionSelectors' +import { getTheme } from '@selectors/UserSelectors' import { darkTheme, lightTheme, diff --git a/src/screens/sleep/SleepView.tsx b/src/screens/sleep/SleepView.tsx index f158b78..9b61c7d 100644 --- a/src/screens/sleep/SleepView.tsx +++ b/src/screens/sleep/SleepView.tsx @@ -71,9 +71,9 @@ const Sleep: FC = () => { - + {/* - + */} From df9266f938e144248b81a4fe306bd58964e74e0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Perttu=20L=C3=A4hteenlahti?= Date: Sun, 23 Aug 2020 22:23:37 +0300 Subject: [PATCH 4/9] Fixing chart --- .../{sleepTimeChart.tsx => SleepChart.tsx} | 17 +++++- .../Charts/SleepTimeChart/SleepBars.tsx | 13 ++++- .../Charts/SleepTimeChart/TargetBars.tsx | 55 +++++++++++++++++++ src/components/Clock.tsx | 4 -- src/components/clock/Date.tsx | 7 +-- src/screens/sleep/SleepView.tsx | 8 +-- 6 files changed, 88 insertions(+), 16 deletions(-) rename src/components/Charts/{sleepTimeChart.tsx => SleepChart.tsx} (88%) create mode 100644 src/components/Charts/SleepTimeChart/TargetBars.tsx diff --git a/src/components/Charts/sleepTimeChart.tsx b/src/components/Charts/SleepChart.tsx similarity index 88% rename from src/components/Charts/sleepTimeChart.tsx rename to src/components/Charts/SleepChart.tsx index ef18009..dc7931e 100644 --- a/src/components/Charts/sleepTimeChart.tsx +++ b/src/components/Charts/SleepChart.tsx @@ -8,11 +8,13 @@ import { ScrollView } from 'react-native-gesture-handler' import Svg from 'react-native-svg' import { useDispatch, useSelector } from 'react-redux' import styled from 'styled-components/native' -import { getAllDays } from '../../store/Selectors/SleepDataSelectors' +import { getAllDays } from '@selectors/SleepDataSelectors' +import { getGoToSleepWindowCenter } from '@selectors/insight-selectors/Insights' import { Day, Night, Value } from '../../Types/Sleepdata' import SleepBars from './SleepTimeChart/SleepBars' import XTicks from './SleepTimeChart/XTicks' import YTicks from './SleepTimeChart/YTicks' +import TargetBars from './SleepTimeChart/TargetBars' const { height, width } = Dimensions.get('window') @@ -25,6 +27,7 @@ const SleepTimeChart: FC = () => { const days = useSelector(getAllDays) const dispatch = useDispatch() const chartWidth = (barWidth + 10) * days.length + paddingLeft + paddingRight + const bedtimeWindow = useSelector(getGoToSleepWindowCenter) const { normalizedSleepData } = useMemo( () => ({ @@ -64,6 +67,8 @@ const SleepTimeChart: FC = () => { const yTicks = scaleY.ticks(5) const xTicks = scaleX.ticks(days.length) + console.log(normalizedSleepData) + return ( Sleep Goal Trend @@ -75,7 +80,16 @@ const SleepTimeChart: FC = () => { showsHorizontalScrollIndicator={false}> + { data={normalizedSleepData} /> scaleY: ScaleTime barWidth: number + onPress: (day: Day) => void } -const SleepBars: FC = ({ data, type, scaleX, scaleY, barWidth }) => { +const SleepBars: FC = ({ + data, + type, + scaleX, + scaleY, + barWidth, + onPress +}) => { const color = type === Value.Asleep ? colors.radiantBlue : colors.inBedColor const { bars } = useMemo( @@ -29,7 +38,7 @@ const SleepBars: FC = ({ data, type, scaleX, scaleY, barWidth }) => { scaleY(moment(item.startDate).valueOf()) return ( - + onPress(datum)} key={item.startDate}> + scaleY: ScaleTime + barWidth: number + onPress: (day: Day) => void + start: string +} + +const TargetBars: FC = ({ + data, + scaleX, + scaleY, + barWidth, + onPress, + start +}) => { + const end = moment(start).add(8, 'hours') + + const { bars } = useMemo( + () => ({ + bars: data.map((datum) => { + const y = scaleY(moment(start).valueOf()) + const x = scaleX(new Date(datum.date)) + const height = scaleY(end.valueOf()) - scaleY(moment(start).valueOf()) + + return ( + onPress(datum)} key={datum.date}> + + + ) + }) + }), + [data] + ) + + return {bars} +} + +export default TargetBars diff --git a/src/components/Clock.tsx b/src/components/Clock.tsx index c63cda6..67a064b 100644 --- a/src/components/Clock.tsx +++ b/src/components/Clock.tsx @@ -128,7 +128,3 @@ const ClockContainer = styled(Animated.View)` flex: 1; margin-top: 8px; ` - -const StyledSvg = styled(Svg)` - position: absolute; -` diff --git a/src/components/clock/Date.tsx b/src/components/clock/Date.tsx index 97d3db3..d0961d2 100644 --- a/src/components/clock/Date.tsx +++ b/src/components/clock/Date.tsx @@ -1,17 +1,16 @@ import Moment from 'moment' -import React, { memo } from 'react' +import React, { memo, FC } from 'react' import { G, Text as SVGText } from 'react-native-svg' import styled from 'styled-components/native' -interface DateProps { +type Props = { date: string - darkTheme: boolean x: number y: number hasData: boolean } -const Date = ({ x, y, hasData, date }: DateProps) => { +const Date: FC = ({ x, y, hasData, date }) => { if (!hasData) { return } diff --git a/src/screens/sleep/SleepView.tsx b/src/screens/sleep/SleepView.tsx index 9b61c7d..f9c5900 100644 --- a/src/screens/sleep/SleepView.tsx +++ b/src/screens/sleep/SleepView.tsx @@ -1,3 +1,4 @@ +import SleepTimeChart from '@components/Charts/SleepChart' import { getHealthKitLoading } from '@selectors/health-kit-selectors/health-kit-selectors' import { getEditMode } from '@selectors/ManualDataSelectors' import { getSelectedDay } from '@selectors/SleepDataSelectors' @@ -6,7 +7,6 @@ import { updateCalendar } from 'actions/sleep/sleep-data-actions' import { backgroundAction, startup } from 'actions/StartupActions' -import SleepTimeChart from 'components/Charts/sleepTimeChart' import Clock from 'components/Clock' import DayStrip from 'components/DayStrip' import { EditNightHeader } from 'components/MainScreenSpecific/EditNightHeader' @@ -16,7 +16,6 @@ import EditHabitModal from 'components/modals/HabitModal/EditHabitModal' import NewHabitModal from 'components/modals/HabitModal/NewHabitModal' import MergeHabitsModal from 'components/modals/MergeHabitsModal/MergeHabitsModal' import RatingModal from 'components/RatingModal' -import InsightsCard from 'components/sleep/InsightsCard' import useBackgroundFetch from 'Hooks/UseBackgroundFetch' import useNotificationEventHandlers from 'Hooks/UseNotificationEventHandlers' import moment from 'moment' @@ -68,9 +67,8 @@ const Sleep: FC = () => { - - - + + {/* */} {/* */} From 32a592858bdbe279b993af4ab1c97fef7e9cbb21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Perttu=20L=C3=A4hteenlahti?= Date: Mon, 24 Aug 2020 22:06:08 +0300 Subject: [PATCH 5/9] Refactoring --- .../CoachingSpecific/WeekCarousel.tsx | 1 - src/screens/Shared/HabitView.tsx | 67 +++++++++++++++---- 2 files changed, 53 insertions(+), 15 deletions(-) diff --git a/src/components/CoachingSpecific/WeekCarousel.tsx b/src/components/CoachingSpecific/WeekCarousel.tsx index 645423a..62c151e 100644 --- a/src/components/CoachingSpecific/WeekCarousel.tsx +++ b/src/components/CoachingSpecific/WeekCarousel.tsx @@ -28,7 +28,6 @@ const WeekCarousel: FC = () => { week={item} cardMargin={cardMargin} cardWidth={cardWidth} - xOffset={xOffset} /> ) } diff --git a/src/screens/Shared/HabitView.tsx b/src/screens/Shared/HabitView.tsx index a2d7ef2..002a88a 100644 --- a/src/screens/Shared/HabitView.tsx +++ b/src/screens/Shared/HabitView.tsx @@ -1,30 +1,42 @@ -import React, { FC } from 'react' -import { SectionList } from 'react-native' -import { useSelector } from 'react-redux' -import { - getActiveHabits, - getArchivedHabits -} from '@selectors/habit-selectors/habit-selectors' -import { Habit } from 'Types/State/habit-state' -import CoachingSectionHeader from '../../components/CoachingSpecific/CoachingSectionHeader' -import EmptyState from '../../components/EmptyState' -import HabitCard from '../../components/HabitCard/HabitCard' -import EditHabitModal from '../../components/modals/HabitModal/EditHabitModal' +import CoachingSectionHeader from '@components/CoachingSpecific/CoachingSectionHeader' +import EmptyState from '@components/EmptyState' +import HabitCard from '@components/HabitCard/HabitCard' +import { IconBold } from '@components/iconRegular' +import EditHabitModal from '@components/modals/HabitModal/EditHabitModal' import { Container, P, PageTitle, SafeAreaView -} from '../../components/Primitives/Primitives' +} from '@components/Primitives/Primitives' +import { + getActiveHabits, + getArchivedHabits +} from '@selectors/habit-selectors/habit-selectors' +import TranslatedText from 'components/TranslatedText' +import React, { FC } from 'react' +import { SectionList } from 'react-native' +import { useSelector, useDispatch } from 'react-redux' +import styled from 'styled-components/native' +import colors from 'styles/colors' +import { fonts } from 'styles/themes' +import { Habit } from 'Types/State/habit-state' +import { toggleNewHabitModal } from '@actions/modal/modal-actions' +import NewHabitModal from 'components/modals/HabitModal/NewHabitModal' const HabitView: FC = () => { const activeHabits = useSelector(getActiveHabits) const archivedHabits = useSelector(getArchivedHabits) + const dispatch = useDispatch() const renderItem = ({ item }: { item: Habit }) => { return } + const toggleModal = () => { + dispatch(toggleNewHabitModal()) + } + const sections = [ { title: 'HABIT.ACTIVE', data: activeHabits }, { title: 'HABIT.ARCHIVED', data: archivedHabits } @@ -39,7 +51,18 @@ const HabitView: FC = () => { ( <> - HABIT.HABIT_TITLE + + HABIT.HABIT_TITLE + + + + +

HABIT.EXPLANATION_1

HABIT.EXPLANATION_2

@@ -56,8 +79,24 @@ const HabitView: FC = () => { /> + ) } export default HabitView + +const TitleRow = styled.View` + padding-right: 20px; + flex: 1; + flex-direction: row; + justify-content: space-between; + align-items: center; +` + +const NewHabitButton = styled.TouchableOpacity` + padding: 3px; + border-radius: 50px; + justify-content: center; + align-items: center; +` From 77c9d18199a8acd8ee3f9ac5720ea5322cbb89dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Perttu=20L=C3=A4hteenlahti?= Date: Tue, 25 Aug 2020 10:02:34 +0300 Subject: [PATCH 6/9] Test string --- src/translations/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/translations/en.json b/src/translations/en.json index 9575b9d..827e6e9 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -619,8 +619,8 @@ "LONGEST_STREAK": "Longest streak", "CURRENT_STREAK": "Current streak", "WARNING_TITLE_EXISTS": "Habit with this title already exists.", - "EXPLANATION_1": "", - "EXPLANATION_2": "", + "EXPLANATION_1": "TODO", + "EXPLANATION_2": "TODO", "MORNING": "Morning", "AFTERNOON": "Afternoon", From 9894d4f9e56e9419ae17bf6d031d76dbc2a82685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Perttu=20L=C3=A4hteenlahti?= Date: Tue, 25 Aug 2020 22:06:30 +0300 Subject: [PATCH 7/9] Refactoring and styling --- src/actions/coaching/content-actions.ts | 11 +++-- .../CoachingSectionHeader.tsx | 33 +++++++++---- src/components/CoachingSpecific/TopHeader.tsx | 8 ++-- .../CoachingSpecific/Week.Cover.tsx | 22 ++++----- src/components/CoachingSpecific/WeekIntro.tsx | 48 +++++++++++++++---- .../CoachingSpecific/WeekViewHeader.tsx | 6 +-- .../NotificationCenterLink.tsx | 37 +++++++------- src/components/sleep/InsightsCard.tsx | 2 +- src/helpers/Dimensions.ts | 2 +- src/helpers/time.ts | 4 +- src/screens/Shared/HabitView.tsx | 38 +++++++++++---- src/screens/coaching/CoachingView.tsx | 7 ++- src/screens/coaching/WeekView.tsx | 20 ++++---- src/screens/sleep/SleepView.tsx | 36 ++++++++------ src/styles/themes.ts | 5 +- src/translations/fi.json | 8 ++-- 16 files changed, 178 insertions(+), 109 deletions(-) diff --git a/src/actions/coaching/content-actions.ts b/src/actions/coaching/content-actions.ts index 2dcfa36..ac907b3 100644 --- a/src/actions/coaching/content-actions.ts +++ b/src/actions/coaching/content-actions.ts @@ -1,6 +1,7 @@ import { documentToPlainTextString } from '@contentful/rich-text-plain-text-renderer' import { ContentfulClientApi, Entry } from 'contentful' import I18n from 'i18n-js' +import { Dispatch, Thunk } from 'Types/ReduxActions' import CONFIG from '../../config/Config' import { actionCreators as contentActions } from '../../store/Reducers/content-reducer/content-reducer' import { @@ -27,7 +28,7 @@ const getFieldValue = ( entry: Entry, fieldToGet: string, object: any, - callback?: Function, + callback?: () => void, fieldToSet?: string ) => { if (entry.fields[fieldToGet]) { @@ -37,7 +38,7 @@ const getFieldValue = ( } } -export const getAllWeeks = () => async (dispatch: Function) => { +export const getAllWeeks = (): Thunk => async (dispatch: Dispatch) => { const locale = I18n.locale === 'en' ? 'en-US' : 'fi-FI' const weeks: ContentWeek[] = [] const lessons: any = [] @@ -45,10 +46,12 @@ export const getAllWeeks = () => async (dispatch: Function) => { const exampleHabits: ExampleHabit[] = [] await dispatch(contentActions.updateContentStart()) + try { const coachingWeeks: any = await client.getEntries({ locale, content_type: 'coachingWeek', + 'fields.slug[ne]': 'introduction', include: 3 }) @@ -83,7 +86,7 @@ export const getAllWeeks = () => async (dispatch: Function) => { ) if (coachingWeek.fields.lessons) { - const weekLessons: any = [] + const weekLessons: string[] = [] coachingWeek.fields.lessons.forEach((lesson: Entry) => { const lessonObject: ContentLesson = { contentId: lesson.sys.id } @@ -113,7 +116,7 @@ export const getAllWeeks = () => async (dispatch: Function) => { const section: Section = { title: lesson.fields.section.fields.title, order: lesson.fields.section.fields.order, - description: lesson.fields!.section!.fields!.description! + description: lesson.fields?.section?.fields?.description } lessonObject.section = section sections.push(section) diff --git a/src/components/CoachingSpecific/CoachingSectionHeader.tsx b/src/components/CoachingSpecific/CoachingSectionHeader.tsx index f5cc308..d65c463 100644 --- a/src/components/CoachingSpecific/CoachingSectionHeader.tsx +++ b/src/components/CoachingSpecific/CoachingSectionHeader.tsx @@ -1,28 +1,43 @@ -import React, { memo } from 'react' +import React, { FC, ReactElement } from 'react' +import { SectionListData } from 'react-native' import styled from 'styled-components/native' +import { Habit } from 'Types/State/habit-state' import { fonts, StyleProps } from '../../styles/themes' import TranslatedText from '../TranslatedText' -interface CoachingSectionHeaderProps { +type Props = { title: string - data: any + data: SectionListData[] | null + subtitle: string } -const CoachingSectionHeader = (props: CoachingSectionHeaderProps) => - props.data.length !== 0 ? ( +const CoachingSectionHeader: FC = ({ + data, + title, + subtitle +}): null | ReactElement => + !data || data.length !== 0 ? ( - {props.title} + {title} + {subtitle} ) : null -export default memo(CoachingSectionHeader) +export default CoachingSectionHeader const SectionHeader = styled.View` background-color: ${(props) => props.theme.PRIMARY_BACKGROUND_COLOR}; - padding: 10px 20px; + padding: 30px 20px 20px; ` const SectionTitle = styled(TranslatedText)` font-family: ${fonts.bold}; font-size: 22px; - color: ${(props: StyleProps) => props.theme.PRIMARY_TEXT_COLOR}; + color: ${({ theme }) => theme.PRIMARY_TEXT_COLOR}; +` + +const Subtitle = styled(TranslatedText)` + margin-top: 5px; + font-family: ${fonts.medium}; + font-size: 13px; + color: ${({ theme }) => theme.SECONDARY_TEXT_COLOR}; ` diff --git a/src/components/CoachingSpecific/TopHeader.tsx b/src/components/CoachingSpecific/TopHeader.tsx index bfa6d3e..bae72e8 100644 --- a/src/components/CoachingSpecific/TopHeader.tsx +++ b/src/components/CoachingSpecific/TopHeader.tsx @@ -1,4 +1,4 @@ -import React, { memo } from 'react' +import React, { memo, FC } from 'react' import Animated from 'react-native-reanimated' import styled from 'styled-components/native' import { @@ -11,11 +11,11 @@ import { fonts } from '../../styles/themes' import GoBack from '../Buttons/GoBack' interface Props { - yOffset: any + yOffset: Animated.Value title: string } -const TopHeader = ({ yOffset, title }: Props) => { +const TopHeader: FC = ({ yOffset, title }) => { const fadeIn = () => ({ opacity: yOffset.interpolate({ inputRange: [HEADER_HALF, HEADER_MAX_HEIGHT - HEADER_MIN_HEIGHT], @@ -53,7 +53,7 @@ const BackButtonContainer = styled(Animated.View)` position: absolute; z-index: 10; top: 0; - padding: ${parseInt(SMART_TOP_PADDING)}px 20px 0px; + padding: ${parseInt(SMART_TOP_PADDING, 0)}px 20px 0px; flex-direction: row; align-items: center; width: 100%; diff --git a/src/components/CoachingSpecific/Week.Cover.tsx b/src/components/CoachingSpecific/Week.Cover.tsx index 1a45348..934c136 100644 --- a/src/components/CoachingSpecific/Week.Cover.tsx +++ b/src/components/CoachingSpecific/Week.Cover.tsx @@ -1,4 +1,4 @@ -import React from 'react' +import React, { FC } from 'react' import LinearGradient from 'react-native-linear-gradient' import Animated from 'react-native-reanimated' import styled from 'styled-components/native' @@ -11,18 +11,14 @@ import { import { StyleProps } from '../../styles/themes' import AnimatedFastImage from '../AnimatedFastImage/AnimatedFastImage' -const Cover = ({ cover, yOffset }: { cover: string; yOffset: any }) => { - const headerHeight = (yOffset: any) => ({ - // transform: [ - // { - // scale: yOffset.interpolate({ - // inputRange: [0, HEADER_MAX_HEIGHT - HEADER_MIN_HEIGHT], - // outputRange: [2, 1], - // extrapolateRight: Animated.Extrapolate.CLAMP, - // }), - // }, - // ], - opacity: yOffset.interpolate({ +type Props = { + cover: string + yOffset: Animated.Value +} + +const Cover: FC = ({ cover, yOffset }) => { + const headerHeight = (offset: Animated.Value) => ({ + opacity: offset.interpolate({ inputRange: [0, HEADER_MAX_HEIGHT - HEADER_MIN_HEIGHT], outputRange: [1, 0], extrapolateRight: Animated.Extrapolate.CLAMP, diff --git a/src/components/CoachingSpecific/WeekIntro.tsx b/src/components/CoachingSpecific/WeekIntro.tsx index 37399d4..a3cd87a 100644 --- a/src/components/CoachingSpecific/WeekIntro.tsx +++ b/src/components/CoachingSpecific/WeekIntro.tsx @@ -6,6 +6,7 @@ import { useDispatch } from 'react-redux' import moment from 'moment' import { PN } from '../Primitives/Primitives' import { StyleProps, fonts, constants } from '../../styles/themes' +import { IconBold } from 'components/iconRegular' interface Props { intro: string @@ -29,14 +30,22 @@ const WeekIntro = ({ return ( - {intro} - {description} - WEEK_VIEW.HABIT_COUNT + {habitCount > 0 && ( + <> + + + WEEK_VIEW.HABIT_COUNT + + + )} {lessonCount > 0 && ( - - WEEK_VIEW.LESSON_COUNT - + <> + + + WEEK_VIEW.LESSON_COUNT + + )} @@ -49,6 +58,9 @@ const WeekIntro = ({ WEEK_VIEW.END_DATE )} + + {intro} + {description} ) } @@ -58,7 +70,7 @@ export default memo(WeekIntro) const Container = styled.View` background-color: ${(props: StyleProps) => props.theme.PRIMARY_BACKGROUND_COLOR}; - padding: 10px 20px 30px; + padding: 20px 20px 30px; ` const Intro = styled.Text` @@ -70,16 +82,14 @@ const Intro = styled.Text` const Information = styled.View` flex-direction: row; - border-bottom-color: ${({ theme }) => theme.HAIRLINE_COLOR}; padding: 10px 0px 5px; - border-bottom-width: ${constants.hairlineWidth}px; ` const Habits = styled(TranslatedText)` font-size: 13px; margin-right: 10px; font-family: ${fonts.medium}; - color: ${({ theme }) => theme.SECONDARY_TEXT_COLOR}; + color: ${({ theme }) => theme.PRIMARY_TEXT_COLOR}; ` const DurationRow = styled.View` @@ -100,3 +110,21 @@ const Ended = styled(TranslatedText)` font-family: ${fonts.medium}; color: ${({ theme }) => theme.SECONDARY_TEXT_COLOR}; ` + +const LessonIcon = styled(IconBold).attrs(({ theme }) => ({ + height: 15, + width: 15, + fill: theme.SECONDARY_TEXT_COLOR, + name: 'bookLamp' +}))` + margin-right: 10px; +` + +const HabitIcon = styled(IconBold).attrs(({ theme }) => ({ + height: 15, + width: 15, + fill: theme.SECONDARY_TEXT_COLOR, + name: 'checklist' +}))` + margin-right: 10px; +` diff --git a/src/components/CoachingSpecific/WeekViewHeader.tsx b/src/components/CoachingSpecific/WeekViewHeader.tsx index 9217c6f..9a8638e 100644 --- a/src/components/CoachingSpecific/WeekViewHeader.tsx +++ b/src/components/CoachingSpecific/WeekViewHeader.tsx @@ -6,15 +6,15 @@ import { HEADER_MAX_HEIGHT, HEADER_MIN_HEIGHT } from '../../helpers/Dimensions' import { fonts, StyleProps } from '../../styles/themes' interface Props { - yOffset: any + yOffset: Animated.Value title?: string } const WeekViewHeader = (props: Props) => { const { yOffset, title } = props - const titleSize = (yOffset: any) => ({ - opacity: yOffset.interpolate({ + const titleSize = (offset: Animated.Value) => ({ + opacity: offset.interpolate({ inputRange: [0, HEADER_MAX_HEIGHT - HEADER_MIN_HEIGHT], outputRange: [1, 0.2], extrapolateRight: Animated.Extrapolate.CLAMP, diff --git a/src/components/NotificationCenter/NotificationCenterLink.tsx b/src/components/NotificationCenter/NotificationCenterLink.tsx index 9ab1915..4b41b01 100644 --- a/src/components/NotificationCenter/NotificationCenterLink.tsx +++ b/src/components/NotificationCenter/NotificationCenterLink.tsx @@ -1,4 +1,4 @@ -import React from 'react' +import React, { FC } from 'react' import styled from 'styled-components/native' import { IconBold } from 'components/iconRegular' import { useNavigation } from '@react-navigation/core' @@ -7,7 +7,7 @@ import colors from 'styles/colors' import { getStaticNotificationsCount } from '@selectors/notification-selectors/notification-selectors' import { useSelector } from 'react-redux' -const NotificationCenterLink = () => { +const NotificationCenterLink: FC = () => { const { navigate } = useNavigation() const notificationCount = useSelector(getStaticNotificationsCount) @@ -16,33 +16,28 @@ const NotificationCenterLink = () => { } return ( - - - + ) } export default NotificationCenterLink -const Container = styled.View` - flex-direction: row; - justify-content: flex-end; - margin: 0px 20px; -` - const Button = styled.TouchableOpacity` background-color: ${({ theme }) => theme.SECONDARY_BACKGROUND_COLOR}; - padding: 10px; + width: 50px; + height: 50px; border-radius: 50px; + align-items: center; + justify-content: center; ` const NotificationCountContainer = styled.View` diff --git a/src/components/sleep/InsightsCard.tsx b/src/components/sleep/InsightsCard.tsx index 2548a78..16dd658 100644 --- a/src/components/sleep/InsightsCard.tsx +++ b/src/components/sleep/InsightsCard.tsx @@ -52,7 +52,7 @@ const InsightsCard: FC = () => { /> {wokeUp} - Woke up + STAT.WOKE_UP diff --git a/src/helpers/Dimensions.ts b/src/helpers/Dimensions.ts index aa73819..d6e2233 100644 --- a/src/helpers/Dimensions.ts +++ b/src/helpers/Dimensions.ts @@ -3,7 +3,7 @@ import { isIphoneX, getStatusBarHeight } from 'react-native-iphone-x-helper' import { getStatusBarHeight as statusBarHeight } from 'react-native-status-bar-height' export const { width: WIDTH, height: HEIGHT } = Dimensions.get('window') -export const HEADER_MAX_HEIGHT = 300 +export const HEADER_MAX_HEIGHT = 350 export const HEADER_MIN_HEIGHT = 80 export const HEADER_HALF = 150 export const SMART_TOP_PADDING = `${isIphoneX() ? getStatusBarHeight(true) : 0}` diff --git a/src/helpers/time.ts b/src/helpers/time.ts index f70ba4a..c7223a4 100644 --- a/src/helpers/time.ts +++ b/src/helpers/time.ts @@ -202,12 +202,12 @@ export function roundAngleToFives(angle: number): number { return Math.round(angle / fiveMinuteAngle) * fiveMinuteAngle } -export function padMinutes(min: number): number { +export function padMinutes(min: number): string { if (`${min}`.length < 2) { return `0${min}` } - return min + return `${min}` } export const getFormattedDateOrPlaceholder = ( diff --git a/src/screens/Shared/HabitView.tsx b/src/screens/Shared/HabitView.tsx index 002a88a..b05fe26 100644 --- a/src/screens/Shared/HabitView.tsx +++ b/src/screens/Shared/HabitView.tsx @@ -1,3 +1,4 @@ +import { toggleNewHabitModal } from '@actions/modal/modal-actions' import CoachingSectionHeader from '@components/CoachingSpecific/CoachingSectionHeader' import EmptyState from '@components/EmptyState' import HabitCard from '@components/HabitCard/HabitCard' @@ -13,16 +14,13 @@ import { getActiveHabits, getArchivedHabits } from '@selectors/habit-selectors/habit-selectors' -import TranslatedText from 'components/TranslatedText' +import NewHabitModal from 'components/modals/HabitModal/NewHabitModal' import React, { FC } from 'react' import { SectionList } from 'react-native' -import { useSelector, useDispatch } from 'react-redux' +import { useDispatch, useSelector } from 'react-redux' import styled from 'styled-components/native' import colors from 'styles/colors' -import { fonts } from 'styles/themes' import { Habit } from 'Types/State/habit-state' -import { toggleNewHabitModal } from '@actions/modal/modal-actions' -import NewHabitModal from 'components/modals/HabitModal/NewHabitModal' const HabitView: FC = () => { const activeHabits = useSelector(getActiveHabits) @@ -38,8 +36,16 @@ const HabitView: FC = () => { } const sections = [ - { title: 'HABIT.ACTIVE', data: activeHabits }, - { title: 'HABIT.ARCHIVED', data: archivedHabits } + { + title: 'HABIT.ACTIVE', + subtitle: 'HABIT.ACTIVE_SUBTITLE', + data: activeHabits + }, + { + title: 'HABIT.ARCHIVED', + subtitle: 'HABIT.ARCHIVED_SUBTITLE', + data: archivedHabits + } ] const habitKeyExtractor = (item: Habit) => { @@ -69,8 +75,12 @@ const HabitView: FC = () => { )} - renderSectionHeader={({ section: { title, data } }) => ( - + renderSectionHeader={({ section: { title, data, subtitle } }) => ( + )} sections={sections} ListEmptyComponent={} @@ -100,3 +110,13 @@ const NewHabitButton = styled.TouchableOpacity` justify-content: center; align-items: center; ` + +const ActiveHabits = styled.View` + margin: 20px; +` + +const Text = styled.Text` + font-size: 15px; + font-family: ${({ theme }) => theme.FONT_MEDIUM}; + color: ${({ theme }) => theme.PRIMARY_TEXT_COLOR}; +` diff --git a/src/screens/coaching/CoachingView.tsx b/src/screens/coaching/CoachingView.tsx index 813ecbf..fa65f34 100644 --- a/src/screens/coaching/CoachingView.tsx +++ b/src/screens/coaching/CoachingView.tsx @@ -1,9 +1,9 @@ +import { getAllWeeks } from '@actions/coaching/content-actions' +import { getLoadingContent } from '@selectors/content-selectors/content-selectors' +import { getActiveCoaching } from '@selectors/subscription-selectors/SubscriptionSelectors' import React, { memo, useEffect } from 'react' import { RefreshControl } from 'react-native' import { useDispatch, useSelector } from 'react-redux' -import { getCoachingNotStarted } from '@selectors/coaching-selectors/coaching-selectors' -import { getLoadingContent } from '@selectors/content-selectors/content-selectors' -import { getAllWeeks } from '@actions/coaching/content-actions' import BuyCoachingButton from '../../components/CoachingSpecific/BuyCoachingButton' import CoachingHeader from '../../components/CoachingSpecific/CoachingHeader' import CoachingNotStarted from '../../components/CoachingSpecific/CoachingNotStarted' @@ -11,7 +11,6 @@ import NewHabitModal from '../../components/modals/HabitModal/NewHabitModal' import { SafeAreaView } from '../../components/Primitives/Primitives' import TopInfo from '../../components/TopInfo' import { WIDTH } from '../../helpers/Dimensions' -import { getActiveCoaching } from '@selectors/subscription-selectors/SubscriptionSelectors' import colors from '../../styles/colors' import Lessons from './Lessons' diff --git a/src/screens/coaching/WeekView.tsx b/src/screens/coaching/WeekView.tsx index 1ad2507..32a48f7 100644 --- a/src/screens/coaching/WeekView.tsx +++ b/src/screens/coaching/WeekView.tsx @@ -1,17 +1,17 @@ +import Copyright from '@components//CoachingSpecific/Copyright' +import StartCoaching from '@components//CoachingSpecific/StartCoaching' +import TopHeader from '@components//CoachingSpecific/TopHeader' +import WeekCover from '@components//CoachingSpecific/Week.Cover' +import WeekIntro from '@components//CoachingSpecific/WeekIntro' +import WeekViewHeader from '@components//CoachingSpecific/WeekViewHeader' +import NewHabitModal from '@components//modals/HabitModal/NewHabitModal' +import { BGContainer } from '@components//Primitives/Primitives' +import { CombinedWeek } from '@selectors/coaching-selectors' +import { getActiveCoaching } from '@selectors/subscription-selectors/SubscriptionSelectors' import React, { memo } from 'react' import Animated from 'react-native-reanimated' import { useSelector } from 'react-redux' -import { CombinedWeek } from '@selectors/coaching-selectors' import styled from 'styled-components/native' -import Copyright from '../../components/CoachingSpecific/Copyright' -import StartCoaching from '../../components/CoachingSpecific/StartCoaching' -import TopHeader from '../../components/CoachingSpecific/TopHeader' -import WeekCover from '../../components/CoachingSpecific/Week.Cover' -import WeekIntro from '../../components/CoachingSpecific/WeekIntro' -import WeekViewHeader from '../../components/CoachingSpecific/WeekViewHeader' -import NewHabitModal from '../../components/modals/HabitModal/NewHabitModal' -import { BGContainer } from '../../components/Primitives/Primitives' -import { getActiveCoaching } from '@selectors/subscription-selectors/SubscriptionSelectors' import Lessons from './Lessons' const yOffset = new Animated.Value(0) diff --git a/src/screens/sleep/SleepView.tsx b/src/screens/sleep/SleepView.tsx index f9c5900..c24b2fc 100644 --- a/src/screens/sleep/SleepView.tsx +++ b/src/screens/sleep/SleepView.tsx @@ -1,4 +1,5 @@ import SleepTimeChart from '@components/Charts/SleepChart' +import NotificationCenterLink from '@components/NotificationCenter/NotificationCenterLink' import { getHealthKitLoading } from '@selectors/health-kit-selectors/health-kit-selectors' import { getEditMode } from '@selectors/ManualDataSelectors' import { getSelectedDay } from '@selectors/SleepDataSelectors' @@ -7,15 +8,15 @@ import { updateCalendar } from 'actions/sleep/sleep-data-actions' import { backgroundAction, startup } from 'actions/StartupActions' -import Clock from 'components/Clock' -import DayStrip from 'components/DayStrip' -import { EditNightHeader } from 'components/MainScreenSpecific/EditNightHeader' -import InitializeSource from 'components/MainScreenSpecific/InitializeSources' -import ExplanationsModal from 'components/modals/ExplanationsModal' -import EditHabitModal from 'components/modals/HabitModal/EditHabitModal' -import NewHabitModal from 'components/modals/HabitModal/NewHabitModal' -import MergeHabitsModal from 'components/modals/MergeHabitsModal/MergeHabitsModal' -import RatingModal from 'components/RatingModal' +import Clock from '@components/Clock' +import DayStrip from '@components/DayStrip' +import { EditNightHeader } from '@components/MainScreenSpecific/EditNightHeader' +import InitializeSource from '@components/MainScreenSpecific/InitializeSources' +import ExplanationsModal from '@components/modals/ExplanationsModal' +import EditHabitModal from '@components/modals/HabitModal/EditHabitModal' +import NewHabitModal from '@components/modals/HabitModal/NewHabitModal' +import MergeHabitsModal from '@components/modals/MergeHabitsModal/MergeHabitsModal' +import RatingModal from '@components/RatingModal' import useBackgroundFetch from 'Hooks/UseBackgroundFetch' import useNotificationEventHandlers from 'Hooks/UseNotificationEventHandlers' import moment from 'moment' @@ -24,6 +25,7 @@ import { ScrollView } from 'react-native-gesture-handler' import { useDispatch, useSelector } from 'react-redux' import styled from 'styled-components/native' import { SafeAreaView } from '../../components/Primitives/Primitives' +import InsightsCard from 'components/sleep/InsightsCard' const Sleep: FC = () => { const today = useSelector(getSelectedDay) @@ -60,18 +62,20 @@ const Sleep: FC = () => { }> - {moment(today.date).format('dddd')} - {moment(today.date).format('DD MMMM yyyy')} + + {moment(today.date).format('dddd')} + {moment(today.date).format('DD MMMM yyyy')} + + - {/* */} - {/* + - */} + @@ -109,8 +113,12 @@ const Subtitle = styled.Text` const TitleRow = styled.View` padding: 16px; margin-bottom: 20px; + flex-direction: row; + justify-content: space-between; ` const RefreshControl = styled.RefreshControl.attrs(({ theme }) => ({ tintColor: theme.SECONDARY_TEXT_COLOR }))`` + +const TitleContainer = styled.View`` diff --git a/src/styles/themes.ts b/src/styles/themes.ts index 70be754..547449f 100644 --- a/src/styles/themes.ts +++ b/src/styles/themes.ts @@ -10,6 +10,7 @@ declare module 'styled-components' { SECONDARY_BACKGROUND_COLOR?: string PRIMARY_TEXT_COLOR?: string SECONDARY_TEXT_COLOR?: string + ICON_COLOR: string PRIMARY_BUTTON_COLOR?: string SECONDARY_BUTTON_COLOR?: string HAIRLINE_COLOR?: string @@ -28,6 +29,7 @@ export const lightTheme: DefaultTheme = { SECONDARY_BACKGROUND_COLOR: '#f7f7f7', PRIMARY_TEXT_COLOR: '#202125', SECONDARY_TEXT_COLOR: '#5e6267', + ICON_COLOR: '#f7f8fb', PRIMARY_BUTTON_COLOR: colors.radiantBlue, SECONDARY_BUTTON_COLOR: colors.radiantBlue, HAIRLINE_COLOR: '#C9C9CB', @@ -49,6 +51,7 @@ export const darkTheme: DefaultTheme = { SECONDARY_BACKGROUND_COLOR: '#333', PRIMARY_TEXT_COLOR: 'white', SECONDARY_TEXT_COLOR: 'rgba(255,255,255,0.87)', + ICON_COLOR: '#f7f8fb', PRIMARY_BUTTON_COLOR: 'white', SECONDARY_BUTTON_COLOR: 'white', HAIRLINE_COLOR: '#C9C9CB', @@ -62,7 +65,7 @@ export const darkTheme: DefaultTheme = { export const constants = { hairlineWidth: StyleSheet.hairlineWidth, - iPhoneX: isIphoneX ? getStatusBarHeight() : '0px' + iPhoneX: isIphoneX() ? getStatusBarHeight() : '0px' } export const fonts = { diff --git a/src/translations/fi.json b/src/translations/fi.json index 9a08d56..23bab01 100644 --- a/src/translations/fi.json +++ b/src/translations/fi.json @@ -444,8 +444,8 @@ "PLEASE_SELECT_DATE": "Saadaksesi lisätietoa yksittäisistä öistä valitse se painamalla kyseisen yön palkkia.", "CLOCK_SLEEP": "Uni", - "CLOCK_NO_DATA_TITLE": "Hassua", - "CLOCK_NO_DATA_SUBTITLE": "Tämän ei pitäisi olla tyhjä.", + "CLOCK_NO_DATA_TITLE": "Ei tietoja", + "CLOCK_NO_DATA_SUBTITLE": "Tältä yöltä ei ole saatavissa unitietoja.", "SEE_ALL": "Näytä kaikki", "MARK_COMPLETE": "Suorita", @@ -589,7 +589,9 @@ "HABITS": "Tavoitteet", "ACTIVE": "Aktiiviset", + "ACTIVE_SUBTITLE": "Tällä hetkellä aktiiviset tavoitteet.", "ARCHIVED": "Arkistoidut", + "ARCHIVED_SUBTITLE": "Aikaisemmin arkistoidut tavoitteet.", "NEW_HABIT_BUTTON": "Luo tavoite", "TIME_OF_DAY": "Ajankohta", @@ -626,7 +628,7 @@ "LONGEST_STREAK": "Pisin sarja", "CURRENT_STREAK": "Nykyinen sarja", "HABIT_TITLE_EXISTS": "Tällä nimellä oleva tavoite on jo olemssa", - "EXPLANATION_1": "", + "EXPLANATION_1": "Täällä voit seurata ja hallita asettamisia tavoitteita. Voit luoda uusia tavoitteita oikean yläkulman painikkeesta. Pyyhkäisemällä vasemmalle tai oikealle tavoitteen kohdalla, voit suorittaa tavoitteen tältä päivältä, arkistoida, tai poistaa sen.", "EXPLANATION_2": "" }, From e994e46a71b817da473bac330eaf2bdc3f049e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Perttu=20L=C3=A4hteenlahti?= Date: Mon, 31 Aug 2020 21:51:22 +0300 Subject: [PATCH 8/9] Making progress --- assets/svgs.tsx | 15 +- ios/Nyxo.xcodeproj/project.pbxproj | 36 +- ios/Podfile | 1 + ios/Podfile.lock | 95 +- src/actions/sleep/sleep-data-actions.ts | 5 +- src/components/Charts/SleepChart.tsx | 6 +- .../Charts/SleepTimeChart/TargetBars.tsx | 5 +- src/components/Clock.tsx | 1 + src/components/DayStrip.tsx | 2 +- .../MainScreenSpecific/ClockCarousel.tsx | 2 +- .../MainScreenSpecific/InitializeSources.tsx | 2 +- src/components/sleep/InsightsCard.tsx | 52 +- src/screens/sleep/SleepView.tsx | 6 +- src/store/Reducers/sleepclockReducer.ts | 7 +- src/translations/en.json | 7 +- yarn.lock | 4220 +++++++++-------- 16 files changed, 2325 insertions(+), 2137 deletions(-) diff --git a/assets/svgs.tsx b/assets/svgs.tsx index 68d5f3c..6f10008 100644 --- a/assets/svgs.tsx +++ b/assets/svgs.tsx @@ -655,13 +655,14 @@ export const icons = { ), bedWindow: ( - - - - - - - + + + + + + + + ), tag: ( diff --git a/ios/Nyxo.xcodeproj/project.pbxproj b/ios/Nyxo.xcodeproj/project.pbxproj index 1576cde..02984c8 100644 --- a/ios/Nyxo.xcodeproj/project.pbxproj +++ b/ios/Nyxo.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ 5B090C42235912AC00FD7E9B /* Domine-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5B090C40235912AC00FD7E9B /* Domine-Bold.ttf */; }; 5B090C43235912AC00FD7E9B /* Domine-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5B090C41235912AC00FD7E9B /* Domine-Regular.ttf */; }; 5B20692D224E434B00257043 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B20692C224E434B00257043 /* StoreKit.framework */; }; + 5B2D63A824FC1942002E853B /* AppCenter-Config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5B2D63A724FC1941002E853B /* AppCenter-Config.plist */; }; 5B33130921DFB5B800698A4A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B33130121DFB5B800698A4A /* AppDelegate.m */; }; 5B33130A21DFB5B800698A4A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B33130221DFB5B800698A4A /* main.m */; }; 5B40961F242BAE0000169B4C /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5B40961E242BAE0000169B4C /* GoogleService-Info.plist */; }; @@ -35,10 +36,6 @@ 5BD58BA722D71D7600D1CD2D /* Montserrat-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5BD58B9522D71D7600D1CD2D /* Montserrat-Light.ttf */; }; 5BD58BA822D71D7600D1CD2D /* Montserrat-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5BD58B9622D71D7600D1CD2D /* Montserrat-Thin.ttf */; }; 5BD58BA922D71D7600D1CD2D /* Montserrat-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5BD58B9722D71D7600D1CD2D /* Montserrat-Bold.ttf */; }; - 8A51C39624F5334200DF3C83 /* AppCenter-Config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8A51C39524F5334200DF3C83 /* AppCenter-Config.plist */; }; - 8A51C43B24F554C100DF3C83 /* Intercom.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A51C43824F552B400DF3C83 /* Intercom.framework */; }; - 8A51C43C24F554C100DF3C83 /* Intercom.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8A51C43824F552B400DF3C83 /* Intercom.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - B95CBA9C2099AEB300243A25 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B95CBA9B2099AEB300243A25 /* HealthKit.framework */; }; C6BF152484FF448FA7435F49 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BAC1FA2BBE14987AE9C5E6D /* libz.tbd */; }; E1DF9C1DF40E9169E37562FD /* libPods-Nyxo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E89B28DB570F1784E077C6A0 /* libPods-Nyxo.a */; }; ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; }; @@ -69,17 +66,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - 5B54765A2233C6650027A9A0 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 8A51C43C24F554C100DF3C83 /* Intercom.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; 5B6E854A21406B9A0013E7B5 /* Embed Watch Content */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -106,6 +92,7 @@ 5B20692C224E434B00257043 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; 5B2069A4224FB24200257043 /* Lato-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Lato-Regular.ttf"; path = "../assets/fonts/Lato-Regular.ttf"; sourceTree = ""; }; 5B2B308921EF5C82007E2982 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = assets; sourceTree = ""; }; + 5B2D63A724FC1941002E853B /* AppCenter-Config.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "AppCenter-Config.plist"; path = "Nyxo/AppCenter-Config.plist"; sourceTree = ""; }; 5B3312FB21DFB5B700698A4A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Nyxo/Images.xcassets; sourceTree = ""; }; 5B3312FE21DFB5B800698A4A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = LaunchScreen.old.xib; sourceTree = ""; }; 5B33130021DFB5B800698A4A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = LaunchScreen.xib; sourceTree = ""; }; @@ -210,8 +197,6 @@ 6CF46B6888304B68952AC827 /* Dosis-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Dosis-Medium.ttf"; path = "../assets/fonts/Dosis-Medium.ttf"; sourceTree = ""; }; 796FDDB5089B4D6FBFF9AF7D /* FontAwesome5_Pro_Brands.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Pro_Brands.ttf; path = ../assets/fonts/FontAwesome5_Pro_Brands.ttf; sourceTree = ""; }; 8299F6F8C97B11A56957F31C /* Pods-Nyxo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Nyxo.debug.xcconfig"; path = "Target Support Files/Pods-Nyxo/Pods-Nyxo.debug.xcconfig"; sourceTree = ""; }; - 8A51C39524F5334200DF3C83 /* AppCenter-Config.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "AppCenter-Config.plist"; sourceTree = ""; }; - 8A51C43824F552B400DF3C83 /* Intercom.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Intercom.framework; sourceTree = ""; }; 9F67C385EC2C483E6892E5F9 /* Pods-Nyxo Dev.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Nyxo Dev.debug.xcconfig"; path = "Target Support Files/Pods-Nyxo Dev/Pods-Nyxo Dev.debug.xcconfig"; sourceTree = ""; }; B959F1EA20BD3D8E00AC734C /* Dosis-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Dosis-Bold.ttf"; path = "../assets/fonts/Dosis-Bold.ttf"; sourceTree = ""; }; B959F21820BD455C00AC734C /* fa-regular-400.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "fa-regular-400.ttf"; sourceTree = ""; }; @@ -241,10 +226,8 @@ files = ( ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */, 5B20692D224E434B00257043 /* StoreKit.framework in Frameworks */, - B95CBA9C2099AEB300243A25 /* HealthKit.framework in Frameworks */, C6BF152484FF448FA7435F49 /* libz.tbd in Frameworks */, E1DF9C1DF40E9169E37562FD /* libPods-Nyxo.a in Frameworks */, - 8A51C43B24F554C100DF3C83 /* Intercom.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -494,8 +477,7 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( - 8A51C43824F552B400DF3C83 /* Intercom.framework */, - 8A51C39524F5334200DF3C83 /* AppCenter-Config.plist */, + 5B2D63A724FC1941002E853B /* AppCenter-Config.plist */, 5B5220FA24F29CA50039E226 /* rnuc.xcconfig */, 5B40961E242BAE0000169B4C /* GoogleService-Info.plist */, 5BA9115A22E1E2070098700A /* Shared */, @@ -633,10 +615,9 @@ 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 5B6E854A21406B9A0013E7B5 /* Embed Watch Content */, - 5B54765A2233C6650027A9A0 /* Embed Frameworks */, 6C3BA05A2308A4078CE786D2 /* [CP] Copy Pods Resources */, DED22F96C89D448186375252 /* Upload Debug Symbols to Sentry */, - 8A51C43A24F553DC00DF3C83 /* ShellScript */, + 8A51C43A24F553DC00DF3C83 /* Strip frameworks */, ); buildRules = ( ); @@ -755,7 +736,7 @@ 5B40961F242BAE0000169B4C /* GoogleService-Info.plist in Resources */, 5BD58BA222D71D7600D1CD2D /* Montserrat-BoldItalic.ttf in Resources */, 5BD58BA322D71D7600D1CD2D /* Montserrat-SemiBold.ttf in Resources */, - 8A51C39624F5334200DF3C83 /* AppCenter-Config.plist in Resources */, + 5B2D63A824FC1942002E853B /* AppCenter-Config.plist in Resources */, 5BD58BA422D71D7600D1CD2D /* Montserrat-BlackItalic.ttf in Resources */, 5BD58BA522D71D7600D1CD2D /* Montserrat-ExtraLight.ttf in Resources */, 5BD58BA622D71D7600D1CD2D /* Montserrat-ExtraBold.ttf in Resources */, @@ -821,7 +802,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Nyxo/Pods-Nyxo-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 8A51C43A24F553DC00DF3C83 /* ShellScript */ = { + 8A51C43A24F553DC00DF3C83 /* Strip frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -830,13 +811,14 @@ ); inputPaths = ( ); + name = "Strip frameworks"; outputFileListPaths = ( ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "bash \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/Intercom.framework/strip-frameworks.sh\"\n"; + shellScript = "\"${PROJECT_DIR}/../node_modules/react-native-purchases/ios/strip-frameworks.sh\"\n"; }; BF842D7B9E4CC79A1B9C718D /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; @@ -1040,7 +1022,6 @@ "$(inherited)", "$(PROJECT_DIR)", "$(PROJECT_DIR)/../node_modules/react-native-background-fetch/ios/**", - "$(PROJECT_DIR)/intercom-ios-master", ); HEADER_SEARCH_PATHS = ( "$(SRCROOT)/../node_modules/react-native/React", @@ -1088,7 +1069,6 @@ "$(inherited)", "$(PROJECT_DIR)", "$(PROJECT_DIR)/../node_modules/react-native-background-fetch/ios/**", - "$(PROJECT_DIR)/intercom-ios-master", ); HEADER_SEARCH_PATHS = ( "$(SRCROOT)/../node_modules/react-native/React", diff --git a/ios/Podfile b/ios/Podfile index 0e5652e..d99661f 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -77,6 +77,7 @@ end platform :ios, '10.0' target 'Nyxo' do + pod 'Intercom' pod 'AppAuth', '>= 1.2.0' use_unimodules!(exclude: ['expo-face-detector']) use_native_modules! diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 15ad0b0..2ced5de 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -184,7 +184,7 @@ PODS: - GoogleUtilities/Logger - GoogleUtilities/UserDefaults (6.7.2): - GoogleUtilities/Logger - - Intercom (6.0.2) + - Intercom (7.1.2) - JKBigInteger2 (0.0.5) - libwebp (1.1.0): - libwebp/demux (= 1.1.0) @@ -373,17 +373,17 @@ PODS: - React-cxxreact (= 0.62.2) - React-jsi (= 0.62.2) - React-jsinspector (0.62.2) - - react-native-app-auth (5.1.2): + - react-native-app-auth (5.1.3): - AppAuth (= 1.2.0) - React - react-native-get-random-values (1.4.0): - React - - react-native-intercom (15.0.0): - - Intercom (~> 6.0.0) + - react-native-intercom (17.0.0): + - Intercom (~> 7.1.0) - React - react-native-maps (0.27.1): - React - - react-native-netinfo (5.9.4): + - react-native-netinfo (5.9.6): - React - react-native-safe-area-context (1.0.2): - React @@ -452,23 +452,23 @@ PODS: - React-cxxreact (= 0.62.2) - React-jsi (= 0.62.2) - ReactCommon/callinvoker (= 0.62.2) - - RNAWSCognito (4.3.2): + - RNAWSCognito (4.3.4): - JKBigInteger2 (= 0.0.5) - React - RNBackgroundFetch (3.1.0): - React - - RNCAsyncStorage (1.11.0): + - RNCAsyncStorage (1.12.0): - React - RNCMaskedView (0.1.10): - React - - RNCPushNotificationIOS (1.2.2): + - RNCPushNotificationIOS (1.4.1): - React - - RNDeviceInfo (5.6.1): + - RNDeviceInfo (5.6.5): - React - - RNFastImage (8.1.5): + - RNFastImage (8.3.2): - React - - SDWebImage (~> 5.0) - - SDWebImageWebPCoder (~> 0.4.1) + - SDWebImage (~> 5.8) + - SDWebImageWebPCoder (~> 0.6.1) - RNFirebase (5.6.0): - Firebase/Core - React @@ -478,39 +478,39 @@ PODS: - Fabric - Firebase/Core - React - - RNGestureHandler (1.6.1): + - RNGestureHandler (1.7.0): - React - RNKeychain (6.1.1): - React - - RNLocalize (1.4.0): + - RNLocalize (1.4.1): - React - RNPurchases (3.3.1): - PurchasesHybridCommon (= 1.2.0) - React - - RNRate (1.2.1): + - RNRate (1.2.4): - React - RNReactNativeHapticFeedback (1.10.0): - React - - RNReanimated (1.9.0): + - RNReanimated (1.13.0): - React - - RNScreens (2.9.0): + - RNScreens (2.10.1): - React - - RNSentry (1.5.0): + - RNSentry (1.7.2): - React - - Sentry (~> 5.1.4) + - Sentry (~> 5.2.0) - RNSha256 (1.3.6): - React - RNSVG (12.1.0): - React - - SDWebImage (5.8.4): - - SDWebImage/Core (= 5.8.4) - - SDWebImage/Core (5.8.4) - - SDWebImageWebPCoder (0.4.1): + - SDWebImage (5.9.0): + - SDWebImage/Core (= 5.9.0) + - SDWebImage/Core (5.9.0) + - SDWebImageWebPCoder (0.6.1): - libwebp (~> 1.0) - - SDWebImage/Core (~> 5.5) - - Sentry (5.1.10): - - Sentry/Core (= 5.1.10) - - Sentry/Core (5.1.10) + - SDWebImage/Core (~> 5.7) + - Sentry (5.2.2): + - Sentry/Core (= 5.2.2) + - Sentry/Core (5.2.2) - UMAppLoader (1.0.2) - UMBarCodeScannerInterface (5.1.0) - UMCameraInterface (5.1.0) @@ -570,6 +570,7 @@ DEPENDENCIES: - FlipperKit/SKIOSNetworkPlugin (~> 0.33.1) - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) + - Intercom - OpenSSL-Universal - RCTAppleHealthKit (from `../node_modules/react-native-healthkit`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -879,7 +880,7 @@ SPEC CHECKSUMS: GoogleDataTransport: 9a8a16f79feffc7f42096743de2a7c4815e84020 GoogleDataTransportCCTSupport: 0f39025e8cf51f168711bd3fb773938d7e62ddb5 GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3 - Intercom: 523417d82ed1a8c635cc7f97b266eb8bd0bd9d85 + Intercom: ce4923a73543fe70c805635846b6dadf03b0b847 JKBigInteger2: e91672035c42328c48b7dd015b66812ddf40ca9b libwebp: 946cb3063cea9236285f7e9a8505d806d30e07f3 nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd @@ -898,11 +899,11 @@ SPEC CHECKSUMS: React-jsi: b6dc94a6a12ff98e8877287a0b7620d365201161 React-jsiexecutor: 1540d1c01bb493ae3124ed83351b1b6a155db7da React-jsinspector: 512e560d0e985d0e8c479a54a4e5c147a9c83493 - react-native-app-auth: 3a8af9e5f62aa3d7a9391d5aa89ab91aeb5a0062 + react-native-app-auth: 4b83339a50548e803db392e6dafa82da9c54c85e react-native-get-random-values: 2b7500cdb68066aba87cdccd97067c29e16ffe95 - react-native-intercom: ddc3a81f883b9089649dbaf4c02e3b3ad271b6d1 + react-native-intercom: f6dcd37016f7114a6c78da31e7991350a411f088 react-native-maps: f4b89da81626ad7f151a8bfcb79733295d31ce5c - react-native-netinfo: cd479ab1b67cdd1cb1403a99ecdb24190a6dd7ef + react-native-netinfo: 38a1e0b3e89b48e4b5833ed475d8df5f049f6f90 react-native-safe-area-context: 9d9640a9085014864052e38496fc1dfde0b93974 react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865 react-native-ultimate-config: 429433ed406d1c0d18b72b169dc99702d7180214 @@ -917,28 +918,28 @@ SPEC CHECKSUMS: React-RCTText: fae545b10cfdb3d247c36c56f61a94cfd6dba41d React-RCTVibration: 4356114dbcba4ce66991096e51a66e61eda51256 ReactCommon: ed4e11d27609d571e7eee8b65548efc191116eb3 - RNAWSCognito: 1f377c51384f8e702146a1fab6726a56013d0817 + RNAWSCognito: c84eb1020796f0f9ae1112671b0cc775a72080dc RNBackgroundFetch: 8dbb63141792f1473e863a0797ffbd5d987af2fc - RNCAsyncStorage: d059c3ee71738c39834a627476322a5a8cd5bf36 + RNCAsyncStorage: 2a692bcb9b69b76a2f1a95f33db057129700af64 RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f - RNCPushNotificationIOS: 4c97a36dbec42dba411cc35e6dac25e34a805fde - RNDeviceInfo: b6e650fbd234732c759544218657d549b4339038 - RNFastImage: 35ae972d6727c84ee3f5c6897e07f84d0a3445e9 + RNCPushNotificationIOS: c145c6253ea016e5efeff604f2720736b4a596f7 + RNDeviceInfo: c5f8f3a456adcbba405ace475254b08febc4c095 + RNFastImage: e19ba191922e7dab9d932a4d59d62d76660aa222 RNFirebase: 37daa9a346d070f9f6ee1f3b4aaf4c8e3b1d5d1c - RNGestureHandler: 8f09cd560f8d533eb36da5a6c5a843af9f056b38 + RNGestureHandler: b6b359bb800ae399a9c8b27032bdbf7c18f08a08 RNKeychain: db956c02a018f7dd3a0ea8a6cf3087bc1894bf2b - RNLocalize: b6df30cc25ae736d37874f9bce13351db2f56796 + RNLocalize: 49634a6a605dcdeb319e9c42a5c2f1aec508694b RNPurchases: bab40549792361f408b1dafbe31a5ebaf0c03c38 - RNRate: a39ac26dc9daf3f9b639ce274b7f80672ae36db1 + RNRate: 15b861025a7821730761fce7f44561ce7e0b2de0 RNReactNativeHapticFeedback: 22c5ecf474428766c6b148f96f2ff6155cd7225e - RNReanimated: b5ccb50650ba06f6e749c7c329a1bc3ae0c88b43 - RNScreens: c526239bbe0e957b988dacc8d75ac94ec9cb19da - RNSentry: edba19169f665609fb092ba5eaf4be3c0776f50a + RNReanimated: 89f5e0a04d1dd52fbf27e7e7030d8f80a646a3fc + RNScreens: b748efec66e095134c7166ca333b628cd7e6f3e2 + RNSentry: 2d4a0e18c6dfe93b647c360e0d15c9391d24e9d1 RNSha256: c6f68c850bf8315c95e2508667e8c908bd9f8487 RNSVG: ce9d996113475209013317e48b05c21ee988d42e - SDWebImage: cf6922231e95550934da2ada0f20f2becf2ceba9 - SDWebImageWebPCoder: 36f8f47bd9879a8aea6044765c1351120fd8e3a8 - Sentry: 8715e88b813bde9ad37aead365d5b04ac7302153 + SDWebImage: 62ae4a18473520c67b79e9724c31a63599cc9423 + SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21 + Sentry: 8fa58a051237554f22507fb483b9a1de0171a2dc UMAppLoader: ee77a072f9e15128f777ccd6d2d00f52ab4387e6 UMBarCodeScannerInterface: 9dc692b87e5f20fe277fa57aa47f45d418c3cc6c UMCameraInterface: 625878bbf2ba188a8548675e1d1d2e438a653e6d @@ -955,6 +956,6 @@ SPEC CHECKSUMS: Yoga: 3ebccbdd559724312790e7742142d062476b698e YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 6e7ff5f5f7fa141c3114e59a6307fbda77c70981 +PODFILE CHECKSUM: 7bde1e2e4860e9ae214605a1416d0954a9c0af97 -COCOAPODS: 1.9.1 +COCOAPODS: 1.9.3 diff --git a/src/actions/sleep/sleep-data-actions.ts b/src/actions/sleep/sleep-data-actions.ts index c72931f..6ea76ac 100644 --- a/src/actions/sleep/sleep-data-actions.ts +++ b/src/actions/sleep/sleep-data-actions.ts @@ -17,7 +17,7 @@ import { } from '@selectors/sleep-source-selectors/sleep-source-selectors' import { getAllDays } from '@selectors/SleepDataSelectors' import { GetState } from 'Types/GetState' -import { Dispatch, Thunk } from 'Types/ReduxActions' +import ReduxAction, { Dispatch, Thunk } from 'Types/ReduxActions' import { SOURCE } from 'typings/state/sleep-source-state' import { Day, Night, Value } from '../../Types/Sleepdata' import { fetchSleepFromHealthKit } from './health-kit-actions' @@ -66,7 +66,7 @@ export const updateSleepData = (data: { days: Day[]; nights: Night[] }) => ({ payload: data }) -export const setSelectedDay = (day: Day) => ({ +export const setSelectedDay = (day: string): ReduxAction => ({ type: SET_SELECTED_DAY, payload: day }) @@ -120,6 +120,7 @@ export const fetchSleepData = (): Thunk => async ( break case SOURCE.POLAR: dispatch(getPolarSleep()) + break default: break diff --git a/src/components/Charts/SleepChart.tsx b/src/components/Charts/SleepChart.tsx index 0bcda20..80a7a6c 100644 --- a/src/components/Charts/SleepChart.tsx +++ b/src/components/Charts/SleepChart.tsx @@ -37,7 +37,7 @@ const SleepTimeChart: FC = () => { ) const select = (day: Day) => { - dispatch(setSelectedDay(day)) + dispatch(setSelectedDay(day.date)) } const xDomain: Date[] = extent( @@ -67,6 +67,7 @@ const SleepTimeChart: FC = () => { const yTicks = scaleY.ticks(5) const xTicks = scaleX.ticks(days.length) + console.log(normalizedSleepData, bedtimeWindow) return ( Sleep Goal Trend @@ -135,8 +136,9 @@ const YTicksContainer = styled(Svg)` ` const Card = styled.View` - margin-top: 10px; + margin-top: 8px; background-color: ${({ theme }) => theme.SECONDARY_BACKGROUND_COLOR}; + box-shadow: ${({ theme }) => theme.SHADOW}; padding: 10px; margin: 8px 16px; border-radius: 7px; diff --git a/src/components/Charts/SleepTimeChart/TargetBars.tsx b/src/components/Charts/SleepTimeChart/TargetBars.tsx index 05bbcec..4e9d5bd 100644 --- a/src/components/Charts/SleepTimeChart/TargetBars.tsx +++ b/src/components/Charts/SleepTimeChart/TargetBars.tsx @@ -11,7 +11,7 @@ interface Props { scaleY: ScaleTime barWidth: number onPress: (day: Day) => void - start: string + start?: string } const TargetBars: FC = ({ @@ -23,6 +23,7 @@ const TargetBars: FC = ({ start }) => { const end = moment(start).add(8, 'hours') + if (!start && typeof start !== 'string') return null const { bars } = useMemo( () => ({ @@ -31,6 +32,8 @@ const TargetBars: FC = ({ const x = scaleX(new Date(datum.date)) const height = scaleY(end.valueOf()) - scaleY(moment(start).valueOf()) + if (Number.isNaN(y)) return null + return ( onPress(datum)} key={datum.date}> theme.SECONDARY_BACKGROUND_COLOR}; + box-shadow: ${({ theme }) => theme.SHADOW}; padding: 5px; border-radius: 7px; flex: 1; diff --git a/src/components/DayStrip.tsx b/src/components/DayStrip.tsx index 2bd44be..68fc99b 100644 --- a/src/components/DayStrip.tsx +++ b/src/components/DayStrip.tsx @@ -21,7 +21,7 @@ const DayStrip: FC = () => { const isToday = moment(item.date).isSame(new Date(), 'day') const handleOnPress = () => { - dispatch(setSelectedDay(item)) + dispatch(setSelectedDay(item.date)) } return ( diff --git a/src/components/MainScreenSpecific/ClockCarousel.tsx b/src/components/MainScreenSpecific/ClockCarousel.tsx index 1bd281e..b74c801 100644 --- a/src/components/MainScreenSpecific/ClockCarousel.tsx +++ b/src/components/MainScreenSpecific/ClockCarousel.tsx @@ -41,7 +41,7 @@ const ClockCarousel = () => { dispatch(setActiveIndex(newIndex)) const day = info.viewableItems[0].item - dispatch(setSelectedDay(day)) + dispatch(setSelectedDay(day.date)) } } diff --git a/src/components/MainScreenSpecific/InitializeSources.tsx b/src/components/MainScreenSpecific/InitializeSources.tsx index a87bb75..bea963d 100644 --- a/src/components/MainScreenSpecific/InitializeSources.tsx +++ b/src/components/MainScreenSpecific/InitializeSources.tsx @@ -45,7 +45,7 @@ const InitializeSource: FC = () => { export default InitializeSource const Container = styled.View` - margin: 8px 0px; + margin: 16px 16px; padding: 20px 20px; background-color: ${({ theme }) => theme.SECONDARY_BACKGROUND_COLOR}; border-radius: 5px; diff --git a/src/components/sleep/InsightsCard.tsx b/src/components/sleep/InsightsCard.tsx index 1286722..83bdea9 100644 --- a/src/components/sleep/InsightsCard.tsx +++ b/src/components/sleep/InsightsCard.tsx @@ -11,14 +11,21 @@ import React, { FC } from 'react' import { useSelector } from 'react-redux' import styled from 'styled-components/native' import colors from 'styles/colors' +import { WIDTH } from 'helpers/Dimensions' + +const pageWidth = WIDTH - 16 * 2 - 2 * 16 const InsightsCard: FC = () => { - const { bedStart, bedEnd } = useSelector(getSelectedDay) + const { bedStart, bedEnd, sleepStart, sleepEnd } = useSelector(getSelectedDay) const goToSleepWindowStart = useSelector(getGoToSleepWindowStart) const goToSleepWindowEnd = useSelector(getGoToSleepWindowEnd) const wentToBed = getFormattedDateOrPlaceholder(bedStart, 'H:mm') - const wokeUp = getFormattedDateOrPlaceholder(bedEnd, 'H:mm') + const gotUp = getFormattedDateOrPlaceholder(bedEnd, 'H:mm') + + const fellAsleep = getFormattedDateOrPlaceholder(sleepStart, 'H:mm') + const wokeUp = getFormattedDateOrPlaceholder(sleepEnd, 'H:mm') + const windowStart = getFormattedDateOrPlaceholder( goToSleepWindowStart, 'H:mm' @@ -38,7 +45,7 @@ const InsightsCard: FC = () => { name="nightMoonBegin" height="30" width="30" - stroke="black" + stroke={colors.inBedColor} /> {wentToBed} @@ -52,11 +59,11 @@ const InsightsCard: FC = () => { name="nightMoonEnd" height="30" width="30" - stroke="black" + stroke={colors.inBedColor} /> - {wokeUp} - STAT.WOKE_UP + {gotUp} + STAT.GOT_UP @@ -68,27 +75,25 @@ const InsightsCard: FC = () => { name="nightMoonEnd" height="30" width="30" - stroke="black" + stroke={colors.asleepColor} /> - 4:00 - STAT.WOKE_UP + {fellAsleep} + STAT.FELL_ASLEEP
- - {windowStart} - {windowEnd} - - STAT.WINDOW + {wokeUp} + STAT.WOKE_UP
@@ -157,32 +162,36 @@ const InsightsCard: FC = () => { - - < - + {/* */} ) } export default InsightsCard -const ScrollView = styled.ScrollView`` +const ScrollView = styled.ScrollView` + flex: 1; +` const Row = styled.View` flex-direction: row; + flex: 1; + width: 100%; margin: 15px 0px; ` const Page = styled.View` flex: 1; + width: ${pageWidth}px; ` const Container = styled.View` flex: 1; background-color: ${({ theme }) => theme.SECONDARY_BACKGROUND_COLOR}; border-radius: 7px; - margin-top: 8px; - padding: 10px 20px; + margin: 8px 0px; + padding: 10px 16px; + box-shadow: ${({ theme }) => theme.SHADOW}; ` const Title = styled(TranslatedText)` @@ -196,6 +205,7 @@ const Figure = styled.View` flex-direction: row; align-items: center; flex: 1; + width: 100%; margin-right: 30px; ` diff --git a/src/screens/sleep/SleepView.tsx b/src/screens/sleep/SleepView.tsx index c37a407..7528458 100644 --- a/src/screens/sleep/SleepView.tsx +++ b/src/screens/sleep/SleepView.tsx @@ -60,7 +60,7 @@ const Sleep: FC = () => { onRefresh={checkSleepData} /> }> - {/* */} + {moment(today.date).format('dddd')} @@ -99,7 +99,7 @@ const Title = styled.Text` text-transform: capitalize; font-family: ${({ theme }) => theme.FONT_MEDIUM}; color: ${({ theme }) => theme.PRIMARY_TEXT_COLOR}; - font-size: 28px; + font-size: 34px; margin-bottom: 5px; ` @@ -112,7 +112,7 @@ const Subtitle = styled.Text` const TitleRow = styled.View` padding: 16px; - margin-bottom: 20px; + margin: 40px 0px 20px; flex-direction: row; justify-content: space-between; ` diff --git a/src/store/Reducers/sleepclockReducer.ts b/src/store/Reducers/sleepclockReducer.ts index f413705..1e03976 100644 --- a/src/store/Reducers/sleepclockReducer.ts +++ b/src/store/Reducers/sleepclockReducer.ts @@ -32,12 +32,7 @@ const reducer = ( return { ...state, today: payload } case SET_SELECTED_DAY: { - const selectedDay = state.days.find((d: Day) => - sameDay(payload.date, d.date) - ) - const day = selectedDay || state.selectedDay - - return { ...state, selectedDay: day } + return { ...state, selectedDay: payload } } case SET_TODAY_AS_SELECTED: { diff --git a/src/translations/en.json b/src/translations/en.json index 827e6e9..e60fd25 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -662,7 +662,12 @@ "WINDOW": "Bedtime window", "WINDOW_EXPLANATION": "The Bedtime window is an estimate of your circadian homeostatic rhythm's 'optimal period falling asleep', which is calculated from your last seven nights. To minimize the time spent in bed awake, and fall asleep faster, aim to fall asleep during your bedtime window.", "RATING": "Rating", - "RATING_EXPLANATION": "Your rating for the night." + "RATING_EXPLANATION": "Your rating for the night.", + "WENT_TO_BED": "Went to bed", + "WOKE_UP": "Woke up", + "FELL_ASLEEP": "Fell asleep", + "GOT_UP": "Got up", + "STATISTICS": "Insights" }, "TAB": { diff --git a/yarn.lock b/yarn.lock index 7ac2825..4555855 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,90 +2,90 @@ # yarn lockfile v1 -"@aws-amplify/analytics@^3.2.1": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@aws-amplify/analytics/-/analytics-3.2.1.tgz#8bcdeb685b298cf61b363b9838d0fe5c61aae828" - integrity sha512-3U0OLtpKBtC7hm8A30NSMTctA63xD9Cuc8Qd55gSyjWIUEXUBaBAUmXFkR0HDIYh0e5pfYbM7B4yLuigeUMe7g== - dependencies: - "@aws-amplify/cache" "^3.1.17" - "@aws-amplify/core" "^3.4.0" - "@aws-sdk/client-firehose" "1.0.0-gamma.2" - "@aws-sdk/client-kinesis" "1.0.0-gamma.2" - "@aws-sdk/client-personalize-events" "1.0.0-gamma.2" - "@aws-sdk/client-pinpoint" "1.0.0-gamma.2" - "@aws-sdk/util-utf8-browser" "1.0.0-gamma.1" +"@aws-amplify/analytics@^3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@aws-amplify/analytics/-/analytics-3.2.7.tgz#2a89eea258f53c7d1ece9dba31cdbc66ef286629" + integrity sha512-NfV9+CK6y1VRZaFjIZnSi2E+ycT8C3hDdJNN/Z5UFytdjXzVpHfaiw4juQv8yJAZ46FPDg8wJ5zhcQkLvLDHfA== + dependencies: + "@aws-amplify/cache" "^3.1.23" + "@aws-amplify/core" "^3.4.6" + "@aws-sdk/client-firehose" "1.0.0-gamma.4" + "@aws-sdk/client-kinesis" "1.0.0-gamma.4" + "@aws-sdk/client-personalize-events" "1.0.0-gamma.4" + "@aws-sdk/client-pinpoint" "1.0.0-gamma.4" + "@aws-sdk/util-utf8-browser" "1.0.0-gamma.3" uuid "^3.2.1" -"@aws-amplify/api-graphql@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@aws-amplify/api-graphql/-/api-graphql-1.1.0.tgz#4468b8db4549d401fb43af25f1c1a2dc93f97c55" - integrity sha512-/GcMhXvxyDELw0ZCiHepAilQluOI0UxI2csJd6nI/mcM1lInq6nZfZ+/RZNbIa/MeAvo2tJka0q2cknshsmRSA== - dependencies: - "@aws-amplify/api-rest" "^1.1.0" - "@aws-amplify/auth" "^3.2.14" - "@aws-amplify/cache" "^3.1.17" - "@aws-amplify/core" "^3.4.0" - "@aws-amplify/pubsub" "^3.0.18" +"@aws-amplify/api-graphql@^1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@aws-amplify/api-graphql/-/api-graphql-1.1.6.tgz#4eed739f5f6e8c47a6a323ed88c2390280bbe647" + integrity sha512-EL2SXGd9HThd492stKW9kdIJtd4rLCoxfFBUlm6QR0IfKYiXFBWoXs/Jx3sWQ2xB8PpB4uV5z6LbhWIuFmbhZQ== + dependencies: + "@aws-amplify/api-rest" "^1.1.6" + "@aws-amplify/auth" "^3.3.5" + "@aws-amplify/cache" "^3.1.23" + "@aws-amplify/core" "^3.4.6" + "@aws-amplify/pubsub" "^3.0.24" graphql "14.0.0" uuid "^3.2.1" zen-observable-ts "0.8.19" -"@aws-amplify/api-rest@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@aws-amplify/api-rest/-/api-rest-1.1.0.tgz#bb99181237b5287e2601abc658573612ecd7ac69" - integrity sha512-iDqBl3VyON8RmLhCdCZdlF6J5moMWlbd3o8Y7nh+bSjvYkU1GBbMcJpobkbAFgNEjd368iJEjzwM8PyZ8USjog== +"@aws-amplify/api-rest@^1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@aws-amplify/api-rest/-/api-rest-1.1.6.tgz#c79398ea051c1d871086164ee0dec8e22072aebe" + integrity sha512-kyshfxAsjKsh0EOIKQJO5deT9cXRLMOQ2Z4syTEDVfwPRwv1w3LtouVEwF6PweB9CkqunfBEOkAOkrJuftK1ug== dependencies: - "@aws-amplify/core" "^3.4.0" + "@aws-amplify/core" "^3.4.6" axios "0.19.0" -"@aws-amplify/api@^3.1.17": - version "3.1.17" - resolved "https://registry.yarnpkg.com/@aws-amplify/api/-/api-3.1.17.tgz#1278fea77ffaadc95e12d9941a7861f4d44302a7" - integrity sha512-juNj6c9pcnYlwCBdDjixfL8hMxoSb/Zfol5qv96go3mtEPjoLhsMExjD1DCnUTuNPK3u187hSI1uBN3+NTd6MQ== +"@aws-amplify/api@^3.1.23": + version "3.1.23" + resolved "https://registry.yarnpkg.com/@aws-amplify/api/-/api-3.1.23.tgz#f1c301b44eb9e0c26970e1dd18d44b94d94840a1" + integrity sha512-OWmcaUoiKWwm1GEUp2xS4ptPeiwIXXCuO39Crub6KyetA+aWmSfX0i5ZQa/0GOFMRqwFYB5eU6+qLIt/LBqG1g== dependencies: - "@aws-amplify/api-graphql" "^1.1.0" - "@aws-amplify/api-rest" "^1.1.0" + "@aws-amplify/api-graphql" "^1.1.6" + "@aws-amplify/api-rest" "^1.1.6" -"@aws-amplify/auth@^3.2.14": - version "3.2.14" - resolved "https://registry.yarnpkg.com/@aws-amplify/auth/-/auth-3.2.14.tgz#f78680b8f90da766f7f0da677c4934b26ac470a7" - integrity sha512-Lr+zZmpG8LgM3GtsahA9cOB1y0pa+vbTvzCl7vVAHjzf1n0SGI/xWtlQZK83CRDAPckgJjQSdPhWSHAMBW/EQw== +"@aws-amplify/auth@^3.3.5": + version "3.3.5" + resolved "https://registry.yarnpkg.com/@aws-amplify/auth/-/auth-3.3.5.tgz#d6a546a61ab1149d74e60c98e3d123dcc5a22e52" + integrity sha512-O/uRfdC2RkDLwwUjsXuTgIbI0uIRAVNv6GxvoGp78le1/ySzDepULuJiNIvp6kI1alpVm0iAoyhk0fyyzvMSyg== dependencies: - "@aws-amplify/cache" "^3.1.17" - "@aws-amplify/core" "^3.4.0" - amazon-cognito-identity-js "^4.3.2" + "@aws-amplify/cache" "^3.1.23" + "@aws-amplify/core" "^3.4.6" + amazon-cognito-identity-js "^4.3.4" crypto-js "^3.3.0" -"@aws-amplify/cache@^3.1.17": - version "3.1.17" - resolved "https://registry.yarnpkg.com/@aws-amplify/cache/-/cache-3.1.17.tgz#874a5ba8069dd3ef325e24e1c60b5c7f2279f605" - integrity sha512-Lo0hXk16W8IaIe4CrETgDAlhuJlcrB3HWo2yLJjJA7qZAmNqiLHU2RYlKr2+9eLK7a/pKJJvoDuxQ79/RR3K0g== +"@aws-amplify/cache@^3.1.23": + version "3.1.23" + resolved "https://registry.yarnpkg.com/@aws-amplify/cache/-/cache-3.1.23.tgz#709fe67d1cbaa9b0889fc8c2101cc16c11e8cd86" + integrity sha512-mk4oRYrbXq8VK9yVJ515i7oc1J86K8g8mKkCiyanitsYS6E6Sh7hgTBVV+nA3wgBW77yAF6GEwGSFeroEkKNIQ== dependencies: - "@aws-amplify/core" "^3.4.0" + "@aws-amplify/core" "^3.4.6" -"@aws-amplify/core@^3.2.1", "@aws-amplify/core@^3.4.0": - version "3.4.0" - resolved "https://registry.yarnpkg.com/@aws-amplify/core/-/core-3.4.0.tgz#714dda1f8998caa8facf8dfb44a05e7e444ac5f9" - integrity sha512-l5dM0kSf4gs9MZ5KzQ+e93pPJDoVMzx1nDhZ+xEZJrS2V9kot5+TMYslb/fgVi/C5/C3kZDI932NHNqdaxcmGA== +"@aws-amplify/core@^3.2.1", "@aws-amplify/core@^3.4.6": + version "3.4.6" + resolved "https://registry.yarnpkg.com/@aws-amplify/core/-/core-3.4.6.tgz#c4cfeb33ce193366d13f309c58ce59edb0f76c03" + integrity sha512-4z1pQvvv19vHq7eUWsEbW64RBLWQ5nyH4VOvfSe5vMEYX9JsUrOfghuougMEH4DkZSZ2w2T761GKUJs2A43o2w== dependencies: "@aws-crypto/sha256-js" "1.0.0-alpha.0" - "@aws-sdk/client-cognito-identity" "1.0.0-gamma.2" - "@aws-sdk/credential-provider-cognito-identity" "1.0.0-gamma.2" - "@aws-sdk/node-http-handler" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/util-hex-encoding" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.1" + "@aws-sdk/client-cognito-identity" "1.0.0-gamma.4" + "@aws-sdk/credential-provider-cognito-identity" "1.0.0-gamma.4" + "@aws-sdk/node-http-handler" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/util-hex-encoding" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.3" url "^0.11.0" zen-observable-ts "0.8.19" -"@aws-amplify/datastore@^2.2.4": - version "2.2.4" - resolved "https://registry.yarnpkg.com/@aws-amplify/datastore/-/datastore-2.2.4.tgz#4c3dd9c23d868555efec781f9a8f3a1bf5f70e5a" - integrity sha512-z4e21CKM/zLq2NPLah6OzWSLEsG/EwZJ3Bth4buClYFSzSXPUj4pzIvEdKAsoCX8mQ0jxuJTF3nNzpleEOmxoQ== +"@aws-amplify/datastore@^2.2.10": + version "2.2.10" + resolved "https://registry.yarnpkg.com/@aws-amplify/datastore/-/datastore-2.2.10.tgz#98fd24998bd94d9610e10e87ff2c25e4bb4fa982" + integrity sha512-k1qm4hRp2WvTipqa653magbOeyTN2dqG1uMCv8+rig34HK4+jz4SGLab1YQDlgO+MxjsvOHYv9AeYjQYum5tRw== dependencies: - "@aws-amplify/api" "^3.1.17" - "@aws-amplify/core" "^3.4.0" - "@aws-amplify/pubsub" "^3.0.18" + "@aws-amplify/api" "^3.1.23" + "@aws-amplify/core" "^3.4.6" + "@aws-amplify/pubsub" "^3.0.24" idb "5.0.2" immer "6.0.1" ulid "2.3.0" @@ -93,53 +93,53 @@ zen-observable-ts "0.8.19" zen-push "0.2.1" -"@aws-amplify/interactions@^3.1.17": - version "3.1.17" - resolved "https://registry.yarnpkg.com/@aws-amplify/interactions/-/interactions-3.1.17.tgz#25aaefa5e85df7feae7d9195e46bfd981c291344" - integrity sha512-qPMoxOGyOxc7fZeyoOQXm6++nWnZpO6Mai2UZqvETpswgIEMmZSES3YFDENun0eXGQUxFKDYWKjq6lkJJqUqnw== - dependencies: - "@aws-amplify/core" "^3.4.0" - "@aws-sdk/client-lex-runtime-service" "1.0.0-gamma.2" - -"@aws-amplify/predictions@^3.1.17": - version "3.1.17" - resolved "https://registry.yarnpkg.com/@aws-amplify/predictions/-/predictions-3.1.17.tgz#a7bb13c6b7b71e08c5ebdae052cfddab77513c56" - integrity sha512-vPcIBe+foNSpRX8AES0klLw5ZGyZwzlUzz37aiviWOR0BwQGY16G6UIq+V791+dZTFmlAlGl8EYXGQIgdUGM9Q== - dependencies: - "@aws-amplify/core" "^3.4.0" - "@aws-amplify/storage" "^3.2.7" - "@aws-sdk/client-comprehend" "1.0.0-gamma.2" - "@aws-sdk/client-polly" "1.0.0-gamma.2" - "@aws-sdk/client-rekognition" "1.0.0-gamma.2" - "@aws-sdk/client-textract" "1.0.0-gamma.2" - "@aws-sdk/client-translate" "1.0.0-gamma.2" - "@aws-sdk/eventstream-marshaller" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-node" "1.0.0-gamma.1" +"@aws-amplify/interactions@^3.1.23": + version "3.1.23" + resolved "https://registry.yarnpkg.com/@aws-amplify/interactions/-/interactions-3.1.23.tgz#1a5b4227c6dc865d5bf428e206b2f02df4975596" + integrity sha512-TQXXVYpA3fwgE8WZNBbn4ozN+7t4iNF1NgM+1JwB+2QXlYV3j/rqPgbg2eOjAT5utALWY8XsYdEThbNRJer55A== + dependencies: + "@aws-amplify/core" "^3.4.6" + "@aws-sdk/client-lex-runtime-service" "1.0.0-gamma.4" + +"@aws-amplify/predictions@^3.1.23": + version "3.1.23" + resolved "https://registry.yarnpkg.com/@aws-amplify/predictions/-/predictions-3.1.23.tgz#8930f716d16533cbf3c2e4b70abed91032356d9e" + integrity sha512-R/yccT/ZvDgyJgsaMDaQZ/TZeoR9/IWqpUOYtAhVh4z/AykUYayTIVTN7BuKyFfZH2zdvUVuojZxoewb88Prcg== + dependencies: + "@aws-amplify/core" "^3.4.6" + "@aws-amplify/storage" "^3.2.13" + "@aws-sdk/client-comprehend" "1.0.0-gamma.4" + "@aws-sdk/client-polly" "1.0.0-gamma.4" + "@aws-sdk/client-rekognition" "1.0.0-gamma.4" + "@aws-sdk/client-textract" "1.0.0-gamma.4" + "@aws-sdk/client-translate" "1.0.0-gamma.4" + "@aws-sdk/eventstream-marshaller" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-node" "1.0.0-gamma.3" uuid "^3.2.1" -"@aws-amplify/pubsub@^3.0.18": - version "3.0.18" - resolved "https://registry.yarnpkg.com/@aws-amplify/pubsub/-/pubsub-3.0.18.tgz#c5ecf0dd2175d1ead52c562efc83172d2ba9a6d2" - integrity sha512-pk1cdv18eK4CPcwrIYq1cIW42lTXg55yVzts0/NuUCbR3l2T7ueCRg0LxlCK2Os7auQJ7r2dvJIGaLvp89pzaQ== +"@aws-amplify/pubsub@^3.0.24": + version "3.0.24" + resolved "https://registry.yarnpkg.com/@aws-amplify/pubsub/-/pubsub-3.0.24.tgz#19bcb38a9baa2b6387be1668ad053081b0db7ae8" + integrity sha512-5CdLR/omYNjUctb0wrhHDYstlKc8mxg1pByB07MosL3l1yvM8gWDeeZ/BiBsZfLpqbRHH5590NYxWCtSCtnD7g== dependencies: - "@aws-amplify/auth" "^3.2.14" - "@aws-amplify/cache" "^3.1.17" - "@aws-amplify/core" "^3.4.0" + "@aws-amplify/auth" "^3.3.5" + "@aws-amplify/cache" "^3.1.23" + "@aws-amplify/core" "^3.4.6" graphql "14.0.0" paho-mqtt "^1.1.0" uuid "^3.2.1" zen-observable-ts "0.8.19" -"@aws-amplify/storage@^3.2.7": - version "3.2.7" - resolved "https://registry.yarnpkg.com/@aws-amplify/storage/-/storage-3.2.7.tgz#3a0939f2b4177f7034561aac371eccb36147e0d0" - integrity sha512-W6i1XPiq3xFh1+b8Qv4dvaFznwI8IkV5FKxYSZ7TR2nTEuHnIZzpO6bO37eBg10BaGN9unFtWU6BYnflAsQwVQ== - dependencies: - "@aws-amplify/core" "^3.4.0" - "@aws-sdk/client-s3" "1.0.0-gamma.2" - "@aws-sdk/s3-request-presigner" "1.0.0-gamma.1" - "@aws-sdk/util-create-request" "1.0.0-gamma.1" - "@aws-sdk/util-format-url" "1.0.0-gamma.1" +"@aws-amplify/storage@^3.2.13": + version "3.2.13" + resolved "https://registry.yarnpkg.com/@aws-amplify/storage/-/storage-3.2.13.tgz#5c93427ad15a062da8474e7f69736af26d175d87" + integrity sha512-MJHYpkr8j4BtW+LBk147t6gLkp0XfEezmYuwQmxhS2zppHxPM/yIXdp/mjcSTYpJ3Em10bHOr/FmfJli6LztYw== + dependencies: + "@aws-amplify/core" "^3.4.6" + "@aws-sdk/client-s3" "1.0.0-gamma.4" + "@aws-sdk/s3-request-presigner" "1.0.0-gamma.3" + "@aws-sdk/util-create-request" "1.0.0-gamma.3" + "@aws-sdk/util-format-url" "1.0.0-gamma.3" axios "0.19.0" events "^3.1.0" sinon "^7.5.0" @@ -149,12 +149,12 @@ resolved "https://registry.yarnpkg.com/@aws-amplify/ui/-/ui-2.0.2.tgz#56bfc3674454f2a12d1cec247f38a444aa13ea09" integrity sha512-OLdZmUCVK29+JV8PrkgVPjg+GIFtBnNjhC0JSRgrps+ynOFkibMQQPKeFXlTYtlukuCuepCelPSkjxvhcLq2ZA== -"@aws-amplify/xr@^2.1.17": - version "2.1.17" - resolved "https://registry.yarnpkg.com/@aws-amplify/xr/-/xr-2.1.17.tgz#739e78f7e53f557e5c7d63ef370d59789ad72412" - integrity sha512-kjDHZlQ5rCs9r+UgfzkxXKw35j4iRtW9Ad6n6A5u91gPOsaNG4Jb0nF1RoSDzaCCXFdm8vTKJt5TqABK9SJgTg== +"@aws-amplify/xr@^2.1.23": + version "2.1.23" + resolved "https://registry.yarnpkg.com/@aws-amplify/xr/-/xr-2.1.23.tgz#f1b36e5859c45ba947d2b22211872ecb6279acc6" + integrity sha512-yrQMaIlzxKIGAV31ScbjTPsZ14mT2y+P9H3eh4R65riX9MXmqZyMV32B9kVlPO9MFnzCkdK9gEnK5GZd0+4CYg== dependencies: - "@aws-amplify/core" "^3.4.0" + "@aws-amplify/core" "^3.4.6" "@aws-crypto/crc32@^1.0.0-alpha.0": version "1.0.0-alpha.0" @@ -199,1003 +199,1053 @@ dependencies: tslib "^1.9.3" -"@aws-sdk/abort-controller@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/abort-controller/-/abort-controller-1.0.0-gamma.1.tgz#e2bf218aadfe1ae8510faea01752578c0c90611f" - integrity sha512-ShIcthHm+mTUgif9cwJDIrOIG/A30HSoA9WdXSCE8lrQ83D0AUTtBMAWwlN4ZuTf9ABzIwBQ/w9wZZpla650eA== +"@aws-sdk/abort-controller@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/abort-controller/-/abort-controller-1.0.0-gamma.3.tgz#52e55073bd7fd85cfbdb2fe0bf943e668053539d" + integrity sha512-iu3eXUlfrYa4hSlxuz93/3oLZwHYkvCGRapb5Mpv30V2+qKaoggQ9q1txycAqm0Pg+NpZgNJgYhSsMEGE775sA== dependencies: - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/chunked-blob-reader-native@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-1.0.0-gamma.1.tgz#fb00a194a877d4928cb65409ff5804d3a53e997f" - integrity sha512-muQUjB6RBjWq94HHBWWMdwIxfwwlZyKb2zTIH7R6nHZZI0IUhrhQc1PJC0dveD+1DTJ3fhTl9n2WrCJHT0uXnQ== +"@aws-sdk/chunked-blob-reader-native@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-1.0.0-gamma.3.tgz#f081c1c359e480b73545998b15bb17364ee85651" + integrity sha512-QDGxdZWMFrxAwRa39xlm1kvBO/Nsz/ppTupK6MPRaUB0nk5NkoKwIZM9KQKb/UvcsQ+r74/Xh9S9Mr7ySgmuyQ== dependencies: - "@aws-sdk/util-base64-browser" "1.0.0-gamma.1" + "@aws-sdk/util-base64-browser" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/chunked-blob-reader@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-1.0.0-gamma.1.tgz#7b39b87d2da023f7c51ce9cf0286220f33424816" - integrity sha512-MZNwCD+A8x9jQsj7Wn3sRFZaj2evWQjVL1hv2gRcr7cc8lG7gIo6TN/IFyVTB5V0eMNoJu8Ej9MXMo98EO0THA== +"@aws-sdk/chunked-blob-reader@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-1.0.0-gamma.3.tgz#579d6fb29dab43bd86b80be6b3ee84fbde384497" + integrity sha512-C0s1DcSTF+mhD47LFsoa2AvvMIhJE3J1x1JTRGeDcJ7bo60Fv4lF4ocsl77VgshZ4TlKvHGKdgNCCHsm22wMcg== dependencies: tslib "^1.8.0" -"@aws-sdk/client-cognito-identity@1.0.0-gamma.2": - version "1.0.0-gamma.2" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-1.0.0-gamma.2.tgz#c5c7ba2180813821cf94ef8365e1a7ead306e3a9" - integrity sha512-gGwTrKRN+mj48m4tXTilTbp1/aYO5mGIBPocDsG7digNFqxmjzFVNCq/yJfoBg7MCNBVlOFJ7i3bxM6H4cylow== +"@aws-sdk/client-cognito-identity@1.0.0-gamma.4": + version "1.0.0-gamma.4" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-1.0.0-gamma.4.tgz#9ca83d3ff415d72163ada3b8d64561929908f1c8" + integrity sha512-NHXKW3rGzV1/g45thfY5CqHrHcMbTbKhzlAzjABtdDFBe7K+dIC/HVV0veJHMsX5ac/Wruu57kiWz7bleeP9wA== dependencies: "@aws-crypto/sha256-browser" "^1.0.0-alpha.0" "@aws-crypto/sha256-js" "^1.0.0-alpha.0" - "@aws-sdk/config-resolver" "1.0.0-gamma.1" - "@aws-sdk/credential-provider-node" "1.0.0-gamma.1" - "@aws-sdk/fetch-http-handler" "1.0.0-gamma.2" - "@aws-sdk/hash-node" "1.0.0-gamma.1" - "@aws-sdk/invalid-dependency" "1.0.0-gamma.1" - "@aws-sdk/middleware-content-length" "1.0.0-gamma.1" - "@aws-sdk/middleware-host-header" "1.0.0-gamma.1" - "@aws-sdk/middleware-retry" "1.0.0-gamma.1" - "@aws-sdk/middleware-serde" "1.0.0-gamma.1" - "@aws-sdk/middleware-signing" "1.0.0-gamma.1" - "@aws-sdk/middleware-stack" "1.0.0-gamma.1" - "@aws-sdk/middleware-user-agent" "1.0.0-gamma.1" - "@aws-sdk/node-http-handler" "1.0.0-gamma.1" - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/region-provider" "1.0.0-gamma.1" - "@aws-sdk/smithy-client" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/url-parser-browser" "1.0.0-gamma.1" - "@aws-sdk/url-parser-node" "1.0.0-gamma.1" - "@aws-sdk/util-base64-browser" "1.0.0-gamma.1" - "@aws-sdk/util-base64-node" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-browser" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-node" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-node" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-browser" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-node" "1.0.0-gamma.1" + "@aws-sdk/config-resolver" "1.0.0-gamma.3" + "@aws-sdk/credential-provider-node" "1.0.0-gamma.3" + "@aws-sdk/fetch-http-handler" "1.0.0-gamma.4" + "@aws-sdk/hash-node" "1.0.0-gamma.3" + "@aws-sdk/invalid-dependency" "1.0.0-gamma.3" + "@aws-sdk/middleware-content-length" "1.0.0-gamma.3" + "@aws-sdk/middleware-host-header" "1.0.0-gamma.3" + "@aws-sdk/middleware-retry" "1.0.0-gamma.3" + "@aws-sdk/middleware-serde" "1.0.0-gamma.3" + "@aws-sdk/middleware-signing" "1.0.0-gamma.3" + "@aws-sdk/middleware-stack" "1.0.0-gamma.3" + "@aws-sdk/middleware-user-agent" "1.0.0-gamma.3" + "@aws-sdk/node-http-handler" "1.0.0-gamma.3" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/region-provider" "1.0.0-gamma.3" + "@aws-sdk/retry-config-provider" "1.0.0-gamma.2" + "@aws-sdk/smithy-client" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/url-parser-browser" "1.0.0-gamma.3" + "@aws-sdk/url-parser-node" "1.0.0-gamma.3" + "@aws-sdk/util-base64-browser" "1.0.0-gamma.3" + "@aws-sdk/util-base64-node" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-browser" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-node" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-node" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-browser" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-node" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/client-comprehend@1.0.0-gamma.2": - version "1.0.0-gamma.2" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-comprehend/-/client-comprehend-1.0.0-gamma.2.tgz#2759fbd26fa255e06fa2e72a27201f75ba193ae3" - integrity sha512-WOkDZI/kvA0DYR5N9zsYXkvQu749vSQfA3W7Ddj4Ln6+jCgB3fA8kEejLisNzPjKI9OWVdbdqkYXvejtynykTg== +"@aws-sdk/client-comprehend@1.0.0-gamma.4": + version "1.0.0-gamma.4" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-comprehend/-/client-comprehend-1.0.0-gamma.4.tgz#bf4ea2be0127e5814eea7fda5c5643ad7a032a31" + integrity sha512-WxT04/xTHNYQiGBy46OD8bbKJfgdu/4mKsP5jTPk/1Za9gnmW3ivpLlmMT4KJmKvG169Cdd6uYwmz8CivDEHbw== dependencies: "@aws-crypto/sha256-browser" "^1.0.0-alpha.0" "@aws-crypto/sha256-js" "^1.0.0-alpha.0" - "@aws-sdk/config-resolver" "1.0.0-gamma.1" - "@aws-sdk/credential-provider-node" "1.0.0-gamma.1" - "@aws-sdk/fetch-http-handler" "1.0.0-gamma.2" - "@aws-sdk/hash-node" "1.0.0-gamma.1" - "@aws-sdk/invalid-dependency" "1.0.0-gamma.1" - "@aws-sdk/middleware-content-length" "1.0.0-gamma.1" - "@aws-sdk/middleware-host-header" "1.0.0-gamma.1" - "@aws-sdk/middleware-retry" "1.0.0-gamma.1" - "@aws-sdk/middleware-serde" "1.0.0-gamma.1" - "@aws-sdk/middleware-signing" "1.0.0-gamma.1" - "@aws-sdk/middleware-stack" "1.0.0-gamma.1" - "@aws-sdk/middleware-user-agent" "1.0.0-gamma.1" - "@aws-sdk/node-http-handler" "1.0.0-gamma.1" - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/region-provider" "1.0.0-gamma.1" - "@aws-sdk/smithy-client" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/url-parser-browser" "1.0.0-gamma.1" - "@aws-sdk/url-parser-node" "1.0.0-gamma.1" - "@aws-sdk/util-base64-browser" "1.0.0-gamma.1" - "@aws-sdk/util-base64-node" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-browser" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-node" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-node" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-browser" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-node" "1.0.0-gamma.1" + "@aws-sdk/config-resolver" "1.0.0-gamma.3" + "@aws-sdk/credential-provider-node" "1.0.0-gamma.3" + "@aws-sdk/fetch-http-handler" "1.0.0-gamma.4" + "@aws-sdk/hash-node" "1.0.0-gamma.3" + "@aws-sdk/invalid-dependency" "1.0.0-gamma.3" + "@aws-sdk/middleware-content-length" "1.0.0-gamma.3" + "@aws-sdk/middleware-host-header" "1.0.0-gamma.3" + "@aws-sdk/middleware-retry" "1.0.0-gamma.3" + "@aws-sdk/middleware-serde" "1.0.0-gamma.3" + "@aws-sdk/middleware-signing" "1.0.0-gamma.3" + "@aws-sdk/middleware-stack" "1.0.0-gamma.3" + "@aws-sdk/middleware-user-agent" "1.0.0-gamma.3" + "@aws-sdk/node-http-handler" "1.0.0-gamma.3" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/region-provider" "1.0.0-gamma.3" + "@aws-sdk/retry-config-provider" "1.0.0-gamma.2" + "@aws-sdk/smithy-client" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/url-parser-browser" "1.0.0-gamma.3" + "@aws-sdk/url-parser-node" "1.0.0-gamma.3" + "@aws-sdk/util-base64-browser" "1.0.0-gamma.3" + "@aws-sdk/util-base64-node" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-browser" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-node" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-node" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-browser" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-node" "1.0.0-gamma.3" tslib "^1.8.0" - uuid "^7.0.0" + uuid "^3.0.0" -"@aws-sdk/client-firehose@1.0.0-gamma.2": - version "1.0.0-gamma.2" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-firehose/-/client-firehose-1.0.0-gamma.2.tgz#aab712072aecd960fd7715dba694b1e38e7b3740" - integrity sha512-D972+fTX1mfLbMu99bEEsrh27eLWx2YnGyHb5jDCTYQLdHT63OfWVxikj/NTtO2LgO7yfPxAe35UGHxthqdJ4A== +"@aws-sdk/client-firehose@1.0.0-gamma.4": + version "1.0.0-gamma.4" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-firehose/-/client-firehose-1.0.0-gamma.4.tgz#1e9fac84c5302f8b01d532dbc54709b3e725d37c" + integrity sha512-1of4j5K2JEZItRRvvTydfee3UwGqydLUi1O14A7bBJdEXnLBBDDdM3gM2gj7UQNYcAx7DouGOwDG0SdEbN+J5Q== dependencies: "@aws-crypto/sha256-browser" "^1.0.0-alpha.0" "@aws-crypto/sha256-js" "^1.0.0-alpha.0" - "@aws-sdk/config-resolver" "1.0.0-gamma.1" - "@aws-sdk/credential-provider-node" "1.0.0-gamma.1" - "@aws-sdk/fetch-http-handler" "1.0.0-gamma.2" - "@aws-sdk/hash-node" "1.0.0-gamma.1" - "@aws-sdk/invalid-dependency" "1.0.0-gamma.1" - "@aws-sdk/middleware-content-length" "1.0.0-gamma.1" - "@aws-sdk/middleware-host-header" "1.0.0-gamma.1" - "@aws-sdk/middleware-retry" "1.0.0-gamma.1" - "@aws-sdk/middleware-serde" "1.0.0-gamma.1" - "@aws-sdk/middleware-signing" "1.0.0-gamma.1" - "@aws-sdk/middleware-stack" "1.0.0-gamma.1" - "@aws-sdk/middleware-user-agent" "1.0.0-gamma.1" - "@aws-sdk/node-http-handler" "1.0.0-gamma.1" - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/region-provider" "1.0.0-gamma.1" - "@aws-sdk/smithy-client" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/url-parser-browser" "1.0.0-gamma.1" - "@aws-sdk/url-parser-node" "1.0.0-gamma.1" - "@aws-sdk/util-base64-browser" "1.0.0-gamma.1" - "@aws-sdk/util-base64-node" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-browser" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-node" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-node" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-browser" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-node" "1.0.0-gamma.1" + "@aws-sdk/config-resolver" "1.0.0-gamma.3" + "@aws-sdk/credential-provider-node" "1.0.0-gamma.3" + "@aws-sdk/fetch-http-handler" "1.0.0-gamma.4" + "@aws-sdk/hash-node" "1.0.0-gamma.3" + "@aws-sdk/invalid-dependency" "1.0.0-gamma.3" + "@aws-sdk/middleware-content-length" "1.0.0-gamma.3" + "@aws-sdk/middleware-host-header" "1.0.0-gamma.3" + "@aws-sdk/middleware-retry" "1.0.0-gamma.3" + "@aws-sdk/middleware-serde" "1.0.0-gamma.3" + "@aws-sdk/middleware-signing" "1.0.0-gamma.3" + "@aws-sdk/middleware-stack" "1.0.0-gamma.3" + "@aws-sdk/middleware-user-agent" "1.0.0-gamma.3" + "@aws-sdk/node-http-handler" "1.0.0-gamma.3" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/region-provider" "1.0.0-gamma.3" + "@aws-sdk/retry-config-provider" "1.0.0-gamma.2" + "@aws-sdk/smithy-client" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/url-parser-browser" "1.0.0-gamma.3" + "@aws-sdk/url-parser-node" "1.0.0-gamma.3" + "@aws-sdk/util-base64-browser" "1.0.0-gamma.3" + "@aws-sdk/util-base64-node" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-browser" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-node" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-node" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-browser" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-node" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/client-kinesis@1.0.0-gamma.2": - version "1.0.0-gamma.2" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-kinesis/-/client-kinesis-1.0.0-gamma.2.tgz#7be172e17b51bc493c269983069ab88e601b2401" - integrity sha512-ysuQ+m9waw2CdbX64h1ap1aPxip+12ck3lISYQ/iPqbhPVH6gkK3MxM2bs95Ploh6Nzrc+g9pUuAAyvAZ66oUg== +"@aws-sdk/client-kinesis@1.0.0-gamma.4": + version "1.0.0-gamma.4" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-kinesis/-/client-kinesis-1.0.0-gamma.4.tgz#4e85b927de4ba43f2c17e5811b1ee9f924d8350d" + integrity sha512-u4c3F7iNqcIti4g36VQP+jcE5jB5MyhxvFz9+ZrOpfbwysx3aKzt8EgA/cm/MeZ3yz59sXkHDmPeD1VHPeWvwg== dependencies: "@aws-crypto/sha256-browser" "^1.0.0-alpha.0" "@aws-crypto/sha256-js" "^1.0.0-alpha.0" - "@aws-sdk/config-resolver" "1.0.0-gamma.1" - "@aws-sdk/credential-provider-node" "1.0.0-gamma.1" - "@aws-sdk/eventstream-serde-browser" "1.0.0-gamma.1" - "@aws-sdk/eventstream-serde-config-resolver" "1.0.0-gamma.1" - "@aws-sdk/eventstream-serde-node" "1.0.0-gamma.1" - "@aws-sdk/fetch-http-handler" "1.0.0-gamma.2" - "@aws-sdk/hash-node" "1.0.0-gamma.1" - "@aws-sdk/invalid-dependency" "1.0.0-gamma.1" - "@aws-sdk/middleware-content-length" "1.0.0-gamma.1" - "@aws-sdk/middleware-host-header" "1.0.0-gamma.1" - "@aws-sdk/middleware-retry" "1.0.0-gamma.1" - "@aws-sdk/middleware-serde" "1.0.0-gamma.1" - "@aws-sdk/middleware-signing" "1.0.0-gamma.1" - "@aws-sdk/middleware-stack" "1.0.0-gamma.1" - "@aws-sdk/middleware-user-agent" "1.0.0-gamma.1" - "@aws-sdk/node-http-handler" "1.0.0-gamma.1" - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/region-provider" "1.0.0-gamma.1" - "@aws-sdk/smithy-client" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/url-parser-browser" "1.0.0-gamma.1" - "@aws-sdk/url-parser-node" "1.0.0-gamma.1" - "@aws-sdk/util-base64-browser" "1.0.0-gamma.1" - "@aws-sdk/util-base64-node" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-browser" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-node" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-node" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-browser" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-node" "1.0.0-gamma.1" + "@aws-sdk/config-resolver" "1.0.0-gamma.3" + "@aws-sdk/credential-provider-node" "1.0.0-gamma.3" + "@aws-sdk/eventstream-serde-browser" "1.0.0-gamma.3" + "@aws-sdk/eventstream-serde-config-resolver" "1.0.0-gamma.3" + "@aws-sdk/eventstream-serde-node" "1.0.0-gamma.3" + "@aws-sdk/fetch-http-handler" "1.0.0-gamma.4" + "@aws-sdk/hash-node" "1.0.0-gamma.3" + "@aws-sdk/invalid-dependency" "1.0.0-gamma.3" + "@aws-sdk/middleware-content-length" "1.0.0-gamma.3" + "@aws-sdk/middleware-host-header" "1.0.0-gamma.3" + "@aws-sdk/middleware-retry" "1.0.0-gamma.3" + "@aws-sdk/middleware-serde" "1.0.0-gamma.3" + "@aws-sdk/middleware-signing" "1.0.0-gamma.3" + "@aws-sdk/middleware-stack" "1.0.0-gamma.3" + "@aws-sdk/middleware-user-agent" "1.0.0-gamma.3" + "@aws-sdk/node-http-handler" "1.0.0-gamma.3" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/region-provider" "1.0.0-gamma.3" + "@aws-sdk/retry-config-provider" "1.0.0-gamma.2" + "@aws-sdk/smithy-client" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/url-parser-browser" "1.0.0-gamma.3" + "@aws-sdk/url-parser-node" "1.0.0-gamma.3" + "@aws-sdk/util-base64-browser" "1.0.0-gamma.3" + "@aws-sdk/util-base64-node" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-browser" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-node" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-node" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-browser" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-node" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/client-lex-runtime-service@1.0.0-gamma.2": - version "1.0.0-gamma.2" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-lex-runtime-service/-/client-lex-runtime-service-1.0.0-gamma.2.tgz#6fd1d6421e7488ccf2ed73b647679daf7e11a2b3" - integrity sha512-rVjfPWFTqUk0dJQjebLjKzcb+uFrfP+AqWz2OE/1HLjwDA5Zu/P0kC30Ch/S/IiKYo9TpGFMDd1KNk3umVLrpw== +"@aws-sdk/client-lex-runtime-service@1.0.0-gamma.4": + version "1.0.0-gamma.4" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-lex-runtime-service/-/client-lex-runtime-service-1.0.0-gamma.4.tgz#9d8f8c5471e5267e9ce5faa50421f13c6a009570" + integrity sha512-vcpQkWDyMHu/4RzR3SFRz7tQop2/IEFx8WMUQRUKFrgxwGKFcirFof4QXycoN5Pr17aUaE17bGbW9nroIDfrrw== dependencies: "@aws-crypto/sha256-browser" "^1.0.0-alpha.0" "@aws-crypto/sha256-js" "^1.0.0-alpha.0" - "@aws-sdk/config-resolver" "1.0.0-gamma.1" - "@aws-sdk/credential-provider-node" "1.0.0-gamma.1" - "@aws-sdk/fetch-http-handler" "1.0.0-gamma.2" - "@aws-sdk/hash-node" "1.0.0-gamma.1" - "@aws-sdk/invalid-dependency" "1.0.0-gamma.1" - "@aws-sdk/middleware-content-length" "1.0.0-gamma.1" - "@aws-sdk/middleware-host-header" "1.0.0-gamma.1" - "@aws-sdk/middleware-retry" "1.0.0-gamma.1" - "@aws-sdk/middleware-serde" "1.0.0-gamma.1" - "@aws-sdk/middleware-signing" "1.0.0-gamma.1" - "@aws-sdk/middleware-stack" "1.0.0-gamma.1" - "@aws-sdk/middleware-user-agent" "1.0.0-gamma.1" - "@aws-sdk/node-http-handler" "1.0.0-gamma.1" - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/region-provider" "1.0.0-gamma.1" - "@aws-sdk/smithy-client" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/url-parser-browser" "1.0.0-gamma.1" - "@aws-sdk/url-parser-node" "1.0.0-gamma.1" - "@aws-sdk/util-base64-browser" "1.0.0-gamma.1" - "@aws-sdk/util-base64-node" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-browser" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-node" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-node" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-browser" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-node" "1.0.0-gamma.1" + "@aws-sdk/config-resolver" "1.0.0-gamma.3" + "@aws-sdk/credential-provider-node" "1.0.0-gamma.3" + "@aws-sdk/fetch-http-handler" "1.0.0-gamma.4" + "@aws-sdk/hash-node" "1.0.0-gamma.3" + "@aws-sdk/invalid-dependency" "1.0.0-gamma.3" + "@aws-sdk/middleware-content-length" "1.0.0-gamma.3" + "@aws-sdk/middleware-host-header" "1.0.0-gamma.3" + "@aws-sdk/middleware-retry" "1.0.0-gamma.3" + "@aws-sdk/middleware-serde" "1.0.0-gamma.3" + "@aws-sdk/middleware-signing" "1.0.0-gamma.3" + "@aws-sdk/middleware-stack" "1.0.0-gamma.3" + "@aws-sdk/middleware-user-agent" "1.0.0-gamma.3" + "@aws-sdk/node-http-handler" "1.0.0-gamma.3" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/region-provider" "1.0.0-gamma.3" + "@aws-sdk/retry-config-provider" "1.0.0-gamma.2" + "@aws-sdk/smithy-client" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/url-parser-browser" "1.0.0-gamma.3" + "@aws-sdk/url-parser-node" "1.0.0-gamma.3" + "@aws-sdk/util-base64-browser" "1.0.0-gamma.3" + "@aws-sdk/util-base64-node" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-browser" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-node" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-node" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-browser" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-node" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/client-personalize-events@1.0.0-gamma.2": - version "1.0.0-gamma.2" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-personalize-events/-/client-personalize-events-1.0.0-gamma.2.tgz#cca27af85db92abd3db6be226994bc68ebf4b4ae" - integrity sha512-LWt6KkA2CqbI9Bai4mRAni+QVQTyk04FREMrkwrs4fq+Zk2TQnvcu938eSFiUjsoT8l5gyDxYaPflhA6eyNx5Q== +"@aws-sdk/client-personalize-events@1.0.0-gamma.4": + version "1.0.0-gamma.4" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-personalize-events/-/client-personalize-events-1.0.0-gamma.4.tgz#1084d3229b75bd5a483149b7d8035fbd9e08b42a" + integrity sha512-IjkGksADl/NaPmlxOZDl+4xazs4Hk2SraF0Kr6XayGKHhlUu1SgpI/qNFmNyaNnW3x56F9VVV2tAnV4L9Z9uqg== dependencies: "@aws-crypto/sha256-browser" "^1.0.0-alpha.0" "@aws-crypto/sha256-js" "^1.0.0-alpha.0" - "@aws-sdk/config-resolver" "1.0.0-gamma.1" - "@aws-sdk/credential-provider-node" "1.0.0-gamma.1" - "@aws-sdk/fetch-http-handler" "1.0.0-gamma.2" - "@aws-sdk/hash-node" "1.0.0-gamma.1" - "@aws-sdk/invalid-dependency" "1.0.0-gamma.1" - "@aws-sdk/middleware-content-length" "1.0.0-gamma.1" - "@aws-sdk/middleware-host-header" "1.0.0-gamma.1" - "@aws-sdk/middleware-retry" "1.0.0-gamma.1" - "@aws-sdk/middleware-serde" "1.0.0-gamma.1" - "@aws-sdk/middleware-signing" "1.0.0-gamma.1" - "@aws-sdk/middleware-stack" "1.0.0-gamma.1" - "@aws-sdk/middleware-user-agent" "1.0.0-gamma.1" - "@aws-sdk/node-http-handler" "1.0.0-gamma.1" - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/region-provider" "1.0.0-gamma.1" - "@aws-sdk/smithy-client" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/url-parser-browser" "1.0.0-gamma.1" - "@aws-sdk/url-parser-node" "1.0.0-gamma.1" - "@aws-sdk/util-base64-browser" "1.0.0-gamma.1" - "@aws-sdk/util-base64-node" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-browser" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-node" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-node" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-browser" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-node" "1.0.0-gamma.1" + "@aws-sdk/config-resolver" "1.0.0-gamma.3" + "@aws-sdk/credential-provider-node" "1.0.0-gamma.3" + "@aws-sdk/fetch-http-handler" "1.0.0-gamma.4" + "@aws-sdk/hash-node" "1.0.0-gamma.3" + "@aws-sdk/invalid-dependency" "1.0.0-gamma.3" + "@aws-sdk/middleware-content-length" "1.0.0-gamma.3" + "@aws-sdk/middleware-host-header" "1.0.0-gamma.3" + "@aws-sdk/middleware-retry" "1.0.0-gamma.3" + "@aws-sdk/middleware-serde" "1.0.0-gamma.3" + "@aws-sdk/middleware-signing" "1.0.0-gamma.3" + "@aws-sdk/middleware-stack" "1.0.0-gamma.3" + "@aws-sdk/middleware-user-agent" "1.0.0-gamma.3" + "@aws-sdk/node-http-handler" "1.0.0-gamma.3" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/region-provider" "1.0.0-gamma.3" + "@aws-sdk/retry-config-provider" "1.0.0-gamma.2" + "@aws-sdk/smithy-client" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/url-parser-browser" "1.0.0-gamma.3" + "@aws-sdk/url-parser-node" "1.0.0-gamma.3" + "@aws-sdk/util-base64-browser" "1.0.0-gamma.3" + "@aws-sdk/util-base64-node" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-browser" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-node" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-node" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-browser" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-node" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/client-pinpoint@1.0.0-gamma.2": - version "1.0.0-gamma.2" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-pinpoint/-/client-pinpoint-1.0.0-gamma.2.tgz#8ed14374e8fa7e88e0e9ca72c6f4ed0d944a1a7d" - integrity sha512-2J7MOjwZs+9Eugo4i4Se0Kha9WE59Toq+Zl4V1oNCFaridOSsOcAlItTHYcTxgHUOWF+d2bJ8NQ2UiGlEcJvsg== +"@aws-sdk/client-pinpoint@1.0.0-gamma.4": + version "1.0.0-gamma.4" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-pinpoint/-/client-pinpoint-1.0.0-gamma.4.tgz#f4daea9bc33268ca3077ebe99bc3157f2f7e89e9" + integrity sha512-YAoz84AUGyYIVlajwoKSewWcPgcHXS3OXp+jJ36eWTgiImRVAmJlRzYn1ZYxeFo+2/x8jF6mG+5WDRBgP7H9iw== dependencies: "@aws-crypto/sha256-browser" "^1.0.0-alpha.0" "@aws-crypto/sha256-js" "^1.0.0-alpha.0" - "@aws-sdk/config-resolver" "1.0.0-gamma.1" - "@aws-sdk/credential-provider-node" "1.0.0-gamma.1" - "@aws-sdk/fetch-http-handler" "1.0.0-gamma.2" - "@aws-sdk/hash-node" "1.0.0-gamma.1" - "@aws-sdk/invalid-dependency" "1.0.0-gamma.1" - "@aws-sdk/middleware-content-length" "1.0.0-gamma.1" - "@aws-sdk/middleware-host-header" "1.0.0-gamma.1" - "@aws-sdk/middleware-retry" "1.0.0-gamma.1" - "@aws-sdk/middleware-serde" "1.0.0-gamma.1" - "@aws-sdk/middleware-signing" "1.0.0-gamma.1" - "@aws-sdk/middleware-stack" "1.0.0-gamma.1" - "@aws-sdk/middleware-user-agent" "1.0.0-gamma.1" - "@aws-sdk/node-http-handler" "1.0.0-gamma.1" - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/region-provider" "1.0.0-gamma.1" - "@aws-sdk/smithy-client" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/url-parser-browser" "1.0.0-gamma.1" - "@aws-sdk/url-parser-node" "1.0.0-gamma.1" - "@aws-sdk/util-base64-browser" "1.0.0-gamma.1" - "@aws-sdk/util-base64-node" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-browser" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-node" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-node" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-browser" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-node" "1.0.0-gamma.1" + "@aws-sdk/config-resolver" "1.0.0-gamma.3" + "@aws-sdk/credential-provider-node" "1.0.0-gamma.3" + "@aws-sdk/fetch-http-handler" "1.0.0-gamma.4" + "@aws-sdk/hash-node" "1.0.0-gamma.3" + "@aws-sdk/invalid-dependency" "1.0.0-gamma.3" + "@aws-sdk/middleware-content-length" "1.0.0-gamma.3" + "@aws-sdk/middleware-host-header" "1.0.0-gamma.3" + "@aws-sdk/middleware-retry" "1.0.0-gamma.3" + "@aws-sdk/middleware-serde" "1.0.0-gamma.3" + "@aws-sdk/middleware-signing" "1.0.0-gamma.3" + "@aws-sdk/middleware-stack" "1.0.0-gamma.3" + "@aws-sdk/middleware-user-agent" "1.0.0-gamma.3" + "@aws-sdk/node-http-handler" "1.0.0-gamma.3" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/region-provider" "1.0.0-gamma.3" + "@aws-sdk/retry-config-provider" "1.0.0-gamma.2" + "@aws-sdk/smithy-client" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/url-parser-browser" "1.0.0-gamma.3" + "@aws-sdk/url-parser-node" "1.0.0-gamma.3" + "@aws-sdk/util-base64-browser" "1.0.0-gamma.3" + "@aws-sdk/util-base64-node" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-browser" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-node" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-node" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-browser" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-node" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/client-polly@1.0.0-gamma.2": - version "1.0.0-gamma.2" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-polly/-/client-polly-1.0.0-gamma.2.tgz#1a1b3b844e3fcc449749df9270f50bfaf0a3cc58" - integrity sha512-qeKEngvEuX6kAgyvw1WavI8V8K25+CPa6ZQiDNsAww256QWZKSCacujTWWvS5/fqib36UaPDwLod+2iFxxBhnA== +"@aws-sdk/client-polly@1.0.0-gamma.4": + version "1.0.0-gamma.4" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-polly/-/client-polly-1.0.0-gamma.4.tgz#eacdb0bf27e4651776d8ea3c9e281384dea29abe" + integrity sha512-dhxLkGrMP74IkTIPP3BLLAnsZdiLQphL+dWeEFdlwy0CGfccsssVcJ9EIGD/K++9F9E9265GQzm6fQ54g/t3LA== dependencies: "@aws-crypto/sha256-browser" "^1.0.0-alpha.0" "@aws-crypto/sha256-js" "^1.0.0-alpha.0" - "@aws-sdk/config-resolver" "1.0.0-gamma.1" - "@aws-sdk/credential-provider-node" "1.0.0-gamma.1" - "@aws-sdk/fetch-http-handler" "1.0.0-gamma.2" - "@aws-sdk/hash-node" "1.0.0-gamma.1" - "@aws-sdk/invalid-dependency" "1.0.0-gamma.1" - "@aws-sdk/middleware-content-length" "1.0.0-gamma.1" - "@aws-sdk/middleware-host-header" "1.0.0-gamma.1" - "@aws-sdk/middleware-retry" "1.0.0-gamma.1" - "@aws-sdk/middleware-serde" "1.0.0-gamma.1" - "@aws-sdk/middleware-signing" "1.0.0-gamma.1" - "@aws-sdk/middleware-stack" "1.0.0-gamma.1" - "@aws-sdk/middleware-user-agent" "1.0.0-gamma.1" - "@aws-sdk/node-http-handler" "1.0.0-gamma.1" - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/region-provider" "1.0.0-gamma.1" - "@aws-sdk/smithy-client" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/url-parser-browser" "1.0.0-gamma.1" - "@aws-sdk/url-parser-node" "1.0.0-gamma.1" - "@aws-sdk/util-base64-browser" "1.0.0-gamma.1" - "@aws-sdk/util-base64-node" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-browser" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-node" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-node" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-browser" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-node" "1.0.0-gamma.1" + "@aws-sdk/config-resolver" "1.0.0-gamma.3" + "@aws-sdk/credential-provider-node" "1.0.0-gamma.3" + "@aws-sdk/fetch-http-handler" "1.0.0-gamma.4" + "@aws-sdk/hash-node" "1.0.0-gamma.3" + "@aws-sdk/invalid-dependency" "1.0.0-gamma.3" + "@aws-sdk/middleware-content-length" "1.0.0-gamma.3" + "@aws-sdk/middleware-host-header" "1.0.0-gamma.3" + "@aws-sdk/middleware-retry" "1.0.0-gamma.3" + "@aws-sdk/middleware-serde" "1.0.0-gamma.3" + "@aws-sdk/middleware-signing" "1.0.0-gamma.3" + "@aws-sdk/middleware-stack" "1.0.0-gamma.3" + "@aws-sdk/middleware-user-agent" "1.0.0-gamma.3" + "@aws-sdk/node-http-handler" "1.0.0-gamma.3" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/region-provider" "1.0.0-gamma.3" + "@aws-sdk/retry-config-provider" "1.0.0-gamma.2" + "@aws-sdk/smithy-client" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/url-parser-browser" "1.0.0-gamma.3" + "@aws-sdk/url-parser-node" "1.0.0-gamma.3" + "@aws-sdk/util-base64-browser" "1.0.0-gamma.3" + "@aws-sdk/util-base64-node" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-browser" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-node" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-node" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-browser" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-node" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/client-rekognition@1.0.0-gamma.2": - version "1.0.0-gamma.2" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-rekognition/-/client-rekognition-1.0.0-gamma.2.tgz#f9e2673731257c04a85f81fbe01932e1bf0eea02" - integrity sha512-Solfdy09kKS7iV1CfBNg853M5rttoS13FJ0Ik1Fczx/OJj7Z8ob8EdxJ2XuhB8/zsQlG1SiXQQ54bw8o+Kc9oA== +"@aws-sdk/client-rekognition@1.0.0-gamma.4": + version "1.0.0-gamma.4" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-rekognition/-/client-rekognition-1.0.0-gamma.4.tgz#73f26e56adf4a6ad46a77ac819a0a7049f0415c0" + integrity sha512-01syRSoCEjqnaSR0YksTrWwzkB+YG6E6JfzZyDzQ4RguT08X+MVUhvdrHYrftIeenNYTc90hR0qza0+CLMn5MQ== dependencies: "@aws-crypto/sha256-browser" "^1.0.0-alpha.0" "@aws-crypto/sha256-js" "^1.0.0-alpha.0" - "@aws-sdk/config-resolver" "1.0.0-gamma.1" - "@aws-sdk/credential-provider-node" "1.0.0-gamma.1" - "@aws-sdk/fetch-http-handler" "1.0.0-gamma.2" - "@aws-sdk/hash-node" "1.0.0-gamma.1" - "@aws-sdk/invalid-dependency" "1.0.0-gamma.1" - "@aws-sdk/middleware-content-length" "1.0.0-gamma.1" - "@aws-sdk/middleware-host-header" "1.0.0-gamma.1" - "@aws-sdk/middleware-retry" "1.0.0-gamma.1" - "@aws-sdk/middleware-serde" "1.0.0-gamma.1" - "@aws-sdk/middleware-signing" "1.0.0-gamma.1" - "@aws-sdk/middleware-stack" "1.0.0-gamma.1" - "@aws-sdk/middleware-user-agent" "1.0.0-gamma.1" - "@aws-sdk/node-http-handler" "1.0.0-gamma.1" - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/region-provider" "1.0.0-gamma.1" - "@aws-sdk/smithy-client" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/url-parser-browser" "1.0.0-gamma.1" - "@aws-sdk/url-parser-node" "1.0.0-gamma.1" - "@aws-sdk/util-base64-browser" "1.0.0-gamma.1" - "@aws-sdk/util-base64-node" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-browser" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-node" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-node" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-browser" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-node" "1.0.0-gamma.1" + "@aws-sdk/config-resolver" "1.0.0-gamma.3" + "@aws-sdk/credential-provider-node" "1.0.0-gamma.3" + "@aws-sdk/fetch-http-handler" "1.0.0-gamma.4" + "@aws-sdk/hash-node" "1.0.0-gamma.3" + "@aws-sdk/invalid-dependency" "1.0.0-gamma.3" + "@aws-sdk/middleware-content-length" "1.0.0-gamma.3" + "@aws-sdk/middleware-host-header" "1.0.0-gamma.3" + "@aws-sdk/middleware-retry" "1.0.0-gamma.3" + "@aws-sdk/middleware-serde" "1.0.0-gamma.3" + "@aws-sdk/middleware-signing" "1.0.0-gamma.3" + "@aws-sdk/middleware-stack" "1.0.0-gamma.3" + "@aws-sdk/middleware-user-agent" "1.0.0-gamma.3" + "@aws-sdk/node-http-handler" "1.0.0-gamma.3" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/region-provider" "1.0.0-gamma.3" + "@aws-sdk/retry-config-provider" "1.0.0-gamma.2" + "@aws-sdk/smithy-client" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/url-parser-browser" "1.0.0-gamma.3" + "@aws-sdk/url-parser-node" "1.0.0-gamma.3" + "@aws-sdk/util-base64-browser" "1.0.0-gamma.3" + "@aws-sdk/util-base64-node" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-browser" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-node" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-node" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-browser" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-node" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/client-s3@1.0.0-gamma.2": - version "1.0.0-gamma.2" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-s3/-/client-s3-1.0.0-gamma.2.tgz#8a1460f0fb30b3559634b8c404e4f9a768646584" - integrity sha512-v5V+/S6X1iyb9JfEFmHMHstt2lJm7PArLm9ursYlv7QUWX4aN7jAgzRFNIxs6YvG+vrlVWg5B3lFKVeN+vF7GA== +"@aws-sdk/client-s3@1.0.0-gamma.4": + version "1.0.0-gamma.4" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-s3/-/client-s3-1.0.0-gamma.4.tgz#1666311027f7aa97ff120afca33bf8f2b4be37d7" + integrity sha512-nnCeduoL25HRq/F1McYl0k/gqFfKhEWjOE/+XpvkKGLx62XAQutbw26GveLk2HOyul9p7FO4nJbk9iECejpLLw== dependencies: "@aws-crypto/sha256-browser" "^1.0.0-alpha.0" "@aws-crypto/sha256-js" "^1.0.0-alpha.0" - "@aws-sdk/config-resolver" "1.0.0-gamma.1" - "@aws-sdk/credential-provider-node" "1.0.0-gamma.1" - "@aws-sdk/eventstream-serde-browser" "1.0.0-gamma.1" - "@aws-sdk/eventstream-serde-config-resolver" "1.0.0-gamma.1" - "@aws-sdk/eventstream-serde-node" "1.0.0-gamma.1" - "@aws-sdk/fetch-http-handler" "1.0.0-gamma.2" - "@aws-sdk/hash-blob-browser" "1.0.0-gamma.1" - "@aws-sdk/hash-node" "1.0.0-gamma.1" - "@aws-sdk/hash-stream-node" "1.0.0-gamma.1" - "@aws-sdk/invalid-dependency" "1.0.0-gamma.1" - "@aws-sdk/md5-js" "1.0.0-gamma.1" - "@aws-sdk/middleware-apply-body-checksum" "1.0.0-gamma.1" - "@aws-sdk/middleware-bucket-endpoint" "1.0.0-gamma.1" - "@aws-sdk/middleware-content-length" "1.0.0-gamma.1" - "@aws-sdk/middleware-expect-continue" "1.0.0-gamma.1" - "@aws-sdk/middleware-host-header" "1.0.0-gamma.1" - "@aws-sdk/middleware-location-constraint" "1.0.0-gamma.1" - "@aws-sdk/middleware-retry" "1.0.0-gamma.1" - "@aws-sdk/middleware-sdk-s3" "1.0.0-gamma.1" - "@aws-sdk/middleware-serde" "1.0.0-gamma.1" - "@aws-sdk/middleware-signing" "1.0.0-gamma.1" - "@aws-sdk/middleware-ssec" "1.0.0-gamma.1" - "@aws-sdk/middleware-stack" "1.0.0-gamma.1" - "@aws-sdk/middleware-user-agent" "1.0.0-gamma.1" - "@aws-sdk/node-http-handler" "1.0.0-gamma.1" - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/region-provider" "1.0.0-gamma.1" - "@aws-sdk/smithy-client" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/url-parser-browser" "1.0.0-gamma.1" - "@aws-sdk/url-parser-node" "1.0.0-gamma.1" - "@aws-sdk/util-base64-browser" "1.0.0-gamma.1" - "@aws-sdk/util-base64-node" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-browser" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-node" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-node" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-browser" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-node" "1.0.0-gamma.1" - "@aws-sdk/xml-builder" "1.0.0-gamma.1" + "@aws-sdk/config-resolver" "1.0.0-gamma.3" + "@aws-sdk/credential-provider-node" "1.0.0-gamma.3" + "@aws-sdk/eventstream-serde-browser" "1.0.0-gamma.3" + "@aws-sdk/eventstream-serde-config-resolver" "1.0.0-gamma.3" + "@aws-sdk/eventstream-serde-node" "1.0.0-gamma.3" + "@aws-sdk/fetch-http-handler" "1.0.0-gamma.4" + "@aws-sdk/hash-blob-browser" "1.0.0-gamma.3" + "@aws-sdk/hash-node" "1.0.0-gamma.3" + "@aws-sdk/hash-stream-node" "1.0.0-gamma.3" + "@aws-sdk/invalid-dependency" "1.0.0-gamma.3" + "@aws-sdk/md5-js" "1.0.0-gamma.3" + "@aws-sdk/middleware-apply-body-checksum" "1.0.0-gamma.3" + "@aws-sdk/middleware-bucket-endpoint" "1.0.0-gamma.3" + "@aws-sdk/middleware-content-length" "1.0.0-gamma.3" + "@aws-sdk/middleware-expect-continue" "1.0.0-gamma.3" + "@aws-sdk/middleware-host-header" "1.0.0-gamma.3" + "@aws-sdk/middleware-location-constraint" "1.0.0-gamma.3" + "@aws-sdk/middleware-retry" "1.0.0-gamma.3" + "@aws-sdk/middleware-sdk-s3" "1.0.0-gamma.3" + "@aws-sdk/middleware-serde" "1.0.0-gamma.3" + "@aws-sdk/middleware-signing" "1.0.0-gamma.3" + "@aws-sdk/middleware-ssec" "1.0.0-gamma.3" + "@aws-sdk/middleware-stack" "1.0.0-gamma.3" + "@aws-sdk/middleware-user-agent" "1.0.0-gamma.3" + "@aws-sdk/node-http-handler" "1.0.0-gamma.3" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/region-provider" "1.0.0-gamma.3" + "@aws-sdk/retry-config-provider" "1.0.0-gamma.2" + "@aws-sdk/smithy-client" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/url-parser-browser" "1.0.0-gamma.3" + "@aws-sdk/url-parser-node" "1.0.0-gamma.3" + "@aws-sdk/util-base64-browser" "1.0.0-gamma.3" + "@aws-sdk/util-base64-node" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-browser" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-node" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-node" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-browser" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-node" "1.0.0-gamma.3" + "@aws-sdk/xml-builder" "1.0.0-gamma.3" fast-xml-parser "^3.16.0" tslib "^1.8.0" -"@aws-sdk/client-textract@1.0.0-gamma.2": - version "1.0.0-gamma.2" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-textract/-/client-textract-1.0.0-gamma.2.tgz#45c995e33b38149c2ae08c2e5918652da8dfccd6" - integrity sha512-omK+qwUJ9zibFU3Hh7kLqUIZxUmYu6LKHQVJPgZMnHmQEV5meccEioHbDUqoKMY2PapbGHWIN0S6kgCk7Ij5JA== +"@aws-sdk/client-textract@1.0.0-gamma.4": + version "1.0.0-gamma.4" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-textract/-/client-textract-1.0.0-gamma.4.tgz#fd0505af6fc5de86295a75cb661ca317d1549daf" + integrity sha512-nDijsSaYlSBgVEgo8T+N19U9VJ6J2RbE0C87sR9XoPUnnWcna1MCyoy5iMVIHX182H20DOZsjyCdwP1RtqhsLw== dependencies: "@aws-crypto/sha256-browser" "^1.0.0-alpha.0" "@aws-crypto/sha256-js" "^1.0.0-alpha.0" - "@aws-sdk/config-resolver" "1.0.0-gamma.1" - "@aws-sdk/credential-provider-node" "1.0.0-gamma.1" - "@aws-sdk/fetch-http-handler" "1.0.0-gamma.2" - "@aws-sdk/hash-node" "1.0.0-gamma.1" - "@aws-sdk/invalid-dependency" "1.0.0-gamma.1" - "@aws-sdk/middleware-content-length" "1.0.0-gamma.1" - "@aws-sdk/middleware-host-header" "1.0.0-gamma.1" - "@aws-sdk/middleware-retry" "1.0.0-gamma.1" - "@aws-sdk/middleware-serde" "1.0.0-gamma.1" - "@aws-sdk/middleware-signing" "1.0.0-gamma.1" - "@aws-sdk/middleware-stack" "1.0.0-gamma.1" - "@aws-sdk/middleware-user-agent" "1.0.0-gamma.1" - "@aws-sdk/node-http-handler" "1.0.0-gamma.1" - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/region-provider" "1.0.0-gamma.1" - "@aws-sdk/smithy-client" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/url-parser-browser" "1.0.0-gamma.1" - "@aws-sdk/url-parser-node" "1.0.0-gamma.1" - "@aws-sdk/util-base64-browser" "1.0.0-gamma.1" - "@aws-sdk/util-base64-node" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-browser" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-node" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-node" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-browser" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-node" "1.0.0-gamma.1" + "@aws-sdk/config-resolver" "1.0.0-gamma.3" + "@aws-sdk/credential-provider-node" "1.0.0-gamma.3" + "@aws-sdk/fetch-http-handler" "1.0.0-gamma.4" + "@aws-sdk/hash-node" "1.0.0-gamma.3" + "@aws-sdk/invalid-dependency" "1.0.0-gamma.3" + "@aws-sdk/middleware-content-length" "1.0.0-gamma.3" + "@aws-sdk/middleware-host-header" "1.0.0-gamma.3" + "@aws-sdk/middleware-retry" "1.0.0-gamma.3" + "@aws-sdk/middleware-serde" "1.0.0-gamma.3" + "@aws-sdk/middleware-signing" "1.0.0-gamma.3" + "@aws-sdk/middleware-stack" "1.0.0-gamma.3" + "@aws-sdk/middleware-user-agent" "1.0.0-gamma.3" + "@aws-sdk/node-http-handler" "1.0.0-gamma.3" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/region-provider" "1.0.0-gamma.3" + "@aws-sdk/retry-config-provider" "1.0.0-gamma.2" + "@aws-sdk/smithy-client" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/url-parser-browser" "1.0.0-gamma.3" + "@aws-sdk/url-parser-node" "1.0.0-gamma.3" + "@aws-sdk/util-base64-browser" "1.0.0-gamma.3" + "@aws-sdk/util-base64-node" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-browser" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-node" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-node" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-browser" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-node" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/client-translate@1.0.0-gamma.2": - version "1.0.0-gamma.2" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-translate/-/client-translate-1.0.0-gamma.2.tgz#439720b63bd3dbdaf1863b3ba9c9e9d063b12efd" - integrity sha512-AHYw6Mlpo1Rf+EGn7tcgCDBeQpvTnyAeh6t0B/dP0WbgevVzCR5wvG+PQvmoNiR+kgKKhfi+ah2CFF5xXZBA6g== +"@aws-sdk/client-translate@1.0.0-gamma.4": + version "1.0.0-gamma.4" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-translate/-/client-translate-1.0.0-gamma.4.tgz#315f490e4b5123374eba2258db978ffa1232b2c6" + integrity sha512-8wYXlG3rJHeehG1ZOreEETlPgdqDk5CGf1Yh2IG46TdVBoltqnRxz6xS05dddKNyM1G+DhUnECj1ec1JIrc3uQ== dependencies: "@aws-crypto/sha256-browser" "^1.0.0-alpha.0" "@aws-crypto/sha256-js" "^1.0.0-alpha.0" - "@aws-sdk/config-resolver" "1.0.0-gamma.1" - "@aws-sdk/credential-provider-node" "1.0.0-gamma.1" - "@aws-sdk/fetch-http-handler" "1.0.0-gamma.2" - "@aws-sdk/hash-node" "1.0.0-gamma.1" - "@aws-sdk/invalid-dependency" "1.0.0-gamma.1" - "@aws-sdk/middleware-content-length" "1.0.0-gamma.1" - "@aws-sdk/middleware-host-header" "1.0.0-gamma.1" - "@aws-sdk/middleware-retry" "1.0.0-gamma.1" - "@aws-sdk/middleware-serde" "1.0.0-gamma.1" - "@aws-sdk/middleware-signing" "1.0.0-gamma.1" - "@aws-sdk/middleware-stack" "1.0.0-gamma.1" - "@aws-sdk/middleware-user-agent" "1.0.0-gamma.1" - "@aws-sdk/node-http-handler" "1.0.0-gamma.1" - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/region-provider" "1.0.0-gamma.1" - "@aws-sdk/smithy-client" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/url-parser-browser" "1.0.0-gamma.1" - "@aws-sdk/url-parser-node" "1.0.0-gamma.1" - "@aws-sdk/util-base64-browser" "1.0.0-gamma.1" - "@aws-sdk/util-base64-node" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-browser" "1.0.0-gamma.1" - "@aws-sdk/util-body-length-node" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.1" - "@aws-sdk/util-user-agent-node" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-browser" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-node" "1.0.0-gamma.1" + "@aws-sdk/config-resolver" "1.0.0-gamma.3" + "@aws-sdk/credential-provider-node" "1.0.0-gamma.3" + "@aws-sdk/fetch-http-handler" "1.0.0-gamma.4" + "@aws-sdk/hash-node" "1.0.0-gamma.3" + "@aws-sdk/invalid-dependency" "1.0.0-gamma.3" + "@aws-sdk/middleware-content-length" "1.0.0-gamma.3" + "@aws-sdk/middleware-host-header" "1.0.0-gamma.3" + "@aws-sdk/middleware-retry" "1.0.0-gamma.3" + "@aws-sdk/middleware-serde" "1.0.0-gamma.3" + "@aws-sdk/middleware-signing" "1.0.0-gamma.3" + "@aws-sdk/middleware-stack" "1.0.0-gamma.3" + "@aws-sdk/middleware-user-agent" "1.0.0-gamma.3" + "@aws-sdk/node-http-handler" "1.0.0-gamma.3" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/region-provider" "1.0.0-gamma.3" + "@aws-sdk/retry-config-provider" "1.0.0-gamma.2" + "@aws-sdk/smithy-client" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/url-parser-browser" "1.0.0-gamma.3" + "@aws-sdk/url-parser-node" "1.0.0-gamma.3" + "@aws-sdk/util-base64-browser" "1.0.0-gamma.3" + "@aws-sdk/util-base64-node" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-browser" "1.0.0-gamma.3" + "@aws-sdk/util-body-length-node" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-browser" "1.0.0-gamma.3" + "@aws-sdk/util-user-agent-node" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-browser" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-node" "1.0.0-gamma.3" tslib "^1.8.0" - uuid "^7.0.0" + uuid "^3.0.0" -"@aws-sdk/config-resolver@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/config-resolver/-/config-resolver-1.0.0-gamma.1.tgz#688653ab39b230ef9458bcfe57277169f8616b78" - integrity sha512-pBmOberuJ35eZ1Svqsu8B8vvHv8z6ilmnmhQ4wuy+QhyR22f4rzD/23wnNyAgK/OKvTPzwxaf0DIMF2x5p5yrA== +"@aws-sdk/config-resolver@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/config-resolver/-/config-resolver-1.0.0-gamma.3.tgz#051f4aaa09370a3916a3e65f5c8a2bd1e40b0020" + integrity sha512-rn2Pa3BtZnpHCGdv2GarX6z/XAWetEtF42w1TEZGI5qJRMg8ZDCJihUNEwLI3n2NB1SKmQMQ5eh0KJ/nmM1KMQ== dependencies: - "@aws-sdk/signature-v4" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/signature-v4" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/credential-provider-cognito-identity@1.0.0-gamma.2": - version "1.0.0-gamma.2" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-1.0.0-gamma.2.tgz#59c40d74fda51aca1f0841769fc37f19ee7df0ef" - integrity sha512-mQSWij2FeyTnJqSwVOVxB6EqIxP0JfSk31wplRMwIFs1JEe2s4CbR6WkgfJdwBfK+uTbZGyR24EtUtlQiSP5zw== +"@aws-sdk/credential-provider-cognito-identity@1.0.0-gamma.4": + version "1.0.0-gamma.4" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-1.0.0-gamma.4.tgz#5159efff0f41368feaa7e8f8a7518b6b0cf9e504" + integrity sha512-+m+Ifgs4x9ZF6u00wv9//zrKPPlHbRFl3s68HP/bdmERkvAAtqMzRKBO1dVbCC0ymsQuR/+1DmnEspfljNmMzQ== dependencies: - "@aws-sdk/client-cognito-identity" "1.0.0-gamma.2" - "@aws-sdk/property-provider" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/client-cognito-identity" "1.0.0-gamma.4" + "@aws-sdk/property-provider" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/credential-provider-env@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-1.0.0-gamma.1.tgz#dd1c2a76daf199f3b77201f394c47364c5647393" - integrity sha512-RB3aZNHNsPojQFzEbds7vPVus/HY+p6EqAVlH7mX8L7ACYBd6Gxtnxs+BKFMQA38Ev86oDbBoW93f1ppjjDHIg== +"@aws-sdk/credential-provider-env@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-1.0.0-gamma.3.tgz#a08fd088406ce78a03dcd80c8b498b3291ecd094" + integrity sha512-LAT36m8mAd9kf8o4zvNGWkgt/9K8w9fUV79UW2iFDR77goZeEVhNcDqtoU49x8p/eJdH3mh3LuF5gOY5iQZJAQ== dependencies: - "@aws-sdk/property-provider" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/property-provider" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/credential-provider-imds@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-imds/-/credential-provider-imds-1.0.0-gamma.1.tgz#e469796f7887cd3388d27394f5b023b477beb399" - integrity sha512-uf1wnGkOf3recCcaFY8OyFqaCZs4I27ETooxUg2j/PiAVuLDGhe+AjAU4jtZqthg8ECDTT73LnfGb3S6tuc3Eg== +"@aws-sdk/credential-provider-imds@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-imds/-/credential-provider-imds-1.0.0-gamma.3.tgz#5ea4aab0d2e9278e452a353ec41f3c2421d2c11d" + integrity sha512-rI25N7K8H1b0oiyR9+8Xx1vgh3/NlXm5wWF4G0HRg4WVl4jGj/pRGYcZhNZZvzCjrF2hIquj+17SMtv6E9tx4g== dependencies: - "@aws-sdk/property-provider" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/property-provider" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/credential-provider-ini@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-1.0.0-gamma.1.tgz#4cae1ea598ae18334d01ce2d1de56cf7db0b2301" - integrity sha512-naocfWbP6l3lWbxmfuSarphadPs87cRVwYpZ9FhQwzXb7Ff7rsWsZVFDBMqn/K0CH9rGZeKEcR1HzfKWx2zQ1w== +"@aws-sdk/credential-provider-ini@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-1.0.0-gamma.3.tgz#ae9379f81c19d9a48ac483a9ba65741a7addfee0" + integrity sha512-kf2ZjscM460jn01JqEfWfzq6VsmKtfD3JM9zMRyE7JyNIwW8tS+saljqNGcv0fzJdgA2aBA2cqOLHxQ5I8Va7w== dependencies: - "@aws-sdk/property-provider" "1.0.0-gamma.1" - "@aws-sdk/shared-ini-file-loader" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/property-provider" "1.0.0-gamma.3" + "@aws-sdk/shared-ini-file-loader" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/credential-provider-node@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-1.0.0-gamma.1.tgz#3abe6ddf4105ed9e12479b1df6f612b9a8cb4d27" - integrity sha512-DBFPoZlmWt3PoQ+pOG4rJRBXw8ofhUaZrKD5Nm7/6Qs0JSbzWPlXSGDDUw1PdyThstFC1GVN/tAF2RhePa4mng== - dependencies: - "@aws-sdk/credential-provider-env" "1.0.0-gamma.1" - "@aws-sdk/credential-provider-imds" "1.0.0-gamma.1" - "@aws-sdk/credential-provider-ini" "1.0.0-gamma.1" - "@aws-sdk/credential-provider-process" "1.0.0-gamma.1" - "@aws-sdk/property-provider" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" +"@aws-sdk/credential-provider-node@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-1.0.0-gamma.3.tgz#961f284699094625c015b61edf809d7a1bd062d3" + integrity sha512-hkqOULwckbv3DgNsG3D6az6ZETbDLPIW5+4SLjNH7MbCdB4HkT0KW0WDwE0QkdlcvQlKg1pfNIzolxDbv8VZCQ== + dependencies: + "@aws-sdk/credential-provider-env" "1.0.0-gamma.3" + "@aws-sdk/credential-provider-imds" "1.0.0-gamma.3" + "@aws-sdk/credential-provider-ini" "1.0.0-gamma.3" + "@aws-sdk/credential-provider-process" "1.0.0-gamma.3" + "@aws-sdk/property-provider" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/credential-provider-process@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-1.0.0-gamma.1.tgz#3001aba244cdcc5604e3c1690dbd4f319cfd18f3" - integrity sha512-gxVOXRF/XR+tfa516tvsy54xqXSvbJuW5gIpVWnUqPfZAesnz5Yh7/AIlWm1e7UHKGG1pDTPRmEKhrXwfyna/Q== +"@aws-sdk/credential-provider-process@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-1.0.0-gamma.3.tgz#dd03efba196265a5b92c73be5f9d4578dc29a085" + integrity sha512-zHkna6XakaOHkb56TR7vTQxA97tmaKYH00EEeIVkWZUu6/QFBOFoSZbQBUxVWdvlIcPDbKwr2Pth7OahsEGmIg== dependencies: - "@aws-sdk/credential-provider-ini" "1.0.0-gamma.1" - "@aws-sdk/property-provider" "1.0.0-gamma.1" - "@aws-sdk/shared-ini-file-loader" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/credential-provider-ini" "1.0.0-gamma.3" + "@aws-sdk/property-provider" "1.0.0-gamma.3" + "@aws-sdk/shared-ini-file-loader" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/eventstream-marshaller@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-1.0.0-gamma.1.tgz#72d560f97f5c3e74fb4cd39c1ae6b9135414edcf" - integrity sha512-qEJdol/mMGfiGFuHGtDKyiqynpWH+819Ja8RZOctw1Qxi6OeHKXTto5M5frJDw+bVgnYlxRKWng96hg9SeMuiA== +"@aws-sdk/eventstream-marshaller@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-1.0.0-gamma.3.tgz#408b76e6386f9982e3cad7bf37d3114903a6e1d5" + integrity sha512-EZaNxRW17SX8eqbRhMsoFXdHp2XTwGmtz89DK6pC+i2OWIQSLskOAYYp0UPWZdeEk9FHk1gmdaY/oDeeeMS1oA== dependencies: "@aws-crypto/crc32" "^1.0.0-alpha.0" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/util-hex-encoding" "1.0.0-gamma.1" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/util-hex-encoding" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/eventstream-serde-browser@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-1.0.0-gamma.1.tgz#d0bdfbbb13f5e06b5ce859977c024e8bcd88d316" - integrity sha512-n9460HbQzS3hVfFUUQbwzLu6t4j5rQEzoNLJWNuYZdkMLkue40Wv1Da2aUcM8kTsuUwSxMZYe7aHfUWaSktrPg== +"@aws-sdk/eventstream-serde-browser@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-1.0.0-gamma.3.tgz#21bab878d17079d18ba57fe0ae5ec0642ff931f2" + integrity sha512-wDJLKAB88HE6Sf80R1CTXRig+v8AkugGRfrDheSde15DLh8Xfo4INkCRxxWF0P1OENVcUFF9MUo8IahyjGck/g== dependencies: - "@aws-sdk/eventstream-marshaller" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/eventstream-marshaller" "1.0.0-gamma.3" + "@aws-sdk/eventstream-serde-universal" "1.0.0-gamma.2" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/eventstream-serde-config-resolver@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-1.0.0-gamma.1.tgz#8b6241f5f6f1da2a154e49a39aeace79270e76c4" - integrity sha512-ZUnZGwbYX+6XBseOnKPiG+WcdIf4PS5o/K9uFuMHeY+dfeEYH/uiP1VFaQDugMnMeXAWF9sOzTt1vcYWhbEDCw== +"@aws-sdk/eventstream-serde-config-resolver@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-1.0.0-gamma.3.tgz#687e53c2918ac3ac38fbe07dd1c4638fd0774ce6" + integrity sha512-fuYWrJhukxEHEoSR4IqWUWTHONOOEqJ+yMNA6yt+/oKC/HZGkW0SaOS8PYIG3+9tJHVr5S4f4uHRSmnm+Xhkpw== dependencies: - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/eventstream-serde-node@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-1.0.0-gamma.1.tgz#1cd3452e0246eb9ff3dd3fa2dc2a8f93d735b480" - integrity sha512-DSN4p4k2+nnx4XDMWKb9a4sggXttkBxQTVqU6HegLR7oM2OeVDoXgI3g09qhdpV9Bbw27STXk6BTu8dzNL2ZxA== +"@aws-sdk/eventstream-serde-node@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-1.0.0-gamma.3.tgz#97f89665fbf69c4b762abfa10d93653c85d00771" + integrity sha512-50e8wnyOBXsrLsJQbGV3SAGbhFXmo6RV+mwrEiXTNkIY/1T6/LkTIhEdyeFvUZI2qCUL2c4ucJYtbN4zpZLB2A== dependencies: - "@aws-sdk/eventstream-marshaller" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/eventstream-marshaller" "1.0.0-gamma.3" + "@aws-sdk/eventstream-serde-universal" "1.0.0-gamma.2" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/fetch-http-handler@1.0.0-gamma.2": +"@aws-sdk/eventstream-serde-universal@1.0.0-gamma.2": version "1.0.0-gamma.2" - resolved "https://registry.yarnpkg.com/@aws-sdk/fetch-http-handler/-/fetch-http-handler-1.0.0-gamma.2.tgz#10a13929273a2e558f7e6a822ffd9c5e996c5a67" - integrity sha512-uSMmGElKKeClA7yVPipZLTPMGXLz1WiQB4utTEAxrgfOFDHIjSkTyAcPELdcB/VU+DmvMeSmPn9IOTQKqwv80g== + resolved "https://registry.yarnpkg.com/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-1.0.0-gamma.2.tgz#0e07c3a77e6525bb1272e674f6fc6d1b6d27ab04" + integrity sha512-ZIUqI/DyYmlXJleUWaP0wiNgy125m/5lOCnv1t0bi/R+aIIrAlWey1Z97O8u4MdTTtF6i09RQv1Zfh7eVOn81g== dependencies: - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/querystring-builder" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/eventstream-marshaller" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/hash-blob-browser@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/hash-blob-browser/-/hash-blob-browser-1.0.0-gamma.1.tgz#c970ade5ae9a420bcdb8e772b73fc9e8409df3ef" - integrity sha512-YosiC6jsq7gKkNAoQn9cOMpV+r7pqvQBS1pU/8bDmaeDFL/BVeettNINKHh9BjZGvdArXJArH8958+3zTb6+ug== +"@aws-sdk/fetch-http-handler@1.0.0-gamma.4": + version "1.0.0-gamma.4" + resolved "https://registry.yarnpkg.com/@aws-sdk/fetch-http-handler/-/fetch-http-handler-1.0.0-gamma.4.tgz#8a5b6fe3ee05aefefedcaa8d33888c7145fd3063" + integrity sha512-l5I8rMqkPfjz7UfQDw2HoDpnwoduWwwlciG9glS+m6lcSek3K9TK2BGjA0WUc2xd+1M11eCKZ5GqvcQYFc3ziw== dependencies: - "@aws-sdk/chunked-blob-reader" "1.0.0-gamma.1" - "@aws-sdk/chunked-blob-reader-native" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/querystring-builder" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/util-base64-browser" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/hash-node@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/hash-node/-/hash-node-1.0.0-gamma.1.tgz#46a6901c5d44798d9760538e2ed119a8fd835a1d" - integrity sha512-NH2aPVm857rWhuL3eRHllE3qHVGevEtLWxOy+dz7i/2gsTJ+nbkc9YihhNxbdAdwO6qEBM4AcnWHS0G1w1F9rA== +"@aws-sdk/hash-blob-browser@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/hash-blob-browser/-/hash-blob-browser-1.0.0-gamma.3.tgz#6eb2364b0df8bca97c2185027daee9853f83b195" + integrity sha512-Ewg8DQnl9JHR5lVjp5DjPkhKCupAOzXuMwHV7gN9FSog/bwyuKhwG0Isr9JvilM2qwyMgPh46hEaE+H3r34MZQ== dependencies: - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/util-buffer-from" "1.0.0-gamma.1" + "@aws-sdk/chunked-blob-reader" "1.0.0-gamma.3" + "@aws-sdk/chunked-blob-reader-native" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/hash-stream-node@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/hash-stream-node/-/hash-stream-node-1.0.0-gamma.1.tgz#58a096b61bbf45d8ebdb88533ff8c5e15f93fe30" - integrity sha512-dW3vP0KbFQ14wfIg1JI+xxBoGOovipbtepFiolhT9JV1b+NnllfCK79oO6BMeRYbrnCWw1xrlMFGTDlXtio0vw== +"@aws-sdk/hash-node@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/hash-node/-/hash-node-1.0.0-gamma.3.tgz#6d765d4ab99b3fa12c7ab762b970d8e8bc37179d" + integrity sha512-AgkpRJtFXMRtVQLYLcW3uzHbKx6GNtcmvC6LhMAm7qiaCY4Z6J5PbjJzcQA4xEbKj53MW+LPPU6PDwGhca6fCw== dependencies: - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/util-buffer-from" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/invalid-dependency@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/invalid-dependency/-/invalid-dependency-1.0.0-gamma.1.tgz#1fe689c307b8dfd71702ecaca9e062df3eef2e1a" - integrity sha512-XAWP6e1nITXGdq9rfvYiId3z6wN0uqBrxwnf0PapElDQeAyQRfpOSjhSfsq2S6PjaTQhbtDsu0QhYpWP1IXhsQ== +"@aws-sdk/hash-stream-node@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/hash-stream-node/-/hash-stream-node-1.0.0-gamma.3.tgz#49caea71ebcb0b442e49315089f6337fca2125de" + integrity sha512-13hxtdbYdFjKyQLV2R/D8ZLXB8k7BVS5edDcFCOD64YJz/2JnX+oxz0sHtIgdtta7pBlGCuHw70NtKchrmH4rg== dependencies: + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/is-array-buffer@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/is-array-buffer/-/is-array-buffer-1.0.0-gamma.1.tgz#67d626963cc441b469c76da26ffe191d2e590209" - integrity sha512-Oj9mpM19H/3mPDECIHS2K4sZYyfMPBsL+8VkCnwU2/+AJABoxgbf5VjXdXmWZUBh7+8Roa0th2aGXb0WG/QUBg== +"@aws-sdk/invalid-dependency@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/invalid-dependency/-/invalid-dependency-1.0.0-gamma.3.tgz#ceb0313445c12dec2642fe0b2f7fe3df8c571a1f" + integrity sha512-dxMxL6x1E5xjaSmwbshLH+NX+5R3qzMemn6/kwIs22EVq89ALZc+oQbG4cEit276/GHgcTBlOc0BpD5/crwpdw== dependencies: tslib "^1.8.0" -"@aws-sdk/md5-js@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/md5-js/-/md5-js-1.0.0-gamma.1.tgz#b9e69053d9f7060adaf64c9b262f72113f046719" - integrity sha512-tvmBETS6M8q8z2Dbw6eHoY2YcToxaJi4/uf9l7bj99275TIwOAt+WQwNLqj3zvfYV3+5TzhfaumnPWnozFNwUg== +"@aws-sdk/is-array-buffer@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/is-array-buffer/-/is-array-buffer-1.0.0-gamma.3.tgz#13af4818c7539bda98f43547358265ac1c1b6eb0" + integrity sha512-OWewCesYIYG3yNDxHCgK+E37QBbe/m6AV3jFAKtrW4bS2BybzDz1Id7D8FbLDycR2MmU4CoX5rGfEHZkE8ApdQ== dependencies: - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/util-utf8-browser" "1.0.0-gamma.1" tslib "^1.8.0" -"@aws-sdk/middleware-apply-body-checksum@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-apply-body-checksum/-/middleware-apply-body-checksum-1.0.0-gamma.1.tgz#69072d20caf6397c8c9b378193c9a4d40d9828d0" - integrity sha512-0pgmuOAdIKEVmWAtLhcOvdHOTjzcALm8lwf//EnElObu8GfWiFzgjLN3+zBcgw8YST6PZap7hWz3EVCy9RNOBw== +"@aws-sdk/md5-js@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/md5-js/-/md5-js-1.0.0-gamma.3.tgz#717eb54fb493940c557053c2a80de47bfe95ea45" + integrity sha512-vYcWVsE8Q5yqj0eruaz1PJc8fzIKSNRuiZ2RdruNQ2X5dv0zUk9wIGotyRzmM5zgaONagmePnSIom54CRA7GKQ== dependencies: - "@aws-sdk/is-array-buffer" "1.0.0-gamma.1" - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/util-utf8-browser" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/middleware-bucket-endpoint@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-1.0.0-gamma.1.tgz#453e4f2fb40241d87b6c6ac811f0cdcc11c0b89c" - integrity sha512-YZRYMa7NSjxNbdK61PLDKRR2Ox1BnwWLv4pJBdQZuBC9/PYNCvspgDlIBnain8R3t5lKs5JjFG3SG9yttQxSqQ== +"@aws-sdk/middleware-apply-body-checksum@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-apply-body-checksum/-/middleware-apply-body-checksum-1.0.0-gamma.3.tgz#dc4d0a91eda1528fc162baf97dc99d8b888317bd" + integrity sha512-m2+53oN9EW3c4JP1NMmR9cZv4G5mN4JuWGtDdIbSJulmcDPZ+koF2978VW775EbvfjUmOfjx5GK6yxj59u9kdg== dependencies: - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/is-array-buffer" "1.0.0-gamma.3" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/middleware-content-length@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-content-length/-/middleware-content-length-1.0.0-gamma.1.tgz#6df71fc805b3fafc25dde205afa2e40ed3849c25" - integrity sha512-i41usSfqgcgE7d36svQ5wkk/3sKfhr1Gfd9tedFh7g91dChd9v5Xzgm7vk/p1HGUP2kNUPlgXD3xATVeptAhiA== +"@aws-sdk/middleware-bucket-endpoint@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-1.0.0-gamma.3.tgz#fb08d35305b6105d097ac198895bd7e57dbd21a9" + integrity sha512-xmSbrUFTdebhxJTwW70mO52wq6Y8d3TsIukuvFQaNbT+0tfOm0wLZA2mm7Q+WPkwxUhjdwL19+es5KxVEA9EGw== dependencies: - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/middleware-expect-continue@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-1.0.0-gamma.1.tgz#95c49887f8fc9b2b6bcda4013870b9bd22aca08c" - integrity sha512-xIzjLk8DESMyeTVT2ZcQ/ddlJZiLbcEx+mz03adSaoX7yV6zvqUamH08nnsM/n73UwERXeuiiqPP08SWYpEVwg== +"@aws-sdk/middleware-content-length@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-content-length/-/middleware-content-length-1.0.0-gamma.3.tgz#e7d3f048f4dc11ffc60e5b7e1e95a5b3fe8a8727" + integrity sha512-uqBaDyYi3+XyBKpJDN45aRuioL96gxpb5rAYmSn0oeAZSUKh25Yxp9c131e1LV0JmHto5mztgoLWjoq5r4CjSQ== dependencies: - "@aws-sdk/middleware-header-default" "1.0.0-gamma.1" - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/middleware-header-default@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-header-default/-/middleware-header-default-1.0.0-gamma.1.tgz#271dcd963f288f6bc6f5eb7d298e654f068f5e64" - integrity sha512-MEtgH0VPNkOjaSJwTtBh1XgUd6DOutgh5Lbp+gcoYmA+GWxYQttNPHqi/so0qVxDIxRN3vt9gJoDLrH38NDr6w== +"@aws-sdk/middleware-expect-continue@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-1.0.0-gamma.3.tgz#952fd5d749a9f1ad9eebf0ea824adbcea99a0bd1" + integrity sha512-J43w0c6DIVQvF4PNXmR6ANo3zwqvT3rUDSyqyUOTGybdRer4ctXxywCB/W3sHVaDX6R8dwCaZA3NOC24omDxlA== dependencies: - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/middleware-header-default" "1.0.0-gamma.3" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/middleware-host-header@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-1.0.0-gamma.1.tgz#71f1d23a78f240ea639261b75ccb164d4e9c895a" - integrity sha512-CsWobqCyDC0hAESuoD/UI2PESBvdF+oagxC15oWcA5IrpaA5sEwJoUi9BuuK2FXRR+HDnsu1sHRMUwcAciwmnA== +"@aws-sdk/middleware-header-default@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-header-default/-/middleware-header-default-1.0.0-gamma.3.tgz#e45cca0c74341429e2cd16b56713f336c51ecdb6" + integrity sha512-NgXxWENL9MqVbB6op+d4SZ/Ht9JQhoh2F0+YN/PG1JpCmwPmi6EyErsgW79MI1wdHG/H/bCQ4Ezgpv86xW1qVg== dependencies: - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/middleware-location-constraint@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-1.0.0-gamma.1.tgz#704606f4ab2bfac5fb78217c8fb1b2e7c0c05224" - integrity sha512-Kkrvd20OHnVQJ4KZC0kbZLZUFS3vcHj1pTX9Ml5ZU86aSWNbCX/KAidTNFvxwBm8o4jZtGlHVvXHyiclBroCOA== +"@aws-sdk/middleware-host-header@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-1.0.0-gamma.3.tgz#8c48b1fdca75ab3e084e66b3cd81f6335044b900" + integrity sha512-YqDiMe3Rw7/XZ2aDRNSsHHIePQapRq4Qx2jv/6WWslg4zU3lI/8i1I00l0TlB6gcxP5phWZ9kIjL6b55vUBQkQ== dependencies: - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/middleware-retry@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-retry/-/middleware-retry-1.0.0-gamma.1.tgz#fb8a98468e8bd97dd32e25119717840ff8385a0a" - integrity sha512-qVefdYFpnlNLVYTHxZ1FyKG10dsZxysUY4prNRFsSU8UrsqnQ72KZrSFxOmP50qPz1sq4FB9zAb5vi+zm2KtAw== +"@aws-sdk/middleware-location-constraint@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-1.0.0-gamma.3.tgz#9d0d1d354a1fab88b5ddfb944ead28c07858ba50" + integrity sha512-U1Tyio81AMDFaaDfIMc/gFHUhc0Hhaerr7UrlDEmBPAZT4y20vvyazGeYr5tkSPl3pj48mugxWVIetpqF86XOA== dependencies: - "@aws-sdk/service-error-classification" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/middleware-sdk-s3@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-1.0.0-gamma.1.tgz#62469e1013df31f52c29764615d9278a8ef69222" - integrity sha512-nJpJVdnaiwxUgzQFeqmBosWtRvTpnHiUOH/Kg18jdTc9vJ+skZHrw/5rwLwmtpiZwkMfoiRNa7oevXGELxjLTw== +"@aws-sdk/middleware-retry@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-retry/-/middleware-retry-1.0.0-gamma.3.tgz#0215ae13a0d6bf317cbdc46f6444519005538b23" + integrity sha512-XtrVkQ92lAeJxsw9SsKDevbW3WU/LnoKafKWCmbZnM1ygm7cpbHh9cuEFD8RR169scHR3BkARKZe8rwaMFUEIg== dependencies: + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/service-error-classification" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + react-native-get-random-values "^1.4.0" tslib "^1.8.0" + uuid "^3.0.0" -"@aws-sdk/middleware-serde@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-serde/-/middleware-serde-1.0.0-gamma.1.tgz#7d442bf18562478e433af8ae64c267677d845a91" - integrity sha512-4rhB/x8zGmiN1k12fPG1LOxvK41XE8yOlayQyach2Lct30i38Oel/7wpnYaIXuTGFaY+npC127fgAY3XuMcdcw== +"@aws-sdk/middleware-sdk-s3@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-1.0.0-gamma.3.tgz#7268f10ac88f68ea31326008926f70d519a3b43a" + integrity sha512-XvThcJdKAQuDm0TD1JlCrFjJ4otYxPZSHsSOA1WpSt/5dEcmaXOh1+H4Gd4iCcJJh9gpVyCwIRFGHrDBXnAyIA== dependencies: - "@aws-sdk/types" "1.0.0-gamma.1" tslib "^1.8.0" -"@aws-sdk/middleware-signing@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-1.0.0-gamma.1.tgz#27570f0ee9116adb9113f1555166b5676c4cc73b" - integrity sha512-JYOBU+WWHoQEjPu+2i71j25jPVuAhkW8fhIIo92WTiqj6txyx4s10eRJATkGCJfwXVazdZ8wrFz3afse9dWUFw== +"@aws-sdk/middleware-serde@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-serde/-/middleware-serde-1.0.0-gamma.3.tgz#035d1eca879cd7eb5a83e23cb485818c59f0c05d" + integrity sha512-IESS+/uvRJeORZs4Td2ZAxys0iFYGCOvh5lxqGN7mwE4GLrviJPVJkuYnFgOYSRao5LdxzLmmCcMQYdZxVNSDA== dependencies: - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/signature-v4" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/middleware-ssec@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-ssec/-/middleware-ssec-1.0.0-gamma.1.tgz#93273a70e72b88e39aaa322cdc49434db2b05d57" - integrity sha512-PmzEaqTuH3Jo+VZa+TgwG/5wGMrpIjwRfze8o0saFzxJxIDqy8Uqwoq7i9DEx5ERYttVa3zyzVSOgfe8wdHPYA== +"@aws-sdk/middleware-signing@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-1.0.0-gamma.3.tgz#7ac24ad061ca4d18902a925c5b17c10d9d7e9144" + integrity sha512-0H+QF5hu3e+qr6CIWl64NdX1wygFuFvukpYN84WfLcig0xTB3qduE0Z6TucBYigiK8xNSeKVtrDj9Mz/VGQJ2A== dependencies: - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/signature-v4" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/middleware-stack@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-stack/-/middleware-stack-1.0.0-gamma.1.tgz#89707cae49120291d1ae3bba83796c3204f1b83b" - integrity sha512-zQEryY3AGVmNUXNl9N0TV7Uvd66QHyf65DAjHR87gOQfqBal1khjyZ33d7C2MlJm4jrkP6gojsdMxL7/C+uUfw== +"@aws-sdk/middleware-ssec@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-ssec/-/middleware-ssec-1.0.0-gamma.3.tgz#905b8d1aa415e5565d645dc5abc88d5fbeb9102d" + integrity sha512-JVlLuOwcCl9mj0+VluhX3dN5yQ3kx8rM7sBWD7l2gYsresHmFHwJpyZC+Cd34lSnIMsx19Q5x9FcLeFcO6Y7eA== dependencies: - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/middleware-user-agent@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-1.0.0-gamma.1.tgz#65091d9f29463f723aaac935bf3065c289830bfe" - integrity sha512-+KsKxTwlXYMFBtu5KeanNr6FMdY3qikVQHRALer0GAQjoOwKI7XW8ZLYmKox9JcZ/jYvFLiNtDFf5rwvmSkosA== +"@aws-sdk/middleware-stack@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-stack/-/middleware-stack-1.0.0-gamma.3.tgz#e50557e0b56bf5d40c5d346a006fdc63255ff00c" + integrity sha512-csiZhFxK6HWy3MDUZHr6saOdoT9CgAp8ifp1/HegZAZ+LhmADq4LNqtMqQaODyEXqxTSIjXBbIzq5vrs3qXwGw== dependencies: - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/node-http-handler@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/node-http-handler/-/node-http-handler-1.0.0-gamma.1.tgz#8ca1836527c388bcca8e20dc75a2b276bfba9b7f" - integrity sha512-f8mttfMzY3MY63daZEVol1K3WEzDD1PGNPLdiZVsgq1f3GcAqnP0GcEK10USOL9l3yI11zL0WyD29Ci08quytQ== +"@aws-sdk/middleware-user-agent@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-1.0.0-gamma.3.tgz#80b87de924cb7f35cc0c8a3cf01c19696d38d26e" + integrity sha512-0utMFeSOQ+VodNSCmjP0uWdgks36qGwY4B1EwwlZekzebEF1sqpBxFrzPreK1VEyv8wUG9drDjIy14khO1S2Kw== dependencies: - "@aws-sdk/abort-controller" "1.0.0-gamma.1" - "@aws-sdk/protocol-http" "1.0.0-gamma.1" - "@aws-sdk/querystring-builder" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/property-provider@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/property-provider/-/property-provider-1.0.0-gamma.1.tgz#a19165312e7f44f65ba1a252df178903e2d60c22" - integrity sha512-38BRXvFuegHZxMFBNWmSGzQFJhITyoBoPtsGGueW505qpEtofgBMv3UAHugbas+9MPRvU310aX5QDwth9oIK3w== +"@aws-sdk/node-http-handler@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/node-http-handler/-/node-http-handler-1.0.0-gamma.3.tgz#27d798ba0a4dca306ffab84493058a09a4459f58" + integrity sha512-cUka0oYYhqrY3Vif5Re9PASPau0Eu3ygGAjozppTzK0W5HE2yjMYM73PCwIyPO/B6qdzv8hTbJe7F/uM24TNmw== dependencies: - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/abort-controller" "1.0.0-gamma.3" + "@aws-sdk/protocol-http" "1.0.0-gamma.3" + "@aws-sdk/querystring-builder" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/protocol-http@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/protocol-http/-/protocol-http-1.0.0-gamma.1.tgz#4a70e8fc9cd893a0773ea52333a25251564be7b1" - integrity sha512-+zrlpgAy7A4QCe5rEs8NMFLNMQGEpCIXEZMGgLP4wxS5bo+46aHremuHz8uNd2K172bETZk8OLy5Xyna2dKRcw== +"@aws-sdk/property-provider@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/property-provider/-/property-provider-1.0.0-gamma.3.tgz#eaf2ec4fcbc3e1d70bc154a52f0328674fdfca08" + integrity sha512-8SOLgaZeniK6uuzurKjeb4LV9d+AyLC/3UTnLNwIvrC2QTfKfLm9S9YMj4kbgwuI/hCu7hhsOVpha7YKRP82lA== dependencies: - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/querystring-builder@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/querystring-builder/-/querystring-builder-1.0.0-gamma.1.tgz#3a6ef13c6b888f3f09fac257aab94cd9b901fd32" - integrity sha512-9WOdsGXSCat3T7xnKRpnNNP+jPmLsTFx2HXsIh2eH6n4GIeIW46JaqPM3sHTTLjjOyd2PLzOoY439ax4BqP7Ag== +"@aws-sdk/protocol-http@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/protocol-http/-/protocol-http-1.0.0-gamma.3.tgz#4e8daff60b10f5e27d655eb34bd118bffe23b92b" + integrity sha512-RuXocAa90OFo+Es2sD0jaswTgnYUOg4eTXacm6vHGZhj1aYY7+JZsiZkRms53OwIuKrloo+974jQpIBS+DTT+A== dependencies: - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/util-uri-escape" "1.0.0-gamma.1" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/querystring-parser@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/querystring-parser/-/querystring-parser-1.0.0-gamma.1.tgz#e95d3847f43129fc9dccc3887d5f097f67c6ccf9" - integrity sha512-g+ndMrYVG15GgeIE0+uBuhSo7xLOqzr343xcaj1262JCrfwMGMl1r/rEWKZix2GycaBXE3TcNKXgcjXSbuLu+A== +"@aws-sdk/querystring-builder@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/querystring-builder/-/querystring-builder-1.0.0-gamma.3.tgz#787c4f91ad18377de4cc880af304967b096abeb8" + integrity sha512-EUheuS+HlYDbfOKi5WQ9De5VJTUe0Ew+EE/xMRjXyZ5SQyEuIlK9OwwKZy3A4DKDBo6rTiifxk6C0ZuE4kVNww== dependencies: - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/util-uri-escape" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/region-provider@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/region-provider/-/region-provider-1.0.0-gamma.1.tgz#1e5355c1787b6a1c41fed9af02772e95e0c8e756" - integrity sha512-r2HQdBlS6BKglMi6Gg4fnGNbIaqEyMIZwtT2u1RwiMPbKC3VWru1OLzwf2MlsL+JmLIVF/y80iNvVEwArryDlQ== +"@aws-sdk/querystring-parser@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/querystring-parser/-/querystring-parser-1.0.0-gamma.3.tgz#7588bed0ed3be42cee60fab5fb398fa0b37f1921" + integrity sha512-flAcTz2TitaLFEcc02AJESGbUS6n2ayQp5F7LBF2FSDAFq8E+Ysi/n/jh8xx8IglURrvoIzpGfem3J1Zm9djeQ== dependencies: - "@aws-sdk/property-provider" "1.0.0-gamma.1" - "@aws-sdk/shared-ini-file-loader" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/s3-request-presigner@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/s3-request-presigner/-/s3-request-presigner-1.0.0-gamma.1.tgz#527b1547596ab3b8424060bbdc10efb8001635ad" - integrity sha512-PRTNnv/UHGgx+U5dTbq3L/RqZlHwKQv2lU3ZNezNwLLJKkZqPxvtTo4/xBpZzotwqoRd299vRdkN0IH6bE4sXw== +"@aws-sdk/region-provider@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/region-provider/-/region-provider-1.0.0-gamma.3.tgz#37e862bd77203014d90422e4c3e71dfd2a1be6a8" + integrity sha512-a7pT+t0tfV2hKgB2db+peMhdFew7ztgS7+bIscFxY5Ce2xqwrgbKOBDEfmgGbx4H3xoPZpa2JrfU1BK43NzjNA== dependencies: - "@aws-sdk/signature-v4" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/util-create-request" "1.0.0-gamma.1" - "@aws-sdk/util-format-url" "1.0.0-gamma.1" + "@aws-sdk/property-provider" "1.0.0-gamma.3" + "@aws-sdk/shared-ini-file-loader" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/service-error-classification@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/service-error-classification/-/service-error-classification-1.0.0-gamma.1.tgz#1dfdeb310fe9b9cddab21247d1ef76a5267d5d12" - integrity sha512-8GiWdH+k3VZHKmW9CjXYFR0lmWXfHJNzd2pAKD//WhuDJjz2GcD7YGn/2OrvOB+p2LAGvbuQA8zmmuhvBoqLWw== +"@aws-sdk/retry-config-provider@1.0.0-gamma.2": + version "1.0.0-gamma.2" + resolved "https://registry.yarnpkg.com/@aws-sdk/retry-config-provider/-/retry-config-provider-1.0.0-gamma.2.tgz#bc4aa806c8be3243bc104cc20a93fcf683702a4a" + integrity sha512-7brOLUXkTc/rA+AbMGzRdlTB16/KeQhaa+2/ozf7ZjKsEhfVW2ymw9y+H7yfZ5MHaJ2ml/WsXjk/7EYP7k4FTQ== + dependencies: + "@aws-sdk/middleware-retry" "1.0.0-gamma.3" + "@aws-sdk/property-provider" "1.0.0-gamma.3" + "@aws-sdk/shared-ini-file-loader" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + tslib "^1.8.0" -"@aws-sdk/shared-ini-file-loader@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-1.0.0-gamma.1.tgz#6680b0876c1654102da04bc17604ff3130cf839c" - integrity sha512-oj2Xn0mY2mGsJyweN+O1VNqQguaQIYKjKIWlOKKxX+j5euhRpvx4iNQhqCigE9VXLK/NOw2J/F5JchZrd6YwPw== +"@aws-sdk/s3-request-presigner@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/s3-request-presigner/-/s3-request-presigner-1.0.0-gamma.3.tgz#32b124cfbf24271b69f87cdb3c8b5b822a5ef9f3" + integrity sha512-e5qwTYOraLljAA30v1B7fjyYBHuU2wUiTimAgzThE2P/9k4wM924Q0i0DAa7hSaIdlUdiGKUFX4hP2UyID3bIg== dependencies: + "@aws-sdk/signature-v4" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/util-create-request" "1.0.0-gamma.3" + "@aws-sdk/util-format-url" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/signature-v4@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4/-/signature-v4-1.0.0-gamma.1.tgz#286654b10018b3aa86cfbf4d29de15c667e2af6b" - integrity sha512-PqsAVg+7hBgxZbJfOzrN2eCvPiAtudiekAb8f/lrUrjD5VCt7ybQZ6stA8eoeOMk/aziOHPV/VK588xZxZMciA== +"@aws-sdk/service-error-classification@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/service-error-classification/-/service-error-classification-1.0.0-gamma.3.tgz#449b6ff5976f70db1a2addc89445d7e08907ef1b" + integrity sha512-O/CsFVWZyfhNIvzDAfNHJ3Uao/9+E5MNek0/jDW2ezZhmPZumW7tQgZ7CrFmPW9o9J5YWjozGaOuF3kuadBGkg== + +"@aws-sdk/shared-ini-file-loader@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-1.0.0-gamma.3.tgz#b56637e79cc0fca3eabd270413cc7547bf78b9f8" + integrity sha512-oujkYSHTlX3bHwA6hhAAnRtzrDSxMH3p0EEluD0QmhI5U89AhN5aP9b6FdPev+p4TC7TBv42jnRKwEo+NWvTlA== dependencies: - "@aws-sdk/is-array-buffer" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" - "@aws-sdk/util-hex-encoding" "1.0.0-gamma.1" - "@aws-sdk/util-uri-escape" "1.0.0-gamma.1" tslib "^1.8.0" -"@aws-sdk/smithy-client@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/smithy-client/-/smithy-client-1.0.0-gamma.1.tgz#bf389fed25af660db8c487bd29d96e41937460ca" - integrity sha512-nuRZkwTIXZj7jsJ1RO0PoLzmyUda7SlfjDLPYrLDBtKLO3JSL44wLNOF2N1T4myK4phKlECEez1aEir/vb4QOA== +"@aws-sdk/signature-v4@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4/-/signature-v4-1.0.0-gamma.3.tgz#f1dabb0dfa61c2b7d4e7e5e7701998207edd5616" + integrity sha512-LUH0Oq8YDWNydvhDmlFzyUBMx1/jHwxufgnptm6FpfDs6ueZ4OWD4XKqSI8cAFE3DXBaHW8/sIhoUZw4imY/0g== dependencies: - "@aws-sdk/middleware-stack" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/is-array-buffer" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + "@aws-sdk/util-hex-encoding" "1.0.0-gamma.3" + "@aws-sdk/util-uri-escape" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/types@1.0.0-gamma.1", "@aws-sdk/types@^1.0.0-alpha.0": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-1.0.0-gamma.1.tgz#4b8ff4c75545750750dfb8af9d434ee3e67600d0" - integrity sha512-K41IMXfj4lCNVjvWarJR7TNaP0sOh6hmbV3fDw9zReZ0t6ehQ4CY9JO2XQEWKnR6njyggmpbi/xNM924HYsgTg== +"@aws-sdk/smithy-client@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/smithy-client/-/smithy-client-1.0.0-gamma.3.tgz#8312ddbea363a166128feb99ae1dfd0af08f7520" + integrity sha512-emEqdzh7Dy3pAPE1HzgKNqw+7xeGaaVQ8XA++1gXL8ht8DFMN6YiV97/Yg0NtBt0oeiVaxlL0plNd/oyx9e3cA== + dependencies: + "@aws-sdk/middleware-stack" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" + tslib "^1.8.0" + +"@aws-sdk/types@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-1.0.0-gamma.3.tgz#44d274f874d90b9c658d8cbbcf139d401cbd9dc3" + integrity sha512-6Zu64X/6I8Y0gO/+J2CGXjYUmYkiI89MX3BEgRcQRh3jUNpKnOm1j4r40w4qsu1QAYxwWJL1M/rjLJPOQPV7zw== + +"@aws-sdk/types@^1.0.0-alpha.0": + version "1.0.0-gamma.5" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-1.0.0-gamma.5.tgz#fa73cb21856da93873598694eff559702a36761c" + integrity sha512-waKbEd7clRocNPAW8NXPHJs2jgyvSfpR0Jfd4dm3R1EygkEa6aM0ct1bNvCEcnOfQFbytvfNiZK5vbLssuYmSA== -"@aws-sdk/url-parser-browser@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/url-parser-browser/-/url-parser-browser-1.0.0-gamma.1.tgz#a13f1657692f2e4fadea0cfdf9fd04c91efab3c7" - integrity sha512-V5/7WWqmkIzN2OD8BQw6VCO7Mr99OoeN0n8kYnFJegF3rtOW/4MPQISWoVm4mK+hdIAAn04gEesqCon1HkTKLw== +"@aws-sdk/url-parser-browser@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/url-parser-browser/-/url-parser-browser-1.0.0-gamma.3.tgz#036bff05ef03f1e2c61a25efddcb78f3bed979d0" + integrity sha512-wo0SwwuFluTIjt2+j49GNQ0Vza+UVOirz2Up0VCbp7aqyMirIzDA66fQWXfzPiDvo0xV80TA7/P4/oyrrGhdbg== dependencies: - "@aws-sdk/querystring-parser" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/querystring-parser" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/url-parser-node@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/url-parser-node/-/url-parser-node-1.0.0-gamma.1.tgz#304aeff46d33c165ef97b4f55299210ac9af1799" - integrity sha512-791C2njiPVKaqvR+EFMSg5kpihQbZzs0ESDqQrBW2x+I66gCAjrrzznuvDDV46UJb5V9av9f0g7ccZkDn/q4cQ== +"@aws-sdk/url-parser-node@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/url-parser-node/-/url-parser-node-1.0.0-gamma.3.tgz#40b35d85c03145590c1cda1bf20b854977558ba6" + integrity sha512-sq779pjaFlQEEFBToNb3m7J1h84Jk9ZcXj+VUixjjUwi8ieDCgea8zMQUAtkaHe0OU6FRcFp4WTadFr0sNrLnQ== dependencies: - "@aws-sdk/querystring-parser" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/querystring-parser" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" url "^0.11.0" -"@aws-sdk/util-base64-browser@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-base64-browser/-/util-base64-browser-1.0.0-gamma.1.tgz#96fa8988b063304323141fbd773b97bce7ad307e" - integrity sha512-5OlqkNnKXrsLo0WGAuGea9clqArZk5qn9KEM2Yu4/gSZ2WNl4lI10m/ig+Zsi26fgdygxtvJg8MZLiK4GyKfqw== +"@aws-sdk/util-base64-browser@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-base64-browser/-/util-base64-browser-1.0.0-gamma.3.tgz#d6d4d18d990cb3bb542e4637f6b6559f3bed31b1" + integrity sha512-VOhetzPDQMgZERY37B6k1Dy/idhirLJk/5EvTDaL78QkihfoWa4N/58Td821WDgY/oaZNV0N4ul61tk0/n65QQ== dependencies: tslib "^1.8.0" -"@aws-sdk/util-base64-node@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-base64-node/-/util-base64-node-1.0.0-gamma.1.tgz#f0d8ef66259ce8d2976e6c417714f52f8a3cb23c" - integrity sha512-9sel4cZHUoULXmyBSsDlJAu9/kk4d3QB9lnhWnIwkj2iQ0pA9Lg5RNxvOAPkrgFHM3KqXtp2gC/wtPvcSoA6iA== +"@aws-sdk/util-base64-node@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-base64-node/-/util-base64-node-1.0.0-gamma.3.tgz#2413e1d66b4e91e9175b936eca29336bb59d1765" + integrity sha512-n2bxJXaSD+1pe3bKeFDWNO3UFnahNKVCqU/I2AKa6ZsWnEWhb8PuUu6A6BvCVdOGYqn77x3sLJvhOxLbsjjU4Q== dependencies: - "@aws-sdk/util-buffer-from" "1.0.0-gamma.1" + "@aws-sdk/util-buffer-from" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/util-body-length-browser@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-body-length-browser/-/util-body-length-browser-1.0.0-gamma.1.tgz#46f15d2b0a3b82bef4282a9fdd57a3a2431a6b17" - integrity sha512-5Sa/+2t1giiHkFfMCmN8bQ9HkKDbwh04yf2kBS/VzeSwjQUMv/GXYF+PHesuaaccDXg7SBaZtXmdeoXpRnK4cQ== +"@aws-sdk/util-body-length-browser@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-body-length-browser/-/util-body-length-browser-1.0.0-gamma.3.tgz#6132cbbbd2ab04286b5550f8babaecdc830f92c4" + integrity sha512-5mkzClLPvo763FeLEsd8RKBHBMQSijuEz2uCG/UNI6SYjzl0tx0RQiK24DoMMVLJq+TQ7goMMJK0REqnGOGYqA== dependencies: tslib "^1.8.0" -"@aws-sdk/util-body-length-node@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-body-length-node/-/util-body-length-node-1.0.0-gamma.1.tgz#50056bda71fae42d4a336429a66bb9d04740220f" - integrity sha512-9or+zbpzi1G78XMXWfvc9cs0aDG6PJywN5Vl41QO9g1AHJ5k6C4XjLQ3FDEXWphnQCFNCyfEJ+4qi/HNjyR1Rg== +"@aws-sdk/util-body-length-node@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-body-length-node/-/util-body-length-node-1.0.0-gamma.3.tgz#01deb6b3ba0812b01d3990f3f179cebb5bb34f28" + integrity sha512-ugDiAA1ivTalwIEH8TX/gshFwpuGs02+vULUyDmL/RQU7VhWR145k+fnoMfP3y1geAwUvudrqS01ZpCUX9w+5g== dependencies: tslib "^1.8.0" -"@aws-sdk/util-buffer-from@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-buffer-from/-/util-buffer-from-1.0.0-gamma.1.tgz#40bba85155afe8a97f63bf162559713ce71387c2" - integrity sha512-Aae/ots79VI0x3HqioK+Podvh/HOAAKC3zHeDvLc1t3WOEwWlWbCalSp9Yi9bXOK2WZgYvHHaAbnCMdbYmxemQ== +"@aws-sdk/util-buffer-from@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-buffer-from/-/util-buffer-from-1.0.0-gamma.3.tgz#e76c053a95852d8c1bd1ccd7e1ce6b4316c79151" + integrity sha512-v6z3b2mjdzSBWgMPwgdb821zFrxvVxILRIPVPe3E2ijnRaQfB4hVSaVHuogZuI949p/Pp4ctcZswwKRJEXIWVw== dependencies: - "@aws-sdk/is-array-buffer" "1.0.0-gamma.1" + "@aws-sdk/is-array-buffer" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/util-create-request@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-create-request/-/util-create-request-1.0.0-gamma.1.tgz#ea72b8496692410926827f521ecc69df3d9132c0" - integrity sha512-mSdyKioGyda+28ZweNYi0twubvdJjTaTxptqZ2SU8jf0SeDSRqKoopzVsAZCgjLbYARd9vtRGL0+7i8Ej6O1RA== +"@aws-sdk/util-create-request@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-create-request/-/util-create-request-1.0.0-gamma.3.tgz#cc2627d6d16f3a038ea40b48dc51bd44b3148293" + integrity sha512-ShEj88J+0tZiZAvUgS6PaLkvBFOrHTJqxsM6DusrA3pmZIavdLS4cUtnp+28VK2Op3HRnL5UkTgjJG/zLAd+UQ== dependencies: - "@aws-sdk/middleware-stack" "1.0.0-gamma.1" - "@aws-sdk/smithy-client" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/middleware-stack" "1.0.0-gamma.3" + "@aws-sdk/smithy-client" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/util-format-url@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-format-url/-/util-format-url-1.0.0-gamma.1.tgz#983c279fcbcc874e2d03838f7cfbfdf0f3d33f43" - integrity sha512-7ysFU8BHqptwK0U3kLP6tpxjMjR4a0dVnm/3lXE//kRMeyZYc8c883UVkhx3rqrvGJmeusJppVSvFURMuHMtjg== +"@aws-sdk/util-format-url@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-format-url/-/util-format-url-1.0.0-gamma.3.tgz#aaceef2a5309de84990e90bcd9d29a953d120839" + integrity sha512-MERO4Zty7BSshScyrigXPpqCSxKixqUHIJ3912TuUF8F3MAf3LM6CgDiaJ19a8KkXdKFglp/8apDWdV5+FmyUg== dependencies: - "@aws-sdk/querystring-builder" "1.0.0-gamma.1" - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/querystring-builder" "1.0.0-gamma.3" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/util-hex-encoding@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-hex-encoding/-/util-hex-encoding-1.0.0-gamma.1.tgz#a4430f3c2d59a449a93248c0f2417c2b373690b4" - integrity sha512-SGOaAgjR3iaPB4obob/gqXPjgmxEN6X3zxWrfFk4jG+pdheKBAniw7ckITdBEG04Gkqh91stIORLIgxR8gxjIg== +"@aws-sdk/util-hex-encoding@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-hex-encoding/-/util-hex-encoding-1.0.0-gamma.3.tgz#3035ff0c1af9e0536e739557b25764c3c9187328" + integrity sha512-wappzF+OLeFtCGdRVxmKQoCCIotlOwe+zAJSVqymTFR94D2CtreIZo1azum6PxHbPiSzRFJs7KxgboHJ9pd18Q== dependencies: tslib "^1.8.0" "@aws-sdk/util-locate-window@^1.0.0-alpha.0": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-1.0.0-gamma.1.tgz#9a01c5506e1903af170a236eda039468f37f201c" - integrity sha512-gKLTmSnpZfdezYMBgEjUFH1jE4VvbxWswQhI4XUs3ChOWdm46AdRBVbGqnN6hlo9dSZwJQaeRE9VPTCkRE8zkA== + version "1.0.0-gamma.6" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-1.0.0-gamma.6.tgz#f8ec924cb9b0174a15bfb3b7697cd7050afb9d48" + integrity sha512-l9i1aHQON7uXLNEOvYsFXUMXya3lPWg2nr/B8hEfGzW4F3OxHEvpmeXuAWuYcFiXysTPhnR/coOz1bKon988Rw== + dependencies: + tslib "^1.8.0" + +"@aws-sdk/util-uri-escape@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-uri-escape/-/util-uri-escape-1.0.0-gamma.3.tgz#0f6377e42e994b3f1f301f6ee64ca4a30c77f3e3" + integrity sha512-4iH08ZsB2/OFLFpjyQ0MHd3yPeOl7h8D6fY9zHjyHN62+syPNNH5jYwFCxyBhwx/SXWVddwPzIqBD5VY4JkR4w== dependencies: tslib "^1.8.0" -"@aws-sdk/util-uri-escape@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-uri-escape/-/util-uri-escape-1.0.0-gamma.1.tgz#5ff78d28ae564ccdc4dc376cab891e699c4108ec" - integrity sha512-HaTwnGMOFCAC3cqRpI0Mzw4YbCLWY22+n9bbkdw9u65N5JVGQU7E5WSueRBpZUcAkTMwHaYhRzLxdssWs0wwsw== +"@aws-sdk/util-user-agent-browser@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-1.0.0-gamma.3.tgz#0099f9b128ad8f7b832e5ccd97ffe2958997bbad" + integrity sha512-//iH3jfxDLylUBmf6kbE19tm/aXGUf65CV6oal+Fgx8QqQJBCDgXdsl/aWWxr54EbANR6Gf/daw+EM7gGVOmPA== dependencies: + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/util-user-agent-browser@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-1.0.0-gamma.1.tgz#5155b1aa06b57661ffc7ed955b08acf572f6237d" - integrity sha512-5vIAR65+dDq4OyEff44GIg/egd1nUQG5aUu7Hd67FgB0Q7ZDvMIixliFJUlF4S69ryAkjqqbWDKdXl+ofW8utw== +"@aws-sdk/util-user-agent-node@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-1.0.0-gamma.3.tgz#434764d8be2944c8cdef9e3c76818d02bdbc0754" + integrity sha512-n2+yTdRioPjn2LyMlR+1faB5G0bP35vhEwW1JtZess7UnScUUcieMiRvdIqiH9ZRApsoIhW7zDjtFZQ7nBpHXg== dependencies: - "@aws-sdk/types" "1.0.0-gamma.1" + "@aws-sdk/types" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/util-user-agent-node@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-1.0.0-gamma.1.tgz#25832b8ce7c9826cedba646539dab3c66a79335f" - integrity sha512-d8EfFgbfBh2MIV1lJt7rQJ9AV2aYYBdAHbr/rTwVhjn8WfyqQTUXHKPHBdTZrS3yTy3v382QNrnGHxnfykTcXQ== +"@aws-sdk/util-utf8-browser@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-1.0.0-gamma.3.tgz#ba8f73abca8fd585fbddbb3c734c7ad574b18e5c" + integrity sha512-N94lggxZnICncYKPQCofy0zx93nZJCGWOOFtcAUdpof78LtQEurqjL4d45Ov4SEF0xcyoNSbtENTSAKCiWFlZQ== dependencies: - "@aws-sdk/types" "1.0.0-gamma.1" tslib "^1.8.0" -"@aws-sdk/util-utf8-browser@1.0.0-gamma.1", "@aws-sdk/util-utf8-browser@^1.0.0-alpha.0": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-1.0.0-gamma.1.tgz#ffdadc875d0e3c5ac314d330c1c26318fe3f91eb" - integrity sha512-UgHEkgvFvupHR2A4pPofdRflGfZEOPboG7LlUVlH6rcuIJdgi7gTzz4codxOe+kf1PVwHuHR6Pf+t22W6K/WWA== +"@aws-sdk/util-utf8-browser@^1.0.0-alpha.0": + version "1.0.0-gamma.6" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-1.0.0-gamma.6.tgz#bdf5bcc98683eff184d8da00cc101d3e05b44614" + integrity sha512-JIT2wPZKdOGynAD6V5ZhGT1XlHJbOWAYn0zQUgf4fkfcwwsfjXp9MALptdavKG/N7plq6p7z5JxMUP/VGKXyYA== dependencies: tslib "^1.8.0" -"@aws-sdk/util-utf8-node@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-node/-/util-utf8-node-1.0.0-gamma.1.tgz#4ac20abfcaf63153f5d9e1cb682c1cae2381421a" - integrity sha512-M/bghdcRoquo7/5HdNV7v+Qw3OaSxCOEaRUNZKYekpRXRG2DuDp3EEKX45V/OmBRKWJjDX5DTBnJlo8rev5AUQ== +"@aws-sdk/util-utf8-node@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-node/-/util-utf8-node-1.0.0-gamma.3.tgz#863afd37a80be77815d702f703892e21ac844029" + integrity sha512-JmJMfupYQr6MeB9ww8Jm5Gwvx3xfHGrY4HJxw1e7EnFHUwFUyevd3lVcBgKJEy2OSXwzDOt2XOTeDFkMcjiVuA== dependencies: - "@aws-sdk/util-buffer-from" "1.0.0-gamma.1" + "@aws-sdk/util-buffer-from" "1.0.0-gamma.3" tslib "^1.8.0" -"@aws-sdk/xml-builder@1.0.0-gamma.1": - version "1.0.0-gamma.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-1.0.0-gamma.1.tgz#b4789d919b9875b7072a8afa24ff1e45d7744df0" - integrity sha512-ttEyfgJXWikHX6ymzCEADI/1IFog5IU/s8jLb6GDGgBaBcxgMI/gJqj3Juzer9rNnUuupyfmAFGD7zH2Mb2hzg== +"@aws-sdk/xml-builder@1.0.0-gamma.3": + version "1.0.0-gamma.3" + resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-1.0.0-gamma.3.tgz#59da3eeba7e4686209affa2de36e88ad0e2ecf60" + integrity sha512-h36zfSXsSyTQWjLP54ik0Ocbb/6+o3GvDWpMe7in//+pog0jH6fSoeoagLikLuKTNJ9lDhtY0RtClcNQ7LkVXQ== dependencies: tslib "^1.8.0" @@ -1213,33 +1263,33 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/compat-data@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.4.tgz#706a6484ee6f910b719b696a9194f8da7d7ac241" - integrity sha512-t+rjExOrSVvjQQXNp5zAIYDp00KjdvGl/TpDX5REPr0S9IAIPQMTilcfG6q8c0QFmj9lSTVySV2VTsyggvtNIw== +"@babel/compat-data@^7.10.4", "@babel/compat-data@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz#e9f73efe09af1355b723a7f39b11bad637d7c99c" + integrity sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ== dependencies: browserslist "^4.12.0" invariant "^2.2.4" semver "^5.5.0" "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@^7.6.2", "@babel/core@^7.7.5": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.4.tgz#780e8b83e496152f8dd7df63892b2e052bf1d51d" - integrity sha512-3A0tS0HWpy4XujGc7QtOIHTeNwUgWaZc/WuS5YQrfhU67jnVmsD6OGPc1AKHH0LJHQICGncy3+YUjIhVlfDdcA== + version "7.11.4" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.4.tgz#4301dfdfafa01eeb97f1896c5501a3f0655d4229" + integrity sha512-5deljj5HlqRXN+5oJTY7Zs37iH3z3b++KjiKtIsJy1NrjOOVSEaJHEetLBhyu0aQOSNNZ/0IuEAan9GzRuDXHg== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.10.4" - "@babel/helper-module-transforms" "^7.10.4" + "@babel/generator" "^7.11.4" + "@babel/helper-module-transforms" "^7.11.0" "@babel/helpers" "^7.10.4" - "@babel/parser" "^7.10.4" + "@babel/parser" "^7.11.4" "@babel/template" "^7.10.4" - "@babel/traverse" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/traverse" "^7.11.0" + "@babel/types" "^7.11.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" json5 "^2.1.2" - lodash "^4.17.13" + lodash "^4.17.19" resolve "^1.3.2" semver "^5.4.1" source-map "^0.5.0" @@ -1255,14 +1305,13 @@ source-map "^0.5.0" trim-right "^1.0.1" -"@babel/generator@^7.10.4", "@babel/generator@^7.4.0", "@babel/generator@^7.5.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.4.tgz#e49eeed9fe114b62fa5b181856a43a5e32f5f243" - integrity sha512-toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng== +"@babel/generator@^7.11.0", "@babel/generator@^7.11.4", "@babel/generator@^7.4.0", "@babel/generator@^7.5.0": + version "7.11.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.4.tgz#1ec7eec00defba5d6f83e50e3ee72ae2fee482be" + integrity sha512-Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.11.0" jsesc "^2.5.1" - lodash "^4.17.13" source-map "^0.5.0" "@babel/helper-annotate-as-pure@7.0.0-beta.47": @@ -1296,13 +1345,13 @@ "@babel/types" "^7.10.4" "@babel/helper-builder-react-jsx-experimental@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.4.tgz#d0ffb875184d749c63ffe1f4f65be15143ec322d" - integrity sha512-LyacH/kgQPgLAuaWrvvq1+E7f5bLyT8jXCh7nM67sRsy2cpIGfgWJ+FCnAKQXfY+F0tXUaN6FqLkp4JiCzdK8Q== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.5.tgz#f35e956a19955ff08c1258e44a515a6d6248646b" + integrity sha512-Buewnx6M4ttG+NLkKyt7baQn7ScC/Td+e99G914fRU8fGIUivDDgVIQeDHFa5e4CRSJQt58WpNHhsAZgtzVhsg== dependencies: "@babel/helper-annotate-as-pure" "^7.10.4" "@babel/helper-module-imports" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/types" "^7.10.5" "@babel/helper-builder-react-jsx@7.0.0-beta.47": version "7.0.0-beta.47" @@ -1340,13 +1389,13 @@ levenary "^1.1.1" semver "^5.5.0" -"@babel/helper-create-class-features-plugin@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.4.tgz#2d4015d0136bd314103a70d84a7183e4b344a355" - integrity sha512-9raUiOsXPxzzLjCXeosApJItoMnX3uyT4QdM2UldffuGApNrF8e938MwNpDCK9CPoyxrEoCgT+hObJc3mZa6lQ== +"@babel/helper-create-class-features-plugin@^7.10.4", "@babel/helper-create-class-features-plugin@^7.10.5": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz#9f61446ba80e8240b0a5c85c6fdac8459d6f259d" + integrity sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A== dependencies: "@babel/helper-function-name" "^7.10.4" - "@babel/helper-member-expression-to-functions" "^7.10.4" + "@babel/helper-member-expression-to-functions" "^7.10.5" "@babel/helper-optimise-call-expression" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-replace-supers" "^7.10.4" @@ -1371,13 +1420,13 @@ lodash "^4.17.5" "@babel/helper-define-map@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.4.tgz#f037ad794264f729eda1889f4ee210b870999092" - integrity sha512-nIij0oKErfCnLUCWaCaHW0Bmtl2RO9cN7+u2QT8yqTywgALKlyUVOvHDElh+b5DwVC6YB1FOYFOTWcN/+41EDA== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30" + integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ== dependencies: "@babel/helper-function-name" "^7.10.4" - "@babel/types" "^7.10.4" - lodash "^4.17.13" + "@babel/types" "^7.10.5" + lodash "^4.17.19" "@babel/helper-explode-assignable-expression@7.0.0-beta.47": version "7.0.0-beta.47" @@ -1388,11 +1437,10 @@ "@babel/types" "7.0.0-beta.47" "@babel/helper-explode-assignable-expression@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz#40a1cd917bff1288f699a94a75b37a1a2dbd8c7c" - integrity sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A== + version "7.11.4" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz#2d8e3470252cc17aba917ede7803d4a7a276a41b" + integrity sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ== dependencies: - "@babel/traverse" "^7.10.4" "@babel/types" "^7.10.4" "@babel/helper-function-name@7.0.0-beta.47": @@ -1448,12 +1496,12 @@ dependencies: "@babel/types" "7.0.0-beta.47" -"@babel/helper-member-expression-to-functions@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.4.tgz#7cd04b57dfcf82fce9aeae7d4e4452fa31b8c7c4" - integrity sha512-m5j85pK/KZhuSdM/8cHUABQTAslV47OjfIB9Cc7P+PvlAoBzdb79BGNfw8RhT5Mq3p+xGd0ZfAKixbrUZx0C7A== +"@babel/helper-member-expression-to-functions@^7.10.4", "@babel/helper-member-expression-to-functions@^7.10.5": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df" + integrity sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.11.0" "@babel/helper-module-imports@7.0.0-beta.47": version "7.0.0-beta.47" @@ -1482,18 +1530,18 @@ "@babel/types" "7.0.0-beta.47" lodash "^4.17.5" -"@babel/helper-module-transforms@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.4.tgz#ca1f01fdb84e48c24d7506bb818c961f1da8805d" - integrity sha512-Er2FQX0oa3nV7eM1o0tNCTx7izmQtwAQsIiaLRWtavAAEcskb0XJ5OjJbVrYXWOTr8om921Scabn4/tzlx7j1Q== +"@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5", "@babel/helper-module-transforms@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359" + integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg== dependencies: "@babel/helper-module-imports" "^7.10.4" "@babel/helper-replace-supers" "^7.10.4" "@babel/helper-simple-access" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.11.0" "@babel/template" "^7.10.4" - "@babel/types" "^7.10.4" - lodash "^4.17.13" + "@babel/types" "^7.11.0" + lodash "^4.17.19" "@babel/helper-optimise-call-expression@7.0.0-beta.47": version "7.0.0-beta.47" @@ -1527,21 +1575,20 @@ lodash "^4.17.5" "@babel/helper-regex@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.4.tgz#59b373daaf3458e5747dece71bbaf45f9676af6d" - integrity sha512-inWpnHGgtg5NOF0eyHlC0/74/VkdRITY9dtTpB2PrxKKn+AkVMRiZz/Adrx+Ssg+MLDesi2zohBW6MVq6b4pOQ== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0" + integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg== dependencies: - lodash "^4.17.13" + lodash "^4.17.19" "@babel/helper-remap-async-to-generator@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz#fce8bea4e9690bbe923056ded21e54b4e8b68ed5" - integrity sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg== + version "7.11.4" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz#4474ea9f7438f18575e30b0cac784045b402a12d" + integrity sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA== dependencies: "@babel/helper-annotate-as-pure" "^7.10.4" "@babel/helper-wrap-function" "^7.10.4" "@babel/template" "^7.10.4" - "@babel/traverse" "^7.10.4" "@babel/types" "^7.10.4" "@babel/helper-replace-supers@7.0.0-beta.47": @@ -1581,6 +1628,13 @@ "@babel/template" "^7.10.4" "@babel/types" "^7.10.4" +"@babel/helper-skip-transparent-expression-wrappers@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz#eec162f112c2f58d3af0af125e3bb57665146729" + integrity sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q== + dependencies: + "@babel/types" "^7.11.0" + "@babel/helper-split-export-declaration@7.0.0-beta.47": version "7.0.0-beta.47" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.47.tgz#e11277855472d8d83baf22f2d0186c4a2059b09a" @@ -1588,12 +1642,12 @@ dependencies: "@babel/types" "7.0.0-beta.47" -"@babel/helper-split-export-declaration@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz#2c70576eaa3b5609b24cb99db2888cc3fc4251d1" - integrity sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg== +"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" + integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.11.0" "@babel/helper-validator-identifier@^7.10.4": version "7.10.4" @@ -1637,10 +1691,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.4.tgz#9eedf27e1998d87739fb5028a5120557c06a1a64" - integrity sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA== +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.11.0", "@babel/parser@^7.11.4", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0": + version "7.11.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.4.tgz#6fa1a118b8b0d80d0267b719213dc947e88cc0ca" + integrity sha512-MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA== "@babel/plugin-external-helpers@^7.0.0": version "7.10.4" @@ -1650,9 +1704,9 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-proposal-async-generator-functions@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.4.tgz#4b65abb3d9bacc6c657aaa413e56696f9f170fc6" - integrity sha512-MJbxGSmejEFVOANAezdO39SObkURO5o/8b6fSH6D1pi9RZQt+ldppKPXfqgUWpSQ9asM6xaSaSJIaeWMDRP0Zg== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz#3491cabf2f7c179ab820606cec27fed15e0e8558" + integrity sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg== dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-remap-async-to-generator" "^7.10.4" @@ -1692,6 +1746,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-export-default-from" "^7.10.4" +"@babel/plugin-proposal-export-namespace-from@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz#570d883b91031637b3e2958eea3c438e62c05f54" + integrity sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-proposal-json-strings@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db" @@ -1700,6 +1762,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-json-strings" "^7.8.0" +"@babel/plugin-proposal-logical-assignment-operators@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz#9f80e482c03083c87125dee10026b58527ea20c8" + integrity sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a" @@ -1724,10 +1794,10 @@ "@babel/helper-plugin-utils" "7.0.0-beta.47" "@babel/plugin-syntax-object-rest-spread" "7.0.0-beta.47" -"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.5.1", "@babel/plugin-proposal-object-rest-spread@^7.9.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0" - integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA== +"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.11.0", "@babel/plugin-proposal-object-rest-spread@^7.5.1", "@babel/plugin-proposal-object-rest-spread@^7.9.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz#bd81f95a1f746760ea43b6c2d3d62b11790ad0af" + integrity sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" @@ -1749,12 +1819,13 @@ "@babel/helper-plugin-utils" "7.0.0-beta.47" "@babel/plugin-syntax-optional-chaining" "7.0.0-beta.47" -"@babel/plugin-proposal-optional-chaining@^7.0.0", "@babel/plugin-proposal-optional-chaining@^7.10.4", "@babel/plugin-proposal-optional-chaining@^7.9.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz#750f1255e930a1f82d8cdde45031f81a0d0adff7" - integrity sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ== +"@babel/plugin-proposal-optional-chaining@^7.0.0", "@babel/plugin-proposal-optional-chaining@^7.11.0", "@babel/plugin-proposal-optional-chaining@^7.9.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz#de5866d0646f6afdaab8a566382fe3a221755076" + integrity sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0" "@babel/plugin-syntax-optional-chaining" "^7.8.0" "@babel/plugin-proposal-private-methods@^7.10.4": @@ -1815,6 +1886,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" +"@babel/plugin-syntax-export-namespace-from@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" + integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-syntax-flow@7.0.0-beta.47": version "7.0.0-beta.47" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.0.0-beta.47.tgz#9d0b09b9af6fec87a7b22e406bf948089d58c188" @@ -1857,7 +1935,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": +"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== @@ -1966,12 +2044,11 @@ lodash "^4.17.5" "@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.4.tgz#a670d1364bb5019a621b9ea2001482876d734787" - integrity sha512-J3b5CluMg3hPUii2onJDRiaVbPtKFPLEaV5dOPY5OeAbDi1iU/UbbFFTgwb7WnanaDy7bjU35kc26W3eM5Qa0A== + version "7.11.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz#5b7efe98852bef8d652c0b28144cd93a9e4b5215" + integrity sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew== dependencies: "@babel/helper-plugin-utils" "^7.10.4" - lodash "^4.17.13" "@babel/plugin-transform-classes@7.0.0-beta.47": version "7.0.0-beta.47" @@ -2135,11 +2212,11 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-modules-amd@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.4.tgz#cb407c68b862e4c1d13a2fc738c7ec5ed75fc520" - integrity sha512-3Fw+H3WLUrTlzi3zMiZWp3AR4xadAEMv6XRCYnd5jAlLM61Rn+CRJaZMaNvIpcJpQ3vs1kyifYvEVPFfoSkKOA== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz#1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1" + integrity sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw== dependencies: - "@babel/helper-module-transforms" "^7.10.4" + "@babel/helper-module-transforms" "^7.10.5" "@babel/helper-plugin-utils" "^7.10.4" babel-plugin-dynamic-import-node "^2.3.3" @@ -2163,12 +2240,12 @@ babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-systemjs@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.4.tgz#8f576afd943ac2f789b35ded0a6312f929c633f9" - integrity sha512-Tb28LlfxrTiOTGtZFsvkjpyjCl9IoaRI52AEU/VIwOwvDQWtbNJsAqTXzh+5R7i74e/OZHH2c2w2fsOqAfnQYQ== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz#6270099c854066681bae9e05f87e1b9cadbe8c85" + integrity sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw== dependencies: "@babel/helper-hoist-variables" "^7.10.4" - "@babel/helper-module-transforms" "^7.10.4" + "@babel/helper-module-transforms" "^7.10.5" "@babel/helper-plugin-utils" "^7.10.4" babel-plugin-dynamic-import-node "^2.3.3" @@ -2226,9 +2303,9 @@ "@babel/helper-plugin-utils" "7.0.0-beta.47" "@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.4.tgz#7b4d137c87ea7adc2a0f3ebf53266871daa6fced" - integrity sha512-RurVtZ/D5nYfEg0iVERXYKEgDFeesHrHfx8RT05Sq57ucj2eOYAP6eu5fynL4Adju4I/mP/I6SO0DqNWAXjfLQ== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz#59d339d58d0b1950435f4043e74e2510005e2c4a" + integrity sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw== dependencies: "@babel/helper-get-function-arity" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" @@ -2288,9 +2365,9 @@ "@babel/plugin-syntax-jsx" "7.0.0-beta.47" "@babel/plugin-transform-react-jsx-source@^7.0.0", "@babel/plugin-transform-react-jsx-source@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.4.tgz#86baf0fcccfe58084e06446a80858e1deae8f291" - integrity sha512-FTK3eQFrPv2aveerUSazFmGygqIdTtvskG50SnGnbEUnRPcGx2ylBhdFIzoVS1ty44hEgcPoCAyw5r3VDEq+Ug== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz#34f1779117520a779c054f2cdd9680435b9222b4" + integrity sha512-wTeqHVkN1lfPLubRiZH3o73f4rfon42HpgxUSs86Nc+8QIcm/B9s8NNVXu/gwGcOyd7yDib9ikxoDLxJP0UiDA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-jsx" "^7.10.4" @@ -2344,9 +2421,9 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-runtime@^7.0.0", "@babel/plugin-transform-runtime@^7.9.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.4.tgz#594fb53453ea1b6f0779cceb48ce0718a447feb7" - integrity sha512-8ULlGv8p+Vuxu+kz2Y1dk6MYS2b/Dki+NO6/0ZlfSj5tMalfDL7jI/o/2a+rrWLqSXvnadEqc2WguB4gdQIxZw== + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.0.tgz#e27f78eb36f19448636e05c33c90fd9ad9b8bccf" + integrity sha512-LFEsP+t3wkYBlis8w6/kmnd6Kb1dxTd+wGJ8MlxTGzQo//ehtqlVL4S9DNUa53+dtPSQobN2CXx4d81FqC58cw== dependencies: "@babel/helper-module-imports" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" @@ -2374,12 +2451,13 @@ dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.47" -"@babel/plugin-transform-spread@^7.0.0", "@babel/plugin-transform-spread@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz#4e2c85ea0d6abaee1b24dcfbbae426fe8d674cff" - integrity sha512-1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ== +"@babel/plugin-transform-spread@^7.0.0", "@babel/plugin-transform-spread@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz#fa84d300f5e4f57752fe41a6d1b3c554f13f17cc" + integrity sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw== dependencies: "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0" "@babel/plugin-transform-sticky-regex@7.0.0-beta.47": version "7.0.0-beta.47" @@ -2406,9 +2484,9 @@ "@babel/helper-plugin-utils" "7.0.0-beta.47" "@babel/plugin-transform-template-literals@^7.0.0", "@babel/plugin-transform-template-literals@^7.10.4", "@babel/plugin-transform-template-literals@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.4.tgz#e6375407b30fcb7fcfdbba3bb98ef3e9d36df7bc" - integrity sha512-4NErciJkAYe+xI5cqfS8pV/0ntlY5N5Ske/4ImxAVX7mk9Rxt2bwDTGv1Msc2BRJvWQcmYEC+yoMLdX22aE4VQ== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz#78bc5d626a6642db3312d9d0f001f5e7639fde8c" + integrity sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw== dependencies: "@babel/helper-annotate-as-pure" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" @@ -2421,11 +2499,11 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-typescript@^7.10.4", "@babel/plugin-transform-typescript@^7.5.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.4.tgz#8b01cb8d77f795422277cc3fcf45af72bc68ba78" - integrity sha512-3WpXIKDJl/MHoAN0fNkSr7iHdUMHZoppXjf2HJ9/ed5Xht5wNIsXllJXdityKOxeA3Z8heYRb1D3p2H5rfCdPw== + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz#2b4879676af37342ebb278216dd090ac67f13abb" + integrity sha512-edJsNzTtvb3MaXQwj8403B7mZoGu9ElDJQZOKjGUnvilquxBA3IQoEIOvkX/1O8xfAsnHS/oQhe2w/IXrr+w0w== dependencies: - "@babel/helper-create-class-features-plugin" "^7.10.4" + "@babel/helper-create-class-features-plugin" "^7.10.5" "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-typescript" "^7.10.4" @@ -2462,29 +2540,33 @@ regenerator-runtime "^0.13.4" "@babel/preset-env@^7.5.0", "@babel/preset-env@^7.9.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.4.tgz#fbf57f9a803afd97f4f32e4f798bb62e4b2bef5f" - integrity sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw== + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.0.tgz#860ee38f2ce17ad60480c2021ba9689393efb796" + integrity sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg== dependencies: - "@babel/compat-data" "^7.10.4" + "@babel/compat-data" "^7.11.0" "@babel/helper-compilation-targets" "^7.10.4" "@babel/helper-module-imports" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-proposal-async-generator-functions" "^7.10.4" "@babel/plugin-proposal-class-properties" "^7.10.4" "@babel/plugin-proposal-dynamic-import" "^7.10.4" + "@babel/plugin-proposal-export-namespace-from" "^7.10.4" "@babel/plugin-proposal-json-strings" "^7.10.4" + "@babel/plugin-proposal-logical-assignment-operators" "^7.11.0" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4" "@babel/plugin-proposal-numeric-separator" "^7.10.4" - "@babel/plugin-proposal-object-rest-spread" "^7.10.4" + "@babel/plugin-proposal-object-rest-spread" "^7.11.0" "@babel/plugin-proposal-optional-catch-binding" "^7.10.4" - "@babel/plugin-proposal-optional-chaining" "^7.10.4" + "@babel/plugin-proposal-optional-chaining" "^7.11.0" "@babel/plugin-proposal-private-methods" "^7.10.4" "@babel/plugin-proposal-unicode-property-regex" "^7.10.4" "@babel/plugin-syntax-async-generators" "^7.8.0" "@babel/plugin-syntax-class-properties" "^7.10.4" "@babel/plugin-syntax-dynamic-import" "^7.8.0" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" "@babel/plugin-syntax-json-strings" "^7.8.0" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" "@babel/plugin-syntax-numeric-separator" "^7.10.4" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" @@ -2517,14 +2599,14 @@ "@babel/plugin-transform-regenerator" "^7.10.4" "@babel/plugin-transform-reserved-words" "^7.10.4" "@babel/plugin-transform-shorthand-properties" "^7.10.4" - "@babel/plugin-transform-spread" "^7.10.4" + "@babel/plugin-transform-spread" "^7.11.0" "@babel/plugin-transform-sticky-regex" "^7.10.4" "@babel/plugin-transform-template-literals" "^7.10.4" "@babel/plugin-transform-typeof-symbol" "^7.10.4" "@babel/plugin-transform-unicode-escapes" "^7.10.4" "@babel/plugin-transform-unicode-regex" "^7.10.4" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.10.4" + "@babel/types" "^7.11.0" browserslist "^4.12.0" core-js-compat "^3.6.2" invariant "^2.2.2" @@ -2532,9 +2614,9 @@ semver "^5.5.0" "@babel/preset-modules@^0.1.3": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72" - integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg== + version "0.1.4" + resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e" + integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" @@ -2564,28 +2646,28 @@ "@babel/plugin-transform-typescript" "^7.10.4" "@babel/register@^7.0.0", "@babel/register@^7.4.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.10.4.tgz#53004ba8b04c4af3cbd84508e03ad150669746e4" - integrity sha512-whHmgGiWNVyTVnYTSawtDWhaeYsc+noeU8Rmi+MPnbGhDYmr5QpEDMrQcIA07D2RUv0BlThPcN89XcHCqq/O4g== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.10.5.tgz#354f3574895f1307f79efe37a51525e52fd38d89" + integrity sha512-eYHdLv43nyvmPn9bfNfrcC4+iYNwdQ8Pxk1MFJuU/U5LpSYl/PH4dFMazCYZDFVi8ueG3shvO+AQfLrxpYulQw== dependencies: find-cache-dir "^2.0.0" - lodash "^4.17.13" + lodash "^4.17.19" make-dir "^2.1.0" pirates "^4.0.0" source-map-support "^0.5.16" "@babel/runtime-corejs3@^7.10.2": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.4.tgz#f29fc1990307c4c57b10dbd6ce667b27159d9e0d" - integrity sha512-BFlgP2SoLO9HJX9WBwN67gHWMBhDX/eDz64Jajd6mR/UAUzqrNMm99d4qHnVaKscAElZoFiPv+JpR/Siud5lXw== + version "7.11.2" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz#02c3029743150188edeb66541195f54600278419" + integrity sha512-qh5IR+8VgFz83VBa6OkaET6uN/mJOhHONuy3m1sgF0CV6mXdPSEBdA7e1eUbVvyNtANjMbg22JUv71BaDXLY6A== dependencies: core-js-pure "^3.0.0" regenerator-runtime "^0.13.4" "@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.6": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.4.tgz#a6724f1a6b8d2f6ea5236dbfe58c7d7ea9c5eb99" - integrity sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw== + version "7.11.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736" + integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw== dependencies: regenerator-runtime "^0.13.4" @@ -2624,20 +2706,20 @@ invariant "^2.2.0" lodash "^4.17.5" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.4.tgz#e642e5395a3b09cc95c8e74a27432b484b697818" - integrity sha512-aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q== +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.11.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.0.tgz#9b996ce1b98f53f7c3e4175115605d56ed07dd24" + integrity sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.10.4" + "@babel/generator" "^7.11.0" "@babel/helper-function-name" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.10.4" - "@babel/parser" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.11.0" + "@babel/parser" "^7.11.0" + "@babel/types" "^7.11.0" debug "^4.1.0" globals "^11.1.0" - lodash "^4.17.13" + lodash "^4.17.19" "@babel/types@7.0.0-beta.47": version "7.0.0-beta.47" @@ -2648,13 +2730,13 @@ lodash "^4.17.5" to-fast-properties "^2.0.0" -"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.4.tgz#369517188352e18219981efd156bfdb199fff1ee" - integrity sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg== +"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.0.tgz#2ae6bf1ba9ae8c3c43824e5861269871b206e90d" + integrity sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA== dependencies: "@babel/helper-validator-identifier" "^7.10.4" - lodash "^4.17.13" + lodash "^4.17.19" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -2788,44 +2870,46 @@ chalk "^2.0.1" slash "^2.0.0" -"@jest/console@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.1.0.tgz#f67c89e4f4d04dbcf7b052aed5ab9c74f915b954" - integrity sha512-+0lpTHMd/8pJp+Nd4lyip+/Iyf2dZJvcCqrlkeZQoQid+JlThA4M9vxHtheyrQ99jJTMQam+es4BcvZ5W5cC3A== +"@jest/console@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.3.0.tgz#ed04063efb280c88ba87388b6f16427c0a85c856" + integrity sha512-/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.3.0" + "@types/node" "*" chalk "^4.0.0" - jest-message-util "^26.1.0" - jest-util "^26.1.0" + jest-message-util "^26.3.0" + jest-util "^26.3.0" slash "^3.0.0" -"@jest/core@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.1.0.tgz#4580555b522de412a7998b3938c851e4f9da1c18" - integrity sha512-zyizYmDJOOVke4OO/De//aiv8b07OwZzL2cfsvWF3q9YssfpcKfcnZAwDY8f+A76xXSMMYe8i/f/LPocLlByfw== +"@jest/core@^26.4.2": + version "26.4.2" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.4.2.tgz#85d0894f31ac29b5bab07aa86806d03dd3d33edc" + integrity sha512-sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg== dependencies: - "@jest/console" "^26.1.0" - "@jest/reporters" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/transform" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/console" "^26.3.0" + "@jest/reporters" "^26.4.1" + "@jest/test-result" "^26.3.0" + "@jest/transform" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" - jest-changed-files "^26.1.0" - jest-config "^26.1.0" - jest-haste-map "^26.1.0" - jest-message-util "^26.1.0" + jest-changed-files "^26.3.0" + jest-config "^26.4.2" + jest-haste-map "^26.3.0" + jest-message-util "^26.3.0" jest-regex-util "^26.0.0" - jest-resolve "^26.1.0" - jest-resolve-dependencies "^26.1.0" - jest-runner "^26.1.0" - jest-runtime "^26.1.0" - jest-snapshot "^26.1.0" - jest-util "^26.1.0" - jest-validate "^26.1.0" - jest-watcher "^26.1.0" + jest-resolve "^26.4.0" + jest-resolve-dependencies "^26.4.2" + jest-runner "^26.4.2" + jest-runtime "^26.4.2" + jest-snapshot "^26.4.2" + jest-util "^26.3.0" + jest-validate "^26.4.2" + jest-watcher "^26.3.0" micromatch "^4.0.2" p-each-series "^2.1.0" rimraf "^3.0.0" @@ -2842,14 +2926,15 @@ "@jest/types" "^24.9.0" jest-mock "^24.9.0" -"@jest/environment@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.1.0.tgz#378853bcdd1c2443b4555ab908cfbabb851e96da" - integrity sha512-86+DNcGongbX7ai/KE/S3/NcUVZfrwvFzOOWX/W+OOTvTds7j07LtC+MgGydH5c8Ri3uIrvdmVgd1xFD5zt/xA== +"@jest/environment@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.3.0.tgz#e6953ab711ae3e44754a025f838bde1a7fd236a0" + integrity sha512-EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA== dependencies: - "@jest/fake-timers" "^26.1.0" - "@jest/types" "^26.1.0" - jest-mock "^26.1.0" + "@jest/fake-timers" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + jest-mock "^26.3.0" "@jest/fake-timers@^24.9.0": version "24.9.0" @@ -2860,36 +2945,37 @@ jest-message-util "^24.9.0" jest-mock "^24.9.0" -"@jest/fake-timers@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.1.0.tgz#9a76b7a94c351cdbc0ad53e5a748789f819a65fe" - integrity sha512-Y5F3kBVWxhau3TJ825iuWy++BAuQzK/xEa+wD9vDH3RytW9f2DbMVodfUQC54rZDX3POqdxCgcKdgcOL0rYUpA== +"@jest/fake-timers@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.3.0.tgz#f515d4667a6770f60ae06ae050f4e001126c666a" + integrity sha512-ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.3.0" "@sinonjs/fake-timers" "^6.0.1" - jest-message-util "^26.1.0" - jest-mock "^26.1.0" - jest-util "^26.1.0" + "@types/node" "*" + jest-message-util "^26.3.0" + jest-mock "^26.3.0" + jest-util "^26.3.0" -"@jest/globals@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.1.0.tgz#6cc5d7cbb79b76b120f2403d7d755693cf063ab1" - integrity sha512-MKiHPNaT+ZoG85oMaYUmGHEqu98y3WO2yeIDJrs2sJqHhYOy3Z6F7F/luzFomRQ8SQ1wEkmahFAz2291Iv8EAw== +"@jest/globals@^26.4.2": + version "26.4.2" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.4.2.tgz#73c2a862ac691d998889a241beb3dc9cada40d4a" + integrity sha512-Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow== dependencies: - "@jest/environment" "^26.1.0" - "@jest/types" "^26.1.0" - expect "^26.1.0" + "@jest/environment" "^26.3.0" + "@jest/types" "^26.3.0" + expect "^26.4.2" -"@jest/reporters@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.1.0.tgz#08952e90c90282e14ff49e927bdf1873617dae78" - integrity sha512-SVAysur9FOIojJbF4wLP0TybmqwDkdnFxHSPzHMMIYyBtldCW9gG+Q5xWjpMFyErDiwlRuPyMSJSU64A67Pazg== +"@jest/reporters@^26.4.1": + version "26.4.1" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.4.1.tgz#3b4d6faf28650f3965f8b97bc3d114077fb71795" + integrity sha512-aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/transform" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/console" "^26.3.0" + "@jest/test-result" "^26.3.0" + "@jest/transform" "^26.3.0" + "@jest/types" "^26.3.0" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" @@ -2900,17 +2986,17 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^26.1.0" - jest-resolve "^26.1.0" - jest-util "^26.1.0" - jest-worker "^26.1.0" + jest-haste-map "^26.3.0" + jest-resolve "^26.4.0" + jest-util "^26.3.0" + jest-worker "^26.3.0" slash "^3.0.0" source-map "^0.6.0" string-length "^4.0.1" terminal-link "^2.0.0" - v8-to-istanbul "^4.1.3" + v8-to-istanbul "^5.0.1" optionalDependencies: - node-notifier "^7.0.0" + node-notifier "^8.0.0" "@jest/source-map@^24.9.0": version "24.9.0" @@ -2921,10 +3007,10 @@ graceful-fs "^4.1.15" source-map "^0.6.0" -"@jest/source-map@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.1.0.tgz#a6a020d00e7d9478f4b690167c5e8b77e63adb26" - integrity sha512-XYRPYx4eEVX15cMT9mstnO7hkHP3krNtKfxUYd8L7gbtia8JvZZ6bMzSwa6IQJENbudTwKMw5R1BePRD+bkEmA== +"@jest/source-map@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.3.0.tgz#0e646e519883c14c551f7b5ae4ff5f1bfe4fc3d9" + integrity sha512-hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ== dependencies: callsites "^3.0.0" graceful-fs "^4.2.4" @@ -2939,26 +3025,26 @@ "@jest/types" "^24.9.0" "@types/istanbul-lib-coverage" "^2.0.0" -"@jest/test-result@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.1.0.tgz#a93fa15b21ad3c7ceb21c2b4c35be2e407d8e971" - integrity sha512-Xz44mhXph93EYMA8aYDz+75mFbarTV/d/x0yMdI3tfSRs/vh4CqSxgzVmCps1fPkHDCtn0tU8IH9iCKgGeGpfw== +"@jest/test-result@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.3.0.tgz#46cde01fa10c0aaeb7431bf71e4a20d885bc7fdb" + integrity sha512-a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg== dependencies: - "@jest/console" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/console" "^26.3.0" + "@jest/types" "^26.3.0" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.1.0.tgz#41a6fc8b850c3f33f48288ea9ea517c047e7f14e" - integrity sha512-Z/hcK+rTq56E6sBwMoQhSRDVjqrGtj1y14e2bIgcowARaIE1SgOanwx6gvY4Q9gTKMoZQXbXvptji+q5GYxa6Q== +"@jest/test-sequencer@^26.4.2": + version "26.4.2" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz#58a3760a61eec758a2ce6080201424580d97cbba" + integrity sha512-83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog== dependencies: - "@jest/test-result" "^26.1.0" + "@jest/test-result" "^26.3.0" graceful-fs "^4.2.4" - jest-haste-map "^26.1.0" - jest-runner "^26.1.0" - jest-runtime "^26.1.0" + jest-haste-map "^26.3.0" + jest-runner "^26.4.2" + jest-runtime "^26.4.2" "@jest/transform@^24.9.0": version "24.9.0" @@ -2982,21 +3068,21 @@ source-map "^0.6.1" write-file-atomic "2.4.1" -"@jest/transform@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.1.0.tgz#697f48898c2a2787c9b4cb71d09d7e617464e509" - integrity sha512-ICPm6sUXmZJieq45ix28k0s+d/z2E8CHDsq+WwtWI6kW8m7I8kPqarSEcUN86entHQ570ZBRci5OWaKL0wlAWw== +"@jest/transform@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.3.0.tgz#c393e0e01459da8a8bfc6d2a7c2ece1a13e8ba55" + integrity sha512-Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^26.1.0" + "@jest/types" "^26.3.0" babel-plugin-istanbul "^6.0.0" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.4" - jest-haste-map "^26.1.0" + jest-haste-map "^26.3.0" jest-regex-util "^26.0.0" - jest-util "^26.1.0" + jest-util "^26.3.0" micromatch "^4.0.2" pirates "^4.0.1" slash "^3.0.0" @@ -3022,13 +3108,14 @@ "@types/yargs" "^15.0.0" chalk "^3.0.0" -"@jest/types@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.1.0.tgz#f8afaaaeeb23b5cad49dd1f7779689941dcb6057" - integrity sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ== +"@jest/types@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.3.0.tgz#97627bf4bdb72c55346eef98e3b3f7ddc4941f71" + integrity sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ== dependencies: "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" "@types/yargs" "^15.0.0" chalk "^4.0.0" @@ -3046,9 +3133,9 @@ integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== "@react-native-community/async-storage@^1.6.2": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@react-native-community/async-storage/-/async-storage-1.11.0.tgz#bf81b8813080846f150c67f531987c429b442166" - integrity sha512-Pq9LlmvtCEKAGdkyrgTcRxNh2fnHFykEj2qnRYijOl1pDIl2MkD5IxaXu5eOL0wgOtAl4U//ff4z40Td6XR5rw== + version "1.12.0" + resolved "https://registry.yarnpkg.com/@react-native-community/async-storage/-/async-storage-1.12.0.tgz#d2fc65bc08aa1c3e9514bbe9fe7095eab8e8aca3" + integrity sha512-y3zVxuVyiOxI8TXrvajmYfDbIt2vFNxzV5MiA28v15DQTxDk6uJH3rpc9my+la7u2Tiwt3PpdU2+59ZgZ4h7wA== dependencies: deep-assign "^3.0.0" @@ -3060,11 +3147,11 @@ serve-static "^1.13.1" "@react-native-community/cli-platform-android@^4.5.1": - version "4.10.1" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-4.10.1.tgz#c326dfcce42acf106cc9c4afb95b360644fa595b" - integrity sha512-RawTRMd+pGQ/k+ZnZ/wTOcPd7sfbxkuhUmBoIthj8WJcufQdda57y/c6Cys9efAxKjvBP02RKX/Uhu+v7aS4jA== + version "4.11.0" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-4.11.0.tgz#0ce9b88ed8b6b0ef962af49d980eb53433c17a84" + integrity sha512-BzqocGjOCjpDW0bM/LUrHMXw4nBvOhDXnHWxaoRp3eeUVsD2oSegoRn52kZo9yhPb9cCPkZJ3b+Web71Ue4j9w== dependencies: - "@react-native-community/cli-tools" "^4.10.1" + "@react-native-community/cli-tools" "^4.11.0" chalk "^3.0.0" execa "^1.0.0" fs-extra "^8.1.0" @@ -3076,11 +3163,11 @@ xmldoc "^1.1.2" "@react-native-community/cli-platform-ios@^4.5.0": - version "4.10.1" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-4.10.1.tgz#c73d7b33f22458aa806069df0dfc0ed55973679b" - integrity sha512-CiwAcZ0YZ5NBz6cKfa4MRFnPtTadRiy/A+kzaBUzsLXqV2qw5YIl08JEaxAI7sjuoi8/EE8CRCIkjlGYcqNK9Q== + version "4.11.0" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-4.11.0.tgz#5870bf5f2b3c01a0aa672a7c1f7f0fe13337c6b5" + integrity sha512-/qkjnhhJ7BGBTNkHSS8a+z8UgWUQbU6YZOTuYxjNywGUzMiTsb/wlm2cWCY1VEAvWtY97c4plAZ5OferPJHaVA== dependencies: - "@react-native-community/cli-tools" "^4.10.1" + "@react-native-community/cli-tools" "^4.11.0" chalk "^3.0.0" glob "^7.1.3" js-yaml "^3.13.1" @@ -3088,13 +3175,13 @@ plist "^3.0.1" xcode "^2.0.0" -"@react-native-community/cli-server-api@^4.10.1": - version "4.10.1" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-4.10.1.tgz#6467c1c7e08bda068873bfd3c9d6ce112be969fa" - integrity sha512-GIueLxHr+qZhrSpwabbQuMMEAfdew38LmctYRuHVLOnsya0JZOvxehmD04aUrU54PaTPBj7Iidyrfd8fPDTaow== +"@react-native-community/cli-server-api@^4.11.0": + version "4.11.0" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-4.11.0.tgz#93887ab8496c9d89b53817297974670184be1191" + integrity sha512-vrRaGq7ezsxyyUsFhAboEtA1CHLDa2UpJygOWHip30LaAluM+vopAJbau2NtHVX54vgQzXo438Tx8TXiRacPhA== dependencies: "@react-native-community/cli-debugger-ui" "^4.9.0" - "@react-native-community/cli-tools" "^4.10.1" + "@react-native-community/cli-tools" "^4.11.0" compression "^1.7.1" connect "^3.6.5" errorhandler "^1.5.0" @@ -3102,10 +3189,10 @@ serve-static "^1.13.1" ws "^1.1.0" -"@react-native-community/cli-tools@^4.10.1": - version "4.10.1" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-4.10.1.tgz#11f6833e646fbf53509282912e8d77658a8578b0" - integrity sha512-zGD0h+Ay8Rk8p+2wG41V163am8HfKkoZsVDKYkEKYD8O019if893pZyQ2sDcgk2ppNILrCt9O264dPDe/Ly1ow== +"@react-native-community/cli-tools@^4.11.0": + version "4.11.0" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-4.11.0.tgz#a53a51da76468a37f89ef7db808acc1d3c5f9cea" + integrity sha512-o2dh9q/778lIYBJxgIvTXkcxi9bSozjt8lv3tpyVmLZNA/PAPmQ7CafT37jWWwdmaSgP7nWyp4DtuE/gRsrXkA== dependencies: chalk "^3.0.0" lodash "^4.17.15" @@ -3120,21 +3207,21 @@ integrity sha512-ael2f1onoPF3vF7YqHGWy7NnafzGu+yp88BbFbP0ydoCP2xGSUzmZVw0zakPTC040Id+JQ9WeFczujMkDy6jYQ== "@react-native-community/cli@^4.5.1", "@react-native-community/cli@^4.8.0": - version "4.10.1" - resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-4.10.1.tgz#3c1e74f55c004936368d3576d4c1da7d02b89904" - integrity sha512-CtDer1sFxxPCvBBgmTbY5mjXgJiY/j7Nm7PzbbKxVBgpTkz5ZWP9B5e17lkmIweLqKDcM3hseCfsM/wG30fcLg== + version "4.12.0" + resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-4.12.0.tgz#42ca3eacd4b4ba2bd5126aba6a032952e66835b5" + integrity sha512-zIrKxgHsQ5EUGjZ+oIW54+qY2XqVwDJbGV3hzsVsCFXleos2QUAQWskR0BG9zf06P1HT8kfwuDuHs/p1Ywe0rg== dependencies: "@hapi/joi" "^15.0.3" "@react-native-community/cli-debugger-ui" "^4.9.0" - "@react-native-community/cli-server-api" "^4.10.1" - "@react-native-community/cli-tools" "^4.10.1" + "@react-native-community/cli-server-api" "^4.11.0" + "@react-native-community/cli-tools" "^4.11.0" "@react-native-community/cli-types" "^4.10.1" chalk "^3.0.0" command-exists "^1.2.8" commander "^2.19.0" cosmiconfig "^5.1.0" deepmerge "^3.2.0" - envinfo "^7.1.0" + envinfo "^7.7.2" execa "^1.0.0" find-up "^4.1.0" fs-extra "^8.1.0" @@ -3165,29 +3252,29 @@ integrity sha512-rk4sWFsmtOw8oyx8SD3KSvawwaK7gRBSEIy2TAwURyGt+3TizssXP1r8nx3zY+R7v2vYYHXZ+k2/GULAT/bcaQ== "@react-native-community/netinfo@^5.7.0": - version "5.9.4" - resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-5.9.4.tgz#a05a9403f8ee09c7d7f7c2dda850b79cac376691" - integrity sha512-mb664NOqPvyUZ4TznzdYEfdS3OhSXWGbZprgsDZn4THw2X/4wcBFcBUeWuMzeQ56KhY0rm/YBBlZWHrSf3C/Aw== + version "5.9.6" + resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-5.9.6.tgz#fab6cd78fe740f9c674b4a93abd77f6bfb90f655" + integrity sha512-cEkA1Apg8+VjnDdeDZRHI+2RqouiPKgYnewouRkvF4ettH9ZS4Cmi/nANQKIpIu2L+czboxM3fCZ44nc7IM9VQ== "@react-native-community/push-notification-ios@^1.0.7": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@react-native-community/push-notification-ios/-/push-notification-ios-1.2.2.tgz#e4437a89bddca2cdeac96d17e02cde34336caaf3" - integrity sha512-0+DL68CgH5TF8WKwdjI9pul+mPKChGk9uHYcMJ0C6b296W5BQVaBQP6On2QYOgL/EWOWNWeBenW65FjKzWFf0g== + version "1.4.1" + resolved "https://registry.yarnpkg.com/@react-native-community/push-notification-ios/-/push-notification-ios-1.4.1.tgz#02b46fb793926f34aa275605ed49f03015e893b3" + integrity sha512-Y+4LS10R+yc17wu54tlDcxgW/SugEAz2dNjmil9I7KUtaZIOc0hTvAE8dUvYTEDvYQ9uYrXI+OqdElTE3FJ3FA== dependencies: invariant "^2.2.4" "@react-navigation/bottom-tabs@^5.0.3": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-5.6.1.tgz#f4aa23913a0c26ec3dd4dc268cd83e3d0e5f4dc4" - integrity sha512-aAqA4lCaa1x3cEWwEyUJ5hBPpVuv/TR0Q0Y/hkBgI2+h27Xdv9B/ZemMIjMWTNDZTjbYXTsJ41AJbVQnPSVTrg== + version "5.8.0" + resolved "https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-5.8.0.tgz#d7386809bceeead0adcaacf61b6563be9cefd5cb" + integrity sha512-geF/FSIg6cArY5jLwJJZrp7PDzLoSrONkCgq9n/4yKxtQapB/Pn5ljSHCNRGNkkb/+g8zqRQmEL5yX4DOja0OA== dependencies: color "^3.1.2" react-native-iphone-x-helper "^1.2.1" "@react-navigation/compat@^5.0.3": - version "5.1.28" - resolved "https://registry.yarnpkg.com/@react-navigation/compat/-/compat-5.1.28.tgz#de605aaf195cd5991b01caba8678ca8dde8b2fec" - integrity sha512-i1zmFHOkIf7SmihUOemaDsdHjTPyDSxJTHb2mS+EKkr0eU9ERGctMnPrETRMcvRtQyTnyWqmklBZdKRjAS1r+Q== + version "5.2.5" + resolved "https://registry.yarnpkg.com/@react-navigation/compat/-/compat-5.2.5.tgz#b8e110f46418834dece9319374e0161cf5a976eb" + integrity sha512-5LpRr6YmuXVf3XbS/qKV83KzHe0/atcIRGC1d86TJMnF6mcwfCmBhhpLETIF1S2Nrf29bwwiHl7IZdx+GZGZcg== "@react-navigation/core@^3.7.6": version "3.7.6" @@ -3199,14 +3286,14 @@ query-string "^6.11.1" react-is "^16.13.0" -"@react-navigation/core@^5.1.2", "@react-navigation/core@^5.11.1": - version "5.11.1" - resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-5.11.1.tgz#c4890910ba3d6332ee6873f0adb3d3d13cf4fa4c" - integrity sha512-zJ/w84msKBhgRR35/tHdY1facxdnN/WP9Ebutnjp/J9ENuv7fHXhYlxX+oIRrMn+/MnbG79RVnYcO/r4lO8OTQ== +"@react-navigation/core@^5.1.2", "@react-navigation/core@^5.12.3": + version "5.12.3" + resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-5.12.3.tgz#0484fcca290569a0dc10b70b99f00edd3f1fd93c" + integrity sha512-aEOTAw4FRRNsNu6F9ibLk3SVSs4Res8BI832NEZN6qUto5ZgtuYnQHWeWV2cZ43Nc9KvUyQC/vXvO2RScwgFwA== dependencies: - "@react-navigation/routers" "^5.4.8" + "@react-navigation/routers" "^5.4.11" escape-string-regexp "^4.0.0" - nanoid "^3.1.9" + nanoid "^3.1.12" query-string "^6.13.1" react-is "^16.13.0" use-subscription "^1.4.0" @@ -3225,24 +3312,24 @@ react-native-safe-area-view "^0.14.9" "@react-navigation/native@^5.0.3": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-5.6.1.tgz#a603b921f39fe3fcfcc27232d71b24e80effc1f2" - integrity sha512-jnSNEnuRzqLvG+7QcMthfB8eCZIzAE0Wku7HDgzfjFS2iA7Oa9ugeX/1qdP9heT2Mp0t9BDQ4XX4boJma9Z/xg== + version "5.7.3" + resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-5.7.3.tgz#3cda5ee7b0fe0d980db6d788419f0af50a64deac" + integrity sha512-bXb1g/cLpGF2DW1Vxk90Ch5vbaZTk5b/4Fn5xjQlueQODgc9ca+GPEssKZ84hCrNmS+Xg+iK1m/ArawLF5gMlw== dependencies: - "@react-navigation/core" "^5.11.1" - nanoid "^3.1.9" + "@react-navigation/core" "^5.12.3" + nanoid "^3.1.12" -"@react-navigation/routers@^5.4.8": - version "5.4.8" - resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-5.4.8.tgz#b85ba06b2465bfa031d61167c078c2911219d877" - integrity sha512-7uxC24fgLQdRquxPfL8SZ8zjle5DXdAB56aYL13tH+HAdhO2YxjKVvulzhGUsfcZthMvZ/9psybhn+m4z71dUg== +"@react-navigation/routers@^5.4.11": + version "5.4.11" + resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-5.4.11.tgz#75dbec1809e282c3749068845099c5bee2c792f0" + integrity sha512-J/CsHdIjYBRe81UUiLOoz9NSrQ91uP23Oe21QPCALInRHx+rfwo2oPl6Fn8xAa7n8Dtt2oQUGyF+g5d05cB74w== dependencies: - nanoid "^3.1.9" + nanoid "^3.1.12" "@react-navigation/stack@^5.0.3": - version "5.6.2" - resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-5.6.2.tgz#d2371f9ffdcf3eee26245697d0947c9722542f38" - integrity sha512-51Aasxg8j2eKxz4mhA0ajJXrhAyJQkk2iiNE511zcqJ3tlfxv/h70Eej3PetnbbHFMOwNsEwc2GjB3OnfQcxjQ== + version "5.9.0" + resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-5.9.0.tgz#bf24607175bf502798cc4c832aa8a86e55f3b365" + integrity sha512-kt6M0ZLMyNKXfKi50n01bHg4/d8zp0Yh5QaQG4d1roWOqdV9ou1nFEK4l2yQ6XKH2lLSYswHElPDZUuWd+6XzA== dependencies: color "^3.1.2" react-native-iphone-x-helper "^1.2.1" @@ -3301,20 +3388,20 @@ redux-thunk "^2.3.0" reselect "^4.0.0" -"@sentry/browser@^5.16.1": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.19.0.tgz#9189b6633fe45e54325e40b39345d9eabd171e4a" - integrity sha512-Cz8PnzC5NGfpHIGCmHLgA6iDEBVELwo4Il/iFweXjs4+VL4biw62lI32Q4iLCCpmX0t5UvrWBOnju2v8zuFIjA== +"@sentry/browser@5.22.3", "@sentry/browser@^5.21.1": + version "5.22.3" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.22.3.tgz#7a64bd1cf01bf393741a3e4bf35f82aa927f5b4e" + integrity sha512-2TzE/CoBa5ZkvxJizDdi1Iz1ldmXSJpFQ1mL07PIXBjCt0Wxf+WOuFSj5IP4L40XHfJE5gU8wEvSH0VDR8nXtA== dependencies: - "@sentry/core" "5.19.0" - "@sentry/types" "5.19.0" - "@sentry/utils" "5.19.0" + "@sentry/core" "5.22.3" + "@sentry/types" "5.22.3" + "@sentry/utils" "5.22.3" tslib "^1.9.3" "@sentry/cli@^1.52.4": - version "1.55.0" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.55.0.tgz#0da95cd9491e11da52b15796bded72480f69591b" - integrity sha512-LOpM69Kvfaossq92wgP8cg3+0XBc9lg76udH4OdmpSZhtavS/qxWedBsnTicaT//7rQUNZBUnTPOpmCYnpGEIA== + version "1.55.2" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.55.2.tgz#d7c32c87be1fb5b7469b3c57229177296ad9a364" + integrity sha512-XLHlqLUY3E/ggYvTqAy76sbUDzr3yxXD7cSeyT2e3rxORSVwMkP2MqMeRJ8sCmQ0DXMdMHfbFOKMDwMqmRZeqQ== dependencies: https-proxy-agent "^5.0.0" mkdirp "^0.5.5" @@ -3322,68 +3409,82 @@ progress "^2.0.3" proxy-from-env "^1.1.0" -"@sentry/core@5.19.0", "@sentry/core@^5.16.1": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.19.0.tgz#31b08a0b46ae1ee6863447225b401ac2a777774c" - integrity sha512-ry1Zms6jrVQPEwmfywItyUhOgabPrykd8stR1x/u2t1YiISWlR813fE5nzdwgW5mxEitXz/ikTwvrfK3egsDWQ== +"@sentry/core@5.22.3", "@sentry/core@^5.21.1": + version "5.22.3" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.22.3.tgz#030f435f2b518f282ba8bd954dac90cd70888bd7" + integrity sha512-eGL5uUarw3o4i9QUb9JoFHnhriPpWCaqeaIBB06HUpdcvhrjoowcKZj1+WPec5lFg5XusE35vez7z/FPzmJUDw== dependencies: - "@sentry/hub" "5.19.0" - "@sentry/minimal" "5.19.0" - "@sentry/types" "5.19.0" - "@sentry/utils" "5.19.0" + "@sentry/hub" "5.22.3" + "@sentry/minimal" "5.22.3" + "@sentry/types" "5.22.3" + "@sentry/utils" "5.22.3" tslib "^1.9.3" -"@sentry/hub@5.19.0", "@sentry/hub@^5.16.1": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.19.0.tgz#f38e7745a4980d9fa6c5baeca5605e7e6fecd5ac" - integrity sha512-UFaQLa1XAa02ZcxUmN9GdDpGs3vHK1LpOyYooimX8ttWa4KAkMuP+O5uXH1TJabry6o/cRwYisg2k6PBSy8gxw== +"@sentry/hub@5.22.3", "@sentry/hub@^5.21.1": + version "5.22.3" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.22.3.tgz#08309a70d2ea8d5e313d05840c1711f34f2fffe5" + integrity sha512-INo47m6N5HFEs/7GMP9cqxOIt7rmRxdERunA3H2L37owjcr77MwHVeeJ9yawRS6FMtbWXplgWTyTIWIYOuqVbw== dependencies: - "@sentry/types" "5.19.0" - "@sentry/utils" "5.19.0" + "@sentry/types" "5.22.3" + "@sentry/utils" "5.22.3" tslib "^1.9.3" -"@sentry/integrations@^5.16.1": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.19.0.tgz#2efe8eaa8d1c26ba92f99af941c9dd922efbb94e" - integrity sha512-vCmej1zfumVRKnxKw0RlwVjZ/TWBJZTAWIzqoAxXZyo67bKRy3fP408nj0QL5QAWKw+sUelqvzNqvY94cy+b0w== +"@sentry/integrations@^5.21.1": + version "5.22.3" + resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.22.3.tgz#ecec954d1d8802930baf824cac4cd2a51c8691cb" + integrity sha512-Fx6h8DTDvUpEOymx8Wi49LBdVcNYHwaI6NqApm1qVU9qn/I50Q29KWoZTCGBjBwmkJud+DOAHWYWoU2qRrIvcQ== dependencies: - "@sentry/types" "5.19.0" - "@sentry/utils" "5.19.0" + "@sentry/types" "5.22.3" + "@sentry/utils" "5.22.3" + localforage "1.8.1" tslib "^1.9.3" -"@sentry/minimal@5.19.0": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.19.0.tgz#aa5a700618608ea79d270280fe77f04bbb44ed5a" - integrity sha512-3FHgirwOuOMF4VlwHboYObPT9c0S9b9y5FW0DGgNt8sJPezS00VaJti/38ZwOHQJ4fJ6ubt/Y3Kz0eBTVxMCCQ== +"@sentry/minimal@5.22.3": + version "5.22.3" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.22.3.tgz#706e4029ae5494123d3875c658ba8911aa5cc440" + integrity sha512-HoINpYnVYCpNjn2XIPIlqH5o4BAITpTljXjtAftOx6Hzj+Opjg8tR8PWliyKDvkXPpc4kXK9D6TpEDw8MO0wZA== dependencies: - "@sentry/hub" "5.19.0" - "@sentry/types" "5.19.0" + "@sentry/hub" "5.22.3" + "@sentry/types" "5.22.3" tslib "^1.9.3" "@sentry/react-native@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-1.5.0.tgz#3ac13d3bbff4c5924cd5ff93d645e949abbbcd60" - integrity sha512-SvcS34fRU74nZIcA9VcyCHKcASTvu8+UW5D2tQ/rQ7+mLsevPKTMiFvYc2yOtxu6dktWa9yM85Jg5J74VchjFw== - dependencies: - "@sentry/browser" "^5.16.1" - "@sentry/core" "^5.16.1" - "@sentry/hub" "^5.16.1" - "@sentry/integrations" "^5.16.1" - "@sentry/types" "^5.16.1" - "@sentry/utils" "^5.16.1" + version "1.7.2" + resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-1.7.2.tgz#4cfe289d54f6687b6e84b8e22574166c817124f5" + integrity sha512-M7tXZ+vW/JLi3gYgZsdEVVEUPWIC8QXTYHwipH2J5CA9T9luYausmBk4xttmMe/p5Mu8pgU9vpsq9zpz4gSMWQ== + dependencies: + "@sentry/browser" "^5.21.1" + "@sentry/core" "^5.21.1" + "@sentry/hub" "^5.21.1" + "@sentry/integrations" "^5.21.1" + "@sentry/react" "^5.21.1" + "@sentry/types" "^5.21.1" + "@sentry/utils" "^5.21.1" "@sentry/wizard" "^1.1.4" -"@sentry/types@5.19.0", "@sentry/types@^5.16.1": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.19.0.tgz#30c6a05040b644d90337ef8b50d9d59c0872744d" - integrity sha512-NlHLS9mwCEimKUA5vClAwVhXFLsqSF3VJEXU+K61fF6NZx8zfJi/HTrIBtoM4iNSAt9o4XLQatC1liIpBC06tg== +"@sentry/react@^5.21.1": + version "5.22.3" + resolved "https://registry.yarnpkg.com/@sentry/react/-/react-5.22.3.tgz#ed692f9e2aff718da6cd15d2941ddda4f1d63385" + integrity sha512-Or/tLayuxpOJhIWOXiDKdaJQZ981uRS9NT0QcPvU+Si1qTElSqtH1zB94GlwhgpglkbmLPiYq6VPrG2HOiZ79Q== + dependencies: + "@sentry/browser" "5.22.3" + "@sentry/minimal" "5.22.3" + "@sentry/types" "5.22.3" + "@sentry/utils" "5.22.3" + hoist-non-react-statics "^3.3.2" + tslib "^1.9.3" + +"@sentry/types@5.22.3", "@sentry/types@^5.21.1": + version "5.22.3" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.22.3.tgz#d1d547b30ee8bd7771fa893af74c4f3d71f0fd18" + integrity sha512-cv+VWK0YFgCVDvD1/HrrBWOWYG3MLuCUJRBTkV/Opdy7nkdNjhCAJQrEyMM9zX0sac8FKWKOHT0sykNh8KgmYw== -"@sentry/utils@5.19.0", "@sentry/utils@^5.16.1": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.19.0.tgz#0e01f84aa67a1cf2ec71faab670230918ea7e9aa" - integrity sha512-EU/T9aJrI8isexRnyDx5InNw/HjSQ0nKI7YWdiwfFrJusqQ/uisnCGK7vw6gGHDgiAHMXW3TJ38NHpNBin6y7Q== +"@sentry/utils@5.22.3", "@sentry/utils@^5.21.1": + version "5.22.3" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.22.3.tgz#e3bda3e789239eb16d436f768daa12829f33d18f" + integrity sha512-AHNryXMBvIkIE+GQxTlmhBXD0Ksh+5w1SwM5qi6AttH+1qjWLvV6WB4+4pvVvEoS8t5F+WaVUZPQLmCCWp6zKw== dependencies: - "@sentry/types" "5.19.0" + "@sentry/types" "5.22.3" tslib "^1.9.3" "@sentry/wizard@^1.0.1", "@sentry/wizard@^1.1.4": @@ -3403,9 +3504,9 @@ yargs "^12.0.2" "@sinonjs/commons@^1", "@sinonjs/commons@^1.3.0", "@sinonjs/commons@^1.4.0", "@sinonjs/commons@^1.7.0": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d" - integrity sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q== + version "1.8.1" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217" + integrity sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw== dependencies: type-detect "4.0.8" @@ -3554,16 +3655,16 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.0.12" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.12.tgz#22f49a028e69465390f87bb103ebd61bd086b8f5" - integrity sha512-t4CoEokHTfcyfb4hUaF9oOHu9RmmNWnm1CP0YmMqOOfClKascOmvlEM736vlqeScuGvBDsHkf8R2INd4DWreQA== + version "7.0.13" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.13.tgz#1874914be974a492e1b4cb00585cabb274e8ba18" + integrity sha512-i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ== dependencies: "@babel/types" "^7.3.0" "@types/cheerio@*": - version "0.22.18" - resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.18.tgz#19018dceae691509901e339d63edf1e935978fe6" - integrity sha512-Fq7R3fINAPSdUEhOyjG4iVxgHrOnqDJbY0/BUuiN0pvD/rfmZWekVZnv+vcs8TtpA2XF50uv50LaE4EnpEL/Hw== + version "0.22.21" + resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.21.tgz#5e37887de309ba11b2e19a6e14cad7874b31a8a3" + integrity sha512-aGI3DfswwqgKPiEOTaiHV2ZPC9KEhprpgEbJnv0fZl3SGX0cGgEva1126dGrMC6AJM6v/aihlUgJn9M5DbDZ/Q== dependencies: "@types/node" "*" @@ -3625,9 +3726,9 @@ "@types/geojson" "*" "@types/d3-dispatch@*": - version "1.0.7" - resolved "https://registry.yarnpkg.com/@types/d3-dispatch/-/d3-dispatch-1.0.7.tgz#6721aefbb9862ce78c20a87a1490c21f57c3ed7f" - integrity sha512-M+z84G7UKwK6hEPnGCSccOg8zJ3Nk2hgDQ9sCstHXgsFU0sMxlIZVKqKB5oxUDbALqQG6ucg0G9e8cmOSlishg== + version "1.0.8" + resolved "https://registry.yarnpkg.com/@types/d3-dispatch/-/d3-dispatch-1.0.8.tgz#eaeb2ad089d6a0d2685dfa2f2cbbfb7509aae014" + integrity sha512-lCDtqoYez0TgFN3FljBXrz2icqeSzD0gufGook6DPBia+NOh2TBfogjHIsmNa/a+ZOewlHtq4cgLY80O1uLymw== "@types/d3-drag@*": version "1.2.3" @@ -3715,9 +3816,9 @@ "@types/d3-time" "*" "@types/d3-selection@*": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@types/d3-selection/-/d3-selection-1.4.1.tgz#fa1f8710a6b5d7cfe5c6caa61d161be7cae4a022" - integrity sha512-bv8IfFYo/xG6dxri9OwDnK3yCagYPeRIjTlrcdYJSx+FDWlCeBDepIHUpqROmhPtZ53jyna0aUajZRk0I3rXNA== + version "1.4.2" + resolved "https://registry.yarnpkg.com/@types/d3-selection/-/d3-selection-1.4.2.tgz#72dcd61a3aeb9ce3e8d443e3bef7685ffea3413f" + integrity sha512-ksY8UxvTXpzD91Dy3D9zZg98yF2ZEPMKJd8ZQJlZt1QH3Xxr08s6fESEdC2l0Kbe6Xd9VhaoJX06cRaMR1lEnA== "@types/d3-shape@*": version "1.3.2" @@ -3831,9 +3932,9 @@ integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ== "@types/glob@^7.1.1": - version "7.1.2" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.2.tgz#06ca26521353a545d94a0adc74f38a59d232c987" - integrity sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA== + version "7.1.3" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" + integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== dependencies: "@types/minimatch" "*" "@types/node" "*" @@ -3883,6 +3984,21 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report" "*" +"@types/istanbul-reports@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" + integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== + dependencies: + "@types/istanbul-lib-report" "*" + +"@types/jest@26.x": + version "26.0.10" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.10.tgz#8faf7e9756c033c39014ae76a7329efea00ea607" + integrity sha512-i2m0oyh8w/Lum7wWK/YOZJakYF8Mx08UaKA1CtbmFeDquVhAEdA7znacsVSf2hJ1OQ/OfVMGN90pw/AtzF8s/Q== + dependencies: + jest-diff "^25.2.1" + pretty-format "^25.2.1" + "@types/jest@^25.2.2": version "25.2.3" resolved "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.3.tgz#33d27e4c4716caae4eced355097a47ad363fdcaf" @@ -3909,9 +4025,9 @@ "@types/lodash" "*" "@types/lodash@*", "@types/lodash@^4.14.144": - version "4.14.157" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.157.tgz#fdac1c52448861dfde1a2e1515dbc46e54926dc8" - integrity sha512-Ft5BNFmv2pHDgxV5JDsndOWTRJ+56zte0ZpYLowp03tW+K+t8u8YMOzAnpuqPgzX6WO1XpDIUm7u04M8vdDiVQ== + version "4.14.161" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.161.tgz#a21ca0777dabc6e4f44f3d07f37b765f54188b18" + integrity sha512-EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA== "@types/minimatch@*": version "3.0.3" @@ -3919,9 +4035,9 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "14.0.14" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.14.tgz#24a0b5959f16ac141aeb0c5b3cd7a15b7c64cbce" - integrity sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ== + version "14.6.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.2.tgz#264b44c5a28dfa80198fc2f7b6d3c8a054b9491f" + integrity sha512-onlIwbaeqvZyniGPfdw/TEhKIh79pz66L1q06WUQqJLnAb6wbjvOtepLYTGHTqzdXgBYIE3ZdmqHDGsRsbBz7A== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -3934,9 +4050,9 @@ integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== "@types/prettier@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.1.tgz#b6e98083f13faa1e5231bfa3bdb1b0feff536b6d" - integrity sha512-boy4xPNEtiw6N3abRhBi/e7hNvy3Tt8E9ZRAQrwAGzoCGZS/1wjo9KY7JHhnfnEsG5wSjDbymCozUM9a3ea7OQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.0.tgz#5f96562c1075ee715a5b138f0b7f591c1f40f6b8" + integrity sha512-hiYA88aHiEIgDmeKlsyVsuQdcFn3Z2VuFd/Xm/HCnGnPD8UFU5BM128uzzRVVGEzKDKYUrRsRH9S2o+NUy/3IA== "@types/prop-types@*": version "15.7.3" @@ -3948,10 +4064,17 @@ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== -"@types/react-native@*", "@types/react-native@^0.62.10": - version "0.62.16" - resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.62.16.tgz#17b05b37482c70126055172e57f5eb110cff7087" - integrity sha512-0f5MF4zzqZpZpDmwTmGS0Pd206k2K3rsVjaz0/iuBPZkpWC9r8+/A6WvTTJXgfP2mhRUcMfAqEY0iyz7Xk75qw== +"@types/react-native@*": + version "0.63.11" + resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.63.11.tgz#0965552aa4cfe8a7c0c64f1afb1c101d2fa7510a" + integrity sha512-OjYwDiMZGENGd5P+su0OZY0t0ctTnmmToS/mJOAErktpZWqfDj99Q2hy3M09tQj+h2KnpsT+WUPozUKoossSxw== + dependencies: + "@types/react" "*" + +"@types/react-native@^0.62.10": + version "0.62.18" + resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.62.18.tgz#ad63691e7c44edef2beeb6af52b2eb942c3ed8a1" + integrity sha512-7QfU8EzIYxYqeXpPf8QNv2xi8hrePlgTbRATRo+plRSdVfJu7N6sAXqrFxKJp6bGLvp82GV1gczl93gqiAfXPA== dependencies: "@types/react" "*" @@ -3973,19 +4096,19 @@ redux "^4.0.0" "@types/react-test-renderer@^16.9.2": - version "16.9.2" - resolved "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-16.9.2.tgz#e1c408831e8183e5ad748fdece02214a7c2ab6c5" - integrity sha512-4eJr1JFLIAlWhzDkBCkhrOIWOvOxcCAfQh+jiKg7l/nNZcCIL2MHl2dZhogIFKyHzedVWHaVP1Yydq/Ruu4agw== + version "16.9.3" + resolved "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-16.9.3.tgz#96bab1860904366f4e848b739ba0e2f67bcae87e" + integrity sha512-wJ7IlN5NI82XMLOyHSa+cNN4Z0I+8/YaLl04uDgcZ+W+ExWCmCiVTLT/7fRNqzy4OhStZcUwIqLNF7q+AdW43Q== dependencies: "@types/react" "*" "@types/react@*", "@types/react@^16.9.19": - version "16.9.41" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.41.tgz#925137ee4d2ff406a0ecf29e8e9237390844002e" - integrity sha512-6cFei7F7L4wwuM+IND/Q2cV1koQUvJ8iSV+Gwn0c3kvABZ691g7sp3hfEQHOUBJtccl1gPi+EyNjMIl9nGA0ug== + version "16.9.48" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.48.tgz#d3387329f070d1b1bc0ff4a54a54ceefd5a8485c" + integrity sha512-4ykBVswgYitPGMXFRxJCHkxJDU2rjfU3/zw67f8+dB7sNdVJXsrwqoYxz/stkAucymnEEbRPFmX7Ce5Mc/kJCw== dependencies: "@types/prop-types" "*" - csstype "^2.2.0" + csstype "^3.0.2" "@types/redux-mock-store@^1.0.2": version "1.0.2" @@ -4000,14 +4123,14 @@ integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== "@types/styled-components@^5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.0.tgz#24d3412ba5395aa06e14fbc93c52f9454cebd0d6" - integrity sha512-ZFlLCuwF5r+4Vb7JUmd+Yr2S0UBdBGmI7ctFTgJMypIp3xOHI4LCFVn2dKMvpk6xDB2hLRykrEWMBwJEpUAUIQ== + version "5.1.2" + resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.2.tgz#652af475b4af917b355ea1c3068acae63d46455f" + integrity sha512-HNocYLfrsnNNm8NTS/W53OERSjRA8dx5Bn6wBd2rXXwt4Z3s+oqvY6/PbVt3e6sgtzI63GX//WiWiRhWur08qQ== dependencies: "@types/hoist-non-react-statics" "*" "@types/react" "*" "@types/react-native" "*" - csstype "^2.2.0" + csstype "^3.0.2" "@types/uuid@^7.0.3": version "7.0.4" @@ -4020,9 +4143,9 @@ integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== "@types/yargs@^13.0.0": - version "13.0.9" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.9.tgz#44028e974343c7afcf3960f1a2b1099c39a7b5e1" - integrity sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg== + version "13.0.10" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.10.tgz#e77bf3fc73c781d48c2eb541f87c453e321e5f4b" + integrity sha512-MU10TSgzNABgdzKvQVW1nuuT+sgBMWeXNc3XOs5YXV5SDAK+PPja2eUuBNB9iqElu03xyEDqlnGw0jgl4nbqGQ== dependencies: "@types/yargs-parser" "*" @@ -4039,51 +4162,51 @@ integrity sha512-0Sir2LxOmupF8HBUvpJoZghLmOqKfZsBk1GYlMwSIccLDDUoN04LHvo0KzDp9qxt1IKf9Fudpj35SrJ8VqetkQ== "@typescript-eslint/eslint-plugin@^3.5.0": - version "3.5.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.5.0.tgz#e7736e0808b5fb947a5f9dd949ae6736a7226b84" - integrity sha512-m4erZ8AkSjoIUOf8s4k2V1xdL2c1Vy0D3dN6/jC9d7+nEqjY3gxXCkgi3gW/GAxPaA4hV8biaCoTVdQmfAeTCQ== + version "3.10.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.1.tgz#7e061338a1383f59edc204c605899f93dc2e2c8f" + integrity sha512-PQg0emRtzZFWq6PxBcdxRH3QIQiyFO3WCVpRL3fgj5oQS3CDs3AeAKfv4DxNhzn8ITdNJGJ4D3Qw8eAJf3lXeQ== dependencies: - "@typescript-eslint/experimental-utils" "3.5.0" + "@typescript-eslint/experimental-utils" "3.10.1" debug "^4.1.1" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@3.5.0": - version "3.5.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.5.0.tgz#d09f9ffb890d1b15a7ffa9975fae92eee05597c4" - integrity sha512-zGNOrVi5Wz0jcjUnFZ6QUD0MCox5hBuVwemGCew2qJzUX5xPoyR+0EzS5qD5qQXL/vnQ8Eu+nv03tpeFRwLrDg== +"@typescript-eslint/experimental-utils@3.10.1": + version "3.10.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz#e179ffc81a80ebcae2ea04e0332f8b251345a686" + integrity sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/types" "3.5.0" - "@typescript-eslint/typescript-estree" "3.5.0" + "@typescript-eslint/types" "3.10.1" + "@typescript-eslint/typescript-estree" "3.10.1" eslint-scope "^5.0.0" eslint-utils "^2.0.0" "@typescript-eslint/parser@^3.5.0": - version "3.5.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.5.0.tgz#9ff8c11877c48df24e10e19d7bf542ee0359500d" - integrity sha512-sU07VbYB70WZHtgOjH/qfAp1+OwaWgrvD1Km1VXqRpcVxt971PMTU7gJtlrCje0M+Sdz7xKAbtiyIu+Y6QdnVA== + version "3.10.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.10.1.tgz#1883858e83e8b442627e1ac6f408925211155467" + integrity sha512-Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "3.5.0" - "@typescript-eslint/types" "3.5.0" - "@typescript-eslint/typescript-estree" "3.5.0" + "@typescript-eslint/experimental-utils" "3.10.1" + "@typescript-eslint/types" "3.10.1" + "@typescript-eslint/typescript-estree" "3.10.1" eslint-visitor-keys "^1.1.0" -"@typescript-eslint/types@3.5.0": - version "3.5.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.5.0.tgz#4e3d2a2272268d8ec3e3e4a37152a64956682639" - integrity sha512-Dreqb5idi66VVs1QkbAwVeDmdJG+sDtofJtKwKCZXIaBsINuCN7Jv5eDIHrS0hFMMiOvPH9UuOs4splW0iZe4Q== +"@typescript-eslint/types@3.10.1": + version "3.10.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727" + integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ== -"@typescript-eslint/typescript-estree@3.5.0": - version "3.5.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.5.0.tgz#dfc895db21a381b84f24c2a719f5bf9c600dcfdc" - integrity sha512-Na71ezI6QP5WVR4EHxwcBJgYiD+Sre9BZO5iJK2QhrmRPo/42+b0no/HZIrdD1sjghzlYv7t+7Jis05M1uMxQg== +"@typescript-eslint/typescript-estree@3.10.1": + version "3.10.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz#fd0061cc38add4fad45136d654408569f365b853" + integrity sha512-QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w== dependencies: - "@typescript-eslint/types" "3.5.0" - "@typescript-eslint/visitor-keys" "3.5.0" + "@typescript-eslint/types" "3.10.1" + "@typescript-eslint/visitor-keys" "3.10.1" debug "^4.1.1" glob "^7.1.6" is-glob "^4.0.1" @@ -4091,10 +4214,10 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@3.5.0": - version "3.5.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.5.0.tgz#73c1ea2582f814735e4afdc1cf6f5e3af78db60a" - integrity sha512-7cTp9rcX2sz9Z+zua9MCOX4cqp5rYyFD5o8LlbSpXrMTXoRdngTtotRZEkm8+FNMHPWYFhitFK+qt/brK8BVJQ== +"@typescript-eslint/visitor-keys@3.10.1": + version "3.10.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz#cd4274773e3eb63b2e870ac602274487ecd1e931" + integrity sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ== dependencies: eslint-visitor-keys "^1.1.0" @@ -4120,9 +4243,9 @@ integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== abab@^2.0.0, abab@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a" - integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg== + version "2.0.4" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.4.tgz#6dfa57b417ca06d21b2478f0e638302f99c2405c" + integrity sha512-Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ== abort-controller@^3.0.0: version "3.0.0" @@ -4191,26 +4314,26 @@ acorn@^6.0.1: integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== acorn@^7.1.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd" - integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA== + version "7.4.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c" + integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w== agent-base@6: - version "6.0.0" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.0.tgz#5d0101f19bbfaed39980b22ae866de153b93f09a" - integrity sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw== + version "6.0.1" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.1.tgz#808007e4e5867decb0ab6ab2f928fbdb5a596db4" + integrity sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg== dependencies: debug "4" aggregate-error@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0" - integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== dependencies: clean-stack "^2.0.0" indent-string "^4.0.0" -airbnb-prop-types@^2.15.0: +airbnb-prop-types@^2.16.0: version "2.16.0" resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz#b96274cefa1abb14f623f804173ee97c13971dc2" integrity sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg== @@ -4225,29 +4348,29 @@ airbnb-prop-types@^2.15.0: prop-types-exact "^1.2.0" react-is "^16.13.1" -ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5: - version "6.12.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd" - integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ== +ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3: + version "6.12.4" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234" + integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ== dependencies: fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.4.1" uri-js "^4.2.2" -amazon-cognito-identity-js@^4.2.1, amazon-cognito-identity-js@^4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/amazon-cognito-identity-js/-/amazon-cognito-identity-js-4.3.2.tgz#55d53277e606bde372d780f2ec31c739d28d32a1" - integrity sha512-7rM/lJnIX4EeUzVbmZX8eYAtR0Tehf3UQ4zvNQCrs0qpXYaOAPF0VVbt0Dc3Qn6zTFvD/R8jMmLs6dLFfi2b6A== +amazon-cognito-identity-js@^4.2.1, amazon-cognito-identity-js@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/amazon-cognito-identity-js/-/amazon-cognito-identity-js-4.3.4.tgz#e21afbe79ee16a2cb8e2804635d68fee97157a5a" + integrity sha512-GO6tOjH6ySiPI0+3UwqLzpdH6nCKQPMm6SYiFZzQCSVblztQ1AEK8HBAFKClz5bhNx66eJlXq86aa7f9aun29w== dependencies: buffer "4.9.1" crypto-js "^3.3.0" - js-cookie "^2.1.4" + js-cookie "^2.2.1" anser@^1.4.9: - version "1.4.9" - resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.9.tgz#1f85423a5dcf8da4631a341665ff675b96845760" - integrity sha512-AI+BjTeGt2+WFk4eWcqbQ7snZpDBt8SaLlj0RT2h5xfdWaiy51OjYvqwMrNzJLGy8iOAL6nKDITWO+rd4MkYEA== + version "1.4.10" + resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.10.tgz#befa3eddf282684bd03b63dcda3927aef8c2e35b" + integrity sha512-hCv9AqTQ8ycjpSd3upOJd7vFwW1JaoYQ7tpham03GJ1ca8/65rqn0RpaWpItOAd6ylW9wAw6luXYPJIyPFVOww== ansi-align@^2.0.0: version "2.0.0" @@ -4263,10 +4386,10 @@ ansi-colors@^1.0.1: dependencies: ansi-wrap "^0.1.0" -ansi-colors@^3.2.1: - version "3.2.4" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" - integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== +ansi-colors@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== ansi-cyan@^0.1.1: version "0.1.1" @@ -4626,32 +4749,32 @@ available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2: array-filter "^1.0.0" aws-amplify-react-native@^4.0.3: - version "4.2.1" - resolved "https://registry.yarnpkg.com/aws-amplify-react-native/-/aws-amplify-react-native-4.2.1.tgz#f6811f96ab655051241041c24758a69b64cccf27" - integrity sha512-J08OL5f8irWPDYbcgUYTS/cmNBBmHgf4hpmNvqGDJdcXpSIbnRR+nFQQXDVkvyJ5UJQnfgMpUXpBEASfSMBUow== + version "4.2.5" + resolved "https://registry.yarnpkg.com/aws-amplify-react-native/-/aws-amplify-react-native-4.2.5.tgz#09a07ffbf2d8b7ec1eb71303439584b420194218" + integrity sha512-Y+3pCEJGT/5RVi1xnY0xwSqEFpy6nOvBwX2THOW0K2rOXT7b5i0YmZeqvHrvHb6erGgvumb+RZ6aGwgDH6QoCg== dependencies: babel-preset-es2015 "^6.24.1" buffer "^5.2.1" react-native-elements "^0.19.1" - react-native-vector-icons "^6.6.0" + react-native-vector-icons "6.6.0" aws-amplify@^3.0.7: - version "3.0.18" - resolved "https://registry.yarnpkg.com/aws-amplify/-/aws-amplify-3.0.18.tgz#d05a71a9c5368c98a97ec6c30b4ade64722ca6c4" - integrity sha512-WegABxg3fGsynZTdtPlTVbG32DZlS5j7oUYVDnXlwDnU/KvBzgKhmdnGrJU6MdTQIVN6QCDSgTHHOK9iJaXq6A== - dependencies: - "@aws-amplify/analytics" "^3.2.1" - "@aws-amplify/api" "^3.1.17" - "@aws-amplify/auth" "^3.2.14" - "@aws-amplify/cache" "^3.1.17" - "@aws-amplify/core" "^3.4.0" - "@aws-amplify/datastore" "^2.2.4" - "@aws-amplify/interactions" "^3.1.17" - "@aws-amplify/predictions" "^3.1.17" - "@aws-amplify/pubsub" "^3.0.18" - "@aws-amplify/storage" "^3.2.7" + version "3.0.24" + resolved "https://registry.yarnpkg.com/aws-amplify/-/aws-amplify-3.0.24.tgz#083d1ab58a585c18dc3bab06fe2dc2339473bf47" + integrity sha512-WQDxD+5sVdfHHPY31jmDMWlEshvMewovCs15h/ugUak61Anv/x5Z3Kf2klxeiVx6KPZ+/aGCNNw66b1YjRB1Sg== + dependencies: + "@aws-amplify/analytics" "^3.2.7" + "@aws-amplify/api" "^3.1.23" + "@aws-amplify/auth" "^3.3.5" + "@aws-amplify/cache" "^3.1.23" + "@aws-amplify/core" "^3.4.6" + "@aws-amplify/datastore" "^2.2.10" + "@aws-amplify/interactions" "^3.1.23" + "@aws-amplify/predictions" "^3.1.23" + "@aws-amplify/pubsub" "^3.0.24" + "@aws-amplify/storage" "^3.2.13" "@aws-amplify/ui" "^2.0.2" - "@aws-amplify/xr" "^2.1.17" + "@aws-amplify/xr" "^2.1.23" aws-sign2@~0.7.0: version "0.7.0" @@ -4659,9 +4782,9 @@ aws-sign2@~0.7.0: integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= aws4@^1.8.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2" - integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA== + version "1.10.1" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428" + integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA== axe-core@^3.5.4: version "3.5.5" @@ -4812,16 +4935,16 @@ babel-helper-replace-supers@^6.24.1: babel-traverse "^6.24.1" babel-types "^6.24.1" -babel-jest@^26.0.1, babel-jest@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.1.0.tgz#b20751185fc7569a0f135730584044d1cb934328" - integrity sha512-Nkqgtfe7j6PxLO6TnCQQlkMm8wdTdnIF8xrdpooHCuD5hXRzVEPbPneTJKknH5Dsv3L8ip9unHDAp48YQ54Dkg== +babel-jest@^26.0.1, babel-jest@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.3.0.tgz#10d0ca4b529ca3e7d1417855ef7d7bd6fc0c3463" + integrity sha512-sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g== dependencies: - "@jest/transform" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/transform" "^26.3.0" + "@jest/types" "^26.3.0" "@types/babel__core" "^7.1.7" babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^26.1.0" + babel-preset-jest "^26.3.0" chalk "^4.0.0" graceful-fs "^4.2.4" slash "^3.0.0" @@ -4875,10 +4998,10 @@ babel-plugin-istanbul@^6.0.0: istanbul-lib-instrument "^4.0.0" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.1.0.tgz#c6a774da08247a28285620a64dfadbd05dd5233a" - integrity sha512-qhqLVkkSlqmC83bdMhM8WW4Z9tB+JkjqAqlbbohS9sJLT5Ha2vfzuKqg5yenXrAjOPG2YC0WiXdH3a9PvB+YYw== +babel-plugin-jest-hoist@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz#bdd0011df0d3d513e5e95f76bd53b51147aca2dd" + integrity sha512-B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" @@ -4912,9 +5035,9 @@ babel-plugin-react-transform@2.0.2: lodash "^4.6.1" "babel-plugin-styled-components@>= 1", babel-plugin-styled-components@^1.10.7: - version "1.10.7" - resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.10.7.tgz#3494e77914e9989b33cc2d7b3b29527a949d635c" - integrity sha512-MBMHGcIA22996n9hZRf/UJLVVgkEOITuR2SvjHLb5dSTUyR4ZRGn+ngITapes36FI3WLxZHfRhkA1ffHxihOrg== + version "1.11.1" + resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz#5296a9e557d736c3186be079fff27c6665d63d76" + integrity sha512-YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA== dependencies: "@babel/helper-annotate-as-pure" "^7.0.0" "@babel/helper-module-imports" "^7.0.0" @@ -5341,7 +5464,7 @@ babel-preset-airbnb@^4.1.0: "@babel/preset-react" "^7.9.4" babel-plugin-transform-react-remove-prop-types "^0.4.24" -babel-preset-current-node-syntax@^0.1.2: +babel-preset-current-node-syntax@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz#b4b547acddbf963cba555ba9f9cbbb70bfd044da" integrity sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ== @@ -5421,13 +5544,13 @@ babel-preset-fbjs@^3.2.0, babel-preset-fbjs@^3.3.0: "@babel/plugin-transform-template-literals" "^7.0.0" babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0" -babel-preset-jest@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.1.0.tgz#612f714e5b457394acfd863793c564cbcdb7d1c1" - integrity sha512-na9qCqFksknlEj5iSdw1ehMVR06LCCTkZLGKeEtxDDdhg8xpUF09m29Kvh1pRbZ07h7AQ5ttLYUwpXL4tO6w7w== +babel-preset-jest@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz#ed6344506225c065fd8a0b53e191986f74890776" + integrity sha512-5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw== dependencies: - babel-plugin-jest-hoist "^26.1.0" - babel-preset-current-node-syntax "^0.1.2" + babel-plugin-jest-hoist "^26.2.0" + babel-preset-current-node-syntax "^0.1.3" babel-preset-react-native-stage-0@^1.0.1: version "1.0.1" @@ -5633,9 +5756,9 @@ bindings@^1.5.0: file-uri-to-path "1.0.0" blueimp-md5@^2.10.0: - version "2.16.0" - resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.16.0.tgz#9018bb805e4ee05512e0e8cbdb9305eeecbdc87c" - integrity sha512-j4nzWIqEFpLSbdhUApHRGDwfXbV8ALhqOn+FY5L6XBdKPAXU9BpGgFSbDsgqogfqPPR9R2WooseWCsfhfEC6uQ== + version "2.17.0" + resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.17.0.tgz#f4fcac088b115f7b4045f19f5da59e9d01b1bb96" + integrity sha512-x5PKJHY5rHQYaADj6NwPUR2QRCUVSggPzrUKkeENpj871o9l9IefJbO2jkT5UvYykeOK9dx0VmkIo6dZ+vThYw== boolbase@^1.0.0, boolbase@~1.0.0: version "1.0.0" @@ -5706,14 +5829,14 @@ browser-process-hrtime@^1.0.0: integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== browserslist@^4.12.0, browserslist@^4.8.5: - version "4.12.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.2.tgz#76653d7e4c57caa8a1a28513e2f4e197dc11a711" - integrity sha512-MfZaeYqR8StRZdstAK9hCKDd2StvePCYp5rHzQCPicUjfFliDgmuaBNPHYUTpAywBN8+Wc/d7NYVFkO0aqaBUw== + version "4.14.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.0.tgz#2908951abfe4ec98737b72f34c3bcedc8d43b000" + integrity sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ== dependencies: - caniuse-lite "^1.0.30001088" - electron-to-chromium "^1.3.483" - escalade "^3.0.1" - node-releases "^1.1.58" + caniuse-lite "^1.0.30001111" + electron-to-chromium "^1.3.523" + escalade "^3.0.2" + node-releases "^1.1.60" bs-logger@0.x: version "0.2.6" @@ -5871,10 +5994,10 @@ camelize@^1.0.0: resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b" integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs= -caniuse-lite@^1.0.30001088: - version "1.0.30001091" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001091.tgz#84908c67b98e02c2a56d4afa51e6458b53fb5321" - integrity sha512-ECd8gfBBpv0GKsEYY5052+8PBjExiugDoi3dfkJcxujh2mf7kiuDvb1o27GXlOOGopKiIPYEX8XDPYj7eo3E9w== +caniuse-lite@^1.0.30001111: + version "1.0.30001120" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001120.tgz#cd21d35e537214e19f7b9f4f161f7b0f2710d46c" + integrity sha512-JBP68okZs1X8D7MQTY602jxMYBmXEKOFkzTBaNSkubooMPFOAv2TXWaKle7qgHpjLDhUzA/TMT0qsNleVyXGUQ== capture-exit@^2.0.0: version "2.0.0" @@ -5921,7 +6044,7 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0: +chalk@^4.0.0, chalk@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== @@ -6013,11 +6136,11 @@ cli-cursor@^3.1.0: restore-cursor "^3.1.0" cli-spinners@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.3.0.tgz#0632239a4b5aa4c958610142c34bb7a651fc8df5" - integrity sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w== + version "2.4.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.4.0.tgz#c6256db216b878cfba4720e719cec7cf72685d7f" + integrity sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA== -cli-truncate@2.1.0, cli-truncate@^2.1.0: +cli-truncate@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== @@ -6030,6 +6153,11 @@ cli-width@^2.0.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== +cli-width@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" + integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== + cliui@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" @@ -6156,9 +6284,9 @@ color@^3.1.2: color-string "^1.5.2" colorette@^1.0.7: - version "1.2.0" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.0.tgz#45306add826d196e8c87236ac05d797f25982e63" - integrity sha512-soRSroY+OF/8OdA3PTQXwaDJeMc7TfknKKrxeSCencL2a4+Tx5zhxmmv7hdpCjhKBjehzp8+bwe/T68K0hpIjw== + version "1.2.1" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" + integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== colors@0.6.x: version "0.6.2" @@ -6182,10 +6310,10 @@ commander@2, commander@^2.12.1, commander@^2.18.0, commander@^2.19.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" - integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== +commander@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-6.1.0.tgz#f8d722b78103141006b66f4c7ba1e97315ba75bc" + integrity sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA== commander@~2.13.0: version "2.13.0" @@ -6255,11 +6383,11 @@ concat-stream@^1.6.0: typedarray "^0.0.6" configstore@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" - integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw== + version "3.1.5" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.5.tgz#e9af331fadc14dabd544d3e7e76dc446a09a530f" + integrity sha512-nlOhI4+fdzoK5xmJ+NY+1gZK56bwEaWZr8fYuXohZ9Vkc1o3a4T/R3M+yE/w7x/ZVJ1zF8c+oaOvF0dztdUgmA== dependencies: - dot-prop "^4.1.0" + dot-prop "^4.2.1" graceful-fs "^4.1.2" make-dir "^1.0.0" unique-string "^1.0.0" @@ -6287,21 +6415,21 @@ contains-path@^0.1.0: integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= contentful-management@^5.12.0: - version "5.27.3" - resolved "https://registry.yarnpkg.com/contentful-management/-/contentful-management-5.27.3.tgz#87fe50b0b783c060bd7866c2d8d147f70e9f67aa" - integrity sha512-6G9DtSgHzIwqz0nuGccOXtR/p1QdwKQtxCSUKxevXXM0ZDSKCXzU7oMb/s7qRaqIVG8dmnlGg1C8zC4x9/WpOA== + version "5.28.0" + resolved "https://registry.yarnpkg.com/contentful-management/-/contentful-management-5.28.0.tgz#f3b58d60400d66e42439bbd9085cecb0e486f0bb" + integrity sha512-o+qihN3zrD6+/BT/e8n26jl/zQvmV6+9S6NY5QDmzM+IaiSeCk6yvPMq74s+IZT9mOS54igl6qFTbeIpdJ9FDA== dependencies: axios "^0.19.0" contentful-sdk-core "^6.4.0" lodash "^4.17.11" type-fest "0.15.1" -contentful-resolve-response@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/contentful-resolve-response/-/contentful-resolve-response-1.1.4.tgz#9eb656876eecb2cd00444f0adf26bd91a5ec1992" - integrity sha512-oFq6n6zjbiwD9/7mBa8YHPwvPM0B0D4uOgg1n/rVzpQPhCrzeIixNj6fbJAbDiJt05rZqxiY3K1Db7pPRhRaZw== +contentful-resolve-response@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/contentful-resolve-response/-/contentful-resolve-response-1.2.2.tgz#3f83a5f4742854de740e250a11020b4fb646da91" + integrity sha512-KyRz05f2YFJDSFs/L5jtsptbL5Fk3+ukSjRF94zFXq0FOtYoaxyCbqKgHhK2+3hlipxVQ+KGRus/tSaD6PoPMg== dependencies: - lodash "^4.17.4" + lodash "^4.17.15" contentful-sdk-core@^6.4.0, contentful-sdk-core@^6.4.5: version "6.4.5" @@ -6321,12 +6449,12 @@ contentful-typescript-codegen@^3.0.0: meow "^5.0.0" contentful@^7.13.1: - version "7.14.5" - resolved "https://registry.yarnpkg.com/contentful/-/contentful-7.14.5.tgz#ca8ff1301b1278b88bf475cfc87ee9ba9f196034" - integrity sha512-Ou3L6xcVXV2TjC9uaw9w5OGp4hHGeQ9wCwsuROKpPEhb53GdcY962zxVzMZ7YTt/WmKkMrZRFsGMWCi3yS6p9g== + version "7.14.6" + resolved "https://registry.yarnpkg.com/contentful/-/contentful-7.14.6.tgz#da692d68f361ceec14045c6114425579cddbfab9" + integrity sha512-7/Xqw/UT0/zW9DeVGAwtW4twGbThIc6rbLATrhUn7AXt/xTCFzgPiJxHgRU9gmr733q/Wckv663B51abDMS9Nw== dependencies: axios "^0.19.1" - contentful-resolve-response "^1.1.4" + contentful-resolve-response "^1.2.2" contentful-sdk-core "^6.4.5" json-stringify-safe "^5.0.1" lodash "^4.17.11" @@ -6392,6 +6520,17 @@ cosmiconfig@^6.0.0: path-type "^4.0.0" yaml "^1.7.2" +cosmiconfig@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3" + integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.2.1" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.10.0" + "countdown@>= 2.3.0", countdown@^2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/countdown/-/countdown-2.6.0.tgz#677fb8e3a9d4cc4e76415901ba253b518af34177" @@ -6577,10 +6716,10 @@ cssstyle@^2.2.0: dependencies: cssom "~0.3.6" -csstype@^2.2.0: - version "2.6.11" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.11.tgz#452f4d024149ecf260a852b025e36562a253ffc5" - integrity sha512-l8YyEC9NBkSm783PFTvh0FmJy7s5pFKrDp49ZL7zBGX3fWkO+N4EEyan1qqp8cwPLDcD0OSdyY6hAMoxp34JFw== +csstype@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.3.tgz#2b410bbeba38ba9633353aff34b05d9755d065f8" + integrity sha512-jPl+wbWPOWJ7SXsWyqGRk3lGecbar0Cb0OvZF/r/ZU011R4YqiRehgkQ9p4eQfo9DSDLqLL3wHwfxeJiuIsNag== cubic-bezier@^0.1.2: version "0.1.2" @@ -6610,9 +6749,9 @@ d3-axis@1: integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ== d3-brush@1: - version "1.1.5" - resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.5.tgz#066b8e84d17b192986030446c97c0fba7e1bacdc" - integrity sha512-rEaJ5gHlgLxXugWjIkolTA0OyMvw8UWU1imYXy1v642XyyswmI1ybKOv05Ft+ewq+TFmdliD3VuK0pRp1VT/5A== + version "1.1.6" + resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz#b0a22c7372cabec128bdddf9bddc058592f89e9b" + integrity sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA== dependencies: d3-dispatch "1" d3-drag "1" @@ -6668,9 +6807,9 @@ d3-dsv@1: rw "1" d3-ease@1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.6.tgz#ebdb6da22dfac0a22222f2d4da06f66c416a0ec0" - integrity sha512-SZ/lVU7LRXafqp7XtIcBdxnWl8yyLpgOmzAk0mWBI9gXNzLDx5ybZgnRbH9dN/yY5tzVBqCQ9avltSnqVwessQ== + version "1.0.7" + resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2" + integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ== d3-fetch@1: version "1.2.0" @@ -6690,9 +6829,9 @@ d3-force@1: d3-timer "1" d3-format@1: - version "1.4.4" - resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.4.tgz#356925f28d0fd7c7983bfad593726fce46844030" - integrity sha512-TWks25e7t8/cqctxCmxpUuzZN11QxIA7YrMbram94zMQ0PXjE4LVIMe/f6a4+xxL8HQ3OsAFULOINQi1pE62Aw== + version "1.4.5" + resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4" + integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ== d3-geo@1: version "1.12.1" @@ -6754,9 +6893,9 @@ d3-scale@2: d3-time-format "2" d3-selection@1, d3-selection@^1.1.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.1.tgz#98eedbbe085fbda5bafa2f9e3f3a2f4d7d622a98" - integrity sha512-BTIbRjv/m5rcVTfBs4AMBLKs4x8XaaLkwm28KWu9S2vKNqXkXt2AH2Qf0sdPZHjFxcWg/YL53zcqAz+3g4/7PA== + version "1.4.2" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c" + integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg== d3-shape@1: version "1.3.7" @@ -6766,9 +6905,9 @@ d3-shape@1: d3-path "1" d3-time-format@2: - version "2.2.3" - resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.2.3.tgz#0c9a12ee28342b2037e5ea1cf0b9eb4dd75f29cb" - integrity sha512-RAHNnD8+XvC4Zc4d2A56Uw0yJoM7bsvOlJR33bclxq399Rak/b9bhvu/InjxdWhPtkgU53JJcleJTGkNRnN6IA== + version "2.3.0" + resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850" + integrity sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ== dependencies: d3-time "1" @@ -6886,14 +7025,14 @@ data-urls@^2.0.0: whatwg-url "^8.0.0" date-fns@^2.15.0: - version "2.15.0" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.15.0.tgz#424de6b3778e4e69d3ff27046ec136af58ae5d5f" - integrity sha512-ZCPzAMJZn3rNUvvQIMlXhDr4A+Ar07eLeGsGREoWU19a3Pqf5oYa+ccd+B3F6XVtQY6HANMFdOQ8A+ipFnvJdQ== + version "2.16.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.0.tgz#d34f0f5f2fd498c984513042e8f7247ea86c4cb7" + integrity sha512-DWTRyfOA85sZ4IiXPHhiRIOs3fW5U6Msrp+gElXARa6EpoQTXPyHQmh7hr+ssw2nx9FtOQWnAMJKgL5vaJqILw== dayjs@^1.8.15: - version "1.8.28" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.28.tgz#37aa6201df483d089645cb6c8f6cef6f0c4dbc07" - integrity sha512-ccnYgKC0/hPSGXxj7Ju6AV/BP4HUkXC2u15mikXT5mX9YorEaoi1bEKOmAqdkJHN4EEkmAf97SpH66Try5Mbeg== + version "1.8.34" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.34.tgz#d3ad33cc43d6b0f24cb8686b90aad2c653708069" + integrity sha512-Olb+E6EoMvdPmAMq2QoucuyZycKHjTlBXmRx8Ada+wGtq4SIXuDCdtoaX4KkK0yjf1fJLnwXQURr8gQKWKaybw== debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" @@ -7081,10 +7220,10 @@ diff-sequences@^25.2.6: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd" integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg== -diff-sequences@^26.0.0: - version "26.0.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.0.0.tgz#0760059a5c287637b842bd7085311db7060e88a6" - integrity sha512-JC/eHYEC3aSS0vZGjuoc4vHA0yAQTzhQQldXMeMF+JlxLGJlCO38Gma82NV9gk1jGFz8mDzUMeaKXvjRRdJ2dg== +diff-sequences@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.3.0.tgz#62a59b1b29ab7fd27cef2a33ae52abe73042d0a2" + integrity sha512-5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig== diff@^3.5.0: version "3.5.0" @@ -7130,7 +7269,7 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -dom-serializer@0, dom-serializer@^0.2.1: +dom-serializer@0: version "0.2.2" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== @@ -7182,13 +7321,6 @@ domhandler@^2.3.0: dependencies: domelementtype "1" -domhandler@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.0.0.tgz#51cd13efca31da95bbb0c5bee3a48300e333b3e9" - integrity sha512-eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw== - dependencies: - domelementtype "^2.0.1" - domutils@1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" @@ -7205,19 +7337,10 @@ domutils@^1.5.1, domutils@^1.7.0: dom-serializer "0" domelementtype "1" -domutils@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.1.0.tgz#7ade3201af43703fde154952e3a868eb4b635f16" - integrity sha512-CD9M0Dm1iaHfQ1R/TI+z3/JWp/pgub0j4jIQKH89ARR4ATAV2nbaOQS5XxU9maJP5jHaPdDDQSEHuE2UmpUTKg== - dependencies: - dom-serializer "^0.2.1" - domelementtype "^2.0.1" - domhandler "^3.0.0" - -dot-prop@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" - integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ== +dot-prop@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4" + integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ== dependencies: is-obj "^1.0.0" @@ -7244,10 +7367,15 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.483: - version "1.3.483" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.483.tgz#9269e7cfc1c8e72709824da171cbe47ca5e3ca9e" - integrity sha512-+05RF8S9rk8S0G8eBCqBRBaRq7+UN3lDs2DAvnG8SBSgQO3hjy0+qt4CmRk5eiuGbTcaicgXfPmBi31a+BD3lg== +electron-to-chromium@^1.3.523: + version "1.3.555" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.555.tgz#a096716ff77cf8da9a608eb628fd6927869503d2" + integrity sha512-/55x3nF2feXFZ5tdGUOr00TxnUjUgdxhrn+eCJ1FAcoAt+cKQTjQkUC5XF4frMWE1R5sjHk+JueuBalimfe5Pg== + +emittery@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz#c02375a927a40948c0345cc903072597f5270451" + integrity sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ== emoji-regex@^7.0.1: version "7.0.3" @@ -7275,11 +7403,11 @@ encodeurl@~1.0.2: integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= encoding@^0.1.11: - version "0.1.12" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" - integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s= + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== dependencies: - iconv-lite "~0.4.13" + iconv-lite "^0.6.2" end-of-stream@^1.1.0: version "1.4.4" @@ -7289,20 +7417,20 @@ end-of-stream@^1.1.0: once "^1.4.0" enhanced-resolve@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz#5d43bda4a0fd447cb0ebbe71bef8deff8805ad0d" - integrity sha512-S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ== + version "4.3.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126" + integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ== dependencies: graceful-fs "^4.1.2" memory-fs "^0.5.0" tapable "^1.0.0" -enquirer@^2.3.5: - version "2.3.5" - resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.5.tgz#3ab2b838df0a9d8ab9e7dff235b0e8712ef92381" - integrity sha512-BNT1C08P9XD0vNg3J475yIUG+mVdp9T6towYFHUv897X0KoHBjB1shyrNmhmtHWKP17iSWgo7Gqh7BBuzLZMSA== +enquirer@^2.3.6: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== dependencies: - ansi-colors "^3.2.1" + ansi-colors "^4.1.1" entities@^1.1.1, entities@~1.1.1: version "1.1.2" @@ -7314,32 +7442,32 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f" integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ== -envinfo@^7.1.0: - version "7.5.1" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.5.1.tgz#93c26897225a00457c75e734d354ea9106a72236" - integrity sha512-hQBkDf2iO4Nv0CNHpCuSBeaSrveU6nThVxFGTrq/eDlV716UQk09zChaJae4mZRsos1x4YLY2TaH3LHUae3ZmQ== +envinfo@^7.7.2: + version "7.7.3" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.3.tgz#4b2d8622e3e7366afb8091b23ed95569ea0208cc" + integrity sha512-46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA== enzyme-adapter-react-16@^1.15.2: - version "1.15.2" - resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.2.tgz#b16db2f0ea424d58a808f9df86ab6212895a4501" - integrity sha512-SkvDrb8xU3lSxID8Qic9rB8pvevDbLybxPK6D/vW7PrT0s2Cl/zJYuXvsd1EBTz0q4o3iqG3FJhpYz3nUNpM2Q== + version "1.15.3" + resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.3.tgz#90154055be3318d70a51df61ac89cfa22e3d5f60" + integrity sha512-98rqNI4n9HZslWIPuuwy4hK1bxRuMy+XX0CU1dS8iUqcgisTxeBaap6oPp2r4MWC8OphCbbqAT8EU/xHz3zIaQ== dependencies: - enzyme-adapter-utils "^1.13.0" - enzyme-shallow-equal "^1.0.1" + enzyme-adapter-utils "^1.13.1" + enzyme-shallow-equal "^1.0.4" has "^1.0.3" object.assign "^4.1.0" object.values "^1.1.1" prop-types "^15.7.2" - react-is "^16.12.0" + react-is "^16.13.1" react-test-renderer "^16.0.0-0" semver "^5.7.0" -enzyme-adapter-utils@^1.13.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz#01c885dde2114b4690bf741f8dc94cee3060eb78" - integrity sha512-YuEtfQp76Lj5TG1NvtP2eGJnFKogk/zT70fyYHXK2j3v6CtuHqc8YmgH/vaiBfL8K1SgVVbQXtTcgQZFwzTVyQ== +enzyme-adapter-utils@^1.13.1: + version "1.13.1" + resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.1.tgz#59c1b734b0927543e3d8dc477299ec957feb312d" + integrity sha512-5A9MXXgmh/Tkvee3bL/9RCAAgleHqFnsurTYCbymecO4ohvtNO5zqIhHxV370t7nJAwaCfkgtffarKpC0GPt0g== dependencies: - airbnb-prop-types "^2.15.0" + airbnb-prop-types "^2.16.0" function.prototype.name "^1.1.2" object.assign "^4.1.0" object.fromentries "^2.0.2" @@ -7354,13 +7482,13 @@ enzyme-matchers@^7.1.2: circular-json-es6 "^2.0.1" deep-equal-ident "^1.1.1" -enzyme-shallow-equal@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.1.tgz#7afe03db3801c9b76de8440694096412a8d9d49e" - integrity sha512-hGA3i1so8OrYOZSM9whlkNmVHOicJpsjgTzC+wn2JMJXhq1oO4kA4bJ5MsfzSIcC71aLDKzJ6gZpIxrqt3QTAQ== +enzyme-shallow-equal@^1.0.1, enzyme-shallow-equal@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz#b9256cb25a5f430f9bfe073a84808c1d74fced2e" + integrity sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q== dependencies: has "^1.0.3" - object-is "^1.0.2" + object-is "^1.1.2" enzyme-to-json@^3.3.0: version "3.5.0" @@ -7437,6 +7565,24 @@ es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstrac string.prototype.trimend "^1.0.1" string.prototype.trimstart "^1.0.1" +es-abstract@^1.18.0-next.0: + version "1.18.0-next.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.0.tgz#b302834927e624d8e5837ed48224291f2c66e6fc" + integrity sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.2.0" + is-negative-zero "^2.0.0" + is-regex "^1.1.1" + object-inspect "^1.8.0" + object-keys "^1.1.1" + object.assign "^4.1.0" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" + es-get-iterator@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.0.tgz#bb98ad9d6d63b31aacdc8f89d5d0ee57bcb5b4c8" @@ -7485,10 +7631,10 @@ es6-symbol@^3.1.0, es6-symbol@^3.1.1, es6-symbol@~3.1.3: d "^1.0.1" ext "^1.1.2" -escalade@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.1.tgz#52568a77443f6927cd0ab9c73129137533c965ed" - integrity sha512-DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA== +escalade@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4" + integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ== escape-html@^1.0.3, escape-html@~1.0.3: version "1.0.3" @@ -7633,9 +7779,9 @@ eslint-plugin-prettier@^3.1.4: prettier-linter-helpers "^1.0.0" eslint-plugin-react-hooks@^4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.0.5.tgz#4879003aa38e5d05d0312175beb6e4a1f617bfcf" - integrity sha512-3YLSjoArsE2rUwL8li4Yxx1SUg3DQWp+78N3bcJQGWVZckcp+yeQGsap/MSq05+thJk57o+Ww4PtZukXGL02TQ== + version "4.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.1.0.tgz#6323fbd5e650e84b2987ba76370523a60f4e7925" + integrity sha512-36zilUcDwDReiORXmcmTc6rRumu9JIM3WjSvV0nclHoUQ0CNrX866EwONvLR/UqaeqFutbAnVu8PEmctdo2SRQ== eslint-plugin-react-native-globals@^0.1.1: version "0.1.2" @@ -7643,16 +7789,17 @@ eslint-plugin-react-native-globals@^0.1.1: integrity sha512-9aEPf1JEpiTjcFAmmyw8eiIXmcNZOqaZyHO77wgm0/dWfT/oxC1SrIq8ET38pMxHYrcB6Uew+TzUVsBeczF88g== eslint-plugin-react-native@^3.8.1: - version "3.8.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.8.1.tgz#92811e37191ecb0d29c0f0a0c9e5c943ee573821" - integrity sha512-6Z4s4nvgFRdda/1s1+uu4a6EMZwEjjJ9Bk/1yBImv0fd9U2CsGu2cUakAtV83cZKhizbWhSouXoaK4JtlScdFg== + version "3.9.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.9.1.tgz#c8f1f4b04482b6667715b739a1bf1d69f1142dc8" + integrity sha512-khd7OzRJmr5qz72IvRVxJmrbp3LwbSk/lpm2MdRiIszVI9z/Qmb8zJdX32OXyUrE00Cfn1nW9AUC2cGZi4zAjg== dependencies: + "@babel/traverse" "^7.7.4" eslint-plugin-react-native-globals "^0.1.1" eslint-plugin-react@^7.20.3: - version "7.20.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.3.tgz#0590525e7eb83890ce71f73c2cf836284ad8c2f1" - integrity sha512-txbo090buDeyV0ugF3YMWrzLIUqpYTsWSDZV9xLSmExE1P/Kmgg9++PD931r+KEWS66O1c9R4srLVVHmeHpoAg== + version "7.20.6" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.6.tgz#4d7845311a93c463493ccfa0a19c9c5d0fd69f60" + integrity sha512-kidMTE5HAEBSLu23CUDvj8dc3LdBU0ri1scwHBZjI41oDv4tjsWZKU7MQccFzH1QYPYhsnTF2ovh7JlcIcmxgg== dependencies: array-includes "^3.1.1" array.prototype.flatmap "^1.2.3" @@ -7782,9 +7929,9 @@ estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== estraverse@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642" - integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw== + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== esutils@^2.0.0, esutils@^2.0.2: version "2.0.3" @@ -7812,9 +7959,9 @@ events@^1.1.0: integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= events@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" - integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== + version "3.2.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" + integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== exec-sh@^0.3.2: version "0.3.4" @@ -7847,10 +7994,10 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^4.0.0, execa@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.2.tgz#ad87fb7b2d9d564f70d2b62d511bee41d5cbb240" - integrity sha512-QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q== +execa@^4.0.0, execa@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2" + integrity sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A== dependencies: cross-spawn "^7.0.0" get-stream "^5.0.0" @@ -7880,16 +8027,16 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expect@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-26.1.0.tgz#8c62e31d0f8d5a8ebb186ee81473d15dd2fbf7c8" - integrity sha512-QbH4LZXDsno9AACrN9eM0zfnby9G+OsdNgZUohjg/P0mLy1O+/bzTAJGT6VSIjVCe8yKM6SzEl/ckEOFBT7Vnw== +expect@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/expect/-/expect-26.4.2.tgz#36db120928a5a2d7d9736643032de32f24e1b2a1" + integrity sha512-IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.3.0" ansi-styles "^4.0.0" - jest-get-type "^26.0.0" - jest-matcher-utils "^26.1.0" - jest-message-util "^26.1.0" + jest-get-type "^26.3.0" + jest-matcher-utils "^26.4.2" + jest-message-util "^26.3.0" jest-regex-util "^26.0.0" expo-asset@~8.1.0: @@ -8315,9 +8462,9 @@ form-data@~2.3.2: mime-types "^2.1.12" formik@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/formik/-/formik-2.1.4.tgz#8deef07ec845ea98f75e03da4aad7aab4ac46570" - integrity sha512-oKz8S+yQBzuQVSEoxkqqJrKQS5XJASWGVn6mrs+oTWrBoHgByVwwI1qHiVc9GKDpZBU9vAxXYAKz2BvujlwunA== + version "2.1.5" + resolved "https://registry.yarnpkg.com/formik/-/formik-2.1.5.tgz#de5bbbe35543fa6d049fe96b8ee329d6cd6892b8" + integrity sha512-bWpo3PiqVDYslvrRjTq0Isrm0mFXHiO33D8MS6t6dWcqSFGeYF52nlpCM2xwOJ6tRVRznDkL+zz/iHPL4LDuvQ== dependencies: deepmerge "^2.1.1" hoist-non-react-statics "^3.3.0" @@ -8466,9 +8613,9 @@ get-stream@^4.0.0: pump "^3.0.0" get-stream@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9" - integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw== + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== dependencies: pump "^3.0.0" @@ -8603,9 +8750,9 @@ graphql@14.0.0: iterall "^1.2.2" graphql@^14.0.0: - version "14.6.0" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.6.0.tgz#57822297111e874ea12f5cd4419616930cd83e49" - integrity sha512-VKzfvHEKybTKjQVpTFrA5yUq2S9ihcZvfJAtsDBBCuV6wauPu1xl/f9ehgVf0FcEJJs4vz6ysb/ZMkGigQZseg== + version "14.7.0" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.7.0.tgz#7fa79a80a69be4a31c27dda824dc04dac2035a72" + integrity sha512-l0xWZpoPKpppFzMfvVyFmp9vLN7w/ZZJPefUicMCepfJeQ8sMcztloGYY9DfjVPo6tIUDzU5Hw3MUbIjj9AVVA== dependencies: iterall "^1.2.2" @@ -8632,11 +8779,11 @@ har-schema@^2.0.0: integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= har-validator@~5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" - integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== + version "5.1.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" + integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== dependencies: - ajv "^6.5.5" + ajv "^6.12.3" har-schema "^2.0.0" has-ansi@^2.0.0: @@ -8705,9 +8852,9 @@ has@^1.0.3: function-bind "^1.1.1" hermes-engine@~0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.4.1.tgz#2d02b295596298643c4d24b86687eb554db9e950" - integrity sha512-Y3JFC8PD7eN3KpnrzrmvMAqp0IwnZrmP/oGOptvaSu33d7Zq/8b/2lHlZZkNvRl7/I1Q0umTX8TByK7zzLfTXA== + version "0.4.3" + resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.4.3.tgz#1754932f989daddd149172600f01e69cb8f27298" + integrity sha512-qkk85ezG+w70C3tQ4iDs22B8talvByGeJQ1VIb2KG5+rMZWVizRq6r+NYptOC/HWAFxkdYb6F3OPca7RxvjYew== hoist-non-react-statics@^2.3.1: version "2.5.5" @@ -8757,7 +8904,7 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -htmlparser2@^3.9.1: +htmlparser2@3.10.1, htmlparser2@^3.9.1: version "3.10.1" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== @@ -8769,16 +8916,6 @@ htmlparser2@^3.9.1: inherits "^2.0.1" readable-stream "^3.1.1" -htmlparser2@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz#9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78" - integrity sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q== - dependencies: - domelementtype "^2.0.1" - domhandler "^3.0.0" - domutils "^2.0.0" - entities "^2.0.0" - http-errors@~1.7.2: version "1.7.3" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" @@ -8838,13 +8975,20 @@ i@0.3.x: resolved "https://registry.yarnpkg.com/i/-/i-0.3.6.tgz#d96c92732076f072711b6b10fd7d4f65ad8ee23d" integrity sha1-2WyScyB28HJxG2sQ/X1PZa2O4j0= -iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@~0.4.13: +iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01" + integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + idb@5.0.2: version "5.0.2" resolved "https://registry.yarnpkg.com/idb/-/idb-5.0.2.tgz#294e5dd0f1930519dd07393a793cd4edfac93834" @@ -8865,15 +9009,20 @@ image-size@^0.6.0: resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.3.tgz#e7e5c65bb534bd7cdcedd6cb5166272a85f75fb2" integrity sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA== +immediate@~3.0.5: + version "3.0.6" + resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" + integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps= + immer@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/immer/-/immer-6.0.1.tgz#7af35e35753d9da6bc9123f0cc99f7e8f2e10681" integrity sha512-oXwigCKgznQywsXi1VgrqgWbQEU3wievNCVc4Fcwky6mwXU6YHj6JuYp0WEM/B1EphkqsLr0x18lm5OiuemPcA== immer@^7.0.3: - version "7.0.5" - resolved "https://registry.yarnpkg.com/immer/-/immer-7.0.5.tgz#8af347db5b60b40af8ae7baf1784ea4d35b5208e" - integrity sha512-TtRAKZyuqld2eYjvWgXISLJ0ZlOl1OOTzRmrmiY8SlB0dnAhZ1OiykIDL5KDFNaPHDXiLfGQFNJGtet8z8AEmg== + version "7.0.8" + resolved "https://registry.yarnpkg.com/immer/-/immer-7.0.8.tgz#41dcbc5669a76500d017bef3ad0d03ce0a1d7c1e" + integrity sha512-XnpIN8PXBBaOD43U8Z17qg6RQiKQYGDGGCIbz1ixmLGwBkSWwmrmx5X7d+hTtXDM8ur7m5OdLE0PiO+y5RB3pw== immutable@^4.0.0-rc.12: version "4.0.0-rc.12" @@ -8888,7 +9037,7 @@ import-fresh@^2.0.0: caller-path "^2.0.0" resolve-from "^3.0.0" -import-fresh@^3.0.0, import-fresh@^3.1.0: +import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== @@ -9001,20 +9150,20 @@ inquirer@^6.2.0: through "^2.3.6" inquirer@^7.0.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.2.0.tgz#63ce99d823090de7eb420e4bb05e6f3449aa389a" - integrity sha512-E0c4rPwr9ByePfNlTIB8z51kK1s2n6jrHuJeEHENl/sbq2G/S1auvibgEwNR4uSyiU+PiYHqSwsgGiXjG8p5ZQ== + version "7.3.3" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" + integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== dependencies: ansi-escapes "^4.2.1" - chalk "^3.0.0" + chalk "^4.1.0" cli-cursor "^3.1.0" - cli-width "^2.0.0" + cli-width "^3.0.0" external-editor "^3.0.3" figures "^3.0.0" - lodash "^4.17.15" + lodash "^4.17.19" mute-stream "0.0.8" run-async "^2.4.0" - rxjs "^6.5.3" + rxjs "^6.6.0" string-width "^4.1.0" strip-ansi "^6.0.0" through "^2.3.6" @@ -9161,9 +9310,9 @@ is-directory@^0.3.1: integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= is-docker@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz#2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b" - integrity sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ== + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" + integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" @@ -9231,6 +9380,11 @@ is-map@^2.0.1: resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1" integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw== +is-negative-zero@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461" + integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE= + is-npm@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" @@ -9287,10 +9441,10 @@ is-redirect@^1.0.0: resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ= -is-regex@^1.0.5, is-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff" - integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw== +is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" + integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== dependencies: has-symbols "^1.0.1" @@ -9371,7 +9525,7 @@ is-wsl@^1.1.0: resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= -is-wsl@^2.1.1: +is-wsl@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== @@ -9492,57 +9646,57 @@ iterall@^1.2.2: resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea" integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg== -jest-changed-files@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.1.0.tgz#de66b0f30453bca2aff98e9400f75905da495305" - integrity sha512-HS5MIJp3B8t0NRKGMCZkcDUZo36mVRvrDETl81aqljT1S9tqiHRSpyoOvWg9ZilzZG9TDisDNaN1IXm54fLRZw== +jest-changed-files@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.3.0.tgz#68fb2a7eb125f50839dab1f5a17db3607fe195b1" + integrity sha512-1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.3.0" execa "^4.0.0" throat "^5.0.0" -jest-cli@^26.0.1, jest-cli@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.1.0.tgz#eb9ec8a18cf3b6aa556d9deaa9e24be12b43ad87" - integrity sha512-Imumvjgi3rU7stq6SJ1JUEMaV5aAgJYXIs0jPqdUnF47N/Tk83EXfmtvNKQ+SnFVI6t6mDOvfM3aA9Sg6kQPSw== +jest-cli@^26.0.1, jest-cli@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.4.2.tgz#24afc6e4dfc25cde4c7ec4226fb7db5f157c21da" + integrity sha512-zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw== dependencies: - "@jest/core" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/core" "^26.4.2" + "@jest/test-result" "^26.3.0" + "@jest/types" "^26.3.0" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" import-local "^3.0.2" is-ci "^2.0.0" - jest-config "^26.1.0" - jest-util "^26.1.0" - jest-validate "^26.1.0" + jest-config "^26.4.2" + jest-util "^26.3.0" + jest-validate "^26.4.2" prompts "^2.0.1" yargs "^15.3.1" -jest-config@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.1.0.tgz#9074f7539acc185e0113ad6d22ed589c16a37a73" - integrity sha512-ONTGeoMbAwGCdq4WuKkMcdMoyfs5CLzHEkzFOlVvcDXufZSaIWh/OXMLa2fwKXiOaFcqEw8qFr4VOKJQfn4CVw== +jest-config@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.4.2.tgz#da0cbb7dc2c131ffe831f0f7f2a36256e6086558" + integrity sha512-QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^26.1.0" - "@jest/types" "^26.1.0" - babel-jest "^26.1.0" + "@jest/test-sequencer" "^26.4.2" + "@jest/types" "^26.3.0" + babel-jest "^26.3.0" chalk "^4.0.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" - jest-environment-jsdom "^26.1.0" - jest-environment-node "^26.1.0" - jest-get-type "^26.0.0" - jest-jasmine2 "^26.1.0" + jest-environment-jsdom "^26.3.0" + jest-environment-node "^26.3.0" + jest-get-type "^26.3.0" + jest-jasmine2 "^26.4.2" jest-regex-util "^26.0.0" - jest-resolve "^26.1.0" - jest-util "^26.1.0" - jest-validate "^26.1.0" + jest-resolve "^26.4.0" + jest-util "^26.3.0" + jest-validate "^26.4.2" micromatch "^4.0.2" - pretty-format "^26.1.0" + pretty-format "^26.4.2" jest-diff@^25.2.1: version "25.5.0" @@ -9554,15 +9708,15 @@ jest-diff@^25.2.1: jest-get-type "^25.2.6" pretty-format "^25.5.0" -jest-diff@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.1.0.tgz#00a549bdc936c9691eb4dc25d1fbd78bf456abb2" - integrity sha512-GZpIcom339y0OXznsEKjtkfKxNdg7bVbEofK8Q6MnevTIiR1jNhDWKhRX6X0SDXJlwn3dy59nZ1z55fLkAqPWg== +jest-diff@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.4.2.tgz#a1b7b303bcc534aabdb3bd4a7caf594ac059f5aa" + integrity sha512-6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ== dependencies: chalk "^4.0.0" - diff-sequences "^26.0.0" - jest-get-type "^26.0.0" - pretty-format "^26.1.0" + diff-sequences "^26.3.0" + jest-get-type "^26.3.0" + pretty-format "^26.4.2" jest-docblock@^26.0.0: version "26.0.0" @@ -9571,16 +9725,16 @@ jest-docblock@^26.0.0: dependencies: detect-newline "^3.0.0" -jest-each@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.1.0.tgz#e35449875009a22d74d1bda183b306db20f286f7" - integrity sha512-lYiSo4Igr81q6QRsVQq9LIkJW0hZcKxkIkHzNeTMPENYYDw/W/Raq28iJ0sLlNFYz2qxxeLnc5K2gQoFYlu2bA== +jest-each@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.4.2.tgz#bb14f7f4304f2bb2e2b81f783f989449b8b6ffae" + integrity sha512-p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.3.0" chalk "^4.0.0" - jest-get-type "^26.0.0" - jest-util "^26.1.0" - pretty-format "^26.1.0" + jest-get-type "^26.3.0" + jest-util "^26.3.0" + pretty-format "^26.4.2" jest-environment-enzyme@^7.1.2: version "7.1.2" @@ -9601,28 +9755,30 @@ jest-environment-jsdom@^24.0.0: jest-util "^24.9.0" jsdom "^11.5.1" -jest-environment-jsdom@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.1.0.tgz#9dc7313ffe1b59761dad1fedb76e2503e5d37c5b" - integrity sha512-dWfiJ+spunVAwzXbdVqPH1LbuJW/kDL+FyqgA5YzquisHqTi0g9hquKif9xKm7c1bKBj6wbmJuDkeMCnxZEpUw== +jest-environment-jsdom@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz#3b749ba0f3a78e92ba2c9ce519e16e5dd515220c" + integrity sha512-zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA== dependencies: - "@jest/environment" "^26.1.0" - "@jest/fake-timers" "^26.1.0" - "@jest/types" "^26.1.0" - jest-mock "^26.1.0" - jest-util "^26.1.0" + "@jest/environment" "^26.3.0" + "@jest/fake-timers" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + jest-mock "^26.3.0" + jest-util "^26.3.0" jsdom "^16.2.2" -jest-environment-node@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.1.0.tgz#8bb387b3eefb132eab7826f9a808e4e05618960b" - integrity sha512-DNm5x1aQH0iRAe9UYAkZenuzuJ69VKzDCAYISFHQ5i9e+2Tbeu2ONGY7YStubCLH8a1wdKBgqScYw85+ySxqxg== +jest-environment-node@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.3.0.tgz#56c6cfb506d1597f94ee8d717072bda7228df849" + integrity sha512-c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw== dependencies: - "@jest/environment" "^26.1.0" - "@jest/fake-timers" "^26.1.0" - "@jest/types" "^26.1.0" - jest-mock "^26.1.0" - jest-util "^26.1.0" + "@jest/environment" "^26.3.0" + "@jest/fake-timers" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + jest-mock "^26.3.0" + jest-util "^26.3.0" jest-enzyme@^7.1.2: version "7.1.2" @@ -9643,10 +9799,10 @@ jest-get-type@^25.2.6: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877" integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig== -jest-get-type@^26.0.0: - version "26.0.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.0.0.tgz#381e986a718998dbfafcd5ec05934be538db4039" - integrity sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg== +jest-get-type@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" + integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== jest-haste-map@^24.7.1, jest-haste-map@^24.9.0: version "24.9.0" @@ -9667,66 +9823,68 @@ jest-haste-map@^24.7.1, jest-haste-map@^24.9.0: optionalDependencies: fsevents "^1.2.7" -jest-haste-map@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.1.0.tgz#ef31209be73f09b0d9445e7d213e1b53d0d1476a" - integrity sha512-WeBS54xCIz9twzkEdm6+vJBXgRBQfdbbXD0dk8lJh7gLihopABlJmIQFdWSDDtuDe4PRiObsjZSUjbJ1uhWEpA== +jest-haste-map@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.3.0.tgz#c51a3b40100d53ab777bfdad382d2e7a00e5c726" + integrity sha512-DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.3.0" "@types/graceful-fs" "^4.1.2" + "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.4" - jest-serializer "^26.1.0" - jest-util "^26.1.0" - jest-worker "^26.1.0" + jest-regex-util "^26.0.0" + jest-serializer "^26.3.0" + jest-util "^26.3.0" + jest-worker "^26.3.0" micromatch "^4.0.2" sane "^4.0.3" walker "^1.0.7" - which "^2.0.2" optionalDependencies: fsevents "^2.1.2" -jest-jasmine2@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.1.0.tgz#4dfe349b2b2d3c6b3a27c024fd4cb57ac0ed4b6f" - integrity sha512-1IPtoDKOAG+MeBrKvvuxxGPJb35MTTRSDglNdWWCndCB3TIVzbLThRBkwH9P081vXLgiJHZY8Bz3yzFS803xqQ== +jest-jasmine2@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz#18a9d5bec30904267ac5e9797570932aec1e2257" + integrity sha512-z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^26.1.0" - "@jest/source-map" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/environment" "^26.3.0" + "@jest/source-map" "^26.3.0" + "@jest/test-result" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^26.1.0" + expect "^26.4.2" is-generator-fn "^2.0.0" - jest-each "^26.1.0" - jest-matcher-utils "^26.1.0" - jest-message-util "^26.1.0" - jest-runtime "^26.1.0" - jest-snapshot "^26.1.0" - jest-util "^26.1.0" - pretty-format "^26.1.0" + jest-each "^26.4.2" + jest-matcher-utils "^26.4.2" + jest-message-util "^26.3.0" + jest-runtime "^26.4.2" + jest-snapshot "^26.4.2" + jest-util "^26.3.0" + pretty-format "^26.4.2" throat "^5.0.0" -jest-leak-detector@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.1.0.tgz#039c3a07ebcd8adfa984b6ac015752c35792e0a6" - integrity sha512-dsMnKF+4BVOZwvQDlgn3MG+Ns4JuLv8jNvXH56bgqrrboyCbI1rQg6EI5rs+8IYagVcfVP2yZFKfWNZy0rK0Hw== +jest-leak-detector@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz#c73e2fa8757bf905f6f66fb9e0070b70fa0f573f" + integrity sha512-akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA== dependencies: - jest-get-type "^26.0.0" - pretty-format "^26.1.0" + jest-get-type "^26.3.0" + pretty-format "^26.4.2" -jest-matcher-utils@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.1.0.tgz#cf75a41bd413dda784f022de5a65a2a5c73a5c92" - integrity sha512-PW9JtItbYvES/xLn5mYxjMd+Rk+/kIt88EfH3N7w9KeOrHWaHrdYPnVHndGbsFGRJ2d5gKtwggCvkqbFDoouQA== +jest-matcher-utils@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz#fa81f3693f7cb67e5fc1537317525ef3b85f4b06" + integrity sha512-KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q== dependencies: chalk "^4.0.0" - jest-diff "^26.1.0" - jest-get-type "^26.0.0" - pretty-format "^26.1.0" + jest-diff "^26.4.2" + jest-get-type "^26.3.0" + pretty-format "^26.4.2" jest-message-util@^24.9.0: version "24.9.0" @@ -9742,13 +9900,13 @@ jest-message-util@^24.9.0: slash "^2.0.0" stack-utils "^1.0.1" -jest-message-util@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.1.0.tgz#52573fbb8f5cea443c4d1747804d7a238a3e233c" - integrity sha512-dY0+UlldiAJwNDJ08SF0HdF32g9PkbF2NRK/+2iMPU40O6q+iSn1lgog/u0UH8ksWoPv0+gNq8cjhYO2MFtT0g== +jest-message-util@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.3.0.tgz#3bdb538af27bb417f2d4d16557606fd082d5841a" + integrity sha512-xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA== dependencies: "@babel/code-frame" "^7.0.0" - "@jest/types" "^26.1.0" + "@jest/types" "^26.3.0" "@types/stack-utils" "^1.0.1" chalk "^4.0.0" graceful-fs "^4.2.4" @@ -9763,14 +9921,15 @@ jest-mock@^24.9.0: dependencies: "@jest/types" "^24.9.0" -jest-mock@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.1.0.tgz#80d8286da1f05a345fbad1bfd6fa49a899465d3d" - integrity sha512-1Rm8EIJ3ZFA8yCIie92UbxZWj9SuVmUGcyhLHyAhY6WI3NIct38nVcfOPWhJteqSn8V8e3xOMha9Ojfazfpovw== +jest-mock@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.3.0.tgz#ee62207c3c5ebe5f35b760e1267fee19a1cfdeba" + integrity sha512-PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.3.0" + "@types/node" "*" -jest-pnp-resolver@^1.2.1: +jest-pnp-resolver@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== @@ -9785,82 +9944,83 @@ jest-regex-util@^26.0.0: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A== -jest-resolve-dependencies@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.1.0.tgz#1ce36472f864a5dadf7dc82fa158e1c77955691b" - integrity sha512-fQVEPHHQ1JjHRDxzlLU/buuQ9om+hqW6Vo928aa4b4yvq4ZHBtRSDsLdKQLuCqn5CkTVpYZ7ARh2fbA8WkRE6g== +jest-resolve-dependencies@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz#739bdb027c14befb2fe5aabbd03f7bab355f1dc5" + integrity sha512-ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.3.0" jest-regex-util "^26.0.0" - jest-snapshot "^26.1.0" + jest-snapshot "^26.4.2" -jest-resolve@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.1.0.tgz#a530eaa302b1f6fa0479079d1561dd69abc00e68" - integrity sha512-KsY1JV9FeVgEmwIISbZZN83RNGJ1CC+XUCikf/ZWJBX/tO4a4NvA21YixokhdR9UnmPKKAC4LafVixJBrwlmfg== +jest-resolve@^26.4.0: + version "26.4.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.4.0.tgz#6dc0af7fb93e65b73fec0368ca2b76f3eb59a6d7" + integrity sha512-bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.3.0" chalk "^4.0.0" graceful-fs "^4.2.4" - jest-pnp-resolver "^1.2.1" - jest-util "^26.1.0" + jest-pnp-resolver "^1.2.2" + jest-util "^26.3.0" read-pkg-up "^7.0.1" resolve "^1.17.0" slash "^3.0.0" -jest-runner@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.1.0.tgz#457f7fc522afe46ca6db1dccf19f87f500b3288d" - integrity sha512-elvP7y0fVDREnfqit0zAxiXkDRSw6dgCkzPCf1XvIMnSDZ8yogmSKJf192dpOgnUVykmQXwYYJnCx641uLTgcw== +jest-runner@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.4.2.tgz#c3ec5482c8edd31973bd3935df5a449a45b5b853" + integrity sha512-FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g== dependencies: - "@jest/console" "^26.1.0" - "@jest/environment" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/console" "^26.3.0" + "@jest/environment" "^26.3.0" + "@jest/test-result" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" chalk "^4.0.0" + emittery "^0.7.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-config "^26.1.0" + jest-config "^26.4.2" jest-docblock "^26.0.0" - jest-haste-map "^26.1.0" - jest-jasmine2 "^26.1.0" - jest-leak-detector "^26.1.0" - jest-message-util "^26.1.0" - jest-resolve "^26.1.0" - jest-runtime "^26.1.0" - jest-util "^26.1.0" - jest-worker "^26.1.0" + jest-haste-map "^26.3.0" + jest-leak-detector "^26.4.2" + jest-message-util "^26.3.0" + jest-resolve "^26.4.0" + jest-runtime "^26.4.2" + jest-util "^26.3.0" + jest-worker "^26.3.0" source-map-support "^0.5.6" throat "^5.0.0" -jest-runtime@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.1.0.tgz#45a37af42115f123ed5c51f126c05502da2469cb" - integrity sha512-1qiYN+EZLmG1QV2wdEBRf+Ci8i3VSfIYLF02U18PiUDrMbhfpN/EAMMkJtT02jgJUoaEOpHAIXG6zS3QRMzRmA== - dependencies: - "@jest/console" "^26.1.0" - "@jest/environment" "^26.1.0" - "@jest/fake-timers" "^26.1.0" - "@jest/globals" "^26.1.0" - "@jest/source-map" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/transform" "^26.1.0" - "@jest/types" "^26.1.0" +jest-runtime@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.4.2.tgz#94ce17890353c92e4206580c73a8f0c024c33c42" + integrity sha512-4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ== + dependencies: + "@jest/console" "^26.3.0" + "@jest/environment" "^26.3.0" + "@jest/fake-timers" "^26.3.0" + "@jest/globals" "^26.4.2" + "@jest/source-map" "^26.3.0" + "@jest/test-result" "^26.3.0" + "@jest/transform" "^26.3.0" + "@jest/types" "^26.3.0" "@types/yargs" "^15.0.0" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-config "^26.1.0" - jest-haste-map "^26.1.0" - jest-message-util "^26.1.0" - jest-mock "^26.1.0" + jest-config "^26.4.2" + jest-haste-map "^26.3.0" + jest-message-util "^26.3.0" + jest-mock "^26.3.0" jest-regex-util "^26.0.0" - jest-resolve "^26.1.0" - jest-snapshot "^26.1.0" - jest-util "^26.1.0" - jest-validate "^26.1.0" + jest-resolve "^26.4.0" + jest-snapshot "^26.4.2" + jest-util "^26.3.0" + jest-validate "^26.4.2" slash "^3.0.0" strip-bom "^4.0.0" yargs "^15.3.1" @@ -9870,41 +10030,54 @@ jest-serializer@^24.4.0, jest-serializer@^24.9.0: resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73" integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ== -jest-serializer@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.1.0.tgz#72a394531fc9b08e173dc7d297440ac610d95022" - integrity sha512-eqZOQG/0+MHmr25b2Z86g7+Kzd5dG9dhCiUoyUNJPgiqi38DqbDEOlHcNijyfZoj74soGBohKBZuJFS18YTJ5w== +jest-serializer@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.3.0.tgz#1c9d5e1b74d6e5f7e7f9627080fa205d976c33ef" + integrity sha512-IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow== dependencies: + "@types/node" "*" graceful-fs "^4.2.4" -jest-snapshot@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.1.0.tgz#c36ed1e0334bd7bd2fe5ad07e93a364ead7e1349" - integrity sha512-YhSbU7eMTVQO/iRbNs8j0mKRxGp4plo7sJ3GzOQ0IYjvsBiwg0T1o0zGQAYepza7lYHuPTrG5J2yDd0CE2YxSw== +jest-snapshot@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.4.2.tgz#87d3ac2f2bd87ea8003602fbebd8fcb9e94104f6" + integrity sha512-N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg== dependencies: "@babel/types" "^7.0.0" - "@jest/types" "^26.1.0" + "@jest/types" "^26.3.0" "@types/prettier" "^2.0.0" chalk "^4.0.0" - expect "^26.1.0" + expect "^26.4.2" graceful-fs "^4.2.4" - jest-diff "^26.1.0" - jest-get-type "^26.0.0" - jest-haste-map "^26.1.0" - jest-matcher-utils "^26.1.0" - jest-message-util "^26.1.0" - jest-resolve "^26.1.0" + jest-diff "^26.4.2" + jest-get-type "^26.3.0" + jest-haste-map "^26.3.0" + jest-matcher-utils "^26.4.2" + jest-message-util "^26.3.0" + jest-resolve "^26.4.0" natural-compare "^1.4.0" - pretty-format "^26.1.0" + pretty-format "^26.4.2" semver "^7.3.2" jest-styled-components@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/jest-styled-components/-/jest-styled-components-7.0.2.tgz#b7711871ea74a04491b12bad123fa35cc65a2a80" - integrity sha512-i1Qke8Jfgx0Why31q74ohVj9S2FmMLUE8bNRSoK4DgiurKkXG6HC4NPhcOLAz6VpVd9wXkPn81hOt4aAQedqsA== + version "7.0.3" + resolved "https://registry.yarnpkg.com/jest-styled-components/-/jest-styled-components-7.0.3.tgz#cc0b031f910484e68f175568682f3969ff774b2c" + integrity sha512-jj9sWyshehUnB0P9WFUaq9Bkh6RKYO8aD8lf3gUrXRwg/MRddTFk7U9D9pC4IAI3v9fbz4vmrMxwaecTpG8NKA== dependencies: css "^2.2.4" +jest-util@26.x, jest-util@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.3.0.tgz#a8974b191df30e2bf523ebbfdbaeb8efca535b3e" + integrity sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw== + dependencies: + "@jest/types" "^26.3.0" + "@types/node" "*" + chalk "^4.0.0" + graceful-fs "^4.2.4" + is-ci "^2.0.0" + micromatch "^4.0.2" + jest-util@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162" @@ -9923,17 +10096,6 @@ jest-util@^24.9.0: slash "^2.0.0" source-map "^0.6.0" -jest-util@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.1.0.tgz#80e85d4ba820decacf41a691c2042d5276e5d8d8" - integrity sha512-rNMOwFQevljfNGvbzNQAxdmXQ+NawW/J72dmddsK0E8vgxXCMtwQ/EH0BiWEIxh0hhMcTsxwAxINt7Lh46Uzbg== - dependencies: - "@jest/types" "^26.1.0" - chalk "^4.0.0" - graceful-fs "^4.2.4" - is-ci "^2.0.0" - micromatch "^4.0.2" - jest-validate@^24.7.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab" @@ -9946,28 +10108,29 @@ jest-validate@^24.7.0: leven "^3.1.0" pretty-format "^24.9.0" -jest-validate@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.1.0.tgz#942c85ad3d60f78250c488a7f85d8f11a29788e7" - integrity sha512-WPApOOnXsiwhZtmkDsxnpye+XLb/tUISP+H6cHjfUIXvlG+eKwP+isnivsxlHCPaO9Q5wvbhloIBkdF3qUn+Nw== +jest-validate@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.4.2.tgz#e871b0dfe97747133014dcf6445ee8018398f39c" + integrity sha512-blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.3.0" camelcase "^6.0.0" chalk "^4.0.0" - jest-get-type "^26.0.0" + jest-get-type "^26.3.0" leven "^3.1.0" - pretty-format "^26.1.0" + pretty-format "^26.4.2" -jest-watcher@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.1.0.tgz#99812a0cd931f0cb3d153180426135ab83e4d8f2" - integrity sha512-ffEOhJl2EvAIki613oPsSG11usqnGUzIiK7MMX6hE4422aXOcVEG3ySCTDFLn1+LZNXGPE8tuJxhp8OBJ1pgzQ== +jest-watcher@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.3.0.tgz#f8ef3068ddb8af160ef868400318dc4a898eed08" + integrity sha512-XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ== dependencies: - "@jest/test-result" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/test-result" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^26.1.0" + jest-util "^26.3.0" string-length "^4.0.1" jest-worker@^24.6.0, jest-worker@^24.9.0: @@ -9978,22 +10141,23 @@ jest-worker@^24.6.0, jest-worker@^24.9.0: merge-stream "^2.0.0" supports-color "^6.1.0" -jest-worker@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.1.0.tgz#65d5641af74e08ccd561c240e7db61284f82f33d" - integrity sha512-Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ== +jest-worker@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f" + integrity sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw== dependencies: + "@types/node" "*" merge-stream "^2.0.0" supports-color "^7.0.0" jest@^26.0.1: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-26.1.0.tgz#2f3aa7bcffb9bfd025473f83bbbf46a3af026263" - integrity sha512-LIti8jppw5BcQvmNJe4w2g1N/3V68HUfAv9zDVm7v+VAtQulGhH0LnmmiVkbNE4M4I43Bj2fXPiBGKt26k9tHw== + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest/-/jest-26.4.2.tgz#7e8bfb348ec33f5459adeaffc1a25d5752d9d312" + integrity sha512-LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw== dependencies: - "@jest/core" "^26.1.0" + "@jest/core" "^26.4.2" import-local "^3.0.2" - jest-cli "^26.1.0" + jest-cli "^26.4.2" jetifier@^1.6.2, jetifier@^1.6.4: version "1.6.6" @@ -10005,7 +10169,7 @@ jju@^1.3.0: resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a" integrity sha1-o6vicYryQaKykE+EpiWXDzia4yo= -js-cookie@^2.1.4: +js-cookie@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== @@ -10081,9 +10245,9 @@ jsdom@^11.5.1: xml-name-validator "^3.0.0" jsdom@^16.2.2: - version "16.2.2" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.2.2.tgz#76f2f7541646beb46a938f5dc476b88705bedf2b" - integrity sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg== + version "16.4.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" + integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w== dependencies: abab "^2.0.3" acorn "^7.1.1" @@ -10105,7 +10269,7 @@ jsdom@^16.2.2: tough-cookie "^3.0.1" w3c-hr-time "^1.0.2" w3c-xmlserializer "^2.0.0" - webidl-conversions "^6.0.0" + webidl-conversions "^6.1.0" whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" @@ -10127,6 +10291,11 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== +json-parse-even-better-errors@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.0.tgz#371873c5ffa44304a6ba12419bcfa95f404ae081" + integrity sha512-o3aP+RsWDJZayj1SbHNQAI8x0v3T3SKiGoZlNYfbUP1S3omJQ6i9CnqADqkSPaOAxwua4/1YWx5CM7oiChJt2Q== + json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -10336,6 +10505,13 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" +lie@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e" + integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4= + dependencies: + immediate "~3.0.5" + lines-and-columns@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" @@ -10347,19 +10523,19 @@ linked-list@0.1.0: integrity sha1-eYsP+X0bkqT9CEgPVa6k6dSdN78= lint-staged@^10.2.2: - version "10.2.11" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.2.11.tgz#713c80877f2dc8b609b05bc59020234e766c9720" - integrity sha512-LRRrSogzbixYaZItE2APaS4l2eJMjjf5MbclRZpLJtcQJShcvUzKXsNeZgsLIZ0H0+fg2tL4B59fU9wHIHtFIA== + version "10.2.13" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.2.13.tgz#b9c504683470edfc464b7d3fe3845a5a1efcd814" + integrity sha512-conwlukNV6aL9SiMWjFtDp5exeDnTMekdNPDZsKGnpfQuHcO0E3L3Bbf58lcR+M7vk6LpCilxDAVks/DDVBYlA== dependencies: - chalk "^4.0.0" - cli-truncate "2.1.0" - commander "^5.1.0" - cosmiconfig "^6.0.0" + chalk "^4.1.0" + cli-truncate "^2.1.0" + commander "^6.0.0" + cosmiconfig "^7.0.0" debug "^4.1.1" dedent "^0.7.0" - enquirer "^2.3.5" - execa "^4.0.1" - listr2 "^2.1.0" + enquirer "^2.3.6" + execa "^4.0.3" + listr2 "^2.6.0" log-symbols "^4.0.0" micromatch "^4.0.2" normalize-path "^3.0.0" @@ -10367,18 +10543,18 @@ lint-staged@^10.2.2: string-argv "0.3.1" stringify-object "^3.3.0" -listr2@^2.1.0: - version "2.1.8" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.1.8.tgz#8af7ebc70cdbe866ddbb6c80909142bd45758f1f" - integrity sha512-Op+hheiChfAphkJ5qUxZtHgyjlX9iNnAeFS/S134xw7mVSg0YVrQo1IY4/K+ElY6XgOPg2Ij4z07urUXR+YEew== +listr2@^2.6.0: + version "2.6.2" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.6.2.tgz#4912eb01e1e2dd72ec37f3895a56bf2622d6f36a" + integrity sha512-6x6pKEMs8DSIpA/tixiYY2m/GcbgMplMVmhQAaLFxEtNSKLeWTGjtmU57xvv6QCm2XcqzyNXL/cTSVf4IChCRA== dependencies: - chalk "^4.0.0" + chalk "^4.1.0" cli-truncate "^2.1.0" figures "^3.2.0" indent-string "^4.0.0" log-update "^4.0.0" p-map "^4.0.0" - rxjs "^6.5.5" + rxjs "^6.6.2" through "^2.3.8" load-json-file@^2.0.0: @@ -10410,6 +10586,13 @@ loader-utils@^1.0.2: emojis-list "^3.0.0" json5 "^1.0.1" +localforage@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.8.1.tgz#f6c0a24b41ab33b10e4dc84342dd696f6f3e3433" + integrity sha512-azSSJJfc7h4bVpi0PGi+SmLQKJl2/8NErI+LhJsrORNikMZnhaQ7rv9fHj+ofwgSHrKRlsDCL/639a6nECIKuQ== + dependencies: + lie "3.1.1" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -10534,10 +10717,10 @@ lodash.times@^4.3.2: resolved "https://registry.yarnpkg.com/lodash.times/-/lodash.times-4.3.2.tgz#3e1f2565c431754d54ab57f2ed1741939285ca1d" integrity sha1-Ph8lZcQxdU1Uq1fy7RdBk5KFyh0= -lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.1: - version "4.17.15" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" - integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== +lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.1: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== log-symbols@^2.0.0, log-symbols@^2.2.0: version "2.2.0" @@ -10979,14 +11162,6 @@ metro@0.58.0, metro@^0.58.0: xpipe "^1.0.5" yargs "^14.2.0" -micromatch@4.x, micromatch@^4.0.0, micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== - dependencies: - braces "^3.0.1" - picomatch "^2.0.5" - micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" @@ -11006,6 +11181,14 @@ micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" +micromatch@^4.0.0, micromatch@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" + integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + dependencies: + braces "^3.0.1" + picomatch "^2.0.5" + mime-db@1.44.0, "mime-db@>= 1.43.0 < 2": version "1.44.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" @@ -11182,10 +11365,10 @@ nanoid@^2.0.0: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== -nanoid@^3.1.9: - version "3.1.10" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.10.tgz#69a8a52b77892de0d11cede96bc9762852145bc4" - integrity sha512-iZFMXKeXWkxzlfmMfM91gw7YhN2sdJtixY+eZh9V6QWJWTOiurhpKhBMgr82pfzgSqglQgqYSCowEYsz8D++6w== +nanoid@^3.1.12: + version "3.1.12" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.12.tgz#6f7736c62e8d39421601e4a0c77623a97ea69654" + integrity sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A== nanomatch@^1.2.9: version "1.2.13" @@ -11215,9 +11398,9 @@ ncp@0.4.x: integrity sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ= nearley@^2.7.10: - version "2.19.4" - resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.19.4.tgz#7518cbdd7d0e8e08b5f82841b9edb0126239c8b1" - integrity sha512-oqj3m4oqwKsN77pETa9IPvxHHHLW68KrDc2KYoWMUOhDlrNUo7finubwffQMBRnwNCOXc4kRxCZO0Rvx4L6Zrw== + version "2.19.6" + resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.19.6.tgz#22663fd7326eb708b4c18bfdd7e4ce204b7239b0" + integrity sha512-OV3Lx+o5iIGWVY38zs+7aiSnBqaHTFAOQiz83VHJje/wOOaSgzE3H0S/xfISxJhFSoPcX611OEDV9sCT8F283g== dependencies: commander "^2.19.0" moo "^0.5.0" @@ -11287,27 +11470,27 @@ node-modules-regexp@^1.0.0: resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= -node-notifier@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-7.0.1.tgz#a355e33e6bebacef9bf8562689aed0f4230ca6f9" - integrity sha512-VkzhierE7DBmQEElhTGJIoiZa1oqRijOtgOlsXg32KrJRXsPy0NXFBqWGW/wTswnJlDCs5viRYaqWguqzsKcmg== +node-notifier@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz#a7eee2d51da6d0f7ff5094bc7108c911240c1620" + integrity sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA== dependencies: growly "^1.3.0" - is-wsl "^2.1.1" - semver "^7.2.1" + is-wsl "^2.2.0" + semver "^7.3.2" shellwords "^0.1.1" - uuid "^7.0.3" + uuid "^8.3.0" which "^2.0.2" -node-releases@^1.1.58: - version "1.1.58" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935" - integrity sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg== +node-releases@^1.1.60: + version "1.1.60" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084" + integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA== node-stream-zip@^1.9.1: - version "1.11.2" - resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.11.2.tgz#5d0124b80e2942afd7f5853a36ceb0d65c1d9e77" - integrity sha512-cowCX+OyzS3tN2i4BMMFxCr/pE6cQlEMTbVCugmos0TNEJQNtcG04tR41CY8lumO1I7F5GFiLaU4WavomJthaA== + version "1.11.3" + resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.11.3.tgz#223892620b4889bce9782b256a76682631c507be" + integrity sha512-GY+9LxkQuIT3O7K8BTdHVGKFcBYBy2vAVcTBtkKpu+OlBef/NSb6VuIWSyLiVDfmLMkggHeRJZN0F3W0GWU/uw== normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0: version "2.5.0" @@ -11415,7 +11598,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.7.0: +object-inspect@^1.7.0, object-inspect@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA== @@ -11521,9 +11704,9 @@ onetime@^2.0.0: mimic-fn "^1.0.0" onetime@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" - integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q== + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== dependencies: mimic-fn "^2.1.0" @@ -11719,13 +11902,13 @@ parse-json@^4.0.0: json-parse-better-errors "^1.0.1" parse-json@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" - integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646" + integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ== dependencies: "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" + json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" parse-node-version@^1.0.0: @@ -11860,9 +12043,9 @@ path-type@^4.0.0: integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== paths-js@^0.4.10: - version "0.4.10" - resolved "https://registry.yarnpkg.com/paths-js/-/paths-js-0.4.10.tgz#a3575f409b4a36f8aa795ba4d051989021be58c7" - integrity sha512-JZoqlRSHtx+bc+xKI9o4bropEbqZBF4ZfYImiB1T9RYpHB73h5I8XZ7FfSBbHbBMtdD1c04ujjAPH8wUuu4+Gw== + version "0.4.11" + resolved "https://registry.yarnpkg.com/paths-js/-/paths-js-0.4.11.tgz#b2a9d5f94ee9949aa8fee945f78a12abff44599e" + integrity sha512-3mqcLomDBXOo7Fo+UlaenG6f71bk1ZezPQy2JCmYHy2W2k5VKpP+Jbin9H0bjXynelTbglCqdFhSEkeIkKTYUA== performance-now@^2.1.0: version "2.1.0" @@ -12035,9 +12218,9 @@ prettier-linter-helpers@^1.0.0: fast-diff "^1.1.2" prettier@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4" - integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg== + version "2.1.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz#d9485dd5e499daa6cb547023b87a6cf51bee37d6" + integrity sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw== pretty-format@^24.7.0, pretty-format@^24.9.0: version "24.9.0" @@ -12059,12 +12242,12 @@ pretty-format@^25.1.0, pretty-format@^25.2.0, pretty-format@^25.2.1, pretty-form ansi-styles "^4.0.0" react-is "^16.12.0" -pretty-format@^26.0.1, pretty-format@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.1.0.tgz#272b9cd1f1a924ab5d443dc224899d7a65cb96ec" - integrity sha512-GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg== +pretty-format@^26.0.1, pretty-format@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.4.2.tgz#d081d032b398e801e2012af2df1214ef75a81237" + integrity sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.3.0" ansi-regex "^5.0.0" ansi-styles "^4.0.0" react-is "^16.12.0" @@ -12134,9 +12317,9 @@ prop-types@^15.5.10, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, react-is "^16.8.1" property-expr@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.2.tgz#fff2a43919135553a3bc2fdd94bdb841965b2330" - integrity sha512-bc/5ggaYZxNkFKj374aLbEDqVADdYaLcFo8XBkishUWbaAdjlphaBFns9TvRA2pUseVL/wMFmui9X3IdNDU37g== + version "2.0.4" + resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.4.tgz#37b925478e58965031bb612ec5b3260f8241e910" + integrity sha512-sFPkHQjVKheDNnPvotjQmm3KD3uk1fWKUN7CrpdbwmUx3CrG3QiM8QpTSimvig5vTXmTvjz7+TDvXOI9+4rkcg== proxy-from-env@^1.1.0: version "1.1.0" @@ -12224,9 +12407,9 @@ querystring@0.2.0, querystring@^0.2.0: integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= querystringify@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e" - integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== quick-lru@^1.0.0: version "1.1.0" @@ -12262,6 +12445,13 @@ randexp@0.4.6: discontinuous-range "1.0.0" ret "~0.1.10" +randombytes@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + range-parser@~1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" @@ -12291,9 +12481,9 @@ react-deep-force-update@^1.0.0: integrity sha512-WUSQJ4P/wWcusaH+zZmbECOk7H5N2pOIl0vzheeornkIMhu+qrNdGFm0bDZLCb0hSF0jf/kH1SgkNGfBdTc4wA== react-devtools-core@^4.0.6: - version "4.7.0" - resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.7.0.tgz#71e89087352abe60c160dfb60a7fa700f612af7a" - integrity sha512-6w/e0nkV0gogUnfz+9Q3yiMtYYol9T+oD27UIf4XWmula1KvSTTkQ9DnzLOqSSch8d1YzNWbTxguuNJMof58ww== + version "4.8.2" + resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.8.2.tgz#4465f2e8de7795564aa20f28b2f3a9737586db23" + integrity sha512-3Lv3nI8FPAwKqUco35oOlgf+4j8mgYNnIcDv2QTfxEqg2G69q17ZJ8ScU9aBnymS28YC1OW+kTxLmdIQeTN8yg== dependencies: shell-quote "^1.6.1" ws "^7" @@ -12326,9 +12516,9 @@ react-native-animatable@1.3.3, react-native-animatable@^1.3.2: prop-types "^15.7.2" react-native-app-auth@^5.0.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/react-native-app-auth/-/react-native-app-auth-5.1.2.tgz#3c791b07e08af5a77078e52198621f727f6e00a3" - integrity sha512-bZ8NFLuNuUCz2adceJJcF3az8X+zDrArkocn9NM0X4DCZIe4QUgw4qHVNLa/fGaZ/K2wIICtMmS5KZLC6eZ4yA== + version "5.1.3" + resolved "https://registry.yarnpkg.com/react-native-app-auth/-/react-native-app-auth-5.1.3.tgz#840ed3a126419be360d54dc9c3f1f3cede2f79ff" + integrity sha512-tIFyGf8pZutstmS5B6BY5MfPOArnOt8mLx2TrvrUQJAQbe9+XvY4MZjHq9ZYYYBQwVRkkv3SmesGOMkpYygIUg== dependencies: invariant "2.2.4" react-native-base64 "0.0.2" @@ -12339,9 +12529,9 @@ react-native-app-intro-slider@^4.0.2: integrity sha512-Zkjaol6X3BbZkHUpVDj2LjdidpS6rCgKi0fx80xgGKa0pHxBRd4swWTv2bHnnvu5k1/HXwYk0mY2TbK+2jHl5w== react-native-autoheight-webview@^1.4.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/react-native-autoheight-webview/-/react-native-autoheight-webview-1.5.1.tgz#67cbfb672212d93dedecf723d1914cbc40287545" - integrity sha512-jm/LGq+lW9MD3jdmbtDqjrBna/nkZqSIi3eajGbLM7SPlDuwDkmiMiBgonglZ6WeGqHyKbRa+f15MxqpVr+kUA== + version "1.5.3" + resolved "https://registry.yarnpkg.com/react-native-autoheight-webview/-/react-native-autoheight-webview-1.5.3.tgz#180837a71c2f8f4ef692cbcc92e65c867953aab9" + integrity sha512-EC9RAmsqit1fuXsFNqJt7w/WlLC9iRQcE+8Wk7+Mj+ptxK7wf9Q4Ohzp71/QYsdDvPEifg+Txw5xSBgcjeWrhQ== dependencies: prop-types "^15.7.2" @@ -12360,9 +12550,9 @@ react-native-base64@0.0.2: integrity sha512-Fu/J1a2y0X22EJDWqJR2oEa1fpP4gTFjYxk8ElJdt1Yak3HOXmFJ7EohLVHU2DaQkgmKfw8qb7u/48gpzveRbg== react-native-calendars@^1.212.0: - version "1.300.0" - resolved "https://registry.yarnpkg.com/react-native-calendars/-/react-native-calendars-1.300.0.tgz#ddd3941a0e01c9256a5aa0c44f615161bb9e664f" - integrity sha512-GOSaF+I24+cK5uxUfw85LEwskCj6Cpi5Cnm3OXdXexMer9hg0FlJ6AYlDrvu0ck0b9yAFdQTxExt64u1wkh+gw== + version "1.343.0" + resolved "https://registry.yarnpkg.com/react-native-calendars/-/react-native-calendars-1.343.0.tgz#db6262202694486db5d6c1bfe4b39f867124ecc4" + integrity sha512-wuBt/XyhCS1ycdmCWLRpXmRF2mXYBbfGjrjh7mKksrmame2DlW5jHX2sW3kvcMyLIsApuL6GEMxlzaPqgCB5Kw== dependencies: hoist-non-react-statics "^3.3.1" immutable "^4.0.0-rc.12" @@ -12406,9 +12596,9 @@ react-native-datepicker@^1.7.2: moment "^2.22.0" react-native-device-info@^5.5.1: - version "5.6.1" - resolved "https://registry.yarnpkg.com/react-native-device-info/-/react-native-device-info-5.6.1.tgz#3ae88d8659b7b64d204dbfc39f69126b769363d4" - integrity sha512-FxjenoDZJKT53pp/Tl5gMsw5DA82Y5tOuySQlKS5AaDmw+Bu6EqEJjt0z4TRhJOVoqVJ35oCiZ3xViVbz/hB0w== + version "5.6.5" + resolved "https://registry.yarnpkg.com/react-native-device-info/-/react-native-device-info-5.6.5.tgz#3f18d7c38b21cfc475163351a9aae6e9037a43a0" + integrity sha512-l457wv7gYXSRnm38AH+NpCgKYa1zxxfN0EL8mTBxo+TnasXtk0FZ86zWDLhm4eqpcSH8xpT/+z2MQrATfqCaoA== react-native-elements@^0.19.1: version "0.19.1" @@ -12421,9 +12611,9 @@ react-native-elements@^0.19.1: prop-types "^15.5.8" react-native-fast-image@^8.1.5: - version "8.1.5" - resolved "https://registry.yarnpkg.com/react-native-fast-image/-/react-native-fast-image-8.1.5.tgz#0a6404c988dad68c98d26f91155d0a5293ba2ea5" - integrity sha512-DoAWGLeQ2hbllummrpXH9B38OgM0TFmNYCF34F90/hdHZirqUtYHzF4QDdb/NV7ebSijHmM3mpkzct8PXtcYyg== + version "8.3.2" + resolved "https://registry.yarnpkg.com/react-native-fast-image/-/react-native-fast-image-8.3.2.tgz#e9db271b70b9634b7be054760914d80954f9898c" + integrity sha512-AJ0b4BEswRwa0bh4SibYUtXszEiaO88Lf4CZ1ib+t5ZfkAgsMk9Liv3L0LYnDblMJmSeGTr1+2ViIM8F2vamjg== react-native-firebase@^5.6.0: version "5.6.0" @@ -12439,9 +12629,9 @@ react-native-flipper@^0.34.0: integrity sha512-48wgm29HJTOlZ0DibBsvXueEOY0EPIVL0wWKbwRfgrk86+luSEuLW3aZC50oJa95zSFb9qYShTV/6dWqh4Jamg== react-native-gesture-handler@^1.5.3: - version "1.6.1" - resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.6.1.tgz#678e2dce250ed66e93af409759be22cd6375dd17" - integrity sha512-gQgIKhDiYf754yzhhliagLuLupvGb6ZyBdzYzr7aus3Fyi87TLOw63ers+r4kGw0h26oAWTAdHd34JnF4NeL6Q== + version "1.7.0" + resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.7.0.tgz#0ef74a5ba836832e497dc49eb1ce58baa6c617e5" + integrity sha512-1CrjJf8Z6Iz2XWzfZknYtsm2sud5Lu/pLhhokkgBIKttxqGDtetDEVFDJOTJWJyKCrUPk0X5tnWi/diSF4q++w== dependencies: "@egjs/hammerjs" "^2.0.17" hoist-non-react-statics "^2.3.1" @@ -12485,9 +12675,9 @@ react-native-linear-gradient@^2.5.6: integrity sha512-HDwEaXcQIuXXCV70O+bK1rizFong3wj+5Q/jSyifKFLg0VWF95xh8XQgfzXwtq0NggL9vNjPKXa016KuFu+VFg== react-native-localize@^1.3.3: - version "1.4.0" - resolved "https://registry.yarnpkg.com/react-native-localize/-/react-native-localize-1.4.0.tgz#4653596d066d0941c48f5404dc1c0d08b6950443" - integrity sha512-W2MQxm6hzD549ZbZcbWzWtYJseY7S7WR2WgsNhm9ULmbwP7tXFfOTbkJjQoqgPXYSXogKN3srXhntVsNZL0Ksw== + version "1.4.1" + resolved "https://registry.yarnpkg.com/react-native-localize/-/react-native-localize-1.4.1.tgz#031bd2089f09cc16ee7daee03019684dda60c275" + integrity sha512-g1L1au6GtCd0Ci6lQ8JVPYgl7uvEtKY2jeVghJcV6qQEN9+qACyqjOIR8pskUyI+qcSj1z4/nZh3IFxDVu1drw== react-native-logger@^1.0.3: version "1.0.3" @@ -12556,43 +12746,43 @@ react-native-radial-context-menu@0.0.2: integrity sha512-jihSUI/VkqLK/Le3BIy7JxsOST19OrXfmcvgqoZrwxttGGYs6EwteCT9LqfBFFNe3U302ikWIKQgmO3qO8xB/g== react-native-rate@^1.1.10: - version "1.2.1" - resolved "https://registry.yarnpkg.com/react-native-rate/-/react-native-rate-1.2.1.tgz#c7a58b13dc68c49372d706d55a644b3700474597" - integrity sha512-Hm1cmSaFVkJZHlSC2ebrhW7Y2PCQozjGr9pvAhkU2vQ/G3fS01OplGqADb0MhW+Md5t1rWUtwZnTS/W3/osXvA== + version "1.2.4" + resolved "https://registry.yarnpkg.com/react-native-rate/-/react-native-rate-1.2.4.tgz#bb4024bebc28f40cd4eed70b5c5cbfa733ea68aa" + integrity sha512-lvmxu4UJ7/OfpNwww3AmTzAkKdD8z65VNguoKanRyBhrSm/IeNYLe482Vku9YodgWNkjZfl2AtJ51Sv9rhUu3A== react-native-ratings@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/react-native-ratings/-/react-native-ratings-7.2.0.tgz#8523e98868470855ec1d2feb112e466e17a1fd9f" - integrity sha512-oSrkQ4rnpYjCw+d6MPJQghXfrfb3uQKoTJx1exdk7xqzw4jnv3pyu0PAuxCDJk/rfDSD/sirIAudz+zdGxrBog== + version "7.3.0" + resolved "https://registry.yarnpkg.com/react-native-ratings/-/react-native-ratings-7.3.0.tgz#32e11e4ed944ba8adbbc995d601df3f131619b6f" + integrity sha512-NCDIkmrVPnxPzP9zKdlcNpa2rPs3Hiv2qXsojUr3FpwbANWfgYE+jjGSSCBcS3vpXndTjhoaTGFDnybnUSFPFA== dependencies: - lodash "^4.17.4" - prop-types "^15.5.10" + lodash "^4.17.15" + prop-types "^15.7.2" react-native-reanimated@^1.7.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.9.0.tgz#38676c99dd585504fdc7331efb45e5f48ec7339a" - integrity sha512-Aj+spgIHRiVv7ezGADxnSH1EoKrQRD2+XaSiGY0MiB/pvRNNrZPSJ+3NVpvLwWf9lZMOP7dwqqyJIzoZgBDt8w== + version "1.13.0" + resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.13.0.tgz#1ee5d27d34bd2cee7dfad4ae9a3673300872c917" + integrity sha512-uadP/0QO+4TCsyPSvzRdl+76NPM7Bp8M25KQLB4Hg3tWBMjhrMrETnzNi33L/OPfmhU+7rceyi0QPe/DxKT5bQ== dependencies: fbjs "^1.0.0" react-native-redash@^14.0.4: - version "14.2.1" - resolved "https://registry.yarnpkg.com/react-native-redash/-/react-native-redash-14.2.1.tgz#1a1690c65fe438a67ad24d0e80c3d5f38cea111a" - integrity sha512-7xeh7LCx9iKXLnRTzEK5bjvthcb/G2c/ktdRv2FoVVqMlzYeApdxeSM+QKsXaJ8ka/hZEABHqO576s2fNnVXrA== + version "14.2.4" + resolved "https://registry.yarnpkg.com/react-native-redash/-/react-native-redash-14.2.4.tgz#5dbb4b2f1a7441bb304fe3494b89e0dc9010c8ef" + integrity sha512-/1R9UxXv3ffKcrbxolqa2B247Cgd3ikyEm2q1VlBng77Es6PAD4LAOXQ83pBavvwNfOsbhF3ebkbMpJcLaVt3Q== dependencies: abs-svg-path "^0.1.1" normalize-svg-path "^1.0.1" parse-svg-path "^0.1.2" react-native-render-html@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/react-native-render-html/-/react-native-render-html-4.2.0.tgz#f355c3e564bf99292f88792ade48749b4bf2ee76" - integrity sha512-hkIy3YIdv77ttS3aNriFwNEPgEM3QJCX8efJn7fbZaV/K9lJ5CkOO+oiTe+FARLwDqqBkrf4KbTyqD4gmAfhRg== + version "4.2.3" + resolved "https://registry.yarnpkg.com/react-native-render-html/-/react-native-render-html-4.2.3.tgz#b1568cd727638f477b2238cc872e2bd675a2aa18" + integrity sha512-0zYXG+5RrvVbXwubIyMtbEmyKnY1TfQwRbJSSow/FITWyKvye/3DsLqvQNbkyqWhvNdofBqxGvyoM4Lf50imbg== dependencies: buffer "^4.5.1" events "^1.1.0" html-entities "^1.2.0" - htmlparser2 "^4.0.0" + htmlparser2 "3.10.1" react-native-safe-area-context@^1.0.0: version "1.0.2" @@ -12607,9 +12797,9 @@ react-native-safe-area-view@^0.14.9: hoist-non-react-statics "^2.3.1" react-native-screens@^2.0.0-beta.2: - version "2.9.0" - resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.9.0.tgz#ead2843107ba00fee259aa377582e457c74f1f3b" - integrity sha512-5MaiUD6HA3nzY3JbVI8l3V7pKedtxQF3d8qktTVI0WmWXTI4QzqOU8r8fPVvfKo3MhOXwhWBjr+kQ7DZaIQQeg== + version "2.10.1" + resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.10.1.tgz#06d22fae87ef0ce51c616c34a199726db1403b95" + integrity sha512-Z2kKSk4AwWRQNCBmTjViuBQK0/Lx0jc25TZptn/2gKYUCOuVRvCekoA26u0Tsb3BIQ8tWDsZW14OwDlFUXW1aw== react-native-sha256@^1.3.6: version "1.3.6" @@ -12670,9 +12860,9 @@ react-native-swiper@^1.5.14: prop-types "^15.5.10" react-native-tab-view@^2.10.0: - version "2.14.4" - resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-2.14.4.tgz#740007e62c8723c6813b8c8a05caaaf82c816620" - integrity sha512-oqkCflPFuZwDTbyY2WaN0377akSsmcttuYACR9LT7htZfO/tKR2Z/ynj1tbv2cz2esGuVICoga9cetN1lPimog== + version "2.15.1" + resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-2.15.1.tgz#cf4df4ffdec504263a2e06a6becd8831b9a19ad9" + integrity sha512-cDYl1pNWspbEHBjHrHVpIC40h4g8VhZe0CIG0CUKcouX98vHVfAojxhgWuRosq9qMhITHpLKM+7BmBLnhCJ0nw== react-native-testing-library@^1.12.0: version "1.14.0" @@ -12729,7 +12919,7 @@ react-native-unimodules@^0.9.1: unimodules-sensors-interface "~5.1.0" unimodules-task-manager-interface "~5.1.0" -react-native-vector-icons@^6.6.0: +react-native-vector-icons@6.6.0: version "6.6.0" resolved "https://registry.yarnpkg.com/react-native-vector-icons/-/react-native-vector-icons-6.6.0.tgz#66cf004918eb05d90778d64bd42077c1800d481b" integrity sha512-MImKVx8JEvVVBnaShMr7/yTX4Y062JZMupht1T+IEgbqBj4aQeQ1z2SH4VHWKNtWtppk4kz9gYyUiMWqx6tNSw== @@ -12805,9 +12995,9 @@ react-proxy@^1.1.7: react-deep-force-update "^1.0.0" react-redux@^7.0.0, react-redux@^7.1.3: - version "7.2.0" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.0.tgz#f970f62192b3981642fec46fd0db18a074fe879d" - integrity sha512-EvCAZYGfOLqwV7gh849xy9/pt55rJXPwmYvI4lilPM5rUT/1NxuuN59ipdBksRVSvz0KInbPnp4IfoXJXCqiDA== + version "7.2.1" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.1.tgz#8dedf784901014db2feca1ab633864dee68ad985" + integrity sha512-T+VfD/bvgGTUA74iW9d2i5THrDQWbweXP0AVNI8tNd1Rk5ch1rnMiJkDD67ejw7YBKM4+REvcvqRuWJb7BLuEg== dependencies: "@babel/runtime" "^7.5.5" hoist-non-react-statics "^3.3.0" @@ -12992,9 +13182,9 @@ realpath-native@^1.1.0: util.promisify "^1.0.0" reanimated-bottom-sheet@^1.0.0-alpha.14: - version "1.0.0-alpha.20" - resolved "https://registry.yarnpkg.com/reanimated-bottom-sheet/-/reanimated-bottom-sheet-1.0.0-alpha.20.tgz#fc586b594a8e8c3e2a49821cfaaccd8c03f80660" - integrity sha512-bcXVkmJLL6SOoIPWU2dIJnT7+78a5tDi9eaE6ESsEewZ10lpfJhjfCCFrngPZKPhatQ6mjCJSYEAL+fwbXCiJw== + version "1.0.0-alpha.22" + resolved "https://registry.yarnpkg.com/reanimated-bottom-sheet/-/reanimated-bottom-sheet-1.0.0-alpha.22.tgz#01a200946f1a461f01f1e773e5b4961c2df2e53b" + integrity sha512-NxecCn+2iA4YzkFuRK5/b86GHHS2OhZ9VRgiM4q18AC20YE/psRilqxzXCKBEvkOjP5AaAvY0yfE7EkEFBjTvw== redent@^2.0.0: version "2.0.0" @@ -13026,12 +13216,12 @@ redux-devtools-extension@^2.13.8: integrity sha512-8qlpooP2QqPtZHQZRhx3x3OP5skEV1py/zUdMY28WNAocbafxdG2tRD1MWE7sp8obGMNYuLWanhhQ7EQvT1FBg== redux-devtools-instrument@^1.9.0, redux-devtools-instrument@^1.9.4: - version "1.9.6" - resolved "https://registry.yarnpkg.com/redux-devtools-instrument/-/redux-devtools-instrument-1.9.6.tgz#6b412595f74b9d48cfd4ecc13e585b1588ed6e7e" - integrity sha512-MwvY4cLEB2tIfWWBzrUR02UM9qRG2i7daNzywRvabOSVdvAY7s9BxSwMmVRH1Y/7QWjplNtOwgT0apKhHg2Qew== + version "1.9.7" + resolved "https://registry.yarnpkg.com/redux-devtools-instrument/-/redux-devtools-instrument-1.9.7.tgz#ea3103c27da3ad2d37e197a885430fa43a0c9580" + integrity sha512-QUc2GwRy7I1zhUVsrsRzopptOzT7kTYkLhKoO2Z1sNChVRrbzV0BKwyyQPShpsRrxvpl2ZF1qn93I688AWn4dg== dependencies: - lodash "^4.2.0" - symbol-observable "^1.0.2" + lodash "^4.17.19" + symbol-observable "^1.2.0" redux-devtools@3.5.0: version "3.5.0" @@ -13102,9 +13292,9 @@ regenerator-runtime@^0.11.0: integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.4: - version "0.13.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" - integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== + version "0.13.7" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" + integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== regenerator-transform@^0.10.0: version "0.10.1" @@ -13228,9 +13418,9 @@ remote-redux-devtools@^0.5.16: socketcluster-client "^14.2.1" remotedev-serialize@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/remotedev-serialize/-/remotedev-serialize-0.1.8.tgz#c99cb184e7f71a906162abc404be8ce33810205f" - integrity sha512-3YG/FDcOmiK22bl5oMRM8RRnbGrFEuPGjbcDG+z2xi5aQaNQNZ8lqoRnZTwXVfaZtutXuiAQOgPRrogzQk8edg== + version "0.1.9" + resolved "https://registry.yarnpkg.com/remotedev-serialize/-/remotedev-serialize-0.1.9.tgz#5e67e05cbca75d408d769d057dc59d0f56cd2c43" + integrity sha512-5tFdZg9mSaAWTv6xmQ7HtHjKMLSFQFExEZOtJe10PLsv1wb7cy7kYHtBvTYRro27/3fRGEcQBRNKSaixOpb69w== dependencies: jsan "^3.1.13" @@ -13249,19 +13439,19 @@ repeat-string@^1.6.1: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= -request-promise-core@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9" - integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ== +request-promise-core@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" + integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw== dependencies: - lodash "^4.17.15" + lodash "^4.17.19" request-promise-native@^1.0.5, request-promise-native@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36" - integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ== + version "1.0.9" + resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" + integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== dependencies: - request-promise-core "1.1.3" + request-promise-core "1.1.4" stealthy-require "^1.1.1" tough-cookie "^2.3.3" @@ -13461,10 +13651,10 @@ rxjs@^5.4.3: dependencies: symbol-observable "1.0.1" -rxjs@^6.4.0, rxjs@^6.5.3, rxjs@^6.5.5: - version "6.5.5" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec" - integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ== +rxjs@^6.4.0, rxjs@^6.6.0, rxjs@^6.6.2: + version "6.6.2" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.2.tgz#8096a7ac03f2cc4fe5860ef6e572810d9e01c0d2" + integrity sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg== dependencies: tslib "^1.9.0" @@ -13473,7 +13663,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -13485,7 +13675,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -13592,7 +13782,7 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@7.x, semver@^7.2.1, semver@^7.3.2: +semver@7.x, semver@^7.3.2: version "7.3.2" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== @@ -13627,9 +13817,11 @@ serialize-error@^2.1.0: integrity sha1-ULZ51WNc34Rme9yOWa9OW4HV9go= serialize-javascript@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.0.0.tgz#492e489a2d77b7b804ad391a5f5d97870952548e" - integrity sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw== + version "3.1.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea" + integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg== + dependencies: + randombytes "^2.1.0" serve-static@^1.13.1: version "1.14.1" @@ -13726,12 +13918,12 @@ shellwords@^0.1.1: integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== side-channel@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947" - integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA== + version "1.0.3" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz#cdc46b057550bbab63706210838df5d4c19519c3" + integrity sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g== dependencies: - es-abstract "^1.17.0-next.1" - object-inspect "^1.7.0" + es-abstract "^1.18.0-next.0" + object-inspect "^1.8.0" signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.3" @@ -14188,9 +14380,9 @@ strip-indent@^2.0.0: integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= strip-json-comments@^3.0.1: - version "3.1.0" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180" - integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w== + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== strip-json-comments@~2.0.1: version "2.0.1" @@ -14238,9 +14430,9 @@ supports-color@^6.1.0: has-flag "^3.0.0" supports-color@^7.0.0, supports-color@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" - integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== dependencies: has-flag "^4.0.0" @@ -14263,9 +14455,9 @@ svg-parser@^2.0.0: integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ== svg-path-properties@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/svg-path-properties/-/svg-path-properties-1.0.4.tgz#e608f38d6e680d8636d0debed0d069b7fee10eeb" - integrity sha512-yoiTZOP37EFt6GetaQlN4IIqUWZSn3i+pMztDg3OtTNwoU0a+0+o7os3PK+UT2nsS115vr02VG4HIzMEVcTzFg== + version "1.0.5" + resolved "https://registry.yarnpkg.com/svg-path-properties/-/svg-path-properties-1.0.5.tgz#8842811f79d722304a6ec6feb8084ba12257c54a" + integrity sha512-Ip3ZJ2pPUAIIskbJKzfBVTssOhW6x8F1VFclm65DRNxi19YPZXedkN6Xe1lxqM/TvIoS2kxZtrZU7ixkoqASUQ== svgo@^1.2.2: version "1.3.2" @@ -14291,7 +14483,7 @@ symbol-observable@1.0.1: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ= -symbol-observable@^1.0.2, symbol-observable@^1.2.0: +symbol-observable@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== @@ -14512,17 +14704,18 @@ trim-right@^1.0.1: integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= ts-jest@^26.0.0: - version "26.1.1" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.1.1.tgz#b98569b8a4d4025d966b3d40c81986dd1c510f8d" - integrity sha512-Lk/357quLg5jJFyBQLnSbhycnB3FPe+e9i7ahxokyXxAYoB0q1pPmqxxRPYr4smJic1Rjcf7MXDBhZWgxlli0A== + version "26.3.0" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.3.0.tgz#6b2845045347dce394f069bb59358253bc1338a9" + integrity sha512-Jq2uKfx6bPd9+JDpZNMBJMdMQUC3sJ08acISj8NXlVgR2d5OqslEHOR2KHMgwymu8h50+lKIm0m0xj/ioYdW2Q== dependencies: + "@types/jest" "26.x" bs-logger "0.x" buffer-from "1.x" fast-json-stable-stringify "2.x" + jest-util "26.x" json5 "2.x" lodash.memoize "4.x" make-error "1.x" - micromatch "4.x" mkdirp "1.x" semver "7.x" yargs-parser "18.x" @@ -14560,20 +14753,20 @@ tsd@^0.11.0: read-pkg-up "^4.0.0" update-notifier "^2.5.0" -tslib@^1.10.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: +tslib@^1.10.0, tslib@^1.13.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.13.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== tslib@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3" - integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g== + version "2.0.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e" + integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ== tslint@^6.1.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.2.tgz#2433c248512cc5a7b2ab88ad44a6b1b34c6911cf" - integrity sha512-UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA== + version "6.1.3" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904" + integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg== dependencies: "@babel/code-frame" "^7.0.0" builtin-modules "^1.1.1" @@ -14586,7 +14779,7 @@ tslint@^6.1.2: mkdirp "^0.5.3" resolve "^1.3.2" semver "^5.3.0" - tslib "^1.10.0" + tslib "^1.13.0" tsutils "^2.29.0" tsutils@^2.29.0: @@ -14658,9 +14851,9 @@ type@^1.0.1: integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3" - integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow== + version "2.1.0" + resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f" + integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA== typedarray-to-buffer@^3.1.2, typedarray-to-buffer@^3.1.5: version "3.1.5" @@ -14694,9 +14887,9 @@ typescript-tuple@^2.2.1: typescript-compare "^0.0.2" typescript@^3.9.6: - version "3.9.6" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.6.tgz#8f3e0198a34c3ae17091b35571d3afd31999365a" - integrity sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw== + version "3.9.7" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" + integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== ua-parser-js@^0.7.18: version "0.7.21" @@ -14712,9 +14905,9 @@ uglify-es@^3.1.9: source-map "~0.6.1" uglify-js@^3.1.4: - version "3.10.1" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.10.1.tgz#dd14767eb7150de97f2573a5ff210db14fffe4ad" - integrity sha512-RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q== + version "3.10.2" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.10.2.tgz#8cfa1209fd04199cc8a7f9930ddedb30b0f1912d" + integrity sha512-GXCYNwqoo0MbLARghYjxVBxDCnU0tLqN7IPLdHHbibCb1NI5zBkU2EPcy/GaVxc0BtTjqyGXJCINe6JMR2Dpow== ulid@2.3.0: version "2.3.0" @@ -14873,9 +15066,9 @@ uri-js@^3.0.2: punycode "^2.1.0" uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + version "4.3.0" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.3.0.tgz#e16cb9ef7b4036d74be59dc7342258e6f1aca20e" + integrity sha512-Q9Q9RlMM08eWfdPPmDDrXd8Ny3R1sY/DaRDR2zTPPneJ6GYiLx3++fPiZobv49ovkYAnHl/P72Ie3HWXIRVVYA== dependencies: punycode "^2.1.0" @@ -14961,30 +15154,25 @@ uuid@3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== -uuid@^3.2.1, uuid@^3.3.2, uuid@^3.4.0: +uuid@^3.0.0, uuid@^3.2.1, uuid@^3.3.2, uuid@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^7.0.0, uuid@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" - integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== - -uuid@^8.0.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.2.0.tgz#cb10dd6b118e2dada7d0cd9730ba7417c93d920e" - integrity sha512-CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q== +uuid@^8.0.0, uuid@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea" + integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ== v8-compile-cache@^2.0.3: version "2.1.1" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745" integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ== -v8-to-istanbul@^4.1.3: - version "4.1.4" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz#b97936f21c0e2d9996d4985e5c5156e9d4e49cd6" - integrity sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ== +v8-to-istanbul@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz#0608f5b49a481458625edb058488607f25498ba5" + integrity sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -15067,7 +15255,7 @@ webidl-conversions@^5.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== -webidl-conversions@^6.0.0: +webidl-conversions@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== @@ -15080,9 +15268,9 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3, whatwg-encoding@^1.0.5: iconv-lite "0.4.24" whatwg-fetch@>=0.10.0, whatwg-fetch@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.1.0.tgz#49d630cdfa308dba7f2819d49d09364f540dbcc6" - integrity sha512-pgmbsVWKpH9GxLXZmtdowDIqtb/rvPyjjQv3z9wLcmgWKFHilKnZD3ldgrOlwJoPGOUluQsRPWd52yVkPfmI1A== + version "3.4.0" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.4.0.tgz#e11de14f4878f773fbebcde8871b2c0699af8b30" + integrity sha512-rsum2ulz2iuZH08mJkT0Yi6JnKhwdw4oeyMjokgxd+mmqYSd9cPpOQf01TIWgjxG/U4+QR+AwKq6lSbXVxkyoQ== whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: version "2.3.0" @@ -15108,13 +15296,13 @@ whatwg-url@^7.0.0: webidl-conversions "^4.0.2" whatwg-url@^8.0.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.1.0.tgz#c628acdcf45b82274ce7281ee31dd3c839791771" - integrity sha512-vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw== + version "8.2.1" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.2.1.tgz#ed73417230784b281fb2a32c3c501738b46167c3" + integrity sha512-ZmVCr6nfBeaMxEHALLEGy0LszYjpJqf6PVNQUQ1qd9Et+q7Jpygd4rGGDXgHjD8e99yLFseD69msHDM4YwPZ4A== dependencies: lodash.sortby "^4.7.0" tr46 "^2.0.2" - webidl-conversions "^5.0.0" + webidl-conversions "^6.1.0" which-boxed-primitive@^1.0.1: version "1.0.1" @@ -15340,9 +15528,9 @@ ws@^5.2.0: async-limiter "~1.0.0" ws@^7, ws@^7.2.3: - version "7.3.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz#4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd" - integrity sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w== + version "7.3.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8" + integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA== x-path@^0.0.2: version "0.0.2" @@ -15424,12 +15612,12 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yaml@^1.7.2: +yaml@^1.10.0, yaml@^1.7.2: version "1.10.0" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e" integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg== -yargs-parser@18.x, yargs-parser@^18.1.1: +yargs-parser@18.x, yargs-parser@^18.1.2: version "18.1.3" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== @@ -15520,9 +15708,9 @@ yargs@^14.2.0: yargs-parser "^15.0.1" yargs@^15.1.0, yargs@^15.3.1: - version "15.3.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" - integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA== + version "15.4.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" + integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== dependencies: cliui "^6.0.0" decamelize "^1.2.0" @@ -15534,12 +15722,12 @@ yargs@^15.1.0, yargs@^15.3.1: string-width "^4.2.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^18.1.1" + yargs-parser "^18.1.2" yarn@^1.22.4: - version "1.22.4" - resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.4.tgz#01c1197ca5b27f21edc8bc472cd4c8ce0e5a470e" - integrity sha512-oYM7hi/lIWm9bCoDMEWgffW8aiNZXCWeZ1/tGy0DWrN6vmzjCXIKu2Y21o8DYVBUtiktwKcNoxyGl/2iKLUNGA== + version "1.22.5" + resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.5.tgz#1933b7635429ca00847222dd9d38f05646e2df23" + integrity sha512-5uzKXwdMc++mYktXqkfpNYT9tY8ViWegU58Hgbo+KXzrzzhEyP1Ip+BTtXloLrXNcNlxFJbLiFKGaS9vK9ym6Q== yup@^0.28.3: version "0.28.5" From 60831ac21c5a80a41ac8ac6bd97071aa8faef92a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Perttu=20L=C3=A4hteenlahti?= Date: Tue, 1 Sep 2020 19:04:57 +0300 Subject: [PATCH 9/9] Finished with changes --- src/Types/SleepClockState.ts | 2 +- src/actions/coaching/content-actions.ts | 4 +-- .../manual-sleep/manual-sleep-actions.ts | 30 ++++++++++++++----- src/actions/sleep/sleep-data-actions.ts | 5 +++- src/components/Charts/SleepChart.tsx | 1 - src/helpers/time.ts | 4 +-- src/store/Reducers/sleepclockReducer.ts | 21 ++++++------- src/store/Selectors/SleepDataSelectors.ts | 24 ++++++++------- src/styles/themes.ts | 8 ++--- src/translations/en.json | 10 +++++-- 10 files changed, 65 insertions(+), 44 deletions(-) diff --git a/src/Types/SleepClockState.ts b/src/Types/SleepClockState.ts index 21fa6f5..5bf14c6 100644 --- a/src/Types/SleepClockState.ts +++ b/src/Types/SleepClockState.ts @@ -17,7 +17,7 @@ export interface SleepClockState { sleepDataUpdated: string today: string current_day: Day - selectedDay: Day + selectedDay: string activeIndex: number | null ratings: [] days: Day[] | [] diff --git a/src/actions/coaching/content-actions.ts b/src/actions/coaching/content-actions.ts index ac907b3..f07f535 100644 --- a/src/actions/coaching/content-actions.ts +++ b/src/actions/coaching/content-actions.ts @@ -28,7 +28,7 @@ const getFieldValue = ( entry: Entry, fieldToGet: string, object: any, - callback?: () => void, + callback?: (args: any) => void, fieldToSet?: string ) => { if (entry.fields[fieldToGet]) { @@ -51,7 +51,7 @@ export const getAllWeeks = (): Thunk => async (dispatch: Dispatch) => { const coachingWeeks: any = await client.getEntries({ locale, content_type: 'coachingWeek', - 'fields.slug[ne]': 'introduction', + // 'fields.slug[ne]': 'introduction', include: 3 }) diff --git a/src/actions/manual-sleep/manual-sleep-actions.ts b/src/actions/manual-sleep/manual-sleep-actions.ts index bb419d9..3920cff 100644 --- a/src/actions/manual-sleep/manual-sleep-actions.ts +++ b/src/actions/manual-sleep/manual-sleep-actions.ts @@ -10,6 +10,7 @@ import { import { GetState } from '../../Types/GetState' import { Day, Value, Night } from '../../Types/Sleepdata' import { updateSleepData } from '../sleep/sleep-data-actions' +import { Dispatch, Thunk } from 'Types/ReduxActions' export const SET_VALUES = 'SET_VALUES' export const TOGGLE_EDIT_MODE = 'TOGGLE_EDIT_MODE' @@ -30,7 +31,7 @@ export const addManualDataToNight = ( date: string, nightStart: { h: number; m: number }, nightEnd: { h: number; m: number } -) => async (dispatch: Function, getState: GetState) => { +): Thunk => async (dispatch: Dispatch, getState: GetState) => { const { sleepclock: { days, nights } } = getState() @@ -102,14 +103,23 @@ export const createNight = async ( value: Value.Asleep } - await AppleHealthKit.saveSleep( - newNightBed, - (error: any, response: any) => {} - ) + await AppleHealthKit.saveSleep(newNightBed, (error: any, response: any) => { + if (error) { + throw error + } else { + return response + } + }) await AppleHealthKit.saveSleep( newNightSleep, - (error: any, response: any) => {} + (error: any, response: any) => { + if (error) { + throw error + } else { + return response + } + } ) } else { const newNight = { @@ -117,6 +127,12 @@ export const createNight = async ( startDate: startTime, endDate: endTime } - await AppleHealthKit.saveSleep(newNight, (error: any, response: any) => {}) + await AppleHealthKit.saveSleep(newNight, (error: any, response: any) => { + if (error) { + throw error + } else { + return response + } + }) } } diff --git a/src/actions/sleep/sleep-data-actions.ts b/src/actions/sleep/sleep-data-actions.ts index 6ea76ac..170d853 100644 --- a/src/actions/sleep/sleep-data-actions.ts +++ b/src/actions/sleep/sleep-data-actions.ts @@ -61,7 +61,10 @@ export const updateDay = (day: Day) => ({ payload: day }) -export const updateSleepData = (data: { days: Day[]; nights: Night[] }) => ({ +export const updateSleepData = (data: { + days: Day[] + nights: Night[] +}): ReduxAction => ({ type: UPDATE_SLEEP_DATA, payload: data }) diff --git a/src/components/Charts/SleepChart.tsx b/src/components/Charts/SleepChart.tsx index 80a7a6c..23cdfc0 100644 --- a/src/components/Charts/SleepChart.tsx +++ b/src/components/Charts/SleepChart.tsx @@ -67,7 +67,6 @@ const SleepTimeChart: FC = () => { const yTicks = scaleY.ticks(5) const xTicks = scaleX.ticks(days.length) - console.log(normalizedSleepData, bedtimeWindow) return ( Sleep Goal Trend diff --git a/src/helpers/time.ts b/src/helpers/time.ts index f40d307..fbdf4a5 100644 --- a/src/helpers/time.ts +++ b/src/helpers/time.ts @@ -215,9 +215,7 @@ export const getFormattedDateOrPlaceholder = ( formatter: string ): string => { if (value) { - const asdasd = parseISO(value) - console.log(asdasd) - return format(asdasd, formatter) + return format(parseISO(value), formatter) } return '-' diff --git a/src/store/Reducers/sleepclockReducer.ts b/src/store/Reducers/sleepclockReducer.ts index 1e03976..51a9390 100644 --- a/src/store/Reducers/sleepclockReducer.ts +++ b/src/store/Reducers/sleepclockReducer.ts @@ -1,6 +1,3 @@ -import { CREATE_SUCCESS } from '@actions/sleep/sleep-to-cloud-actions' -import moment from 'moment' -import ReduxAction from 'Types/ReduxActions' import { RESET_APP } from '@actions/shared' import { CREATE_NEW_CALENDAR, @@ -14,8 +11,10 @@ import { UPDATE_DAY, UPDATE_SLEEP_DATA } from '@actions/sleep/sleep-data-actions' +import { CREATE_SUCCESS } from '@actions/sleep/sleep-to-cloud-actions' +import moment from 'moment' +import ReduxAction from 'Types/ReduxActions' import { sortDays } from '../../helpers/sleep' -import { sameDay } from '../../helpers/time' import { SleepClockState } from '../../Types/SleepClockState' import { Day } from '../../Types/Sleepdata' import { initialState } from '../InitialStates/SleepClock' @@ -36,12 +35,7 @@ const reducer = ( } case SET_TODAY_AS_SELECTED: { - const selectedDay = state.days.find((day: Day) => - sameDay(payload, day.date) - ) - const day = selectedDay || state.selectedDay - - return { ...state, selectedDay: day } + return { ...state, selectedDay: payload } } case CREATE_NEW_CALENDAR: @@ -78,9 +72,12 @@ const reducer = ( case RATE_NIGHT: { const filteredDays = state.days.filter( - (item: Day) => item.date !== state.selectedDay.date + (item: Day) => item.date !== state.selectedDay + ) + const day = state.days.find( + (item: Day) => item.date === state.selectedDay ) - const newDay = { ...state.selectedDay, rating: payload } + const newDay = { ...(day as Day), rating: payload } const daysArray = [...filteredDays, newDay] const sorted = sortDays(daysArray) return { ...state, days: sorted } diff --git a/src/store/Selectors/SleepDataSelectors.ts b/src/store/Selectors/SleepDataSelectors.ts index 9b43cfe..644b6bd 100644 --- a/src/store/Selectors/SleepDataSelectors.ts +++ b/src/store/Selectors/SleepDataSelectors.ts @@ -3,7 +3,7 @@ import { clockTimeToAngle } from 'helpers/geometry' import Moment from 'moment' import { createSelector } from 'reselect' import { SleepClockState } from '../../Types/SleepClockState' -import { Day } from '../../Types/Sleepdata' +import { Day, Days } from '../../Types/Sleepdata' import { State } from '../../Types/State' const getState = (state: State) => state.sleepclock @@ -209,7 +209,7 @@ const dummyDay: Day = { } const getSday = (state: State) => - state.sleepclock.selectedDay ? state.sleepclock.selectedDay : dummyDay + state.sleepclock.selectedDay ? state.sleepclock.selectedDay : dummyDay.date const getSleepclock = (state: State) => state.sleepclock @@ -219,18 +219,22 @@ export const getSleepTrackerName = createSelector( ) export const getSelectedDay = createSelector( - (state: State) => state.sleepclock.selectedDay, - (selectedDay) => selectedDay + [getDays, getSday], + (days, selectedDay) => { + const fromState = days.find((day) => day.date === selectedDay) + const day = fromState ?? { ...dummyDay, date: selectedDay } + return day + } ) export const getSelectedDayInBedDuration = createSelector( - getSday, - (selectedDay) => selectedDay.inBedDuration + getSelectedDay, + (selectedDay) => (selectedDay ? selectedDay.inBedDuration : 0) ) export const getSelectedDayAsleepDuration = createSelector( - getSday, - (selectedDay) => selectedDay.asleepDuration + getSelectedDay, + (selectedDay) => (selectedDay ? selectedDay.asleepDuration : 0) ) export const getSleepDataUpdated = createSelector( @@ -249,13 +253,13 @@ export const getStartDate = createSelector( ) export const getNightInAngles = createSelector(getSelectedDay, (day) => { - if (day.bedEnd && day.bedStart) { + if (day?.bedEnd && day?.bedStart) { return { startAngle: clockTimeToAngle(day.bedStart), endAngle: clockTimeToAngle(day.bedEnd) } } - if (day.sleepEnd && day.sleepStart) { + if (day?.sleepEnd && day?.sleepStart) { return { startAngle: clockTimeToAngle(day.sleepStart), endAngle: clockTimeToAngle(day.sleepEnd) diff --git a/src/styles/themes.ts b/src/styles/themes.ts index f0b6fff..df11bb5 100644 --- a/src/styles/themes.ts +++ b/src/styles/themes.ts @@ -34,11 +34,11 @@ export const lightTheme: DefaultTheme = { SECONDARY_BUTTON_COLOR: colors.radiantBlue, HAIRLINE_COLOR: '#C9C9CB', GRADIENT: [ - 'rgba(255,255,255,0)', - 'rgba(255,255,255,0)', - 'rgba(255,255,255,1)' + 'rgba(246,246,249,0)', + 'rgba(246,246,249,0)', + 'rgba(246,246,249,1)' ], - SHADOW: ` 1px 1px 5px rgba(32, 33, 37, 0.1)`, + SHADOW: `1px 1px 5px rgba(32, 33, 37, 0.1)`, FONT_REGULAR: 'Montserrat-Regular', FONT_MEDIUM: 'Montserrat-Medium', diff --git a/src/translations/en.json b/src/translations/en.json index e60fd25..573007d 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -79,7 +79,7 @@ "Time asleep": "Time asleep", "ClockNotLoading": "Something went wrong in loading data", - "Sleep Goal Trend": "Sleep Goal Trend", + "Sleep Goal Trend": "Sleep Trend", "NEED_HELP": { "TITLE": "Need Help?", @@ -602,7 +602,10 @@ "HABITS": "Habits", "ACTIVE": "Active Habits", + "ACTIVE_SUBTITLE": "Habits that are currently active.", "ARCHIVED": "Archived Habits", + "ARCHIVED_SUBTITLE": "Habits that have been archived previously.", + "COMPLETED_HABITS": "{{completedCount}}/{{taskCount}} habits completed", "NEW_HABIT": "New Habit", "HABIT_STREAK": "{{dayStreak}}-day streak", @@ -618,9 +621,10 @@ "DESCRIPTION_FIELD": "Description", "LONGEST_STREAK": "Longest streak", "CURRENT_STREAK": "Current streak", + "WARNING_TITLE_EXISTS": "Habit with this title already exists.", - "EXPLANATION_1": "TODO", - "EXPLANATION_2": "TODO", + "EXPLANATION_1": "Here you manage your Habits. You can create new ones from the top right corner. By swiping left or right on the Habit card, you can mark it as completed, archive it, or delete it.", + "EXPLANATION_2": "", "MORNING": "Morning", "AFTERNOON": "Afternoon",