From c5072bc1e605e8dab81bcc49d62ddbaa32634a1e Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Wed, 17 Apr 2019 15:59:05 +0200 Subject: [PATCH 01/42] Update .gitignore --- .gitignore | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 723c5be5..92cd2eb5 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,9 @@ yarn-error.log* .DS_Store # secrets -app.json \ No newline at end of file +app.json +.idea/misc.xml +.idea/modules.xml +.idea/shoot-i-smoke.iml +.idea/vcs.xml +.idea/workspace.xml From 3b805f0c5209709ce169249e649b46b2271a4c72 Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Wed, 17 Apr 2019 16:00:06 +0200 Subject: [PATCH 02/42] Implement translation package & translate ErrorScreen --- App/Screens/ErrorScreen/ErrorScreen.js | 15 ++++++--------- App/localization/index.js | 17 +++++++++++++++++ App/localization/languages/en.json | 8 ++++++++ App/localization/languages/fr.json | 5 +++++ package.json | 1 + yarn.lock | 5 +++++ 6 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 App/localization/index.js create mode 100644 App/localization/languages/en.json create mode 100644 App/localization/languages/fr.json diff --git a/App/Screens/ErrorScreen/ErrorScreen.js b/App/Screens/ErrorScreen/ErrorScreen.js index 6b80e62c..8b314ee3 100644 --- a/App/Screens/ErrorScreen/ErrorScreen.js +++ b/App/Screens/ErrorScreen/ErrorScreen.js @@ -7,6 +7,7 @@ import { Image, StyleSheet, Text, TouchableOpacity, View } from 'react-native'; import error from '../../../assets/images/error.png'; import * as theme from '../../utils/theme'; +import { i18n } from "../../localization"; @inject('stores') @observer @@ -21,23 +22,19 @@ export class ErrorScreen extends Component { - Sorry! - {'\n'} - We cannot - {'\n'} - load your cigarettes. + {i18n.t('error_screen_common_sorry')} + {i18n.t('error_screen_error_cannot_load_cigarettes')} - CHOOSE OTHER LOCATION + {i18n.t('error_screen_choose_other_location').toUpperCase()} - There's either a problem with our databases, or you don't have any Air - Monitoring Stations near you. Try again later! + {i18n.t('error_screen_error_description')} - Error: {errorText} + {i18n.t('error_screen_error_message', { errorText })} ); } diff --git a/App/localization/index.js b/App/localization/index.js new file mode 100644 index 00000000..2efea791 --- /dev/null +++ b/App/localization/index.js @@ -0,0 +1,17 @@ +import { Localization } from 'expo'; +import i18n from 'i18n-js'; + +// languages +const en = require('./languages/en'); +const fr = require('./languages/fr'); + +i18n.fallbacks = true; +i18n.translations = { + en, + fr +}; +i18n.locale = Localization.locale; + +export { + i18n +}; diff --git a/App/localization/languages/en.json b/App/localization/languages/en.json new file mode 100644 index 00000000..a5f29b83 --- /dev/null +++ b/App/localization/languages/en.json @@ -0,0 +1,8 @@ +{ + "app_name": "Sh**t! I smoke!", + "error_screen_common_sorry": "Sorry!\n", + "error_screen_error_cannot_load_cigarettes": "We cannot\nload your\ncigarettes.", + "error_screen_choose_other_location": "Choose other location", + "error_screen_error_description": "There's either a problem with our databases, or you don't have any Air\nMonitoring Stations near you. Try again later!", + "error_screen_error_message": "Error: {{errorText}}" +} diff --git a/App/localization/languages/fr.json b/App/localization/languages/fr.json new file mode 100644 index 00000000..a99d2a75 --- /dev/null +++ b/App/localization/languages/fr.json @@ -0,0 +1,5 @@ +{ + "app_name": "Sh**t! I smoke!", + "error_screen_common_sorry": "Désolé!\n", + "error_screen_error_cannot_load_cigarettes": "Nous n'avons pas pu\ncharger vos\ncigarettes." +} diff --git a/package.json b/package.json index f6cb623e..ffaeff80 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "date-fns": "^2.0.0-alpha.25", "expo": "^32.0.0", "haversine": "^1.1.0", + "i18n-js": "^3.2.1", "mobx": "^4.6.0", "mobx-react": "^5.3.6", "mobx-state-tree": "^3.7.1", diff --git a/yarn.lock b/yarn.lock index 2e769760..341b9640 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4069,6 +4069,11 @@ https-proxy-agent@^2.2.1: agent-base "^4.1.0" debug "^3.1.0" +i18n-js@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/i18n-js/-/i18n-js-3.2.1.tgz#26cea8e327207bebccf1030baa761c5245ceb63b" + integrity sha512-AN8Ol+7QMcRml338l5W7JeNsJgXZqXHOwF+e2iKu6gqRM87bmbxk3g2CAfapo7+5ASKOhl+0PiH+YP8OjN+rXg== + iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" From 0f8f707470b723080185b068b5b833ca91ab8280 Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Wed, 17 Apr 2019 18:23:40 +0200 Subject: [PATCH 03/42] Finish translations setup --- App/Screens/About/About.js | 41 ++++++---------- App/Screens/Details/Details.js | 5 +- App/Screens/Details/Distance/Distance.js | 3 +- App/Screens/Details/Header/Header.js | 5 +- App/Screens/Home/Header/Header.js | 4 +- App/Screens/Home/Home.js | 46 ++++++++++-------- App/Screens/Home/swearWords.js | 11 +++++ App/Screens/Home/swearWords.json | 1 - App/Screens/Loading/Loading.js | 5 +- .../Search/SearchHeader/SearchHeader.js | 3 +- App/components/BackButton/BackButton.js | 3 +- App/localization/languages/en.json | 47 ++++++++++++++++++- 12 files changed, 115 insertions(+), 59 deletions(-) create mode 100644 App/Screens/Home/swearWords.js delete mode 100644 App/Screens/Home/swearWords.json diff --git a/App/Screens/About/About.js b/App/Screens/About/About.js index 233cae54..c70b9ebe 100644 --- a/App/Screens/About/About.js +++ b/App/Screens/About/About.js @@ -8,6 +8,7 @@ import { Linking, ScrollView, StyleSheet, Text, View } from 'react-native'; import { Box } from './Box'; import * as theme from '../../utils/theme'; import { BackButton } from '../../components/BackButton'; +import {i18n} from "../../localization"; export class About extends PureComponent { handleOpenAmaury = () => Linking.openURL('https://twitter.com/amaurymartiny'); @@ -32,15 +33,14 @@ export class About extends PureComponent { - How do you calculate the number of cigarettes? + {i18n.t('about_how_do_you_calculate_the_number_of_cigarettes_title')} - This app was inspired by Berkeley Earth’s findings about the{' '} + {i18n.t('about_how_do_you_calculate_the_number_of_cigarettes_message_1')}{' '} - equivalence between air pollution and cigarette smoking + {i18n.t('about_how_do_you_calculate_the_number_of_cigarettes_link_1')} - . The rule of thumb is simple: one cigarette per day is the rough - equivalent of a PM2.5 level of 22{' '} + {i18n.t('about_how_do_you_calculate_the_number_of_cigarettes_message_2')}{' '} µ g/m³ {' \u207D'} @@ -57,46 +57,35 @@ export class About extends PureComponent { - Where does the data come from? + {i18n.t('about_where_does_data_come_from_title')} - Air quality data comes from{' '} + {i18n.t('about_where_does_data_come_from_message_1')}{' '} - WAQI + {i18n.t('about_where_does_data_come_from_link_1')} {' '} - in the form of PM2.5 AQI levels which are usually updated every one - hour and converted to direct PM2.5 levels by the app. + {i18n.t('about_were_does_data_come_from_message_2')} - Why is the station so far away from my current location? + {i18n.t('about_why_is_the_station_so_far_title')} - Since stations that measure and communicate Air Quality results - every hour are expensive, the data is still limited to - well-developed regions and larger cities around the globe. If you - are far from a more prominent urban center, results will probably - not be so accurate. Chances are that your air is better in that case - at least! + {i18n.t('about_why_is_the_station_so_far_message')} - The results are weird or inconsistent with other sources! + {i18n.t('about_weird_results_title')} - We have also encountered a few surprising results: large cities with - better air than small villages; sudden huge increases in the number - of cigarettes; stations of the same town showing significantly - different numbers... The fact is air quality depends on several - factors such as temperature, pressure, humidity and even wind - direction and intensity. If the result seems weird for you, check{' '} + {i18n.t('about_weird_results_message_1')}{' '} - WAQI + {i18n.t('about_weird_results_link_1')} {' '} - for more information and history on your station. + {i18n.t('about_weird_results_message_2')} diff --git a/App/Screens/Details/Details.js b/App/Screens/Details/Details.js index aa5020b7..9901dd90 100644 --- a/App/Screens/Details/Details.js +++ b/App/Screens/Details/Details.js @@ -13,6 +13,7 @@ import { Header } from './Header'; import homeIcon from '../../../assets/images/home.png'; import stationIcon from '../../../assets/images/station.png'; import * as theme from '../../utils/theme'; +import {i18n} from "../../localization"; @inject('stores') @observer @@ -83,14 +84,14 @@ export class Details extends Component { coordinate={station} image={stationIcon} ref={this.handleStationRef} - title='Air Quality Station' + title={i18n.t('details_air_quality_station_marker')} description={truncate(station.description, 40)} /> )} diff --git a/App/Screens/Details/Distance/Distance.js b/App/Screens/Details/Distance/Distance.js index 2c1859cd..0c16d6df 100644 --- a/App/Screens/Details/Distance/Distance.js +++ b/App/Screens/Details/Distance/Distance.js @@ -7,6 +7,7 @@ import { StyleSheet, Text } from 'react-native'; import { Banner } from '../../../components/Banner'; import * as theme from '../../../utils/theme'; +import {i18n} from "../../../localization"; @inject('stores') @observer @@ -19,7 +20,7 @@ export class Distance extends Component { return ( - AQI STATION: {distanceToStation}KM AWAY + {i18n.t('details_distance_label', { distanceToStation }).toUpperCase()} ); diff --git a/App/Screens/Details/Header/Header.js b/App/Screens/Details/Header/Header.js index 75912675..48b61db6 100644 --- a/App/Screens/Details/Header/Header.js +++ b/App/Screens/Details/Header/Header.js @@ -10,6 +10,7 @@ import { BackButton } from '../../../components/BackButton'; import locationIcon from '../../../../assets/images/location.png'; import { CurrentLocation } from '../../../components/CurrentLocation'; import * as theme from '../../../utils/theme'; +import {i18n} from "../../../localization"; const trackedPollutant = ['pm25', 'pm10', 'co', 'o3', 'no2', 'so2']; @@ -37,11 +38,11 @@ export class Header extends Component { {lastUpdated && this.renderInfo( - 'Latest Update:', + i18n.t('details_header_latest_update_label'), formatRelative(lastUpdated, new Date()) )} {dominentpol && - this.renderInfo('Primary pollutant:', dominentpol.toUpperCase())} + this.renderInfo(i18n.t('details_header_primary_pollutant_label'), dominentpol.toUpperCase())} {trackedPollutant.map( diff --git a/App/Screens/Home/Header/Header.js b/App/Screens/Home/Header/Header.js index a6e022cb..9151a2ee 100644 --- a/App/Screens/Home/Header/Header.js +++ b/App/Screens/Home/Header/Header.js @@ -9,6 +9,7 @@ import changeLocation from '../../../../assets/images/changeLocation.png'; import { CurrentLocation } from '../../../components/CurrentLocation'; import * as theme from '../../../utils/theme'; import warning from '../../../../assets/images/warning.png'; +import {i18n} from "../../../localization"; @inject('stores') @observer @@ -33,8 +34,7 @@ export class Header extends Component { )} - Air Quality Station: {distanceToStation} - km away + {i18n.t('home_header_air_quality_station_distance', { distanceToStation })} diff --git a/App/Screens/Home/Home.js b/App/Screens/Home/Home.js index 5672ef97..47a52907 100644 --- a/App/Screens/Home/Home.js +++ b/App/Screens/Home/Home.js @@ -18,6 +18,7 @@ import { SmallButton } from './SmallButton'; import { SmokeVideo } from './SmokeVideo'; import swearWords from './swearWords'; import * as theme from '../../utils/theme'; +import {i18n} from "../../localization"; @inject('stores') @observer @@ -30,11 +31,8 @@ export class Home extends Component { handleShare = () => Share.share({ - title: - 'Did you know that you may be smoking up to 20 cigarettes per day, just for living in a big city?', - message: `Shoot! I 'smoked' ${ - this.props.stores.cigarettes - } cigarettes today by breathing urban air. And you? Find out here: https://shootismoke.github.io` + title: i18n.t('home_share_title'), + message: i18n.t('home_share_message', { cigarettes: this.props.stores.cigarettes }) }); render () { @@ -57,8 +55,7 @@ export class Home extends Component { {isStationTooFar && ( - We couldn’t find a closer station to you.{'\n'}Results may be - inaccurate at this distance. + {i18n.t('home_station_too_far_message')} )} {this.renderBigButton()} @@ -77,7 +74,7 @@ export class Home extends Component { return ( - WHY IS THE STATION SO FAR? + {i18n.t('home_btn_why_is_station_so_far').toUpperCase()} ); @@ -86,7 +83,7 @@ export class Home extends Component { return ( - SEE DETAILED INFO + {i18n.t('home_btn_see_detailed_info').toUpperCase()} ); @@ -101,17 +98,17 @@ export class Home extends Component { {isStationTooFar ? ( ) : ( )} - + ); }; @@ -119,8 +116,8 @@ export class Home extends Component { renderPresentPast = () => { const time = new Date().getHours(); - if (time < 15) return "You'll smoke"; - return 'You smoked'; + if (time < 15) return i18n.t('home_common_you_ll_smoke'); + return i18n.t('home_common_you_smoked'); }; renderShit = () => { @@ -128,7 +125,7 @@ export class Home extends Component { stores: { cigarettes } } = this.props; - if (cigarettes <= 1) return 'Oh'; + if (cigarettes <= 1) return i18n.t('home_common_oh'); // Return a random swear word return swearWords[Math.floor(Math.random() * swearWords.length)]; @@ -139,14 +136,23 @@ export class Home extends Component { // Round to 1 decimal const cigarettes = Math.round(stores.cigarettes * 10) / 10; + const text = i18n.t('home_smoked_cigarette_title', { + swearWord: this.renderShit(), + presentPast: this.renderPresentPast(), + singularPlural: cigarettes === 1 ? i18n.t('home_common_cigarette').toLowerCase() : i18n.t('home_common_cigarettes').toLowerCase(), + cigarettes + }); + + const firstPartText = text.split('<')[0]; + const secondPartText = text.split('<')[1]; + return ( - {this.renderShit()}! {this.renderPresentPast()}{' '} + {firstPartText} - {cigarettes} cigarette - {cigarettes === 1 ? '' : 's'} - {' '} - today. + {secondPartText.split('>')[0]} + + {secondPartText.split('>')[1]} ); }; diff --git a/App/Screens/Home/swearWords.js b/App/Screens/Home/swearWords.js new file mode 100644 index 00000000..abb8bbab --- /dev/null +++ b/App/Screens/Home/swearWords.js @@ -0,0 +1,11 @@ +import { i18n } from "../../localization"; + +export default [ + i18n.t('home_swear_word_shoot'), + i18n.t('home_swear_word_dang'), + i18n.t('home_swear_word_darn'), + i18n.t('home_swear_word_geez'), + i18n.t('home_swear_word_omg'), + i18n.t('home_swear_word_crap'), + i18n.t('home_swear_word_arrgh') +]; diff --git a/App/Screens/Home/swearWords.json b/App/Screens/Home/swearWords.json deleted file mode 100644 index 76e845ef..00000000 --- a/App/Screens/Home/swearWords.json +++ /dev/null @@ -1 +0,0 @@ -["Shoot", "Dang", "Darn", "Geez", "OMG", "Crap", "Arrgh"] diff --git a/App/Screens/Loading/Loading.js b/App/Screens/Loading/Loading.js index 934232d9..2555f975 100644 --- a/App/Screens/Loading/Loading.js +++ b/App/Screens/Loading/Loading.js @@ -10,6 +10,7 @@ import { StyleSheet, Text } from 'react-native'; import { Background } from './Background'; import * as dataSources from '../../utils/dataSources'; import * as theme from '../../utils/theme'; +import {i18n} from "../../localization"; @inject('stores') @observer @@ -113,7 +114,7 @@ export class Loading extends Component { renderCough = index => ( - Cough + {i18n.t('loading_title_cough')} ... ); @@ -133,7 +134,7 @@ export class Loading extends Component { return ( - Loading + {i18n.t('loading_title_loading')} ... {Array.from({ length: coughs }, (_, index) => index + 1).map( // Create array 1..N and rendering Cough... diff --git a/App/Screens/Search/SearchHeader/SearchHeader.js b/App/Screens/Search/SearchHeader/SearchHeader.js index b9409723..d1b68c50 100644 --- a/App/Screens/Search/SearchHeader/SearchHeader.js +++ b/App/Screens/Search/SearchHeader/SearchHeader.js @@ -7,6 +7,7 @@ import { Image, StyleSheet, TextInput } from 'react-native'; import { Banner } from '../../../components/Banner'; import searchIcon from '../../../../assets/images/search.png'; import * as theme from '../../../utils/theme'; +import {i18n} from "../../../localization"; export class SearchHeader extends PureComponent { render () { @@ -16,7 +17,7 @@ export class SearchHeader extends PureComponent { this.props.onClick(); @@ -21,7 +22,7 @@ export class BackButton extends PureComponent { style={styles.backButton} > - Back + {i18n.t('nav_btn_back')} ); diff --git a/App/localization/languages/en.json b/App/localization/languages/en.json index a5f29b83..6a9a79e1 100644 --- a/App/localization/languages/en.json +++ b/App/localization/languages/en.json @@ -4,5 +4,50 @@ "error_screen_error_cannot_load_cigarettes": "We cannot\nload your\ncigarettes.", "error_screen_choose_other_location": "Choose other location", "error_screen_error_description": "There's either a problem with our databases, or you don't have any Air\nMonitoring Stations near you. Try again later!", - "error_screen_error_message": "Error: {{errorText}}" + "error_screen_error_message": "Error: {{errorText}}", + "home_station_too_far_message": "We couldn’t find a closer station to you.\nResults may be inaccurate at this distance.", + "home_share_title": "Did you know that you may be smoking up to 20 cigarettes per day, just for living in a big city?", + "home_share_message": "Shoot! I 'smoked' {{cigarettes}} cigarettes today by breathing urban air. And you? Find out here: https://shootismoke.github.io", + "home_header_air_quality_station_distance": "Air Quality Station: {{distanceToStation}}km away", + "home_btn_why_is_station_so_far": "Why is the station so far?", + "home_btn_see_detailed_info": "See detailed info", + "home_btn_more_details": "More details", + "home_btn_faq_about": "Faq/About", + "home_btn_share": "Share", + "home_common_you_ll_smoke": "You'll smoke", + "home_common_you_smoked": "You smoked", + "home_common_oh": "Oh", + "home_common_cigarette": "Cigarette", + "home_common_cigarettes": "Cigarettes", + "home_smoked_cigarette_title": "{{swearWord}}! {{presentPast}} <{{cigarettes}} {{singularPlural}}> today.", + "home_swear_word_dang": "Dang", + "home_swear_word_shoot": "Shoot", + "home_swear_word_darn": "Darn", + "home_swear_word_geez": "Geez", + "home_swear_word_omg": "OMG", + "home_swear_word_crap": "Crap", + "home_swear_word_arrgh": "Arrgh", + "loading_title_cough": "Cough", + "loading_title_loading": "Loading", + "search_header_input_placeholder": "Search for a city or address", + "nav_btn_back": "Back", + "details_air_quality_station_marker": "Air Quality Station", + "details_your_position_marker": "Your position", + "details_header_latest_update_label": "Latest Update:", + "details_header_primary_pollutant_label": "Primary Pollutant:", + "details_distance_label": "AQI Station: {{distanceToStation}}km away", + "about_how_do_you_calculate_the_number_of_cigarettes_title": "How do you calculate the number of cigarettes?", + "about_how_do_you_calculate_the_number_of_cigarettes_message_1": "This app was inspired by Berkeley Earth’s findings about the", + "about_how_do_you_calculate_the_number_of_cigarettes_link_1": "equivalence between air pollution and cigarette smoking", + "about_how_do_you_calculate_the_number_of_cigarettes_message_2": ". The rule of thumb is simple: one cigarette per day is the rough equivalent of a PM2.5 level of 22", + "about_where_does_data_come_from_title": "Where does the data come from?", + "about_where_does_data_come_from_message_1": "Air quality data comes from", + "about_where_does_data_come_from_link_1": "WAQI", + "about_were_does_data_come_from_message_2": "in the form of PM2.5 AQI levels which are usually updated every one hour and converted to direct PM2.5 levels by the app.", + "about_why_is_the_station_so_far_title": "Why is the station so far away from my current location?", + "about_why_is_the_station_so_far_message": "Since stations that measure and communicate Air Quality results every hour are expensive, the data is still limited to well-developed regions and larger cities around the globe. If you are far from a more prominent urban center, results will probably not be so accurate. Chances are that your air is better in that case at least!", + "about_weird_results_title": "The results are weird or inconsistent with other sources!", + "about_weird_results_message_1": "We have also encountered a few surprising results: large cities with better air than small villages; sudden huge increases in the number of cigarettes; stations of the same town showing significantly different numbers... The fact is air quality depends on several factors such as temperature, pressure, humidity and even wind direction and intensity. If the result seems weird for you, check", + "about_weird_results_link_1": "WAQI", + "about_weird_results_message_2": "for more information and history on your station." } From 8bb12ec7f25458463142d5473202c52c6ea65fbe Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Wed, 17 Apr 2019 18:47:03 +0200 Subject: [PATCH 04/42] Minor lint fixes --- App/Screens/About/About.js | 2 +- App/Screens/Details/Details.js | 2 +- App/Screens/Details/Distance/Distance.js | 2 +- App/Screens/Details/Header/Header.js | 2 +- App/Screens/ErrorScreen/ErrorScreen.js | 2 +- App/Screens/Home/Header/Header.js | 2 +- App/Screens/Home/Home.js | 2 +- App/Screens/Home/swearWords.js | 16 ++++++++-------- App/Screens/Loading/Loading.js | 2 +- App/Screens/Search/SearchHeader/SearchHeader.js | 2 +- App/components/BackButton/BackButton.js | 2 +- App/localization/index.js | 6 +++--- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/App/Screens/About/About.js b/App/Screens/About/About.js index c70b9ebe..2629f29c 100644 --- a/App/Screens/About/About.js +++ b/App/Screens/About/About.js @@ -8,7 +8,7 @@ import { Linking, ScrollView, StyleSheet, Text, View } from 'react-native'; import { Box } from './Box'; import * as theme from '../../utils/theme'; import { BackButton } from '../../components/BackButton'; -import {i18n} from "../../localization"; +import {i18n} from '../../localization'; export class About extends PureComponent { handleOpenAmaury = () => Linking.openURL('https://twitter.com/amaurymartiny'); diff --git a/App/Screens/Details/Details.js b/App/Screens/Details/Details.js index 9901dd90..42be5d65 100644 --- a/App/Screens/Details/Details.js +++ b/App/Screens/Details/Details.js @@ -13,7 +13,7 @@ import { Header } from './Header'; import homeIcon from '../../../assets/images/home.png'; import stationIcon from '../../../assets/images/station.png'; import * as theme from '../../utils/theme'; -import {i18n} from "../../localization"; +import {i18n} from '../../localization'; @inject('stores') @observer diff --git a/App/Screens/Details/Distance/Distance.js b/App/Screens/Details/Distance/Distance.js index 0c16d6df..77551870 100644 --- a/App/Screens/Details/Distance/Distance.js +++ b/App/Screens/Details/Distance/Distance.js @@ -7,7 +7,7 @@ import { StyleSheet, Text } from 'react-native'; import { Banner } from '../../../components/Banner'; import * as theme from '../../../utils/theme'; -import {i18n} from "../../../localization"; +import {i18n} from '../../../localization'; @inject('stores') @observer diff --git a/App/Screens/Details/Header/Header.js b/App/Screens/Details/Header/Header.js index 48b61db6..58300b1a 100644 --- a/App/Screens/Details/Header/Header.js +++ b/App/Screens/Details/Header/Header.js @@ -10,7 +10,7 @@ import { BackButton } from '../../../components/BackButton'; import locationIcon from '../../../../assets/images/location.png'; import { CurrentLocation } from '../../../components/CurrentLocation'; import * as theme from '../../../utils/theme'; -import {i18n} from "../../../localization"; +import {i18n} from '../../../localization'; const trackedPollutant = ['pm25', 'pm10', 'co', 'o3', 'no2', 'so2']; diff --git a/App/Screens/ErrorScreen/ErrorScreen.js b/App/Screens/ErrorScreen/ErrorScreen.js index 8b314ee3..872e2129 100644 --- a/App/Screens/ErrorScreen/ErrorScreen.js +++ b/App/Screens/ErrorScreen/ErrorScreen.js @@ -7,7 +7,7 @@ import { Image, StyleSheet, Text, TouchableOpacity, View } from 'react-native'; import error from '../../../assets/images/error.png'; import * as theme from '../../utils/theme'; -import { i18n } from "../../localization"; +import { i18n } from '../../localization'; @inject('stores') @observer diff --git a/App/Screens/Home/Header/Header.js b/App/Screens/Home/Header/Header.js index 9151a2ee..4ac667c6 100644 --- a/App/Screens/Home/Header/Header.js +++ b/App/Screens/Home/Header/Header.js @@ -9,7 +9,7 @@ import changeLocation from '../../../../assets/images/changeLocation.png'; import { CurrentLocation } from '../../../components/CurrentLocation'; import * as theme from '../../../utils/theme'; import warning from '../../../../assets/images/warning.png'; -import {i18n} from "../../../localization"; +import {i18n} from '../../../localization'; @inject('stores') @observer diff --git a/App/Screens/Home/Home.js b/App/Screens/Home/Home.js index 47a52907..a06625fa 100644 --- a/App/Screens/Home/Home.js +++ b/App/Screens/Home/Home.js @@ -18,7 +18,7 @@ import { SmallButton } from './SmallButton'; import { SmokeVideo } from './SmokeVideo'; import swearWords from './swearWords'; import * as theme from '../../utils/theme'; -import {i18n} from "../../localization"; +import {i18n} from '../../localization'; @inject('stores') @observer diff --git a/App/Screens/Home/swearWords.js b/App/Screens/Home/swearWords.js index abb8bbab..fcbd2517 100644 --- a/App/Screens/Home/swearWords.js +++ b/App/Screens/Home/swearWords.js @@ -1,11 +1,11 @@ -import { i18n } from "../../localization"; +import { i18n } from '../../localization'; export default [ - i18n.t('home_swear_word_shoot'), - i18n.t('home_swear_word_dang'), - i18n.t('home_swear_word_darn'), - i18n.t('home_swear_word_geez'), - i18n.t('home_swear_word_omg'), - i18n.t('home_swear_word_crap'), - i18n.t('home_swear_word_arrgh') + i18n.t('home_swear_word_shoot'), + i18n.t('home_swear_word_dang'), + i18n.t('home_swear_word_darn'), + i18n.t('home_swear_word_geez'), + i18n.t('home_swear_word_omg'), + i18n.t('home_swear_word_crap'), + i18n.t('home_swear_word_arrgh') ]; diff --git a/App/Screens/Loading/Loading.js b/App/Screens/Loading/Loading.js index 2555f975..ad2c75f8 100644 --- a/App/Screens/Loading/Loading.js +++ b/App/Screens/Loading/Loading.js @@ -10,7 +10,7 @@ import { StyleSheet, Text } from 'react-native'; import { Background } from './Background'; import * as dataSources from '../../utils/dataSources'; import * as theme from '../../utils/theme'; -import {i18n} from "../../localization"; +import {i18n} from '../../localization'; @inject('stores') @observer diff --git a/App/Screens/Search/SearchHeader/SearchHeader.js b/App/Screens/Search/SearchHeader/SearchHeader.js index d1b68c50..eca90439 100644 --- a/App/Screens/Search/SearchHeader/SearchHeader.js +++ b/App/Screens/Search/SearchHeader/SearchHeader.js @@ -7,7 +7,7 @@ import { Image, StyleSheet, TextInput } from 'react-native'; import { Banner } from '../../../components/Banner'; import searchIcon from '../../../../assets/images/search.png'; import * as theme from '../../../utils/theme'; -import {i18n} from "../../../localization"; +import {i18n} from '../../../localization'; export class SearchHeader extends PureComponent { render () { diff --git a/App/components/BackButton/BackButton.js b/App/components/BackButton/BackButton.js index edba45c3..065d797c 100644 --- a/App/components/BackButton/BackButton.js +++ b/App/components/BackButton/BackButton.js @@ -6,7 +6,7 @@ import { Image, StyleSheet, Text, TouchableOpacity, View } from 'react-native'; import backIcon from '../../../assets/images/back.png'; import * as theme from '../../utils/theme'; -import {i18n} from "../../localization"; +import {i18n} from '../../localization'; export class BackButton extends PureComponent { onClick = () => this.props.onClick(); diff --git a/App/localization/index.js b/App/localization/index.js index 2efea791..fbdab696 100644 --- a/App/localization/index.js +++ b/App/localization/index.js @@ -7,11 +7,11 @@ const fr = require('./languages/fr'); i18n.fallbacks = true; i18n.translations = { - en, - fr + en, + fr }; i18n.locale = Localization.locale; export { - i18n + i18n }; From 574268fe66ad05c8e6602f526922a5013388711a Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Wed, 17 Apr 2019 20:28:54 +0200 Subject: [PATCH 05/42] Possible dark video background issue fix --- App/Screens/Home/SmokeVideo/SmokeVideo.js | 37 +++++++++++++++-------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/App/Screens/Home/SmokeVideo/SmokeVideo.js b/App/Screens/Home/SmokeVideo/SmokeVideo.js index c940a473..a696a30f 100644 --- a/App/Screens/Home/SmokeVideo/SmokeVideo.js +++ b/App/Screens/Home/SmokeVideo/SmokeVideo.js @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0 import React, { Component } from 'react'; -import { Dimensions, StyleSheet } from 'react-native'; +import { Dimensions, StyleSheet, View } from 'react-native'; import { inject, observer } from 'mobx-react'; import { Video } from 'expo'; @@ -16,26 +16,39 @@ export class SmokeVideo extends Component { stores: { cigarettes } } = this.props; - if (cigarettes <= 1) return { opacity: 0.2 }; - if (cigarettes < 5) return { opacity: 0.5 }; - if (cigarettes < 15) return { opacity: 0.7 }; - return { opacity: 1 }; + if (cigarettes <= 1) return { backgroundColor: '#FFFFFFCC' }; + if (cigarettes < 5) return { backgroundColor: '#FFFFFFAA' }; + if (cigarettes < 15) return { backgroundColor: '#FFFFFF22' }; + return { backgroundColor: '#FFFFFF00' }; }; render () { return ( - + + {i18n.t('about_language')}: + + ); @@ -157,6 +162,20 @@ const styles = StyleSheet.create({ lineHeight: 24, marginBottom: theme.spacing.small }, + language: { + flexDirection: 'row', + marginTop: theme.spacing.normal + }, + micro: { + ...Platform.select({ + ios: { + fontFamily: 'Georgia' + }, + android: { + fontFamily: 'normal' + } + }) + }, section: { marginBottom: theme.spacing.big } diff --git a/App/Screens/About/Language/Language.js b/App/Screens/About/Language/Language.js new file mode 100644 index 00000000..a953ddcc --- /dev/null +++ b/App/Screens/About/Language/Language.js @@ -0,0 +1,71 @@ +// Sh**t! I Smoke +// Copyright (C) 2018-2019 Marcelo S. Coelho, Amaury Martiny + +// Sh**t! I Smoke is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Sh**t! I Smoke is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Sh**t! I Smoke. If not, see . + +import { inject, observer } from 'mobx-react'; +import React, { Component } from 'react'; +import { Picker, StyleSheet, Text, View } from 'react-native'; + +import { i18n } from '../../../localization'; +import * as names from './names.json'; +import * as theme from '../../../utils/theme'; + +@inject('stores') +@observer +export class Language extends Component { + handleValueChange = (itemValue) => { + i18n.locale = itemValue; + + // Reload app for changes to take effect + this.props.stores.reloadApp(); + } + + render () { + // Using this hack to show custom picker style + // https://github.com/facebook/react-native/issues/7817#issuecomment-264851951 + return ( + + {names[i18n.locale].nativeName} + + {Object.keys(i18n.translations).map((lang) => + ) + } + + + + ); + } +} + +const styles = StyleSheet.create({ + container: { + borderWidth: 0 + }, + picker: { + height: 1000, + position: 'absolute', + top: 0, + width: 1000 + } +}); diff --git a/App/Screens/About/Language/index.js b/App/Screens/About/Language/index.js new file mode 100644 index 00000000..030ee9f3 --- /dev/null +++ b/App/Screens/About/Language/index.js @@ -0,0 +1,17 @@ +// Sh**t! I Smoke +// Copyright (C) 2018-2019 Marcelo S. Coelho, Amaury Martiny + +// Sh**t! I Smoke is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Sh**t! I Smoke is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Sh**t! I Smoke. If not, see . + +export * from './Language'; diff --git a/App/Screens/About/Language/names.json b/App/Screens/About/Language/names.json new file mode 100644 index 00000000..6e9addf3 --- /dev/null +++ b/App/Screens/About/Language/names.json @@ -0,0 +1,14 @@ +{ + "en": { + "name": "English", + "nativeName": "English" + }, + "es": { + "name": "Spanish", + "nativeName": "Español" + }, + "fr": { + "name": "French", + "nativeName": "Français" + } +} diff --git a/App/localization/index.js b/App/localization/index.js index 0eee2646..1c981d48 100644 --- a/App/localization/index.js +++ b/App/localization/index.js @@ -28,7 +28,10 @@ i18n.translations = { es, fr }; -i18n.locale = Localization.locale; + +// `Localization.locale` can come in the form of `en-US` sometimes, so we just +// take the 1st part. +i18n.locale = (Localization.locale || 'en').split('-')[0]; export { i18n diff --git a/App/localization/languages/en.json b/App/localization/languages/en.json index 7ab4d2ef..946f5f60 100644 --- a/App/localization/languages/en.json +++ b/App/localization/languages/en.json @@ -56,5 +56,6 @@ "about_credits_design_and_copywriting": "Design & Copywriting by", "about_credits_data_from": "Air quality data from", "about_credits_source_code": "Source code", - "about_credits_available_github": "available on Github" + "about_credits_available_github": "available on Github", + "about_language": "Language" } diff --git a/App/localization/languages/es.json b/App/localization/languages/es.json index bb487847..5e7066b4 100644 --- a/App/localization/languages/es.json +++ b/App/localization/languages/es.json @@ -56,5 +56,6 @@ "about_credits_design_and_copywriting": "Diseño y Copywriting por", "about_credits_data_from": "Datos de calidad del aire de", "about_credits_source_code": "Código fuente", - "about_credits_available_github": "disponible en Github" + "about_credits_available_github": "disponible en Github", + "about_language": "Idioma" } diff --git a/App/stores/index.js b/App/stores/index.js index e0c1b833..fb790981 100644 --- a/App/stores/index.js +++ b/App/stores/index.js @@ -68,5 +68,9 @@ export const RootStore = types // TODO Add sentry // https://github.com/amaurymartiny/shoot-i-smoke/issues/22 self.error = newError; + }, + reloadApp () { + // This will reload the app + self.location.setCurrent(); } })); From a152cf616e479f8b40d9ca3e403c21f4cbbd2605 Mon Sep 17 00:00:00 2001 From: Pierre Veissi Date: Thu, 2 May 2019 18:10:52 +0430 Subject: [PATCH 22/42] fix: removes undefined style (#87) --- App/Screens/Home/Cigarettes/Cigarettes.js | 1 - 1 file changed, 1 deletion(-) diff --git a/App/Screens/Home/Cigarettes/Cigarettes.js b/App/Screens/Home/Cigarettes/Cigarettes.js index 046bf9bc..8f4156de 100644 --- a/App/Screens/Home/Cigarettes/Cigarettes.js +++ b/App/Screens/Home/Cigarettes/Cigarettes.js @@ -59,7 +59,6 @@ export class Cigarettes extends Component { diagonal={diagonal} length={decimal || 1} size={this.getSize(cigarettes)} - style={cigarettes <= 1 ? styles.single : undefined} vertical={vertical} /> ) : null} From 601d5a97d53cc5b87705900d17bdcf36efa6723d Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Fri, 17 May 2019 11:28:53 +0200 Subject: [PATCH 23/42] chore: Update README.md (#88) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 02db8d4c..1ce36276 100644 --- a/README.md +++ b/README.md @@ -79,3 +79,5 @@ GPL-3.0. See [LICENSE](./LICENSE) file for more information. ## :star: Credits Created with ❤ by [Marcelo](http://www.marcelocoelho.cc) & [Amaury](https://www.toptal.com/resume/amaury-martiny#utilize-unreal-developers-today). + +Sh**t! I Smoke - See your city's air pollution measured in daily cigarettes. | Product Hunt Embed From 090fdc5bc499c1ca5fe93b22510b2f46edb43a20 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 3 Jun 2019 11:34:36 +0200 Subject: [PATCH 24/42] chore: Update axios (#90) --- package.json | 2 +- yarn.lock | 36 ++++++++++++++++++++++++------------ 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 44421ba8..6d01be65 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "dependencies": { "@expo/vector-icons": "^9.0.0", "async-retry": "^1.2.3", - "axios": "^0.18.0", + "axios": "^0.19.0", "date-fns": "^2.0.0-alpha.25", "expo": "^32.0.0", "haversine": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index 88e843d4..20b4a55a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1676,13 +1676,13 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== -axios@^0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102" - integrity sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI= +axios@^0.19.0: + version "0.19.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8" + integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ== dependencies: - follow-redirects "^1.3.0" - is-buffer "^1.1.5" + follow-redirects "1.5.10" + is-buffer "^2.0.2" babel-code-frame@^6.26.0: version "6.26.0" @@ -2820,7 +2820,14 @@ debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6. dependencies: ms "2.0.0" -debug@^3.1.0, debug@^3.2.6: +debug@=3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + +debug@^3.1.0: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -4038,12 +4045,12 @@ flatted@^2.0.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916" integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg== -follow-redirects@^1.3.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76" - integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ== +follow-redirects@1.5.10: + version "1.5.10" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" + integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== dependencies: - debug "^3.2.6" + debug "=3.1.0" for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" @@ -4589,6 +4596,11 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== +is-buffer@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725" + integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw== + is-callable@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" From eb98f8c6c3d7f187b051c4a4bcd40d7e577db9ad Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 3 Jun 2019 11:43:32 +0200 Subject: [PATCH 25/42] chore(deps-dev): Bump jest from 24.5.0 to 24.8.0 (#91) Bumps [jest](https://github.com/facebook/jest) from 24.5.0 to 24.8.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/compare/v24.5.0...v24.8.0) --- package.json | 2 +- yarn.lock | 764 ++++++++++++++++++++++++++------------------------- 2 files changed, 384 insertions(+), 382 deletions(-) diff --git a/package.json b/package.json index 6d01be65..bbc5ef9e 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,6 @@ "eslint-plugin-promise": "^4.1.1", "eslint-plugin-react": "^7.12.4", "eslint-plugin-standard": "^4.0.0", - "jest": "^24.5.0" + "jest": "^24.8.0" } } diff --git a/yarn.lock b/yarn.lock index 20b4a55a..488e4cea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1050,42 +1050,41 @@ pouchdb-collections "^1.0.1" tiny-queue "^0.2.1" -"@jest/console@^24.3.0": - version "24.3.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.3.0.tgz#7bd920d250988ba0bf1352c4493a48e1cb97671e" - integrity sha512-NaCty/OOei6rSDcbPdMiCbYCI0KGFGPgGO6B09lwWt5QTxnkuhKYET9El5u5z1GAcSxkQmSMtM63e24YabCWqA== +"@jest/console@^24.7.1": + version "24.7.1" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545" + integrity sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg== dependencies: "@jest/source-map" "^24.3.0" - "@types/node" "*" chalk "^2.0.1" slash "^2.0.0" -"@jest/core@^24.5.0": - version "24.5.0" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.5.0.tgz#2cefc6a69e9ebcae1da8f7c75f8a257152ba1ec0" - integrity sha512-RDZArRzAs51YS7dXG1pbXbWGxK53rvUu8mCDYsgqqqQ6uSOaTjcVyBl2Jce0exT2rSLk38ca7az7t2f3b0/oYQ== +"@jest/core@^24.8.0": + version "24.8.0" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.8.0.tgz#fbbdcd42a41d0d39cddbc9f520c8bab0c33eed5b" + integrity sha512-R9rhAJwCBQzaRnrRgAdVfnglUuATXdwTRsYqs6NMdVcAl5euG8LtWDe+fVkN27YfKVBW61IojVsXKaOmSnqd/A== dependencies: - "@jest/console" "^24.3.0" - "@jest/reporters" "^24.5.0" - "@jest/test-result" "^24.5.0" - "@jest/transform" "^24.5.0" - "@jest/types" "^24.5.0" + "@jest/console" "^24.7.1" + "@jest/reporters" "^24.8.0" + "@jest/test-result" "^24.8.0" + "@jest/transform" "^24.8.0" + "@jest/types" "^24.8.0" ansi-escapes "^3.0.0" chalk "^2.0.1" exit "^0.1.2" graceful-fs "^4.1.15" - jest-changed-files "^24.5.0" - jest-config "^24.5.0" - jest-haste-map "^24.5.0" - jest-message-util "^24.5.0" + jest-changed-files "^24.8.0" + jest-config "^24.8.0" + jest-haste-map "^24.8.0" + jest-message-util "^24.8.0" jest-regex-util "^24.3.0" - jest-resolve-dependencies "^24.5.0" - jest-runner "^24.5.0" - jest-runtime "^24.5.0" - jest-snapshot "^24.5.0" - jest-util "^24.5.0" - jest-validate "^24.5.0" - jest-watcher "^24.5.0" + jest-resolve-dependencies "^24.8.0" + jest-runner "^24.8.0" + jest-runtime "^24.8.0" + jest-snapshot "^24.8.0" + jest-util "^24.8.0" + jest-validate "^24.8.0" + jest-watcher "^24.8.0" micromatch "^3.1.10" p-each-series "^1.0.0" pirates "^4.0.1" @@ -1093,48 +1092,47 @@ rimraf "^2.5.4" strip-ansi "^5.0.0" -"@jest/environment@^24.5.0": - version "24.5.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.5.0.tgz#a2557f7808767abea3f9e4cc43a172122a63aca8" - integrity sha512-tzUHR9SHjMXwM8QmfHb/EJNbF0fjbH4ieefJBvtwO8YErLTrecc1ROj0uo2VnIT6SlpEGZnvdCK6VgKYBo8LsA== - dependencies: - "@jest/fake-timers" "^24.5.0" - "@jest/transform" "^24.5.0" - "@jest/types" "^24.5.0" - "@types/node" "*" - jest-mock "^24.5.0" - -"@jest/fake-timers@^24.5.0": - version "24.5.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.5.0.tgz#4a29678b91fd0876144a58f8d46e6c62de0266f0" - integrity sha512-i59KVt3QBz9d+4Qr4QxsKgsIg+NjfuCjSOWj3RQhjF5JNy+eVJDhANQ4WzulzNCHd72srMAykwtRn5NYDGVraw== - dependencies: - "@jest/types" "^24.5.0" - "@types/node" "*" - jest-message-util "^24.5.0" - jest-mock "^24.5.0" - -"@jest/reporters@^24.5.0": - version "24.5.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.5.0.tgz#9363a210d0daa74696886d9cb294eb8b3ad9b4d9" - integrity sha512-vfpceiaKtGgnuC3ss5czWOihKOUSyjJA4M4udm6nH8xgqsuQYcyDCi4nMMcBKsHXWgz9/V5G7iisnZGfOh1w6Q== - dependencies: - "@jest/environment" "^24.5.0" - "@jest/test-result" "^24.5.0" - "@jest/transform" "^24.5.0" - "@jest/types" "^24.5.0" +"@jest/environment@^24.8.0": + version "24.8.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.8.0.tgz#0342261383c776bdd652168f68065ef144af0eac" + integrity sha512-vlGt2HLg7qM+vtBrSkjDxk9K0YtRBi7HfRFaDxoRtyi+DyVChzhF20duvpdAnKVBV6W5tym8jm0U9EfXbDk1tw== + dependencies: + "@jest/fake-timers" "^24.8.0" + "@jest/transform" "^24.8.0" + "@jest/types" "^24.8.0" + jest-mock "^24.8.0" + +"@jest/fake-timers@^24.8.0": + version "24.8.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.8.0.tgz#2e5b80a4f78f284bcb4bd5714b8e10dd36a8d3d1" + integrity sha512-2M4d5MufVXwi6VzZhJ9f5S/wU4ud2ck0kxPof1Iz3zWx6Y+V2eJrES9jEktB6O3o/oEyk+il/uNu9PvASjWXQw== + dependencies: + "@jest/types" "^24.8.0" + jest-message-util "^24.8.0" + jest-mock "^24.8.0" + +"@jest/reporters@^24.8.0": + version "24.8.0" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.8.0.tgz#075169cd029bddec54b8f2c0fc489fd0b9e05729" + integrity sha512-eZ9TyUYpyIIXfYCrw0UHUWUvE35vx5I92HGMgS93Pv7du+GHIzl+/vh8Qj9MCWFK/4TqyttVBPakWMOfZRIfxw== + dependencies: + "@jest/environment" "^24.8.0" + "@jest/test-result" "^24.8.0" + "@jest/transform" "^24.8.0" + "@jest/types" "^24.8.0" chalk "^2.0.1" exit "^0.1.2" glob "^7.1.2" - istanbul-api "^2.1.1" istanbul-lib-coverage "^2.0.2" istanbul-lib-instrument "^3.0.1" + istanbul-lib-report "^2.0.4" istanbul-lib-source-maps "^3.0.1" - jest-haste-map "^24.5.0" - jest-resolve "^24.5.0" - jest-runtime "^24.5.0" - jest-util "^24.5.0" - jest-worker "^24.4.0" + istanbul-reports "^2.1.1" + jest-haste-map "^24.8.0" + jest-resolve "^24.8.0" + jest-runtime "^24.8.0" + jest-util "^24.8.0" + jest-worker "^24.6.0" node-notifier "^5.2.1" slash "^2.0.0" source-map "^0.6.0" @@ -1149,42 +1147,53 @@ graceful-fs "^4.1.15" source-map "^0.6.0" -"@jest/test-result@^24.5.0": - version "24.5.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.5.0.tgz#ab66fb7741a04af3363443084e72ea84861a53f2" - integrity sha512-u66j2vBfa8Bli1+o3rCaVnVYa9O8CAFZeqiqLVhnarXtreSXG33YQ6vNYBogT7+nYiFNOohTU21BKiHlgmxD5A== +"@jest/test-result@^24.8.0": + version "24.8.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.8.0.tgz#7675d0aaf9d2484caa65e048d9b467d160f8e9d3" + integrity sha512-+YdLlxwizlfqkFDh7Mc7ONPQAhA4YylU1s529vVM1rsf67vGZH/2GGm5uO8QzPeVyaVMobCQ7FTxl38QrKRlng== + dependencies: + "@jest/console" "^24.7.1" + "@jest/types" "^24.8.0" + "@types/istanbul-lib-coverage" "^2.0.0" + +"@jest/test-sequencer@^24.8.0": + version "24.8.0" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz#2f993bcf6ef5eb4e65e8233a95a3320248cf994b" + integrity sha512-OzL/2yHyPdCHXEzhoBuq37CE99nkme15eHkAzXRVqthreWZamEMA0WoetwstsQBCXABhczpK03JNbc4L01vvLg== dependencies: - "@jest/console" "^24.3.0" - "@jest/types" "^24.5.0" - "@types/istanbul-lib-coverage" "^1.1.0" + "@jest/test-result" "^24.8.0" + jest-haste-map "^24.8.0" + jest-runner "^24.8.0" + jest-runtime "^24.8.0" -"@jest/transform@^24.5.0": - version "24.5.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.5.0.tgz#6709fc26db918e6af63a985f2cc3c464b4cf99d9" - integrity sha512-XSsDz1gdR/QMmB8UCKlweAReQsZrD/DK7FuDlNo/pE8EcKMrfi2kqLRk8h8Gy/PDzgqJj64jNEzOce9pR8oj1w== +"@jest/transform@^24.8.0": + version "24.8.0" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.8.0.tgz#628fb99dce4f9d254c6fd9341e3eea262e06fef5" + integrity sha512-xBMfFUP7TortCs0O+Xtez2W7Zu1PLH9bvJgtraN1CDST6LBM/eTOZ9SfwS/lvV8yOfcDpFmwf9bq5cYbXvqsvA== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^24.5.0" + "@jest/types" "^24.8.0" babel-plugin-istanbul "^5.1.0" chalk "^2.0.1" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.1.15" - jest-haste-map "^24.5.0" + jest-haste-map "^24.8.0" jest-regex-util "^24.3.0" - jest-util "^24.5.0" + jest-util "^24.8.0" micromatch "^3.1.10" realpath-native "^1.1.0" slash "^2.0.0" source-map "^0.6.1" write-file-atomic "2.4.1" -"@jest/types@^24.5.0": - version "24.5.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.5.0.tgz#feee214a4d0167b0ca447284e95a57aa10b3ee95" - integrity sha512-kN7RFzNMf2R8UDadPOl6ReyI+MT8xfqRuAnuVL+i4gwjv/zubdDK+EDeLHYwq1j0CSSR2W/MmgaRlMZJzXdmVA== +"@jest/types@^24.8.0": + version "24.8.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz#f31e25948c58f0abd8c845ae26fcea1491dea7ad" + integrity sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg== dependencies: - "@types/istanbul-lib-coverage" "^1.1.0" + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^1.1.1" "@types/yargs" "^12.0.9" "@react-navigation/core@3.1.1": @@ -1287,10 +1296,25 @@ resolved "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.29.tgz#aa845204cd0a289f65d47e0de63a6a815e30cc66" integrity sha512-lRVw09gOvgviOfeUrKc/pmTiRZ7g7oDOU6OAutyuSHpm1/o2RaBQvRhgK8QEdu+FFuw/wnWb29A/iuxv9i8OpQ== -"@types/istanbul-lib-coverage@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.0.tgz#2cc2ca41051498382b43157c8227fea60363f94a" - integrity sha512-ohkhb9LehJy+PA40rDtGAji61NCgdtKLAlFoYp4cnuuQEswwdK3vz9SOIkkyc3wrk8dzjphQApNs56yyXLStaQ== +"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" + integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg== + +"@types/istanbul-lib-report@*": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c" + integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg== + dependencies: + "@types/istanbul-lib-coverage" "*" + +"@types/istanbul-reports@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a" + integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA== + dependencies: + "@types/istanbul-lib-coverage" "*" + "@types/istanbul-lib-report" "*" "@types/lodash.zipobject@^4.1.4": version "4.1.6" @@ -1490,13 +1514,6 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -append-transform@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab" - integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw== - dependencies: - default-require-extensions "^2.0.0" - aproba@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -1649,7 +1666,7 @@ async-retry@^1.2.3: dependencies: retry "0.12.0" -async@^2.4.0, async@^2.5.0, async@^2.6.1: +async@^2.4.0, async@^2.5.0: version "2.6.2" resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381" integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg== @@ -1828,16 +1845,16 @@ babel-helpers@^6.24.1: babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-jest@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.5.0.tgz#0ea042789810c2bec9065f7c8ab4dc18e1d28559" - integrity sha512-0fKCXyRwxFTJL0UXDJiT2xYxO9Lu2vBd9n+cC+eDjESzcVG3s2DRGAxbzJX21fceB1WYoBjAh8pQ83dKcl003g== +babel-jest@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.8.0.tgz#5c15ff2b28e20b0f45df43fe6b7f2aae93dba589" + integrity sha512-+5/kaZt4I9efoXzPlZASyK/lN9qdRKmmUav9smVc0ruPQD7IsfucQ87gpOE8mn2jbDuS6M/YOW6n3v9ZoIfgnw== dependencies: - "@jest/transform" "^24.5.0" - "@jest/types" "^24.5.0" + "@jest/transform" "^24.8.0" + "@jest/types" "^24.8.0" "@types/babel__core" "^7.1.0" babel-plugin-istanbul "^5.1.0" - babel-preset-jest "^24.3.0" + babel-preset-jest "^24.6.0" chalk "^2.4.2" slash "^2.0.0" @@ -1864,10 +1881,10 @@ babel-plugin-istanbul@^5.1.0: istanbul-lib-instrument "^3.0.0" test-exclude "^5.0.0" -babel-plugin-jest-hoist@^24.3.0: - version "24.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.3.0.tgz#f2e82952946f6e40bb0a75d266a3790d854c8b5b" - integrity sha512-nWh4N1mVH55Tzhx2isvUN5ebM5CDUvIpXPZYMRazQughie/EqGnbR+czzoQlhUmJG9pPJmYDRhvocotb2THl1w== +babel-plugin-jest-hoist@^24.6.0: + version "24.6.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz#f7f7f7ad150ee96d7a5e8e2c5da8319579e78019" + integrity sha512-3pKNH6hMt9SbOv0F3WVmy5CWQ4uogS3k0GY5XLyQHJ9EGpAT9XWkFd2ZiXXtkwFHdAHa5j7w7kfxSP5lAIwu7w== dependencies: "@types/babel__traverse" "^7.0.6" @@ -2161,13 +2178,13 @@ babel-preset-fbjs@2.3.0, babel-preset-fbjs@^2.1.2: babel-plugin-transform-react-display-name "^6.8.0" babel-plugin-transform-react-jsx "^6.8.0" -babel-preset-jest@^24.3.0: - version "24.3.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.3.0.tgz#db88497e18869f15b24d9c0e547d8e0ab950796d" - integrity sha512-VGTV2QYBa/Kn3WCOKdfS31j9qomaXSgJqi65B6o05/1GsJyj9LVhSljM9ro4S+IBGj/ENhNBuH9bpqzztKAQSw== +babel-preset-jest@^24.6.0: + version "24.6.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz#66f06136eefce87797539c0d63f1769cc3915984" + integrity sha512-pdZqLEdmy1ZK5kyRUfvBb2IfTPb2BUvIJczlPspS8fWmBQslNNDBqVfh7BW5leOVJMDZKzjD8XEyABTk6gQ5yw== dependencies: "@babel/plugin-syntax-object-rest-spread" "^7.0.0" - babel-plugin-jest-hoist "^24.3.0" + babel-plugin-jest-hoist "^24.6.0" babel-register@^6.26.0: version "6.26.0" @@ -2620,11 +2637,6 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= -compare-versions@^3.2.1: - version "3.4.0" - resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.4.0.tgz#e0747df5c9cb7f054d6d3dc3e1dbc444f9e92b26" - integrity sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg== - component-emitter@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" @@ -2866,13 +2878,6 @@ deep-is@~0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= -default-require-extensions@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7" - integrity sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc= - dependencies: - strip-bom "^3.0.0" - define-properties@^1.1.2: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -3401,16 +3406,16 @@ expand-range@^1.8.1: dependencies: fill-range "^2.1.0" -expect@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-24.5.0.tgz#492fb0df8378d8474cc84b827776b069f46294ed" - integrity sha512-p2Gmc0CLxOgkyA93ySWmHFYHUPFIHG6XZ06l7WArWAsrqYVaVEkOU5NtT5i68KUyGKbkQgDCkiT65bWmdoL6Bw== +expect@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-24.8.0.tgz#471f8ec256b7b6129ca2524b2a62f030df38718d" + integrity sha512-/zYvP8iMDrzaaxHVa724eJBCKqSHmO0FA7EDkBiRHxg6OipmMn1fN+C8T9L9K8yr7UONkOifu6+LLH+z76CnaA== dependencies: - "@jest/types" "^24.5.0" + "@jest/types" "^24.8.0" ansi-styles "^3.2.0" - jest-get-type "^24.3.0" - jest-matcher-utils "^24.5.0" - jest-message-util "^24.5.0" + jest-get-type "^24.8.0" + jest-matcher-utils "^24.8.0" + jest-message-util "^24.8.0" jest-regex-util "^24.3.0" expo-ads-admob@~2.0.0: @@ -3958,14 +3963,6 @@ filename-regex@^2.0.0: resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= -fileset@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0" - integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA= - dependencies: - glob "^7.0.3" - minimatch "^3.0.3" - fill-range@^2.1.0: version "2.2.4" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" @@ -4124,6 +4121,14 @@ fsevents@^1.2.3: nan "^2.9.2" node-pre-gyp "^0.10.0" +fsevents@^1.2.7: + version "1.2.9" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f" + integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw== + dependencies: + nan "^2.12.1" + node-pre-gyp "^0.12.0" + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -4208,7 +4213,7 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" -glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: +glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: version "7.1.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== @@ -4830,38 +4835,12 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= -istanbul-api@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.1.tgz#194b773f6d9cbc99a9258446848b0f988951c4d0" - integrity sha512-kVmYrehiwyeBAk/wE71tW6emzLiHGjYIiDrc8sfyty4F8M02/lrgXSm+R1kXysmF20zArvmZXjlE/mg24TVPJw== - dependencies: - async "^2.6.1" - compare-versions "^3.2.1" - fileset "^2.0.3" - istanbul-lib-coverage "^2.0.3" - istanbul-lib-hook "^2.0.3" - istanbul-lib-instrument "^3.1.0" - istanbul-lib-report "^2.0.4" - istanbul-lib-source-maps "^3.0.2" - istanbul-reports "^2.1.1" - js-yaml "^3.12.0" - make-dir "^1.3.0" - minimatch "^3.0.4" - once "^1.4.0" - istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#0b891e5ad42312c2b9488554f603795f9a2211ba" integrity sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw== -istanbul-lib-hook@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.3.tgz#e0e581e461c611be5d0e5ef31c5f0109759916fb" - integrity sha512-CLmEqwEhuCYtGcpNVJjLV1DQyVnIqavMLFHV/DP+np/g3qvdxu3gsPqYoJMXm15sN84xOlckFB3VNvRbf5yEgA== - dependencies: - append-transform "^1.0.0" - -istanbul-lib-instrument@^3.0.0, istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.1.0: +istanbul-lib-instrument@^3.0.0, istanbul-lib-instrument@^3.0.1: version "3.1.0" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz#a2b5484a7d445f1f311e93190813fa56dfb62971" integrity sha512-ooVllVGT38HIk8MxDj/OIHXSYvH+1tq/Vb38s8ixt9GoJadXska4WkGY+0wkmtYCZNYtaARniH/DixUGGLZ0uA== @@ -4883,7 +4862,7 @@ istanbul-lib-report@^2.0.4: make-dir "^1.3.0" supports-color "^6.0.0" -istanbul-lib-source-maps@^3.0.1, istanbul-lib-source-maps@^3.0.2: +istanbul-lib-source-maps@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.2.tgz#f1e817229a9146e8424a28e5d69ba220fda34156" integrity sha512-JX4v0CiKTGp9fZPmoxpu9YEkPbEqCqBbO3403VabKjH+NRXo72HafD5UgnjTEqHL2SAjaZK1XDuDOkn6I5QVfQ== @@ -4901,65 +4880,66 @@ istanbul-reports@^2.1.1: dependencies: handlebars "^4.1.0" -jest-changed-files@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.5.0.tgz#4075269ee115d87194fd5822e642af22133cf705" - integrity sha512-Ikl29dosYnTsH9pYa1Tv9POkILBhN/TLZ37xbzgNsZ1D2+2n+8oEZS2yP1BrHn/T4Rs4Ggwwbp/x8CKOS5YJOg== +jest-changed-files@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.8.0.tgz#7e7eb21cf687587a85e50f3d249d1327e15b157b" + integrity sha512-qgANC1Yrivsq+UrLXsvJefBKVoCsKB0Hv+mBb6NMjjZ90wwxCDmU3hsCXBya30cH+LnPYjwgcU65i6yJ5Nfuug== dependencies: - "@jest/types" "^24.5.0" + "@jest/types" "^24.8.0" execa "^1.0.0" throat "^4.0.0" -jest-cli@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.5.0.tgz#598139d3446d1942fb7dc93944b9ba766d756d4b" - integrity sha512-P+Jp0SLO4KWN0cGlNtC7JV0dW1eSFR7eRpoOucP2UM0sqlzp/bVHeo71Omonvigrj9AvCKy7NtQANtqJ7FXz8g== +jest-cli@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.8.0.tgz#b075ac914492ed114fa338ade7362a301693e989" + integrity sha512-+p6J00jSMPQ116ZLlHJJvdf8wbjNbZdeSX9ptfHX06/MSNaXmKihQzx5vQcw0q2G6JsdVkUIdWbOWtSnaYs3yA== dependencies: - "@jest/core" "^24.5.0" - "@jest/test-result" "^24.5.0" - "@jest/types" "^24.5.0" + "@jest/core" "^24.8.0" + "@jest/test-result" "^24.8.0" + "@jest/types" "^24.8.0" chalk "^2.0.1" exit "^0.1.2" import-local "^2.0.0" is-ci "^2.0.0" - jest-config "^24.5.0" - jest-util "^24.5.0" - jest-validate "^24.5.0" + jest-config "^24.8.0" + jest-util "^24.8.0" + jest-validate "^24.8.0" prompts "^2.0.1" realpath-native "^1.1.0" yargs "^12.0.2" -jest-config@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.5.0.tgz#404d1bc6bb81aed6bd1890d07e2dca9fbba2e121" - integrity sha512-t2UTh0Z2uZhGBNVseF8wA2DS2SuBiLOL6qpLq18+OZGfFUxTM7BzUVKyHFN/vuN+s/aslY1COW95j1Rw81huOQ== +jest-config@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.8.0.tgz#77db3d265a6f726294687cbbccc36f8a76ee0f4f" + integrity sha512-Czl3Nn2uEzVGsOeaewGWoDPD8GStxCpAe0zOYs2x2l0fZAgPbCr3uwUkgNKV3LwE13VXythM946cd5rdGkkBZw== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^24.5.0" - babel-jest "^24.5.0" + "@jest/test-sequencer" "^24.8.0" + "@jest/types" "^24.8.0" + babel-jest "^24.8.0" chalk "^2.0.1" glob "^7.1.1" - jest-environment-jsdom "^24.5.0" - jest-environment-node "^24.5.0" - jest-get-type "^24.3.0" - jest-jasmine2 "^24.5.0" + jest-environment-jsdom "^24.8.0" + jest-environment-node "^24.8.0" + jest-get-type "^24.8.0" + jest-jasmine2 "^24.8.0" jest-regex-util "^24.3.0" - jest-resolve "^24.5.0" - jest-util "^24.5.0" - jest-validate "^24.5.0" + jest-resolve "^24.8.0" + jest-util "^24.8.0" + jest-validate "^24.8.0" micromatch "^3.1.10" - pretty-format "^24.5.0" + pretty-format "^24.8.0" realpath-native "^1.1.0" -jest-diff@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.5.0.tgz#a2d8627964bb06a91893c0fbcb28ab228c257652" - integrity sha512-mCILZd9r7zqL9Uh6yNoXjwGQx0/J43OD2vvWVKwOEOLZliQOsojXwqboubAQ+Tszrb6DHGmNU7m4whGeB9YOqw== +jest-diff@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.8.0.tgz#146435e7d1e3ffdf293d53ff97e193f1d1546172" + integrity sha512-wxetCEl49zUpJ/bvUmIFjd/o52J+yWcoc5ZyPq4/W1LUKGEhRYDIbP1KcF6t+PvqNrGAFk4/JhtxDq/Nnzs66g== dependencies: chalk "^2.0.1" diff-sequences "^24.3.0" - jest-get-type "^24.3.0" - pretty-format "^24.5.0" + jest-get-type "^24.8.0" + pretty-format "^24.8.0" jest-docblock@23.2.0, jest-docblock@^23.2.0: version "23.2.0" @@ -4975,44 +4955,44 @@ jest-docblock@^24.3.0: dependencies: detect-newline "^2.1.0" -jest-each@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.5.0.tgz#da14d017a1b7d0f01fb458d338314cafe7f72318" - integrity sha512-6gy3Kh37PwIT5sNvNY2VchtIFOOBh8UCYnBlxXMb5sr5wpJUDPTUATX2Axq1Vfk+HWTMpsYPeVYp4TXx5uqUBw== +jest-each@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.8.0.tgz#a05fd2bf94ddc0b1da66c6d13ec2457f35e52775" + integrity sha512-NrwK9gaL5+XgrgoCsd9svsoWdVkK4gnvyhcpzd6m487tXHqIdYeykgq3MKI1u4I+5Zf0tofr70at9dWJDeb+BA== dependencies: - "@jest/types" "^24.5.0" + "@jest/types" "^24.8.0" chalk "^2.0.1" - jest-get-type "^24.3.0" - jest-util "^24.5.0" - pretty-format "^24.5.0" - -jest-environment-jsdom@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.5.0.tgz#1c3143063e1374100f8c2723a8b6aad23b6db7eb" - integrity sha512-62Ih5HbdAWcsqBx2ktUnor/mABBo1U111AvZWcLKeWN/n/gc5ZvDBKe4Og44fQdHKiXClrNGC6G0mBo6wrPeGQ== - dependencies: - "@jest/environment" "^24.5.0" - "@jest/fake-timers" "^24.5.0" - "@jest/types" "^24.5.0" - jest-mock "^24.5.0" - jest-util "^24.5.0" + jest-get-type "^24.8.0" + jest-util "^24.8.0" + pretty-format "^24.8.0" + +jest-environment-jsdom@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz#300f6949a146cabe1c9357ad9e9ecf9f43f38857" + integrity sha512-qbvgLmR7PpwjoFjM/sbuqHJt/NCkviuq9vus9NBn/76hhSidO+Z6Bn9tU8friecegbJL8gzZQEMZBQlFWDCwAQ== + dependencies: + "@jest/environment" "^24.8.0" + "@jest/fake-timers" "^24.8.0" + "@jest/types" "^24.8.0" + jest-mock "^24.8.0" + jest-util "^24.8.0" jsdom "^11.5.1" -jest-environment-node@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.5.0.tgz#763eebdf529f75b60aa600c6cf8cb09873caa6ab" - integrity sha512-du6FuyWr/GbKLsmAbzNF9mpr2Iu2zWSaq/BNHzX+vgOcts9f2ayXBweS7RAhr+6bLp6qRpMB6utAMF5Ygktxnw== +jest-environment-node@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.8.0.tgz#d3f726ba8bc53087a60e7a84ca08883a4c892231" + integrity sha512-vIGUEScd1cdDgR6sqn2M08sJTRLQp6Dk/eIkCeO4PFHxZMOgy+uYLPMC4ix3PEfM5Au/x3uQ/5Tl0DpXXZsJ/Q== dependencies: - "@jest/environment" "^24.5.0" - "@jest/fake-timers" "^24.5.0" - "@jest/types" "^24.5.0" - jest-mock "^24.5.0" - jest-util "^24.5.0" + "@jest/environment" "^24.8.0" + "@jest/fake-timers" "^24.8.0" + "@jest/types" "^24.8.0" + jest-mock "^24.8.0" + jest-util "^24.8.0" -jest-get-type@^24.3.0: - version "24.3.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.3.0.tgz#582cfd1a4f91b5cdad1d43d2932f816d543c65da" - integrity sha512-HYF6pry72YUlVcvUx3sEpMRwXEWGEPlJ0bSPVnB3b3n++j4phUEoSPcS6GC0pPJ9rpyPSe4cb5muFo6D39cXow== +jest-get-type@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.8.0.tgz#a7440de30b651f5a70ea3ed7ff073a32dfe646fc" + integrity sha512-RR4fo8jEmMD9zSz2nLbs2j0zvPpk/KCEz3a62jJWbd2ayNo0cb+KFRxPHVhE4ZmgGJEQp0fosmNz84IfqM8cMQ== jest-haste-map@23.5.0: version "23.5.0" @@ -5028,80 +5008,84 @@ jest-haste-map@23.5.0: micromatch "^2.3.11" sane "^2.0.0" -jest-haste-map@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.5.0.tgz#3f17d0c548b99c0c96ed2893f9c0ccecb2eb9066" - integrity sha512-mb4Yrcjw9vBgSvobDwH8QUovxApdimGcOkp+V1ucGGw4Uvr3VzZQBJhNm1UY3dXYm4XXyTW2G7IBEZ9pM2ggRQ== +jest-haste-map@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.0.tgz#51794182d877b3ddfd6e6d23920e3fe72f305800" + integrity sha512-ZBPRGHdPt1rHajWelXdqygIDpJx8u3xOoLyUBWRW28r3tagrgoepPrzAozW7kW9HrQfhvmiv1tncsxqHJO1onQ== dependencies: - "@jest/types" "^24.5.0" + "@jest/types" "^24.8.0" + anymatch "^2.0.0" fb-watchman "^2.0.0" graceful-fs "^4.1.15" invariant "^2.2.4" jest-serializer "^24.4.0" - jest-util "^24.5.0" - jest-worker "^24.4.0" + jest-util "^24.8.0" + jest-worker "^24.6.0" micromatch "^3.1.10" sane "^4.0.3" + walker "^1.0.7" + optionalDependencies: + fsevents "^1.2.7" -jest-jasmine2@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.5.0.tgz#e6af4d7f73dc527d007cca5a5b177c0bcc29d111" - integrity sha512-sfVrxVcx1rNUbBeyIyhkqZ4q+seNKyAG6iM0S2TYBdQsXjoFDdqWFfsUxb6uXSsbimbXX/NMkJIwUZ1uT9+/Aw== +jest-jasmine2@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz#a9c7e14c83dd77d8b15e820549ce8987cc8cd898" + integrity sha512-cEky88npEE5LKd5jPpTdDCLvKkdyklnaRycBXL6GNmpxe41F0WN44+i7lpQKa/hcbXaQ+rc9RMaM4dsebrYong== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^24.5.0" - "@jest/test-result" "^24.5.0" - "@jest/types" "^24.5.0" + "@jest/environment" "^24.8.0" + "@jest/test-result" "^24.8.0" + "@jest/types" "^24.8.0" chalk "^2.0.1" co "^4.6.0" - expect "^24.5.0" + expect "^24.8.0" is-generator-fn "^2.0.0" - jest-each "^24.5.0" - jest-matcher-utils "^24.5.0" - jest-message-util "^24.5.0" - jest-runtime "^24.5.0" - jest-snapshot "^24.5.0" - jest-util "^24.5.0" - pretty-format "^24.5.0" + jest-each "^24.8.0" + jest-matcher-utils "^24.8.0" + jest-message-util "^24.8.0" + jest-runtime "^24.8.0" + jest-snapshot "^24.8.0" + jest-util "^24.8.0" + pretty-format "^24.8.0" throat "^4.0.0" -jest-leak-detector@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.5.0.tgz#21ae2b3b0da252c1171cd494f75696d65fb6fa89" - integrity sha512-LZKBjGovFRx3cRBkqmIg+BZnxbrLqhQl09IziMk3oeh1OV81Hg30RUIx885mq8qBv1PA0comB9bjKcuyNO1bCQ== +jest-leak-detector@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz#c0086384e1f650c2d8348095df769f29b48e6980" + integrity sha512-cG0yRSK8A831LN8lIHxI3AblB40uhv0z+SsQdW3GoMMVcK+sJwrIIyax5tu3eHHNJ8Fu6IMDpnLda2jhn2pD/g== dependencies: - pretty-format "^24.5.0" + pretty-format "^24.8.0" -jest-matcher-utils@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.5.0.tgz#5995549dcf09fa94406e89526e877b094dad8770" - integrity sha512-QM1nmLROjLj8GMGzg5VBra3I9hLpjMPtF1YqzQS3rvWn2ltGZLrGAO1KQ9zUCVi5aCvrkbS5Ndm2evIP9yZg1Q== +jest-matcher-utils@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz#2bce42204c9af12bde46f83dc839efe8be832495" + integrity sha512-lex1yASY51FvUuHgm0GOVj7DCYEouWSlIYmCW7APSqB9v8mXmKSn5+sWVF0MhuASG0bnYY106/49JU1FZNl5hw== dependencies: chalk "^2.0.1" - jest-diff "^24.5.0" - jest-get-type "^24.3.0" - pretty-format "^24.5.0" + jest-diff "^24.8.0" + jest-get-type "^24.8.0" + pretty-format "^24.8.0" -jest-message-util@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.5.0.tgz#181420a65a7ef2e8b5c2f8e14882c453c6d41d07" - integrity sha512-6ZYgdOojowCGiV0D8WdgctZEAe+EcFU+KrVds+0ZjvpZurUW2/oKJGltJ6FWY2joZwYXN5VL36GPV6pNVRqRnQ== +jest-message-util@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.8.0.tgz#0d6891e72a4beacc0292b638685df42e28d6218b" + integrity sha512-p2k71rf/b6ns8btdB0uVdljWo9h0ovpnEe05ZKWceQGfXYr4KkzgKo3PBi8wdnd9OtNh46VpNIJynUn/3MKm1g== dependencies: "@babel/code-frame" "^7.0.0" - "@jest/test-result" "^24.5.0" - "@jest/types" "^24.5.0" + "@jest/test-result" "^24.8.0" + "@jest/types" "^24.8.0" "@types/stack-utils" "^1.0.1" chalk "^2.0.1" micromatch "^3.1.10" slash "^2.0.0" stack-utils "^1.0.1" -jest-mock@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.5.0.tgz#976912c99a93f2a1c67497a9414aa4d9da4c7b76" - integrity sha512-ZnAtkWrKf48eERgAOiUxVoFavVBziO2pAi2MfZ1+bGXVkDfxWLxU0//oJBkgwbsv6OAmuLBz4XFFqvCFMqnGUw== +jest-mock@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.8.0.tgz#2f9d14d37699e863f1febf4e4d5a33b7fdbbde56" + integrity sha512-6kWugwjGjJw+ZkK4mDa0Df3sDlUTsV47MSrT0nGQ0RBWJbpODDQ8MHDVtGtUYBne3IwZUhtB7elxHspU79WH3A== dependencies: - "@jest/types" "^24.5.0" + "@jest/types" "^24.8.0" jest-pnp-resolver@^1.2.1: version "1.2.1" @@ -5113,75 +5097,75 @@ jest-regex-util@^24.3.0: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz#d5a65f60be1ae3e310d5214a0307581995227b36" integrity sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg== -jest-resolve-dependencies@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.5.0.tgz#1a0dae9cdd41349ca4a84148b3e78da2ba33fd4b" - integrity sha512-dRVM1D+gWrFfrq2vlL5P9P/i8kB4BOYqYf3S7xczZ+A6PC3SgXYSErX/ScW/469pWMboM1uAhgLF+39nXlirCQ== +jest-resolve-dependencies@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz#19eec3241f2045d3f990dba331d0d7526acff8e0" + integrity sha512-hyK1qfIf/krV+fSNyhyJeq3elVMhK9Eijlwy+j5jqmZ9QsxwKBiP6qukQxaHtK8k6zql/KYWwCTQ+fDGTIJauw== dependencies: - "@jest/types" "^24.5.0" + "@jest/types" "^24.8.0" jest-regex-util "^24.3.0" - jest-snapshot "^24.5.0" + jest-snapshot "^24.8.0" -jest-resolve@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.5.0.tgz#8c16ba08f60a1616c3b1cd7afb24574f50a24d04" - integrity sha512-ZIfGqLX1Rg8xJpQqNjdoO8MuxHV1q/i2OO1hLXjgCWFWs5bsedS8UrOdgjUqqNae6DXA+pCyRmdcB7lQEEbXew== +jest-resolve@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz#84b8e5408c1f6a11539793e2b5feb1b6e722439f" + integrity sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw== dependencies: - "@jest/types" "^24.5.0" + "@jest/types" "^24.8.0" browser-resolve "^1.11.3" chalk "^2.0.1" jest-pnp-resolver "^1.2.1" realpath-native "^1.1.0" -jest-runner@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.5.0.tgz#9be26ece4fd4ab3dfb528b887523144b7c5ffca8" - integrity sha512-oqsiS9TkIZV5dVkD+GmbNfWBRPIvxqmlTQ+AQUJUQ07n+4xTSDc40r+aKBynHw9/tLzafC00DIbJjB2cOZdvMA== +jest-runner@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.8.0.tgz#4f9ae07b767db27b740d7deffad0cf67ccb4c5bb" + integrity sha512-utFqC5BaA3JmznbissSs95X1ZF+d+4WuOWwpM9+Ak356YtMhHE/GXUondZdcyAAOTBEsRGAgH/0TwLzfI9h7ow== dependencies: - "@jest/console" "^24.3.0" - "@jest/environment" "^24.5.0" - "@jest/test-result" "^24.5.0" - "@jest/types" "^24.5.0" + "@jest/console" "^24.7.1" + "@jest/environment" "^24.8.0" + "@jest/test-result" "^24.8.0" + "@jest/types" "^24.8.0" chalk "^2.4.2" exit "^0.1.2" graceful-fs "^4.1.15" - jest-config "^24.5.0" + jest-config "^24.8.0" jest-docblock "^24.3.0" - jest-haste-map "^24.5.0" - jest-jasmine2 "^24.5.0" - jest-leak-detector "^24.5.0" - jest-message-util "^24.5.0" - jest-resolve "^24.5.0" - jest-runtime "^24.5.0" - jest-util "^24.5.0" - jest-worker "^24.4.0" + jest-haste-map "^24.8.0" + jest-jasmine2 "^24.8.0" + jest-leak-detector "^24.8.0" + jest-message-util "^24.8.0" + jest-resolve "^24.8.0" + jest-runtime "^24.8.0" + jest-util "^24.8.0" + jest-worker "^24.6.0" source-map-support "^0.5.6" throat "^4.0.0" -jest-runtime@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.5.0.tgz#3a76e0bfef4db3896d5116e9e518be47ba771aa2" - integrity sha512-GTFHzfLdwpaeoDPilNpBrorlPoNZuZrwKKzKJs09vWwHo+9TOsIIuszK8cWOuKC7ss07aN1922Ge8fsGdsqCuw== +jest-runtime@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.8.0.tgz#05f94d5b05c21f6dc54e427cd2e4980923350620" + integrity sha512-Mq0aIXhvO/3bX44ccT+czU1/57IgOMyy80oM0XR/nyD5zgBcesF84BPabZi39pJVA6UXw+fY2Q1N+4BiVUBWOA== dependencies: - "@jest/console" "^24.3.0" - "@jest/environment" "^24.5.0" + "@jest/console" "^24.7.1" + "@jest/environment" "^24.8.0" "@jest/source-map" "^24.3.0" - "@jest/transform" "^24.5.0" - "@jest/types" "^24.5.0" + "@jest/transform" "^24.8.0" + "@jest/types" "^24.8.0" "@types/yargs" "^12.0.2" chalk "^2.0.1" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.1.15" - jest-config "^24.5.0" - jest-haste-map "^24.5.0" - jest-message-util "^24.5.0" - jest-mock "^24.5.0" + jest-config "^24.8.0" + jest-haste-map "^24.8.0" + jest-message-util "^24.8.0" + jest-mock "^24.8.0" jest-regex-util "^24.3.0" - jest-resolve "^24.5.0" - jest-snapshot "^24.5.0" - jest-util "^24.5.0" - jest-validate "^24.5.0" + jest-resolve "^24.8.0" + jest-snapshot "^24.8.0" + jest-util "^24.8.0" + jest-validate "^24.8.0" realpath-native "^1.1.0" slash "^2.0.0" strip-bom "^3.0.0" @@ -5197,35 +5181,34 @@ jest-serializer@^24.4.0: resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz#f70c5918c8ea9235ccb1276d232e459080588db3" integrity sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q== -jest-snapshot@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.5.0.tgz#e5d224468a759fd19e36f01217aac912f500f779" - integrity sha512-eBEeJb5ROk0NcpodmSKnCVgMOo+Qsu5z9EDl3tGffwPzK1yV37mjGWF2YeIz1NkntgTzP+fUL4s09a0+0dpVWA== +jest-snapshot@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.8.0.tgz#3bec6a59da2ff7bc7d097a853fb67f9d415cb7c6" + integrity sha512-5ehtWoc8oU9/cAPe6fez6QofVJLBKyqkY2+TlKTOf0VllBB/mqUNdARdcjlZrs9F1Cv+/HKoCS/BknT0+tmfPg== dependencies: "@babel/types" "^7.0.0" - "@jest/types" "^24.5.0" + "@jest/types" "^24.8.0" chalk "^2.0.1" - expect "^24.5.0" - jest-diff "^24.5.0" - jest-matcher-utils "^24.5.0" - jest-message-util "^24.5.0" - jest-resolve "^24.5.0" + expect "^24.8.0" + jest-diff "^24.8.0" + jest-matcher-utils "^24.8.0" + jest-message-util "^24.8.0" + jest-resolve "^24.8.0" mkdirp "^0.5.1" natural-compare "^1.4.0" - pretty-format "^24.5.0" + pretty-format "^24.8.0" semver "^5.5.0" -jest-util@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.5.0.tgz#9d9cb06d9dcccc8e7cc76df91b1635025d7baa84" - integrity sha512-Xy8JsD0jvBz85K7VsTIQDuY44s+hYJyppAhcsHsOsGisVtdhar6fajf2UOf2mEVEgh15ZSdA0zkCuheN8cbr1Q== +jest-util@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.8.0.tgz#41f0e945da11df44cc76d64ffb915d0716f46cd1" + integrity sha512-DYZeE+XyAnbNt0BG1OQqKy/4GVLPtzwGx5tsnDrFcax36rVE3lTA5fbvgmbVPUZf9w77AJ8otqR4VBbfFJkUZA== dependencies: - "@jest/console" "^24.3.0" - "@jest/fake-timers" "^24.5.0" + "@jest/console" "^24.7.1" + "@jest/fake-timers" "^24.8.0" "@jest/source-map" "^24.3.0" - "@jest/test-result" "^24.5.0" - "@jest/types" "^24.5.0" - "@types/node" "*" + "@jest/test-result" "^24.8.0" + "@jest/types" "^24.8.0" callsites "^3.0.0" chalk "^2.0.1" graceful-fs "^4.1.15" @@ -5234,30 +5217,29 @@ jest-util@^24.5.0: slash "^2.0.0" source-map "^0.6.0" -jest-validate@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.5.0.tgz#62fd93d81214c070bb2d7a55f329a79d8057c7de" - integrity sha512-gg0dYszxjgK2o11unSIJhkOFZqNRQbWOAB2/LOUdsd2LfD9oXiMeuee8XsT0iRy5EvSccBgB4h/9HRbIo3MHgQ== +jest-validate@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.8.0.tgz#624c41533e6dfe356ffadc6e2423a35c2d3b4849" + integrity sha512-+/N7VOEMW1Vzsrk3UWBDYTExTPwf68tavEPKDnJzrC6UlHtUDU/fuEdXqFoHzv9XnQ+zW6X3qMZhJ3YexfeLDA== dependencies: - "@jest/types" "^24.5.0" + "@jest/types" "^24.8.0" camelcase "^5.0.0" chalk "^2.0.1" - jest-get-type "^24.3.0" + jest-get-type "^24.8.0" leven "^2.1.0" - pretty-format "^24.5.0" + pretty-format "^24.8.0" -jest-watcher@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.5.0.tgz#da7bd9cb5967e274889b42078c8f501ae1c47761" - integrity sha512-/hCpgR6bg0nKvD3nv4KasdTxuhwfViVMHUATJlnGCD0r1QrmIssimPbmc5KfAQblAVxkD8xrzuij9vfPUk1/rA== +jest-watcher@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.8.0.tgz#58d49915ceddd2de85e238f6213cef1c93715de4" + integrity sha512-SBjwHt5NedQoVu54M5GEx7cl7IGEFFznvd/HNT8ier7cCAx/Qgu9ZMlaTQkvK22G1YOpcWBLQPFSImmxdn3DAw== dependencies: - "@jest/test-result" "^24.5.0" - "@jest/types" "^24.5.0" - "@types/node" "*" + "@jest/test-result" "^24.8.0" + "@jest/types" "^24.8.0" "@types/yargs" "^12.0.9" ansi-escapes "^3.0.0" chalk "^2.0.1" - jest-util "^24.5.0" + jest-util "^24.8.0" string-length "^2.0.0" jest-worker@23.2.0, jest-worker@^23.2.0: @@ -5267,22 +5249,21 @@ jest-worker@23.2.0, jest-worker@^23.2.0: dependencies: merge-stream "^1.0.1" -jest-worker@^24.4.0: - version "24.4.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.4.0.tgz#fbc452b0120bb5c2a70cdc88fa132b48eeb11dd0" - integrity sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ== +jest-worker@^24.6.0: + version "24.6.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz#7f81ceae34b7cde0c9827a6980c35b7cdc0161b3" + integrity sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ== dependencies: - "@types/node" "*" merge-stream "^1.0.1" supports-color "^6.1.0" -jest@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-24.5.0.tgz#38f11ae2c2baa2f86c2bc4d8a91d2b51612cd19a" - integrity sha512-lxL+Fq5/RH7inxxmfS2aZLCf8MsS+YCUBfeiNO6BWz/MmjhDGaIEA/2bzEf9q4Q0X+mtFHiinHFvQ0u+RvW/qQ== +jest@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz#d5dff1984d0d1002196e9b7f12f75af1b2809081" + integrity sha512-o0HM90RKFRNWmAWvlyV8i5jGZ97pFwkeVoGvPW1EtLTgJc2+jcuqcbbqcSZLE/3f2S5pt0y2ZBETuhpWNl1Reg== dependencies: import-local "^2.0.0" - jest-cli "^24.5.0" + jest-cli "^24.8.0" js-levenshtein@^1.1.3: version "1.1.6" @@ -5299,14 +5280,6 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@^3.12.0, js-yaml@^3.9.0: - version "3.12.2" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc" - integrity sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - js-yaml@^3.13.0: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" @@ -5315,6 +5288,14 @@ js-yaml@^3.13.0: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^3.9.0: + version "3.12.2" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc" + integrity sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -6051,7 +6032,7 @@ min-document@^2.19.0: dependencies: dom-walk "^0.1.0" -minimatch@^3.0.3, minimatch@^3.0.4: +minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -6159,6 +6140,11 @@ mute-stream@0.0.7: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= +nan@^2.12.1: + version "2.14.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" + integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== + nan@^2.9.2: version "2.13.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.0.tgz#7bdfc27dd3c060c46e60b62c72b74012d1a4cd68" @@ -6255,6 +6241,22 @@ node-pre-gyp@^0.10.0: semver "^5.3.0" tar "^4" +node-pre-gyp@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149" + integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4" + node-releases@^1.1.14: version "1.1.15" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.15.tgz#9e76a73b0eca3bf7801addaa0e6ce90c795f2b9a" @@ -6791,12 +6793,12 @@ pretty-format@^23.6.0: ansi-regex "^3.0.0" ansi-styles "^3.2.0" -pretty-format@^24.5.0: - version "24.5.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.5.0.tgz#cc69a0281a62cd7242633fc135d6930cd889822d" - integrity sha512-/3RuSghukCf8Riu5Ncve0iI+BzVkbRU5EeUoArKARZobREycuH5O4waxvaNIloEXdb0qwgmEAed5vTpX1HNROQ== +pretty-format@^24.8.0: + version "24.8.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.8.0.tgz#8dae7044f58db7cb8be245383b565a963e3c27f2" + integrity sha512-P952T7dkrDEplsR+TuY7q3VXDae5Sr7zmQb12JU/NDQa/3CH7/QW0yvqLcGN6jL+zQFKaoJcPc+yJxMTGmosqw== dependencies: - "@jest/types" "^24.5.0" + "@jest/types" "^24.8.0" ansi-regex "^4.0.0" ansi-styles "^3.2.0" react-is "^16.8.4" @@ -8375,7 +8377,7 @@ w3c-hr-time@^1.0.1: dependencies: browser-process-hrtime "^0.1.2" -walker@~1.0.5: +walker@^1.0.7, walker@~1.0.5: version "1.0.7" resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= From 155dceead5036c997104965ecaba4911f9bd4e41 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 3 Jun 2019 11:45:17 +0200 Subject: [PATCH 26/42] chore(deps): Bump sentry-expo from 1.11.2 to 1.12.0 (#92) Bumps sentry-expo from 1.11.2 to 1.12.0. --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index bbc5ef9e..716e8095 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "react": "16.5.0", "react-native": "https://github.com/expo/react-native/archive/sdk-32.0.0.tar.gz", "react-navigation": "^3.0.9", - "sentry-expo": "~1.11.2", + "sentry-expo": "~1.12.0", "truncate": "^2.0.1" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 488e4cea..c0949919 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7016,10 +7016,10 @@ react-native-screens@1.0.0-alpha.22, "react-native-screens@^1.0.0 || ^1.0.0-alph resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-1.0.0-alpha.22.tgz#7a120377b52aa9bbb94d0b8541a014026be9289b" integrity sha512-kSyAt0AeVU6N7ZonfV6dP6iZF8B7Bce+tk3eujXhzBGsLg0VSLnU7uE9VqJF0xdQrHR91ZjGgVMieo/8df9KTA== -react-native-sentry@^0.40.2: - version "0.40.3" - resolved "https://registry.yarnpkg.com/react-native-sentry/-/react-native-sentry-0.40.3.tgz#de2dadd2e4bd39a08ac84e6561c7716313726b02" - integrity sha512-Dv4HLYLIWaq+deYiGTuKVsY0XDSsy1ltTypgngDASBD9N8JcxiqK5nQyNLlmxPSL7HEsBvCACPPE4HMBCNxfmQ== +react-native-sentry@^0.42.0: + version "0.42.0" + resolved "https://registry.yarnpkg.com/react-native-sentry/-/react-native-sentry-0.42.0.tgz#9cd59659d9b6cd36d6fc4c48f50613cd82cde25f" + integrity sha512-Nt3/yDSiK0QCtuWMEX04e4DJ3sWyMbjUPiiRNs3omD0rCzt51i4F5/fORDz7aMuYH2tSUw6RWCfJmxc3ILvx7Q== dependencies: "@sentry/wizard" "^0.12.1" raven-js "^3.24.2" @@ -7595,14 +7595,14 @@ send@0.16.2: range-parser "~1.2.0" statuses "~1.4.0" -sentry-expo@~1.11.2: - version "1.11.2" - resolved "https://registry.yarnpkg.com/sentry-expo/-/sentry-expo-1.11.2.tgz#8d9b58fa58751673393e32ee5bdb7362f6034e9f" - integrity sha512-/nMuBnUDZB7QmbsVDgJmPEg9kbrmYQ8FWH0x/bk/VwUVU2Qo1wiuJxZTZtRPztznOF575XHZmC5VA5LGwyA0GQ== +sentry-expo@~1.12.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/sentry-expo/-/sentry-expo-1.12.0.tgz#250e513e2b9b31a51b212d347bcf38fd0b5d6d7a" + integrity sha512-tvgcglaOwcXdX1iBJYSiN3VjNkpDwJ5urUMiI/QMIYln1VXpYpoFdc2w3LMT/t/w2aU2ehg9rQoItAFxzjnIwA== dependencies: "@expo/spawn-async" "^1.2.8" mkdirp "^0.5.1" - react-native-sentry "^0.40.2" + react-native-sentry "^0.42.0" rimraf "^2.6.1" serialize-error@^2.1.0: From 8ac811bb88905fc6432e6f2ddda450bb5f705a83 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 3 Jun 2019 11:58:49 +0200 Subject: [PATCH 27/42] chore(deps-dev): Bump eslint-plugin-import from 2.17.2 to 2.17.3 (#95) Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.17.2 to 2.17.3. - [Release notes](https://github.com/benmosher/eslint-plugin-import/releases) - [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md) - [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.17.2...v2.17.3) --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 716e8095..2aa2aa11 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "eslint-config-prettier": "^4.1.0", "eslint-config-semistandard": "^13.0.0", "eslint-config-standard": "^12.0.0", - "eslint-plugin-import": "^2.17.2", + "eslint-plugin-import": "^2.17.3", "eslint-plugin-node": "^8.0.1", "eslint-plugin-prettier": "^3.0.1", "eslint-plugin-promise": "^4.1.1", diff --git a/yarn.lock b/yarn.lock index c0949919..f1b77643 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3151,10 +3151,10 @@ eslint-plugin-es@^1.3.1: eslint-utils "^1.3.0" regexpp "^2.0.1" -eslint-plugin-import@^2.17.2: - version "2.17.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.2.tgz#d227d5c6dc67eca71eb590d2bb62fb38d86e9fcb" - integrity sha512-m+cSVxM7oLsIpmwNn2WXTJoReOF9f/CtLMo7qOVmKd1KntBy0hEcuNZ3erTmWjx+DxRO0Zcrm5KwAvI9wHcV5g== +eslint-plugin-import@^2.17.3: + version "2.17.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.3.tgz#00548b4434c18faebaba04b24ae6198f280de189" + integrity sha512-qeVf/UwXFJbeyLbxuY8RgqDyEKCkqV7YC+E5S5uOjAp4tOc8zj01JP3ucoBM8JcEqd1qRasJSg6LLlisirfy0Q== dependencies: array-includes "^3.0.3" contains-path "^0.1.0" @@ -3166,7 +3166,7 @@ eslint-plugin-import@^2.17.2: lodash "^4.17.11" minimatch "^3.0.4" read-pkg-up "^2.0.0" - resolve "^1.10.0" + resolve "^1.11.0" eslint-plugin-node@^8.0.1: version "8.0.1" @@ -7419,10 +7419,10 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@^1.10.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1, resolve@^1.9.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba" - integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg== +resolve@^1.10.0, resolve@^1.11.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1, resolve@^1.9.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232" + integrity sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw== dependencies: path-parse "^1.0.6" From ebf944afc1766d8f2cc8c232dfbfc6d9651725a1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 3 Jun 2019 12:09:37 +0200 Subject: [PATCH 28/42] chore(deps): Bump truncate from 2.0.1 to 2.1.0 (#94) Bumps [truncate](https://github.com/FGRibreau/node-truncate) from 2.0.1 to 2.1.0. - [Release notes](https://github.com/FGRibreau/node-truncate/releases) - [Changelog](https://github.com/FGRibreau/node-truncate/blob/master/CHANGELOG.md) - [Commits](https://github.com/FGRibreau/node-truncate/compare/v2.0.1...v2.1.0) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2aa2aa11..be35904d 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "react-native": "https://github.com/expo/react-native/archive/sdk-32.0.0.tar.gz", "react-navigation": "^3.0.9", "sentry-expo": "~1.12.0", - "truncate": "^2.0.1" + "truncate": "^2.1.0" }, "devDependencies": { "babel-eslint": "^10.0.1", diff --git a/yarn.lock b/yarn.lock index f1b77643..f32cec92 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8161,10 +8161,10 @@ trim-right@^1.0.1: resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= -truncate@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/truncate/-/truncate-2.0.1.tgz#dd1a6d15630515663d8475f6f24edf2f800ebb1b" - integrity sha1-3RptFWMFFWY9hHX28k7fL4AOuxs= +truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/truncate/-/truncate-2.1.0.tgz#391183563a25cffbd4d613a1d00ae5844c9e55d3" + integrity sha512-em3E3SUDONOjTBcZ36DTm3RvDded3IRU9rX32oHwwXNt3rJD5MVaFlJTQvs8tJoHRoeYP36OuQ1eL/Q7bNEWIQ== tslib@^1.9.0: version "1.9.3" From 3b44265f5c63cc3d1b939dff7d9e44c58ae07ea0 Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Wed, 19 Jun 2019 22:44:55 +0200 Subject: [PATCH 29/42] Expo version bump to 33.0.0 --- app.example.json | 2 +- package.json | 6 +- yarn.lock | 2059 ++++++++++++++++++++-------------------------- 3 files changed, 919 insertions(+), 1148 deletions(-) diff --git a/app.example.json b/app.example.json index 4800df60..ea5a52a0 100644 --- a/app.example.json +++ b/app.example.json @@ -49,7 +49,7 @@ "name": "Sh**t! I Smoke", "primaryColor": "#EBE7DD", "privacy": "public", - "sdkVersion": "32.0.0", + "sdkVersion": "33.0.0", "slug": "shoot-i-smoke", "splash": { "backgroundColor": "#ebe7dd", diff --git a/package.json b/package.json index be35904d..95d3461c 100644 --- a/package.json +++ b/package.json @@ -17,14 +17,14 @@ "async-retry": "^1.2.3", "axios": "^0.19.0", "date-fns": "^2.0.0-alpha.25", - "expo": "^32.0.0", + "expo": "^33.0.0", "haversine": "^1.1.0", "i18n-js": "^3.2.1", "mobx": "^4.6.0", "mobx-react": "^5.3.6", "mobx-state-tree": "^3.7.1", - "react": "16.5.0", - "react-native": "https://github.com/expo/react-native/archive/sdk-32.0.0.tar.gz", + "react": "16.8.3", + "react-native": "https://github.com/expo/react-native/archive/sdk-33.0.0.tar.gz", "react-navigation": "^3.0.9", "sentry-expo": "~1.12.0", "truncate": "^2.1.0" diff --git a/yarn.lock b/yarn.lock index f32cec92..6af71219 100644 --- a/yarn.lock +++ b/yarn.lock @@ -420,6 +420,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-syntax-class-properties@^7.0.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.2.0.tgz#23b3b7b9bcdabd73672a9149f728cd3be6214812" + integrity sha512-UxYaGXYQ7rrKJS/PxIKRkv3exi05oH7rokBAsmCSsCxz1sVPZ7Fu6FzKoGgUvmY+0YgSkYHgUoCh5R5bCNBQlw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-decorators@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz#c50b1b957dcc69e4b1127b65e1c33eef61570c1b" @@ -441,7 +448,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-flow@^7.2.0": +"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz#a765f061f803bc48f240c26f8747faf97c26bf7c" integrity sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg== @@ -455,7 +462,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-jsx@^7.2.0": +"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7" integrity sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw== @@ -522,7 +529,7 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-remap-async-to-generator" "^7.1.0" -"@babel/plugin-transform-block-scoped-functions@^7.2.0": +"@babel/plugin-transform-block-scoped-functions@^7.0.0", "@babel/plugin-transform-block-scoped-functions@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190" integrity sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w== @@ -663,7 +670,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-member-expression-literals@^7.2.0": +"@babel/plugin-transform-member-expression-literals@^7.0.0", "@babel/plugin-transform-member-expression-literals@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d" integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA== @@ -733,7 +740,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-object-super@^7.2.0": +"@babel/plugin-transform-object-super@^7.0.0", "@babel/plugin-transform-object-super@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz#b35d4c10f56bab5d650047dad0f1d8e8814b6598" integrity sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg== @@ -759,7 +766,7 @@ "@babel/helper-get-function-arity" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-property-literals@^7.2.0": +"@babel/plugin-transform-property-literals@^7.0.0", "@babel/plugin-transform-property-literals@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905" integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ== @@ -951,6 +958,13 @@ pirates "^4.0.0" source-map-support "^0.5.9" +"@babel/runtime@^7.0.0": + version "7.4.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12" + integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ== + dependencies: + regenerator-runtime "^0.13.2" + "@babel/runtime@^7.1.2": version "7.3.4" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83" @@ -1031,7 +1045,14 @@ "@types/cross-spawn" "^6.0.0" cross-spawn "^6.0.5" -"@expo/vector-icons@^9.0.0", "@expo/vector-icons@~9.0.0": +"@expo/vector-icons@^10.0.1": + version "10.0.2" + resolved "https://registry.yarnpkg.com/@expo/vector-icons/-/vector-icons-10.0.2.tgz#63223bd4a97bb1943dc8ea947fc10b29cbf84e4e" + integrity sha512-ea3cNMTfSsXo1QU/drBFTw93cMbqC6MxYOisxGyzZ9UiDIqvz3PJ9CQDtbqjZX9UASxLmg0mHWLVdsygAQJYwQ== + dependencies: + lodash "^4.17.4" + +"@expo/vector-icons@^9.0.0": version "9.0.0" resolved "https://registry.yarnpkg.com/@expo/vector-icons/-/vector-icons-9.0.0.tgz#7f18e21d3edc8b99b76d7d1b8e26b212393e08b3" integrity sha512-k5ndrW3oueW5jRDLt3o8iXKmiU+CvvCZPewOvxY7eRMivi8hIr6TkW6tMCGE1vS5fwmXffIkIpKGZkSbX7TxwA== @@ -1196,6 +1217,51 @@ "@types/istanbul-reports" "^1.1.1" "@types/yargs" "^12.0.9" +"@react-native-community/cli@^1.2.1": + version "1.9.10" + resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-1.9.10.tgz#6494e604fae3fd5993571a31bd16f0af751d56b4" + integrity sha512-mYFsSljhia/xNozRRDXC5HyGRBWaDh3OickT28i6NrJSZLjp0kAH6g4c0OWk67EslgXcMi/qYpucA8W54ldu1w== + dependencies: + chalk "^1.1.1" + commander "^2.19.0" + compression "^1.7.1" + connect "^3.6.5" + denodeify "^1.2.1" + envinfo "^5.7.0" + errorhandler "^1.5.0" + escape-string-regexp "^1.0.5" + execa "^1.0.0" + fs-extra "^7.0.1" + glob "^7.1.1" + graceful-fs "^4.1.3" + inquirer "^3.0.6" + lodash "^4.17.5" + metro "^0.51.0" + metro-config "^0.51.0" + metro-core "^0.51.0" + metro-memory-fs "^0.51.0" + metro-react-native-babel-transformer "^0.51.0" + mime "^1.3.4" + minimist "^1.2.0" + mkdirp "^0.5.1" + morgan "^1.9.0" + node-fetch "^2.2.0" + node-notifier "^5.2.1" + opn "^3.0.2" + plist "^3.0.0" + semver "^5.0.3" + serve-static "^1.13.1" + shell-quote "1.6.1" + slash "^2.0.0" + ws "^1.1.0" + xcode "^2.0.0" + xmldoc "^0.4.0" + +"@react-native-community/netinfo@2.0.10": + version "2.0.10" + resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-2.0.10.tgz#d28a446352e75754b78509557988359133cdbcca" + integrity sha512-NrIzyLe0eSbhgMnHl2QdSEhaA7yXh6p9jzMomfUa//hoTXE+xbObGDdiWWSQm2bnXnZJg8XCU3AB9qzvqcuLnA== + "@react-navigation/core@3.1.1": version "3.1.1" resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.1.1.tgz#badf449ac7d2ae65b0f5aa1bf63a87e7888458d3" @@ -1358,6 +1424,22 @@ resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.9.tgz#693e76a52f61a2f1e7fb48c0eef167b95ea4ffd0" integrity sha512-sCZy4SxP9rN2w30Hlmg5dtdRwgYQfYRiLo9usw8X9cxlf+H4FqM1xX7+sNH7NNKVdbXMJWqva7iyy+fxh/V7fA== +"@unimodules/core@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@unimodules/core/-/core-2.0.1.tgz#e5d760aa1a01885871d2d5c3f1fd3404552e5fcb" + integrity sha512-evbJUEAf8TvIfzR2/T9npWuqyYE8042qvmE7uWF+uDAt8KclMS9g7clbNTEG1ck5ov9AYWMMgohFaPfDCkJicw== + dependencies: + compare-versions "^3.4.0" + +"@unimodules/react-native-adapter@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@unimodules/react-native-adapter/-/react-native-adapter-2.0.1.tgz#021f1f7e2247d296986b0d8f1949a4d8e748ce9c" + integrity sha512-D9CSGLIWX0iWLv4Voq0i+xo0YZcraTN1uCdJ+EepwmBplRHDrDCoh2M9Upm4aIso5812pXOBHmGf31AhIKKhYA== + dependencies: + invariant "^2.2.4" + lodash "^4.5.0" + prop-types "^15.6.1" + abab@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f" @@ -1416,17 +1498,7 @@ agent-base@^4.1.0: dependencies: es6-promisify "^5.0.0" -ajv-errors@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" - integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== - -ajv-keywords@^3.1.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d" - integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw== - -ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1: +ajv@^6.5.5, ajv@^6.9.1: version "6.10.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1" integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg== @@ -1701,40 +1773,6 @@ axios@^0.19.0: follow-redirects "1.5.10" is-buffer "^2.0.2" -babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -babel-core@^6.26.0, babel-core@^6.7.2: - version "6.26.3" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" - integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA== - dependencies: - babel-code-frame "^6.26.0" - babel-generator "^6.26.0" - babel-helpers "^6.24.1" - babel-messages "^6.23.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - convert-source-map "^1.5.1" - debug "^2.6.9" - json5 "^0.5.1" - lodash "^4.17.4" - minimatch "^3.0.4" - path-is-absolute "^1.0.1" - private "^0.1.8" - slash "^1.0.0" - source-map "^0.5.7" - babel-eslint@^10.0.1: version "10.0.1" resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.1.tgz#919681dc099614cd7d31d45c8908695092a1faed" @@ -1747,104 +1785,6 @@ babel-eslint@^10.0.1: eslint-scope "3.7.1" eslint-visitor-keys "^1.0.0" -babel-generator@^6.26.0: - version "6.26.1" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" - integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA== - dependencies: - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - detect-indent "^4.0.0" - jsesc "^1.3.0" - lodash "^4.17.4" - source-map "^0.5.7" - trim-right "^1.0.1" - -babel-helper-builder-react-jsx@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0" - integrity sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA= - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - esutils "^2.0.2" - -babel-helper-call-delegate@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" - integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340= - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-define-map@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" - integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8= - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-function-name@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" - integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk= - dependencies: - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-get-function-arity@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" - integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-hoist-variables@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" - integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-optimise-call-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" - integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-replace-supers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" - integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo= - dependencies: - babel-helper-optimise-call-expression "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helpers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" - integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI= - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-jest@^24.8.0: version "24.8.0" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.8.0.tgz#5c15ff2b28e20b0f45df43fe6b7f2aae93dba589" @@ -1858,20 +1798,6 @@ babel-jest@^24.8.0: chalk "^2.4.2" slash "^2.0.0" -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-check-es2015-constants@^6.8.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" - integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o= - dependencies: - babel-runtime "^6.22.0" - babel-plugin-istanbul@^5.1.0: version "5.1.1" resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.1.tgz#7981590f1956d75d67630ba46f0c22493588c893" @@ -1904,224 +1830,10 @@ babel-plugin-react-native-web@^0.9.6: resolved "https://registry.yarnpkg.com/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.9.13.tgz#20d76e8e78815582b3d983efa19b3116168e7784" integrity sha512-cgHJcA+jDIcEH0g0JSCjRxGlKIMVR5GWCgVSFwfjIP1HCvjFOtjUWGHPEnlMShp9mHl/WtL2v59sRWzVnoK3CA== -babel-plugin-syntax-class-properties@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de" - integrity sha1-1+sjt5oxf4VDlixQW4J8fWysJ94= - -babel-plugin-syntax-flow@^6.18.0, babel-plugin-syntax-flow@^6.8.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d" - integrity sha1-TDqyCiryaqIM0lmVw5jE63AxDI0= - -babel-plugin-syntax-jsx@^6.8.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" - integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= - -babel-plugin-syntax-object-rest-spread@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" - integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U= - -babel-plugin-syntax-trailing-function-commas@^6.8.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" - integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM= - -babel-plugin-transform-class-properties@^6.8.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac" - integrity sha1-anl2PqYdM9NvN7YRqp3vgagbRqw= - dependencies: - babel-helper-function-name "^6.24.1" - babel-plugin-syntax-class-properties "^6.8.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-arrow-functions@^6.8.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" - integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoped-functions@^6.8.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" - integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoping@^6.8.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" - integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8= - dependencies: - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-plugin-transform-es2015-classes@^6.8.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" - integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs= - dependencies: - babel-helper-define-map "^6.24.1" - babel-helper-function-name "^6.24.1" - babel-helper-optimise-call-expression "^6.24.1" - babel-helper-replace-supers "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-computed-properties@^6.8.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" - integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM= - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-destructuring@^6.8.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" - integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-for-of@^6.8.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" - integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-function-name@^6.8.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" - integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos= - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-literals@^6.8.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" - integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-modules-commonjs@^6.8.0: - version "6.26.2" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3" - integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q== - dependencies: - babel-plugin-transform-strict-mode "^6.24.1" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-types "^6.26.0" - -babel-plugin-transform-es2015-object-super@^6.8.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" - integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40= - dependencies: - babel-helper-replace-supers "^6.24.1" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-parameters@^6.8.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" - integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys= - dependencies: - babel-helper-call-delegate "^6.24.1" - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-shorthand-properties@^6.8.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" - integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-spread@^6.8.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" - integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-template-literals@^6.8.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" - integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es3-member-expression-literals@^6.8.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es3-member-expression-literals/-/babel-plugin-transform-es3-member-expression-literals-6.22.0.tgz#733d3444f3ecc41bef8ed1a6a4e09657b8969ebb" - integrity sha1-cz00RPPsxBvvjtGmpOCWV7iWnrs= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es3-property-literals@^6.8.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es3-property-literals/-/babel-plugin-transform-es3-property-literals-6.22.0.tgz#b2078d5842e22abf40f73e8cde9cd3711abd5758" - integrity sha1-sgeNWELiKr9A9z6M3pzTcRq9V1g= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-flow-strip-types@^6.8.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf" - integrity sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988= - dependencies: - babel-plugin-syntax-flow "^6.18.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-object-rest-spread@^6.8.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06" - integrity sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY= - dependencies: - babel-plugin-syntax-object-rest-spread "^6.8.0" - babel-runtime "^6.26.0" - -babel-plugin-transform-react-display-name@^6.8.0: - version "6.25.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1" - integrity sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx@^6.8.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3" - integrity sha1-hAoCjn30YN/DotKfDA2R9jduZqM= - dependencies: - babel-helper-builder-react-jsx "^6.24.1" - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-strict-mode@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" - integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" +babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0: + version "7.0.0-beta.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf" + integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ== babel-preset-expo@^5.0.0: version "5.0.0" @@ -2144,39 +1856,38 @@ babel-preset-expo@^5.1.1: babel-plugin-react-native-web "^0.9.6" metro-react-native-babel-preset "^0.49.0" -babel-preset-fbjs@2.3.0, babel-preset-fbjs@^2.1.2: - version "2.3.0" - resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-2.3.0.tgz#92ff81307c18b926895114f9828ae1674c097f80" - integrity sha512-ZOpAI1/bN0Y3J1ZAK9gRsFkHy9gGgJoDRUjtUCla/129LC7uViq9nIK22YdHfey8szohYoZY3f9L2lGOv0Edqw== - dependencies: - babel-plugin-check-es2015-constants "^6.8.0" - babel-plugin-syntax-class-properties "^6.8.0" - babel-plugin-syntax-flow "^6.8.0" - babel-plugin-syntax-jsx "^6.8.0" - babel-plugin-syntax-object-rest-spread "^6.8.0" - babel-plugin-syntax-trailing-function-commas "^6.8.0" - babel-plugin-transform-class-properties "^6.8.0" - babel-plugin-transform-es2015-arrow-functions "^6.8.0" - babel-plugin-transform-es2015-block-scoped-functions "^6.8.0" - babel-plugin-transform-es2015-block-scoping "^6.8.0" - babel-plugin-transform-es2015-classes "^6.8.0" - babel-plugin-transform-es2015-computed-properties "^6.8.0" - babel-plugin-transform-es2015-destructuring "^6.8.0" - babel-plugin-transform-es2015-for-of "^6.8.0" - babel-plugin-transform-es2015-function-name "^6.8.0" - babel-plugin-transform-es2015-literals "^6.8.0" - babel-plugin-transform-es2015-modules-commonjs "^6.8.0" - babel-plugin-transform-es2015-object-super "^6.8.0" - babel-plugin-transform-es2015-parameters "^6.8.0" - babel-plugin-transform-es2015-shorthand-properties "^6.8.0" - babel-plugin-transform-es2015-spread "^6.8.0" - babel-plugin-transform-es2015-template-literals "^6.8.0" - babel-plugin-transform-es3-member-expression-literals "^6.8.0" - babel-plugin-transform-es3-property-literals "^6.8.0" - babel-plugin-transform-flow-strip-types "^6.8.0" - babel-plugin-transform-object-rest-spread "^6.8.0" - babel-plugin-transform-react-display-name "^6.8.0" - babel-plugin-transform-react-jsx "^6.8.0" +babel-preset-fbjs@^3.0.1, babel-preset-fbjs@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.2.0.tgz#c0e6347d3e0379ed84b3c2434d3467567aa05297" + integrity sha512-5Jo+JeWiVz2wHUUyAlvb/sSYnXNig9r+HqGAOSfh5Fzxp7SnAaR/tEGRJ1ZX7C77kfk82658w6R5Z+uPATTD9g== + dependencies: + "@babel/plugin-proposal-class-properties" "^7.0.0" + "@babel/plugin-proposal-object-rest-spread" "^7.0.0" + "@babel/plugin-syntax-class-properties" "^7.0.0" + "@babel/plugin-syntax-flow" "^7.0.0" + "@babel/plugin-syntax-jsx" "^7.0.0" + "@babel/plugin-syntax-object-rest-spread" "^7.0.0" + "@babel/plugin-transform-arrow-functions" "^7.0.0" + "@babel/plugin-transform-block-scoped-functions" "^7.0.0" + "@babel/plugin-transform-block-scoping" "^7.0.0" + "@babel/plugin-transform-classes" "^7.0.0" + "@babel/plugin-transform-computed-properties" "^7.0.0" + "@babel/plugin-transform-destructuring" "^7.0.0" + "@babel/plugin-transform-flow-strip-types" "^7.0.0" + "@babel/plugin-transform-for-of" "^7.0.0" + "@babel/plugin-transform-function-name" "^7.0.0" + "@babel/plugin-transform-literals" "^7.0.0" + "@babel/plugin-transform-member-expression-literals" "^7.0.0" + "@babel/plugin-transform-modules-commonjs" "^7.0.0" + "@babel/plugin-transform-object-super" "^7.0.0" + "@babel/plugin-transform-parameters" "^7.0.0" + "@babel/plugin-transform-property-literals" "^7.0.0" + "@babel/plugin-transform-react-display-name" "^7.0.0" + "@babel/plugin-transform-react-jsx" "^7.0.0" + "@babel/plugin-transform-shorthand-properties" "^7.0.0" + "@babel/plugin-transform-spread" "^7.0.0" + "@babel/plugin-transform-template-literals" "^7.0.0" + babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0" babel-preset-jest@^24.6.0: version "24.6.0" @@ -2186,20 +1897,7 @@ babel-preset-jest@^24.6.0: "@babel/plugin-syntax-object-rest-spread" "^7.0.0" babel-plugin-jest-hoist "^24.6.0" -babel-register@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" - integrity sha1-btAhFz4vy0htestFxgCahW9kcHE= - dependencies: - babel-core "^6.26.0" - babel-runtime "^6.26.0" - core-js "^2.5.0" - home-or-tmp "^2.0.0" - lodash "^4.17.4" - mkdirp "^0.5.1" - source-map-support "^0.4.15" - -babel-runtime@^6.22.0, babel-runtime@^6.26.0: +babel-runtime@^6.11.6: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= @@ -2207,47 +1905,6 @@ babel-runtime@^6.22.0, babel-runtime@^6.26.0: core-js "^2.4.0" regenerator-runtime "^0.11.0" -babel-template@^6.24.1, babel-template@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI= - dependencies: - babel-runtime "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - lodash "^4.17.4" - -babel-traverse@^6.24.1, babel-traverse@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4= - dependencies: - babel-code-frame "^6.26.0" - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - debug "^2.6.8" - globals "^9.18.0" - invariant "^2.2.2" - lodash "^4.17.4" - -babel-types@^6.24.1, babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc= - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== - balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -2258,7 +1915,7 @@ base64-js@1.1.2: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.1.2.tgz#d6400cac1c4c660976d90d07a04351d89395f5e8" integrity sha1-1kAMrBxMZgl22Q0HoENR2JOV9eg= -base64-js@^1.1.2, base64-js@^1.2.3: +base64-js@^1.1.2, base64-js@^1.2.3, base64-js@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3" integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw== @@ -2295,10 +1952,10 @@ big-integer@^1.6.7: resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.42.tgz#91623ae5ceeff9a47416c56c9440a66f12f534f1" integrity sha512-3UQFKcRMx+5Z+IK5vYTMYK2jzLRJkt+XqyDdacgWgtMjjuifKpKTFneJLEgeBElOE2/lXZ1LcMcb5s8pwG2U8Q== -big.js@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" - integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== +blueimp-md5@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.10.0.tgz#02f0843921f90dca14f5b8920a38593201d6964d" + integrity sha512-EkNUOi7tpV68TqjpiUz9D9NcT8um2+qtgntmMbi5UKssVX2m/2PLqotcric0RE63pB3HPN/fjf3cKHN2ufGSUQ== bplist-creator@0.0.7: version "0.0.7" @@ -2388,6 +2045,11 @@ buffer-alloc@^1.1.0: buffer-alloc-unsafe "^1.1.0" buffer-fill "^1.0.0" +buffer-crc32@^0.2.13: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + buffer-fill@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" @@ -2457,6 +2119,11 @@ camelcase@^5.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.2.0.tgz#e7522abda5ed94cc0489e1b8466610e88404cf45" integrity sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ== +can-use-dom@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/can-use-dom/-/can-use-dom-0.1.0.tgz#22cc4a34a0abc43950f42c6411024a3f6366b45a" + integrity sha1-IsxKNKCrxDlQ9CxkEQJKP2NmtFo= + caniuse-lite@^1.0.30000960: version "1.0.30000960" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000960.tgz#ec48297037e5607f582f246ae7b12bee66a78999" @@ -2474,7 +2141,7 @@ caseless@^0.12.0, caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -chalk@^1.1.1, chalk@^1.1.3: +chalk@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= @@ -2494,6 +2161,11 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +change-emitter@^0.1.2: + version "0.1.6" + resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515" + integrity sha1-6LL+PX8at9aaMhma/5HqaTFAlRU= + chardet@^0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" @@ -2572,7 +2244,7 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^1.9.0, color-convert@^1.9.1: +color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -2584,32 +2256,11 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -color-name@^1.0.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -color-string@^1.5.2: - version "1.5.3" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc" - integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw== - dependencies: - color-name "^1.0.0" - simple-swizzle "^0.2.2" - color-support@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== -color@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color/-/color-2.0.1.tgz#e4ed78a3c4603d0891eba5430b04b86314f4c839" - integrity sha512-ubUCVVKfT7r2w2D3qtHakj8mbmKms+tThR8gI8zEYCbUBl8/voqFGt3kgBqGwXAopgXybnkuOq+qMYCRrp4cXw== - dependencies: - color-convert "^1.9.1" - color-string "^1.5.2" - combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828" @@ -2617,6 +2268,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" +commander@^2.19.0: + version "2.20.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" + integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== + commander@^2.9.0: version "2.19.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" @@ -2637,6 +2293,11 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= +compare-versions@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.4.0.tgz#e0747df5c9cb7f054d6d3dc3e1dbc444f9e92b26" + integrity sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg== + component-emitter@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" @@ -2697,7 +2358,7 @@ contains-path@^0.1.0: resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= -convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1: +convert-source-map@^1.1.0, convert-source-map@^1.4.0: version "1.6.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A== @@ -2734,7 +2395,7 @@ core-js@^1.0.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY= -core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.5.7: +core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.7: version "2.6.5" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895" integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A== @@ -2932,13 +2593,6 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg= - dependencies: - repeating "^2.0.0" - detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" @@ -3011,11 +2665,6 @@ emoji-regex@^7.0.1: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== -emojis-list@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= - encodeurl@~1.0.1, encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -3093,7 +2742,7 @@ escape-html@~1.0.3: resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: +escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= @@ -3418,382 +3067,395 @@ expect@^24.8.0: jest-message-util "^24.8.0" jest-regex-util "^24.3.0" -expo-ads-admob@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-ads-admob/-/expo-ads-admob-2.0.0.tgz#53b78a5ac5eee4f306ff461256160990ab96936b" - integrity sha512-mGx4rDBlDgVRf0jKsl4IpghBDG7vphriUmGa6BYRjnwc7PaQJMeQOINxQKLr37CvTuzvhiDz+yYFBeS5baRNXg== +expo-ads-admob@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-ads-admob/-/expo-ads-admob-5.0.1.tgz#5a74e7cfba3ef8b81b34697df52a78b6d95e9761" + integrity sha512-9eKifW2HQpfk4pNlUXetZHEXUFyflK/nwfMPkXYRxay6tG3OsKKKfF42pod6KohguEtwEy+RFM3lGUf4tLgG5Q== dependencies: prop-types "^15.6.2" -expo-analytics-segment@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-analytics-segment/-/expo-analytics-segment-2.0.0.tgz#5b957c97729b688825f58b39bba09463622e8d3f" - integrity sha512-NSqvm1bK0cxnBXwypkfQc1ZM8jE5ARgSs1PYgxqsyEDY1ivxJkpvf0R0QOxqHjG4N34ox0J3YJHRCLHyMyrRbA== +expo-ads-facebook@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-ads-facebook/-/expo-ads-facebook-5.0.1.tgz#3b563446c4bb2cd18e9a189da0d0671612be477e" + integrity sha512-PPPc4AwGUsmCUGwH6/7iE8nMyG7XqdAqMTo/WVN+Tfit3KVte46SLnaKCT53CAhqPuFvKTy6t9a1mqz6eglAqA== dependencies: - expo-core "~2.0.0" + fbemitter "^2.1.1" + nullthrows "^1.1.0" -expo-app-auth@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-app-auth/-/expo-app-auth-2.0.0.tgz#434d1a16f62a298b9ed1eff6cc6a464d1d29440f" - integrity sha512-g3U0+G2nwgcTiINTAS3FtQvvLfOm9ZMeUDJ6rc6YkG7JmcW6vC0s3QURYlF33UdqWeN4VUYw7o0zP6r4jsZhNQ== - dependencies: - expo-constants-interface "~2.0.0" - expo-core "~2.0.0" +expo-analytics-amplitude@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-analytics-amplitude/-/expo-analytics-amplitude-5.0.1.tgz#2f0d046f1949342c45cf0b6351f5b021357d4f92" + integrity sha512-zzH82IbA/MTfpEbSQuDq4fHR1O3srNTwdOsBYSizn/mvt7+5DPHn4pHJuf9QRtm8FhmpuQQ7d26I6/2/5JCKKA== -expo-app-loader-provider@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/expo-app-loader-provider/-/expo-app-loader-provider-1.0.0.tgz#62dae0d6e2829d51b168a973b03bc8a3a8ac78d3" - integrity sha512-PAQnlGNQLO6k+k+kgGyqw4oaLS6GAvRwZRG1BofYBvcIzhZf24Nys7DuA6JT5Ukb1FtO8c5Ioi4C7pKntYiPdw== - dependencies: - expo-core "~2.0.0" +expo-analytics-segment@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-analytics-segment/-/expo-analytics-segment-5.0.1.tgz#63443c0c8fa133ce558b557e28baad12326c8bd2" + integrity sha512-IfGmtzbyBOJEvDYKiXbr/L5RMtZsVqagnOXDhd5LlHYXPSsVyLZUYzi61blyy/Yoc3fPDfAzk9BTfjYR+zD3MQ== -expo-asset@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-asset/-/expo-asset-2.0.0.tgz#c4a1d44ccf1d321b505e437d1582dd2d382995e2" - integrity sha512-8E/vQ/grJl1OX2lkzChbQJWsynIRupkxR0r8RMJ0js+MfDtmyi3m4lVzY4AjUz/y7KJ9XpldKjsqerFWb/Nmew== +expo-app-auth@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-app-auth/-/expo-app-auth-5.0.1.tgz#ddf5417d33931870311c8b7571f8d2ad13bbfc2a" + integrity sha512-7t2UCw2Ga4t71v4LlaWTu6ikZLG8LEhv3f7dQ82FYO09cQck7PPMJZyWbw7B8pgaFuO7A3mLF1H2F3MXLMZzRw== dependencies: - uri-parser "^1.0.1" - url-join "^4.0.0" - url-loader "^1.1.2" + invariant "^2.2.4" -expo-background-fetch@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/expo-background-fetch/-/expo-background-fetch-1.0.0.tgz#d84dfd001c2fc71b233de14ccd6a110b07f9e705" - integrity sha512-oQY2gCEZIka1xKlkW0y3/GYobdXDl9Q3//sfogLlxVcoTFScLRYCwTOBVb6RsCzLwv/CzZedbR+1WjlvKshS6Q== +expo-app-loader-provider@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-app-loader-provider/-/expo-app-loader-provider-5.0.1.tgz#56f531e189de8407bdf257d5753ccec43dd253f7" + integrity sha512-RrbKXYmy980MdSgroY0fWPEFp4qqRGfE2oixPgN52poXJyrLbFeSmV/92IDsEOFv02jtrbbHJ8i3tiIF63czXA== + +expo-asset@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-asset/-/expo-asset-5.0.1.tgz#02445aeb695b8449cb7239e11fc3a8d34e6c86ce" + integrity sha512-dDu2jgFVd5UdBVfCgiznaib7R8bF3fZ0H3cLEO8q05lXV5NwFc/ftC2BXy0+tvV5u/yEtnRvQFAQQBJVhtbvpQ== dependencies: - expo-task-manager "~1.0.0" + blueimp-md5 "^2.10.0" + path-browserify "^1.0.0" + url-parse "^1.4.4" -expo-barcode-scanner-interface@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-barcode-scanner-interface/-/expo-barcode-scanner-interface-2.0.0.tgz#3d5c7855511a783628baf9fd827f94770854ca12" - integrity sha512-rfCLqL06zVcyT5usKBQqDA0ilIEYv5zi91lUJ6s2/Llvx/OHuiPY4w1ol5HJPRJQvaBHop3lXqnb7dUuEMTsIA== +expo-av@~5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/expo-av/-/expo-av-5.0.2.tgz#8f308fc14d7be8b3bc79d6f8dc6c270da07f94d4" + integrity sha512-InvEYDinIv5enZR1HM6oIKFrvFoIsXuxAKcbZmgtqeuRzeJpOLJgzEJ5XlqPDfCM9/RX2Fhv4b2mSQsL20T4IQ== + dependencies: + lodash "^4.17.11" -expo-barcode-scanner@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-barcode-scanner/-/expo-barcode-scanner-2.0.0.tgz#0b06c81a4457bc9c1c34f3423acf757dea6ac638" - integrity sha512-ryWfpqpw+gzvZVfsm6IUj6oSi22sWeuEg7j38Vn0C9LoHVWNt93JcKWTulO+8Pk2iThvr/ernmHqyMGatwmv6g== +expo-background-fetch@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-background-fetch/-/expo-background-fetch-5.0.1.tgz#103538d81dda5010dd4f525dd4c73daaa54f61d8" + integrity sha512-nisjKhpqY9B4XoFcTXtT2tjiSgt0ApuKRxGbECG3q4vq85o13cGoOYuNJv7XkKuuEpVkvuCK6yjh+WVgOoouRw== dependencies: - expo-barcode-scanner-interface "~2.0.0" - lodash.mapvalues "^4.6.0" - prop-types "^15.6.0" + expo-task-manager "~5.0.1" -expo-camera-interface@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-camera-interface/-/expo-camera-interface-2.0.0.tgz#d6de1aa6bd9626146a174911949fa801abb5de7e" - integrity sha512-6CLexDa/RhrJ74dzNKyg7aHcNG11FH/F83sD+wIbhoE7fm3FGEbSXxOKccWmVAUApMyn3Sdev4MLjnKUX0opBQ== +expo-barcode-scanner@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-barcode-scanner/-/expo-barcode-scanner-5.0.1.tgz#4b35704e05ab61fa5d203ccc27045739072f84f7" + integrity sha512-9IGXvfd5w8P3swhauSXgCjR55qDvrSgQIc9AdyPZ70V5+UyBB6rmRF7NVPyNAWd3t41HhZ9mo9TKhOmggboG0Q== dependencies: - expo-core "~2.0.0" + lodash "^4.6.0" + prop-types "^15.6.0" -expo-camera@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-camera/-/expo-camera-2.0.0.tgz#ea55105970eff1b5ad858de156fee36b6e5bb632" - integrity sha512-TVRuMMQ8+Y54v7Q3Wls3ZXABMhA+W7u5M3Ghdmc6hPUVubG1TprAk257BorfaI09QJ5jOevDzdw3IAFEvyE+Pg== +expo-blur@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-blur/-/expo-blur-5.0.1.tgz#39edbb391965ec3b426ded6b869618d8294dd56c" + integrity sha512-tOrVAut04HBkGQ+CizvCXCluHYWVkBvJ4b4OJnLmVV6WzW7Q2cfWglPzGRn/ue/Yw5IZ6p6mZInEqLt/SFkGDg== dependencies: - lodash.mapvalues "^4.6.0" prop-types "^15.6.0" -expo-constants-interface@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-constants-interface/-/expo-constants-interface-2.0.0.tgz#9cccb024d8e1b6a8fa765882456ba89afb57d03b" - integrity sha512-H5qXLl1Ew+Aemo127B9zvdtutYCZRwYnb1wRY2gKvECuyHTfRylld7fA6otebNf1NwqCQ5bowTZtls4SKWxTiQ== +expo-brightness@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-brightness/-/expo-brightness-5.0.1.tgz#90e0445a34c7ef92c4511211c888bbc50eae0441" + integrity sha512-jUbbucNYoBiWiQhHJG78SB4e7DVTRpcm19DKxvvtcwyDMDUch6YFtk1+pImOjkPDlD6xVFm4xPpSWdW3Y2Md3Q== + +expo-calendar@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-calendar/-/expo-calendar-5.0.1.tgz#52660f08d3a41109080ecfb2ee7ebbcd9f67c071" + integrity sha512-muMxE5W7itpTmsveuEQwRD6bDi5ccDBxkiFNEsqOYheVzAQA55XwIad5a7PrZ4tT4QfeEVvhR1+mE+ShdWqCmw== + +expo-camera@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-camera/-/expo-camera-5.0.1.tgz#1c90cda9e368148dbf538d14bd047cdf33ea3350" + integrity sha512-FlgTV6dubDE1IMRKiOipTl2uH1eCravcFDfUQlQaxIlz73YEilZhJT7MAentq8VLJoYXsD99F3TfGcIltMA46Q== dependencies: - expo-core "~2.0.0" + lodash "^4.6.0" + prop-types "^15.6.0" -expo-constants@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/expo-constants/-/expo-constants-2.0.1.tgz#f3090e206da7c580c8dbb16178f918a8110644c2" - integrity sha512-OIT1afOYYSpDxnnTp5jNXNB2nfnbmykLT+fLaKTu60VdtrO0sr20eB30YwuALU7n/xSYM/xKPsP8jDCzq40YLw== +expo-constants@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-constants/-/expo-constants-5.0.1.tgz#597263397f269d7fe37d9cd6b30e305c16635a00" + integrity sha512-Ny3teALKaE/jFzBg6DHr2GOoHpwQ/OLs3q3VugZOoR6hXCeVcCEP9MyNvhgn/cheeBDAa6UIgarv2Yufb5RMqQ== dependencies: ua-parser-js "^0.7.19" - uuid "^3.3.2" -expo-contacts@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-contacts/-/expo-contacts-2.0.0.tgz#ea71d0b3734c33515a3e2ae8d7afa037ce7f3738" - integrity sha512-aRq8WZ9XeTffI8vidS2Yu51WqIRsj+oWt2kaFPCnGHeH71eE6HxuNapQGe+RmoyJmpntVHYdlg3kAgyW84odQw== +expo-contacts@~5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/expo-contacts/-/expo-contacts-5.0.2.tgz#4ed7102e31c426367ba3c9dca86d496b38546ab6" + integrity sha512-mOsov0eomKsscsdRU2HQPLLZ61lzojHNgO3FVyBF/yoxKAIyMYLTjneHbiOEKAFX4yfFT4bztHgcrL26aLooXQ== dependencies: - expo-core "~2.0.0" - expo-errors "~1.0.0" uuid-js "^0.7.5" -expo-core@~2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/expo-core/-/expo-core-2.0.2.tgz#61e1e5cc6c4341a834a0d7f37c68887cee8d971f" - integrity sha512-QKkICJ06m/J1PxTJqtVu03+fUXwjLqb2YPF5J9DT7W4EknPq1sHY3ZKJgAr1PhK24fzvVoxWOKqiIstliZdBOA== +expo-crypto@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-crypto/-/expo-crypto-5.0.1.tgz#ffb48895c68dd5c5f51bf9648152a6d122514ad8" + integrity sha512-Tu3d+KJ9eXBNhP5XYvBFQ2n0I0kwlbOw8iEXnbzXmasvhOqr/fPZEdXVbX7xX0/QJE5G1c+OTIV0z/cS8GdVVQ== -expo-errors@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/expo-errors/-/expo-errors-1.0.0.tgz#0e212e6e10eb7e8c01eb59d79560ed2cdaaadd95" - integrity sha512-4CL/75aigg+pYwgR+7SUJwYgX2oa7ZGAwK1aYKnyUnwQOa9jmjJJoT9KPHO8SbDHz+mEwjD5TE8ZXfOWlMl+kw== +expo-document-picker@~5.0.1: + version "5.0.2" + resolved "https://registry.yarnpkg.com/expo-document-picker/-/expo-document-picker-5.0.2.tgz#e6ea131491c8267bdca1c617ad9ff96c6c4fa675" + integrity sha512-m8oLY6zmqzbZv2ZLx4R4tpVLJfD68OSC8wlBQHcdzo9TTalsxjO62kp3mxRqfe4Jpj0h7icrl4bqNN4bxSGNNw== dependencies: - expo-core "~2.0.0" - -expo-face-detector-interface@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-face-detector-interface/-/expo-face-detector-interface-2.0.0.tgz#ed93427ab1dc312444a9ef997753c26d57b53133" - integrity sha512-BXBxTMFy2YFANWxxgXmrie2R68ATv2KJJ9iaVYCNSoAXplAsHF+Kc2hkVBLE/xAU2+QFzVq9N21CVOIfKsWN4A== - dependencies: - expo-core "~2.0.0" + uuid "^3.3.2" -expo-face-detector@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-face-detector/-/expo-face-detector-2.0.0.tgz#d3f96038174d8de47cd0b6a33412ab488dfe7403" - integrity sha512-w+pO6AURNNZt0ocqHPFHR6EQ2ZyZorSkwRCCZoLLm7GZ1PdMLIRfkqeN1hAWmHcGt9sEzRBaYWJETzDtwSd4BA== - dependencies: - expo-core "~2.0.0" - expo-face-detector-interface "~2.0.0" - expo-permissions-interface "~2.0.0" +expo-face-detector@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-face-detector/-/expo-face-detector-5.0.1.tgz#51012d54f8d28d470fc18ed6aea333b1fe1271ce" + integrity sha512-UUsbLtmENF8S86AJIeeLkj89Q1gvk69wYe1lQflNN7Wy8YLhrRq3V833Gt0Mna5tKThTnj0MkfOcmR2w2skgtg== -expo-file-system-interface@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-file-system-interface/-/expo-file-system-interface-2.0.0.tgz#610cb7ec797a65199fe5d04ba5d515aba95a3fb9" - integrity sha512-lhNjfPyNspQIJOqDM/Z8lpFICc0QF/Ah1DtYCDeQSng/zgAaLlRyDN3vSb/a5NrluSDfRlU2oF2sbrxIsOzzbg== - dependencies: - expo-core "~2.0.0" +expo-facebook@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-facebook/-/expo-facebook-5.0.1.tgz#a339ae21c3748185ad583ab3c1979c0d5637afa9" + integrity sha512-rm28dfPtUcdJEB+7zFgZvwl4G8liYGIfDgxECJGqQZNqFVeRQVxbqyxEBuTBuRmYL/nA5n8egTTeW62NC7v85g== -expo-file-system@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-file-system/-/expo-file-system-2.0.0.tgz#96da55dd03dab88e4ae32bfd5237aaa810ab33f0" - integrity sha512-snYf1kIYB9Jx2z1Vsj7+q3SSKyjmWPH+dpWlxCS+gHRgFzWI36y46SZCL/d76SmM2SOMhS95mIU+EZR7rKSJTQ== +expo-file-system@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-file-system/-/expo-file-system-5.0.1.tgz#c26054e512c3bb2e256325b48e603957a24e6210" + integrity sha512-8AD8Tt0vR8XNIPXOg5akPUPGuf+SCiE9kY5JppUwfJtfIsiH3BZnebu1bkYCVOMojSgFA017kr8VmH57vEWdnQ== dependencies: - expo-core "~2.0.0" - expo-file-system-interface "~2.0.0" uuid-js "^0.7.5" -expo-font-interface@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-font-interface/-/expo-font-interface-2.0.0.tgz#183d033029e41c2f92c1117425d1381dbb0dd452" - integrity sha512-5tEGjUwOLd5h6vTR3xfNc6jXTRKzLVnGpIjns+L2aArIIktmlZU3Y/gzueY8AkB6J6SB5DYSLlybp5kQrUOImw== - dependencies: - expo-core "~2.0.0" - -expo-font@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-font/-/expo-font-2.0.0.tgz#0b1e21084a678ddb7fafd16a4b02dcd9bb325963" - integrity sha512-0o79ON0aQQCcA3OXXnRllGGnFFfDXXe2QB/IIGrksD5UL8MPwhLWAsD3ZsZJYgo3H6tE/i8moB2zQ1i2Q/4pNg== +expo-font@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-font/-/expo-font-5.0.1.tgz#b3174134efd0ce3382db3a6c282147cba8bee203" + integrity sha512-fa/z31lLi1ut6IGTf9/Kvw9KAlwSGQaBkuunuqjrW2ephqiXlHTeOOsaqKMirtmiqgsKOJysdlYUH1Aw03Y2bg== dependencies: - invariant "^2.2.2" + fontfaceobserver "^2.1.0" -expo-gl-cpp@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-gl-cpp/-/expo-gl-cpp-2.0.0.tgz#65c3859f93ec16feafcd1124d86a5c8d463f96f7" - integrity sha512-Vuj/ABhqOQgdFFJjGEzZ9soFEHGbwOzL6T9oH70osrl4laep/4RCtQy80zThC0aNRDFFmh5923SyqBo5CGKJyQ== - dependencies: - expo-core "~2.0.0" +expo-gl-cpp@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-gl-cpp/-/expo-gl-cpp-5.0.1.tgz#cc83b18c4ab0e3e125cb95cf501975455a2c5bbe" + integrity sha512-4RMylFwAyakmi5Dp8Vqomq6N+Ywx81ehM3UqhFLuaEkS7dmKd8UQBKwiTiaFcDLsNkvLbTnyllAx7/qctJLQvQ== -expo-gl@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-gl/-/expo-gl-2.0.0.tgz#c78f5c6934a8a6ca25e8b7655fa3498add7f5845" - integrity sha512-iCzaBXvV/YIfPUTAZrI6TDdQDp3qPOCKfib8L/haAjXLf74SqDevQzLFSTfahGZJRgR9/NXsVfKc0z6MmTeIZw== +expo-gl@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-gl/-/expo-gl-5.0.1.tgz#52cb200a76744131284622622cde16032b176397" + integrity sha512-S3LRjIpyedR04QeeSXOJRxPgq8s+o0W3bFlvKZS0ch54xFYJqDk/TM2YTJYY5j9aR4HY/hypnDbP231NwNm30w== dependencies: + expo-gl-cpp "~5.0.1" prop-types "^15.6.2" -expo-google-sign-in@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-google-sign-in/-/expo-google-sign-in-2.0.0.tgz#f3352300b3f1f8625f5a2835b28910edd61e31db" - integrity sha512-2uuHbKQov4e+oITVBj/TyUhGqyP2hCEGRMqzHc1POb47z7J3yfVordAxdost4sazrWkWRrOHMAJp6Xah38d5pQ== +expo-google-sign-in@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-google-sign-in/-/expo-google-sign-in-5.0.1.tgz#1285afd2cb605129c310ef89b555ba8a3a5f61c2" + integrity sha512-VwKIiG+S7uswF27RN9+WBO4dGQhmBPeqYnlBjuw3Zf8pS+tZcE5VROb1PBzyhgn4WEvGEql+40axm8fIMlensw== dependencies: - expo-errors "~1.0.0" invariant "^2.2.4" -expo-image-loader-interface@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-image-loader-interface/-/expo-image-loader-interface-2.0.0.tgz#3934f01c4ccdea40d4248110b7da234741abf9c8" - integrity sha512-aOHa37N/8gEyzDGO5df6PST8uce1L94OxNTfD5JtWVH3tWmkaN760S33T9ecWmydcUv9zFCOcCC4gZTwEWUJiQ== - dependencies: - expo-core "~2.0.0" +expo-haptics@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-haptics/-/expo-haptics-5.0.1.tgz#60b67bc613522ddd1ad5e4d701412771fe333c40" + integrity sha512-+ULs5ZNJXT81PILX+Dpp1l9AvcfZZUazg9wX7Dho//ZIaWncPpd5kkiqZpgBlIJNmr7W0rjGcaD8SqVXgesnKg== -expo-local-authentication@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-local-authentication/-/expo-local-authentication-2.0.0.tgz#b16763242ab0ebff902e4c4545052d114ecf3d4a" - integrity sha512-okW+EeLXgIG6xNfxl99bjJDrzmrx44fzYmSRKFspCH6JJQNqGFUgyMjqOsiSlEjPxr3S7Y2aYU0pHgoeoajGjw== +expo-image-manipulator@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-image-manipulator/-/expo-image-manipulator-5.0.1.tgz#7e24161eade3888d87471e7fb724fba91d5857eb" + integrity sha512-9SOp1hAF4CghwsnO3odx1/ia7NlMrXX/6uIWx+1nxDYGhRg52YFB/Kv84vXS/a5cSGuewBPc4t3++QTo9S7qdQ== + +expo-image-picker@~5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/expo-image-picker/-/expo-image-picker-5.0.2.tgz#975ef46bc614d471f01e6de0b2db42e55aab4a56" + integrity sha512-6Lf0rd21JhcOxL0ThL0VLewaR0w8SZ/49FYFsyx/XGpo6CSqu9AOZrS11BnVqlwHPaiS4OPsFSlO4IhEF72mFQ== + +expo-intent-launcher@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-intent-launcher/-/expo-intent-launcher-5.0.1.tgz#906fa3bcf13bf4607a9ac88e323ce0ac427b54cf" + integrity sha512-fvcwkKBcDwKo6JxTGRM3112zgmPbuPtmQx6TdJWuRPJTBWmeCAG2AelohMt1+xzqpnJxnkXEXET2WoMuI+BXvw== + +expo-keep-awake@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-keep-awake/-/expo-keep-awake-5.0.1.tgz#15aeffd9de673f7eaf145449883e8d83f7d7a799" + integrity sha512-DPWAqgxbmLyJoCXPbDXbj+1XFjP/ulv4AYzvi1a+jsvZRU2uiFdho0w269Y++DLCQf30vbuu3zs5HiaJGU43fA== + +expo-linear-gradient@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-linear-gradient/-/expo-linear-gradient-5.0.1.tgz#b4f5450d680b9315f22f4f99fee6a2b90fb49d92" + integrity sha512-5dKn9JIXmXXHq6itC/Jpqo65Tkgjwacyw1kpD8sekoFTEVfT6ciFd2djqIcciUqIa57FF/5d2q54mUvjoqD/TA== + +expo-local-authentication@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-local-authentication/-/expo-local-authentication-5.0.1.tgz#e5c239e46cdaa64c342d0fea2411b9294348d252" + integrity sha512-Fy4T/5N/WUIFsbuRCDWOZzKejbe90nuCbyD4I5rOmHTZRbIxDfGePUUF/fJv5JhjxEl87QdrIlNMpLLyTLiRqw== dependencies: - expo-core "~2.0.0" invariant "^2.2.4" -expo-localization@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-localization/-/expo-localization-2.0.0.tgz#d7b9b44585d5bb70691c6b62ebde6b00d8535a0e" - integrity sha512-QDs76ZWi8zf/Zbt9EG/ToQ8qQv3Z8GsjPVFT3J0idikpuMIPhqKSZLYOkiXpTuOhh5I1CGfIiXCqkQX77n8l7A== +expo-localization@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-localization/-/expo-localization-5.0.1.tgz#9b617198f4627ed5c4eea406ed1a616dbc6d44f6" + integrity sha512-tPubS0oSO9nI3rdqnhnuhegV1REE1h3ltXNgtKX9oj9gHeZ+j7trQChF4xb1IGwaKTVm/ur1f4mkhRpQddJIUg== dependencies: - expo-core "~2.0.0" - moment "^2.22.2" - moment-timezone "^0.5.23" rtl-detect "^1.0.2" -expo-location@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/expo-location/-/expo-location-2.0.1.tgz#44d5865640ce28a1683dec8ff9269e786b86aa2e" - integrity sha512-hd1lZ1yPh+q50AihNqdeAumr3R64fp7qKlJ/5Ry1ap519Gy3uA1y+XOw5HHNXDw+/fbO9O1xBLpAuJUbZxVk8w== +expo-location@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-location/-/expo-location-5.0.1.tgz#697adb49b42018db9e32aa05b7623e0d71250eb9" + integrity sha512-YXMrPuYlLfqcHxKjwdc99XjCpeJYWtxu6kqaM9f++u/zjeup95YNnlzeq8uD7YhNuWk8O6boVAFTSXPn9bY+9w== dependencies: invariant "^2.2.4" -expo-media-library@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-media-library/-/expo-media-library-2.0.0.tgz#24ed4aa99a014a6be1284a5e139eb39d22d63aa5" - integrity sha512-o6zQEuanRYFIh2z74B5NhZQdCAZPRTBLFnGB5ZUfdiAXjrN5gnn9tY+7vYyNJcS4uxd7r7sVK+2l2QP14EsPMg== +expo-mail-composer@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-mail-composer/-/expo-mail-composer-5.0.1.tgz#adf4eb2e9a3d4f79b9d128b6c45e8a16c89db818" + integrity sha512-ps927F7BY+m1BzVqDYamIgVxmcaE8USQmBXNoligDzl/VqyKhS+68FijkLRdowRo5zGdXIHiZF9EW1Cvbcm3Vw== dependencies: - expo-core "~2.0.0" - expo-errors "~1.0.0" - expo-permissions-interface "~2.0.0" + lodash "^4.6.0" + query-string "^6.2.0" -expo-payments-stripe@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-payments-stripe/-/expo-payments-stripe-2.0.0.tgz#31cc9f493c2332321ae9260b6c36385a966e79a3" - integrity sha512-13xMfo7vmFnfWvt5TihqN2baEUBCHztk4DBX3vOhjUU/dpgUcLX+jQUFVQNduYxlOk7nFW/z7GiByjqVkkOd0Q== - dependencies: - expo-core "~2.0.0" +expo-media-library@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-media-library/-/expo-media-library-5.0.1.tgz#f7f3b7fa0808eac224cd966583253380f0af2d1d" + integrity sha512-b5DHS+Ga8dyhw1+xQDB7Dafiea1jd91iOXbaE8LWg+awUDXTh6Ss14KMh8WI2mE3DVbBkcuLPTQ9NXlM2Oz67Q== + +expo-payments-stripe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-payments-stripe/-/expo-payments-stripe-5.0.1.tgz#da096cf81fc03dbfd540ce6814cc67222d7447ff" + integrity sha512-U1SP9QPrCUUgYURGysUsQN1VEHs88ok+vTd30vsdbKq3TkguIPc0HuL/p2VE48KpVuykLKTmD4j9Ey56qUUiLg== -expo-permissions-interface@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-permissions-interface/-/expo-permissions-interface-2.0.0.tgz#563fd815925fd472a1b04f292afc9bef77f14774" - integrity sha512-hk9oR6CtV2MLONdtPkKvOfpfmbJ48BDbYjvW/Na31znVvUAPHs7owckqSgh5BVoIAz8tMgp7fptaifEhPOayvg== - dependencies: - expo-core "~2.0.0" +expo-permissions@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-permissions/-/expo-permissions-5.0.1.tgz#cc6af49a37ea3ab73e780a8a19f22b7662379941" + integrity sha512-cOg9f9TaV8grORTwLSuoPfviDGcJSALjaALvxdmQD5ujPW6lxO6Ofd/s4/dV4L3lJww4HXiurjPJnT5yo+3ydw== -expo-permissions@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-permissions/-/expo-permissions-2.0.0.tgz#31421819a2e6ee44ed9161387a7bf4259c73426f" - integrity sha512-0niegCTjcNdLk/715VqG5ibnT45eRGRebgdjTk/HtFOLjFtMs2mQKpneF3BbwVAK88bCbAiwtSBNt21/C+6z7A== - dependencies: - expo-core "~2.0.0" - expo-permissions-interface "~2.0.0" +expo-print@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-print/-/expo-print-5.0.1.tgz#2daca5538a4447764a2910a6cd95d7b844c6637d" + integrity sha512-cQ7kyKoAfL52iRnXH7b0aHNmZdORURBXZLZ6z495XG/S52nox1GtuXdZSSfo9qptDwWaKbsetVzDAM58LVIoWw== -expo-print@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-print/-/expo-print-2.0.0.tgz#d072825a00a11d5a06a81788d5d5a252141315fa" - integrity sha512-wTzqIxaNb7qq+2P+y8Yf/umfqDJQnXYCf9Ns046pFOeybHd1r3pJRy6A9Myc2tFeNA2/xSx8oICMmqO1ZNRPLQ== +expo-random@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-random/-/expo-random-5.0.1.tgz#44ba8b3324f7d179aa1a6f30ccb4d4e3c94afe32" + integrity sha512-VUPDd8Ds1adaQoaCxTvEsSdiE02LuszazkxwvDjykE+oPG9CYOcc19yvk8wivyciEkMnjD5zYkM67ystFELGXw== dependencies: - babel-preset-expo "^5.0.0" - expo-core "~2.0.0" - expo-errors "~1.0.0" + base64-js "^1.3.0" -expo-react-native-adapter@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-react-native-adapter/-/expo-react-native-adapter-2.0.0.tgz#0a8f74e7f79116b2f28eec79deab236c2ee0611f" - integrity sha512-pRlmqqb9mPr1abgzEGnzeEWa7VI8WWqMWRnU/ySJTcOWRyX63oUobTKX/Bw1HuwGyB6+rVRqEF+IObOeo8va4w== +expo-secure-store@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-secure-store/-/expo-secure-store-5.0.1.tgz#451d61e9519bb964e315c2be336e2aa5f130b8a4" + integrity sha512-iA0/MJCHZk9z5OdxEXH5TYEDKq5sEIdASBr/7XkdCl+gB7+3peSeEXsXPRK+TK/Tzo9JGgfYrXha/CsVC9nD5A== + +expo-sensors@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-sensors/-/expo-sensors-5.0.1.tgz#67dd446f1318712c90d714807f195c263e18552b" + integrity sha512-mPpcPKUDeVO/vtpHnHix3yczxlYWv+cHw6w2aeVem3zaXGeg+1pHH95h/pzUgO4B7Y8lci+OnozA5YFy0yNyjA== dependencies: - expo-image-loader-interface "~2.0.0" - expo-permissions-interface "~2.0.0" invariant "^2.2.4" - lodash.omit "^4.5.0" - lodash.pick "^4.4.0" - prop-types "^15.6.1" -expo-sensors-interface@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-sensors-interface/-/expo-sensors-interface-2.0.0.tgz#8b94051e1996dae8ef90a9dafc8d32dc7b3c0af3" - integrity sha512-Lx5j4xeBxPHPxc1ySL3EZqr0PtJAdNaHu/uEj4OkrvWfE8QfyN/dS8j8x7vtdHZmwlBONWev2dL5Kpojzo7DEQ== - dependencies: - expo-core "~2.0.0" +expo-sharing@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-sharing/-/expo-sharing-5.0.1.tgz#ec761be19469e39650e45972053663eae8ed0431" + integrity sha512-oBrRpVnhPxDb6qgC4RkcGz82JfTz7ao4uI+/DC8OJGUkRyCczVHuDG0v4R6jLMPld8dkjAxUmUkba7JVgg53FQ== -expo-sensors@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-sensors/-/expo-sensors-2.0.0.tgz#29fa73958192f2ec9d9e51dfd01630db96038bab" - integrity sha512-qr5n+gXKmmXL4LCAXygeafIHxzOLfepewsnVS2ZJJ3ARNdhH6bWpgXLOxJH8482O21sV/dGFn0DG/lbuiyBxeg== - dependencies: - invariant "^2.2.4" +expo-sms@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-sms/-/expo-sms-5.0.1.tgz#c4f40e9bd15a2f3d8641595807aff536d88bb083" + integrity sha512-rGZkTsCLqbigUD7OKYHEt9vYBMG43ne+j8NvWbBwl1DFtkPcAZQIBN7pMFnXjRY0FLZnFePFDeYpboGquyQrgQ== -expo-sms@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/expo-sms/-/expo-sms-2.0.0.tgz#0347743435dda5ef8754e692fa92d0127cd85bfd" - integrity sha512-kQ7VnBHjz0B2OyfM100daLWwOvGQ88Tm1q75RPiYN/miry/3mpXriFDbvMnF8EH6G7UlfdrVTIdV63HuYyhNmA== - dependencies: - expo-core "~2.0.0" - expo-permissions-interface "~2.0.0" +expo-speech@~5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/expo-speech/-/expo-speech-5.0.2.tgz#ccc66e50614ebbdc06296dde150560c55b8333fd" + integrity sha512-AbLIM0lPUA9X+iCq20W7KW4Z/k6CvtKdCHZXEzJXqmm45YnCqENpSmrhVwePG6Lem6MJ4Bzg4DTC0UXl57SD4Q== -expo-task-manager-interface@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/expo-task-manager-interface/-/expo-task-manager-interface-1.0.0.tgz#898535ace8fca441cdd84ec8dd4b2ce1f29919e2" - integrity sha512-ly+LK55Yyx/jFQN4ZQsRFFn5JGAczY6nPNMV1iTxxK7o6I1hv2ZO9DAzYQpU41VIoPNDsSO/5JAh0HWV44MlsA== +expo-sqlite@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-sqlite/-/expo-sqlite-5.0.1.tgz#71bb054141929371330de6ac7a9c16294e05a177" + integrity sha512-NQXFcjSScpjCRAC+oKQ1Fn+RYSLkYHudaiJSG5wqN28pKqg3yLqjpPG2gDbq/PvgHYkjZXBnvrNgmddjFzDyIQ== dependencies: - expo-core "~2.0.0" + "@expo/websql" "^1.0.1" + "@types/websql" "^0.0.27" + lodash "^4.17.11" -expo-task-manager@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/expo-task-manager/-/expo-task-manager-1.0.0.tgz#fec44602f35915ab7be082d7709e928e136b2bf8" - integrity sha512-ySm4K9JNl+Yw5BAdatJdc0A3rV8Bp2PT6R3P0M7q6P6jkbscn+NJ7VAVzu05ID8MY8yGGSZHyzRjScEW7/lskA== - dependencies: - expo-core "~2.0.0" - expo-errors "~1.0.0" - expo-task-manager-interface "~1.0.0" +expo-task-manager@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/expo-task-manager/-/expo-task-manager-5.0.1.tgz#18e0a2a7539617d7731c3e4e9bedcf0a3574577b" + integrity sha512-ManMdoYH++K2ZaRCYc2hfi1N33XTzjn1o1O8Qkj8JH49VssOzW9TF1URw2j+qRt3iN5Iba4+ECONoi++GoCiqw== + +expo-web-browser@~5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/expo-web-browser/-/expo-web-browser-5.0.3.tgz#c382358ece64a4fad5a5996795faea3446072298" + integrity sha512-Etue3QfBki4shFChsVd3Of3xvY7KsXoNINKvckiRCmcCjOC5bGiZ+Grhf70YEHVUB2bEcAUeZhC9Tg0Ip2tdEQ== -expo@^32.0.0: - version "32.0.6" - resolved "https://registry.yarnpkg.com/expo/-/expo-32.0.6.tgz#71ef60ac5293b9ca8f2219584bc6add8a975714b" - integrity sha512-LMFtWZY+lwMHkoThTBwirctPB/5WeZtGrVM8MVoCI1e7jlONOfNQceM6X2j06BO5HxcCF/ASJSUDiTIIStAeaA== +expo@^33.0.0: + version "33.0.6" + resolved "https://registry.yarnpkg.com/expo/-/expo-33.0.6.tgz#fe027735b3b2aec4a3289350a416a8bc13817df7" + integrity sha512-BhPaEIdB+tEb5Wlp7ux+RDy7/mMPUSR6aCAVH2HlgrIpndFqgaWbm7pjRigE1Aqco0Iwcw/1G5k2spSu180GNA== dependencies: "@babel/runtime" "^7.1.2" - "@expo/vector-icons" "~9.0.0" - "@expo/websql" "^1.0.1" + "@expo/vector-icons" "^10.0.1" + "@react-native-community/netinfo" "2.0.10" "@types/fbemitter" "^2.0.32" "@types/invariant" "^2.2.29" "@types/lodash.zipobject" "^4.1.4" "@types/qs" "^6.5.1" "@types/uuid-js" "^0.7.1" - "@types/websql" "^0.0.27" + "@unimodules/core" "^2.0.0" + "@unimodules/react-native-adapter" "^2.0.0" babel-preset-expo "^5.0.0" cross-spawn "^6.0.5" - expo-ads-admob "~2.0.0" - expo-analytics-segment "~2.0.0" - expo-app-auth "~2.0.0" - expo-app-loader-provider "~1.0.0" - expo-asset "~2.0.0" - expo-background-fetch "~1.0.0" - expo-barcode-scanner "~2.0.0" - expo-barcode-scanner-interface "~2.0.0" - expo-camera "~2.0.0" - expo-camera-interface "~2.0.0" - expo-constants "~2.0.0" - expo-constants-interface "~2.0.0" - expo-contacts "~2.0.0" - expo-core "~2.0.0" - expo-errors "~1.0.0" - expo-face-detector "~2.0.0" - expo-face-detector-interface "~2.0.0" - expo-file-system "~2.0.0" - expo-file-system-interface "~2.0.0" - expo-font "~2.0.0" - expo-font-interface "~2.0.0" - expo-gl "~2.0.0" - expo-gl-cpp "~2.0.0" - expo-google-sign-in "~2.0.0" - expo-image-loader-interface "~2.0.0" - expo-local-authentication "~2.0.0" - expo-localization "~2.0.0" - expo-location "~2.0.1" - expo-media-library "~2.0.0" - expo-payments-stripe "~2.0.0" - expo-permissions "~2.0.0" - expo-permissions-interface "~2.0.0" - expo-print "~2.0.0" - expo-react-native-adapter "~2.0.0" - expo-sensors "~2.0.0" - expo-sensors-interface "~2.0.0" - expo-sms "~2.0.0" - expo-task-manager "~1.0.0" + expo-ads-admob "~5.0.1" + expo-ads-facebook "~5.0.1" + expo-analytics-amplitude "~5.0.1" + expo-analytics-segment "~5.0.1" + expo-app-auth "~5.0.1" + expo-app-loader-provider "~5.0.1" + expo-asset "~5.0.1" + expo-av "~5.0.2" + expo-background-fetch "~5.0.1" + expo-barcode-scanner "~5.0.1" + expo-blur "~5.0.1" + expo-brightness "~5.0.1" + expo-calendar "~5.0.1" + expo-camera "~5.0.1" + expo-constants "~5.0.1" + expo-contacts "~5.0.2" + expo-crypto "~5.0.1" + expo-document-picker "~5.0.1" + expo-face-detector "~5.0.1" + expo-facebook "~5.0.1" + expo-file-system "~5.0.1" + expo-font "~5.0.1" + expo-gl "~5.0.1" + expo-gl-cpp "~5.0.1" + expo-google-sign-in "~5.0.1" + expo-haptics "~5.0.1" + expo-image-manipulator "~5.0.1" + expo-image-picker "~5.0.2" + expo-intent-launcher "~5.0.1" + expo-keep-awake "~5.0.1" + expo-linear-gradient "~5.0.1" + expo-local-authentication "~5.0.1" + expo-localization "~5.0.1" + expo-location "~5.0.1" + expo-mail-composer "~5.0.1" + expo-media-library "~5.0.1" + expo-payments-stripe "~5.0.1" + expo-permissions "~5.0.1" + expo-print "~5.0.1" + expo-random "~5.0.1" + expo-secure-store "~5.0.1" + expo-sensors "~5.0.1" + expo-sharing "~5.0.1" + expo-sms "~5.0.1" + expo-speech "~5.0.2" + expo-sqlite "~5.0.1" + expo-task-manager "~5.0.1" + expo-web-browser "~5.0.3" fbemitter "^2.1.1" invariant "^2.2.2" - lodash.filter "^4.6.0" - lodash.map "^4.6.0" - lodash.omit "^4.5.0" - lodash.zipobject "^4.1.3" - lottie-react-native "2.5.0" + lodash "^4.6.0" + lottie-react-native "2.6.1" md5-file "^3.2.3" nullthrows "^1.1.0" pretty-format "^23.6.0" prop-types "^15.6.0" qs "^6.5.0" + react-google-maps "^9.4.5" react-native-branch "2.2.5" - react-native-gesture-handler "~1.0.14" - react-native-maps expo/react-native-maps#v0.22.1-exp.0 - react-native-reanimated "1.0.0-alpha.11" + react-native-gesture-handler "1.2.1" + react-native-maps "0.24.2" + react-native-reanimated "1.0.1" react-native-screens "1.0.0-alpha.22" - react-native-svg "8.0.10" - react-native-view-shot "2.5.0" + react-native-svg "9.4.0" + react-native-view-shot "2.6.0" + react-native-webview "5.8.1" serialize-error "^2.1.0" + unimodules-barcode-scanner-interface "~2.0.1" + unimodules-camera-interface "~2.0.1" + unimodules-constants-interface "~2.0.1" + unimodules-face-detector-interface "~2.0.1" + unimodules-file-system-interface "~2.0.1" + unimodules-font-interface "~2.0.1" + unimodules-image-loader-interface "~2.0.1" + unimodules-permissions-interface "~2.0.1" + unimodules-sensors-interface "~2.0.1" uuid-js "^0.7.5" - whatwg-fetch "^2.0.4" extend-shallow@^1.1.2: version "1.1.4" @@ -3915,14 +3577,19 @@ fbemitter@^2.1.1: dependencies: fbjs "^0.8.4" -fbjs-scripts@^0.8.1: - version "0.8.3" - resolved "https://registry.yarnpkg.com/fbjs-scripts/-/fbjs-scripts-0.8.3.tgz#b854de7a11e62a37f72dab9aaf4d9b53c4a03174" - integrity sha512-aUJ/uEzMIiBYuj/blLp4sVNkQQ7ZEB/lyplG1IzzOmZ83meiWecrGg5jBo4wWrxXmO4RExdtsSV1QkTjPt2Gag== +fbjs-css-vars@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8" + integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ== + +fbjs-scripts@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fbjs-scripts/-/fbjs-scripts-1.2.0.tgz#069a0c0634242d10031c6460ef1fccefcdae8b27" + integrity sha512-5krZ8T0Bf8uky0abPoCLrfa7Orxd8UH4Qq8hRUF2RZYNMu+FmEOrBc7Ib3YVONmxTXTlLAvyrrdrVmksDb2OqQ== dependencies: + "@babel/core" "^7.0.0" ansi-colors "^1.0.1" - babel-core "^6.7.2" - babel-preset-fbjs "^2.1.2" + babel-preset-fbjs "^3.2.0" core-js "^2.4.1" cross-spawn "^5.1.0" fancy-log "^1.3.2" @@ -3931,7 +3598,7 @@ fbjs-scripts@^0.8.1: semver "^5.1.0" through2 "^2.0.0" -fbjs@0.8.17, fbjs@^0.8.0, fbjs@^0.8.4, fbjs@^0.8.9: +fbjs@^0.8.0, fbjs@^0.8.1, fbjs@^0.8.4, fbjs@^0.8.9: version "0.8.17" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd" integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90= @@ -3944,6 +3611,20 @@ fbjs@0.8.17, fbjs@^0.8.0, fbjs@^0.8.4, fbjs@^0.8.9: setimmediate "^1.0.5" ua-parser-js "^0.7.18" +fbjs@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-1.0.0.tgz#52c215e0883a3c86af2a7a776ed51525ae8e0a5a" + integrity sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA== + dependencies: + core-js "^2.4.1" + fbjs-css-vars "^1.0.0" + isomorphic-fetch "^2.1.1" + loose-envify "^1.0.0" + object-assign "^4.1.0" + promise "^7.1.1" + setimmediate "^1.0.5" + ua-parser-js "^0.7.18" + figures@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" @@ -4049,6 +3730,11 @@ follow-redirects@1.5.10: dependencies: debug "=3.1.0" +fontfaceobserver@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fontfaceobserver/-/fontfaceobserver-2.1.0.tgz#e2705d293e2c585a6531c2a722905657317a2991" + integrity sha512-ReOsO2F66jUa0jmv2nlM/s1MiutJx/srhAe2+TE8dJCMi02ZZOcCTxTCQFr3Yet+uODUtnr4Mewg+tNQ+4V1Ng== + for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -4101,6 +3787,15 @@ fs-extra@^1.0.0: jsonfile "^2.1.0" klaw "^1.0.0" +fs-extra@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-minipass@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" @@ -4238,10 +3933,10 @@ globals@^11.1.0, globals@^11.7.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.11.0.tgz#dcf93757fa2de5486fbeed7118538adf789e9c2e" integrity sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw== -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== +google-maps-infobox@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/google-maps-infobox/-/google-maps-infobox-2.0.0.tgz#1ea6de93c0cdf4138c2d586331835c83dcc59dc2" + integrity sha512-hTuWmWZZSOxf5D/z7l3/hTF1grgRvLG53BEKMdjiKOG+FcK/kH7vqseUeyIU9Zj2ZIqKTOaro0nknxpAuRq4Vw== graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9: version "4.1.15" @@ -4359,14 +4054,6 @@ hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.0.1: dependencies: react-is "^16.7.0" -home-or-tmp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" - integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg= - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.1" - home-or-tmp@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-3.0.0.tgz#57a8fe24cf33cdd524860a15821ddc25c86671fb" @@ -4555,7 +4242,7 @@ inquirer@^6.2.2: strip-ansi "^5.1.0" through "^2.3.6" -invariant@^2.2.2, invariant@^2.2.4: +invariant@2.2.4, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== @@ -4591,11 +4278,6 @@ is-arrayish@^0.2.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= -is-arrayish@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" - integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== - is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -4689,13 +4371,6 @@ is-extglob@^1.0.0: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= -is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= - dependencies: - number-is-nan "^1.0.0" - is-fullwidth-code-point@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" @@ -4941,13 +4616,6 @@ jest-diff@^24.8.0: jest-get-type "^24.8.0" pretty-format "^24.8.0" -jest-docblock@23.2.0, jest-docblock@^23.2.0: - version "23.2.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7" - integrity sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c= - dependencies: - detect-newline "^2.1.0" - jest-docblock@^24.3.0: version "24.3.0" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.3.0.tgz#b9c32dac70f72e4464520d2ba4aec02ab14db5dd" @@ -4994,19 +4662,18 @@ jest-get-type@^24.8.0: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.8.0.tgz#a7440de30b651f5a70ea3ed7ff073a32dfe646fc" integrity sha512-RR4fo8jEmMD9zSz2nLbs2j0zvPpk/KCEz3a62jJWbd2ayNo0cb+KFRxPHVhE4ZmgGJEQp0fosmNz84IfqM8cMQ== -jest-haste-map@23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.5.0.tgz#d4ca618188bd38caa6cb20349ce6610e194a8065" - integrity sha512-bt9Swigb6KZ6ZQq/fQDUwdUeHenVvZ6G/lKwJjwRGp+Fap8D4B3bND3FaeJg7vXVsLX8hXshRArbVxLop/5wLw== +jest-haste-map@24.0.0-alpha.6: + version "24.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.0.0-alpha.6.tgz#fb2c785080f391b923db51846b86840d0d773076" + integrity sha512-+NO2HMbjvrG8BC39ieLukdpFrcPhhjCJGhpbHodHNZygH1Tt06WrlNYGpZtWKx/zpf533tCtMQXO/q59JenjNw== dependencies: fb-watchman "^2.0.0" graceful-fs "^4.1.11" invariant "^2.2.4" - jest-docblock "^23.2.0" - jest-serializer "^23.0.1" - jest-worker "^23.2.0" + jest-serializer "^24.0.0-alpha.6" + jest-worker "^24.0.0-alpha.6" micromatch "^2.3.11" - sane "^2.0.0" + sane "^3.0.0" jest-haste-map@^24.8.0: version "24.8.0" @@ -5171,12 +4838,12 @@ jest-runtime@^24.8.0: strip-bom "^3.0.0" yargs "^12.0.2" -jest-serializer@23.0.1, jest-serializer@^23.0.1: - version "23.0.1" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165" - integrity sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU= +jest-serializer@24.0.0-alpha.6: + version "24.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.0.0-alpha.6.tgz#27d2fee4b1a85698717a30c3ec2ab80767312597" + integrity sha512-IPA5T6/GhlE6dedSk7Cd7YfuORnYjN0VD5iJVFn1Q81RJjpj++Hen5kJbKcg547vXsQ1TddV15qOA/zeIfOCLw== -jest-serializer@^24.4.0: +jest-serializer@^24.0.0-alpha.6, jest-serializer@^24.4.0: version "24.4.0" resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz#f70c5918c8ea9235ccb1276d232e459080588db3" integrity sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q== @@ -5242,14 +4909,14 @@ jest-watcher@^24.8.0: jest-util "^24.8.0" string-length "^2.0.0" -jest-worker@23.2.0, jest-worker@^23.2.0: - version "23.2.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.2.0.tgz#faf706a8da36fae60eb26957257fa7b5d8ea02b9" - integrity sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk= +jest-worker@24.0.0-alpha.6: + version "24.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.0.0-alpha.6.tgz#463681b92c117c57107135c14b9b9d6cd51d80ce" + integrity sha512-iXtH7MR9bjWlNnlnRBcrBRrb4cSVxML96La5vsnmBvDI+mJnkP5uEt6Fgpo5Y8f3z9y2Rd7wuPnKRxqQsiU/dA== dependencies: merge-stream "^1.0.1" -jest-worker@^24.6.0: +jest-worker@^24.0.0-alpha.6, jest-worker@^24.6.0: version "24.6.0" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz#7f81ceae34b7cde0c9827a6980c35b7cdc0161b3" integrity sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ== @@ -5275,11 +4942,6 @@ js-levenshtein@^1.1.3: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= - js-yaml@^3.13.0: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" @@ -5333,11 +4995,6 @@ jsdom@^11.5.1: ws "^5.2.0" xml-name-validator "^3.0.0" -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s= - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -5385,13 +5042,6 @@ json5@^0.5.1: resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= -json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== - dependencies: - minimist "^1.2.0" - json5@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" @@ -5406,6 +5056,13 @@ jsonfile@^2.1.0: optionalDependencies: graceful-fs "^4.1.6" +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + jsonify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" @@ -5521,15 +5178,6 @@ load-json-file@^4.0.0: pify "^3.0.0" strip-bom "^3.0.0" -loader-utils@^1.1.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" - integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== - dependencies: - big.js "^5.2.2" - emojis-list "^2.0.0" - json5 "^1.0.1" - locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -5546,31 +5194,11 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" -lodash.filter@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" - integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= - lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= -lodash.map@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" - integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= - -lodash.mapvalues@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c" - integrity sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw= - -lodash.omit@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60" - integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA= - lodash.pad@^4.1.0: version "4.5.1" resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70" @@ -5586,11 +5214,6 @@ lodash.padstart@^4.1.0: resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= -lodash.pick@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" - integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= - lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -5601,12 +5224,7 @@ lodash.throttle@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ= -lodash.zipobject@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/lodash.zipobject/-/lodash.zipobject-4.1.3.tgz#b399f5aba8ff62a746f6979bf20b214f964dbef8" - integrity sha1-s5n1q6j/YqdG9peb8gshT5ZNvvg= - -lodash@^4.0.0, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.6.1: +lodash@^4.0.0, lodash@^4.16.2, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.0, lodash@^4.6.1: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== @@ -5618,18 +5236,18 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4 dependencies: js-tokens "^3.0.0 || ^4.0.0" -lottie-ios@^2.5.0: +lottie-ios@2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/lottie-ios/-/lottie-ios-2.5.0.tgz#55c808e785d4a6933b0c10b395530b17098b05de" integrity sha1-VcgI54XUppM7DBCzlVMLFwmLBd4= -lottie-react-native@2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/lottie-react-native/-/lottie-react-native-2.5.0.tgz#0711b8b34bec7741552c24b71efd3d4cab347571" - integrity sha1-BxG4s0vsd0FVLCS3Hv09TKs0dXE= +lottie-react-native@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/lottie-react-native/-/lottie-react-native-2.6.1.tgz#330d24fa6aac5928ea63f8e181b9b7d930a1a119" + integrity sha512-Z+6lARvWWhB8n8OSmW7/aHkV71ftsmO7hYXFt0D+REy/G40mpkQt1H7Cdy1HqY4cKAp7EYDWVxhu5+fkdD6o4g== dependencies: invariant "^2.2.2" - lottie-ios "^2.5.0" + lottie-ios "2.5.0" prop-types "^15.5.10" react-native-safe-module "^1.1.0" @@ -5674,6 +5292,16 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" +marker-clusterer-plus@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/marker-clusterer-plus/-/marker-clusterer-plus-2.1.4.tgz#f8eff74d599dab3b7d0e3fed5264ea0e704f5d67" + integrity sha1-+O/3TVmdqzt9Dj/tUmTqDnBPXWc= + +markerwithlabel@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/markerwithlabel/-/markerwithlabel-2.0.2.tgz#fa6aee4abb0ee553e24e2b708226858f58b8729e" + integrity sha512-C/cbm1A0h/u54gwHk5ZJNdUU3V3+1BbCpRPMsMyFA7vF4yL+aB4rWpxACz29TpQ+cTg6/iQroExh0PMSRGtQFg== + math-random@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" @@ -5714,10 +5342,10 @@ merge@^1.2.0: resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ== -metro-babel-register@^0.45.6: - version "0.45.6" - resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.45.6.tgz#c0dfb78b7d4f8454468a515a3118a12b08e855cc" - integrity sha512-Io8JinYIzGcXiTaO7o0DGw8wFcAiITTb7mLh3lbuJd9PndbPOo+jhrHkTsNtXc9MRHiT4KbEheXJ/QoeLKJK/Q== +metro-babel-register@0.51.0: + version "0.51.0" + resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.51.0.tgz#d86d3f2d90b45c7a3c6ae67a53bd1e50bad7a24d" + integrity sha512-rhdvHFOZ7/ub019A3+aYs8YeLydb02/FAMsKr2Nz2Jlf6VUxWrMnrcT0NYX16F9TGdi2ulRlJ9dwvUmdhkk+Bw== dependencies: "@babel/core" "^7.0.0" "@babel/plugin-proposal-class-properties" "^7.0.0" @@ -5732,12 +5360,19 @@ metro-babel-register@^0.45.6: core-js "^2.2.2" escape-string-regexp "^1.0.5" -metro-babel7-plugin-react-transform@0.45.6: - version "0.45.6" - resolved "https://registry.yarnpkg.com/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.45.6.tgz#e13b7b0e87e4f908d61b1bf88753af1119e19f58" - integrity sha512-NsVKqiBaF+Tm3FXzqiEExl9iJG+EimbpQP5h9ygxBE4AsYRc2S3X/YD/1ds3RTHMgfhinWVaus+DrG5OqK5mTA== +metro-babel-transformer@0.51.0: + version "0.51.0" + resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.51.0.tgz#9ee5199163ac46b2057527b3f8cbd8b089ffc03e" + integrity sha512-M7KEY/hjD3E8tJEliWgI0VOSaJtqaznC0ItM6FiMrhoGDqqa1BvGofl+EPcKqjBSOV1UgExua/T1VOIWbjwQsw== dependencies: - "@babel/helper-module-imports" "^7.0.0" + "@babel/core" "^7.0.0" + +metro-babel-transformer@0.51.1: + version "0.51.1" + resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.51.1.tgz#97be9e2b96c78aa202b52ae05fb86f71327aef72" + integrity sha512-+tOnZZzOzufB86ASdfimUEGB1jBKsdsVpPdjNJZkueTFyvYlGqWDQKHM1w9bwKMeM/czPQ48Y6m8Bou6le0X4w== + dependencies: + "@babel/core" "^7.0.0" metro-babel7-plugin-react-transform@0.49.2: version "0.49.2" @@ -5746,52 +5381,108 @@ metro-babel7-plugin-react-transform@0.49.2: dependencies: "@babel/helper-module-imports" "^7.0.0" -metro-cache@0.45.6: - version "0.45.6" - resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.45.6.tgz#7ca9f66bc038a309d21e4c5264b806a692ca5a55" - integrity sha512-v7q2pLsI7oABEjpwPJwTd7ufwKvpctVOddcffI/2hRhuJC/seLlqkRt7kv+Q/WfaR9X4KLcEoIjZmgNy4cw1ag== +metro-babel7-plugin-react-transform@0.51.0: + version "0.51.0" + resolved "https://registry.yarnpkg.com/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.51.0.tgz#af27dd81666b91f05d2b371b0d6d283c585e38b6" + integrity sha512-dZ95kXcE2FJMoRsYhxr7YLCbOlHWKwe0bOpihRhfImDTgFfuKIzU4ROQwMUbE0NCbzB+ATFsa2FZ3pHDJ5GI0w== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + +metro-babel7-plugin-react-transform@0.51.1: + version "0.51.1" + resolved "https://registry.yarnpkg.com/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.51.1.tgz#9cce2c340cc4006fc82aa6dfab27af22d592607e" + integrity sha512-wzn4X9KgmAMZ7Bi6v9KxA7dw+AHGL0RODPxU5NDJ3A6d0yERvzfZ3qkzWhz8jbFkVBK12cu5DTho3HBazKQDOw== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + +metro-cache@0.51.1: + version "0.51.1" + resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.51.1.tgz#d0b296eab8e009214413bba87e4eac3d9b44cd04" + integrity sha512-0m1+aicsw77LVAehNuTxDpE1c/7Xv/ajRD+UL/lFCWUxnrjSbxVtIKr8l5DxEY11082c1axVRuaV9e436W+eXg== dependencies: - jest-serializer "23.0.1" - metro-core "0.45.6" + jest-serializer "24.0.0-alpha.6" + metro-core "0.51.1" mkdirp "^0.5.1" rimraf "^2.5.4" -metro-config@0.45.6: - version "0.45.6" - resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.45.6.tgz#f08472ea8c4807bd23263c42948019a9a4f34ada" - integrity sha512-ZhVtkpXhOi+qWi7vdE3HGIhyyBT1wtIukQuxTMwLTUluv2/1DClo/uX9inmf++CmOhOpU7QpqrMzl6vf+AwnOg== +metro-config@0.51.1, metro-config@^0.51.0: + version "0.51.1" + resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.51.1.tgz#8f1a241ce2c0b521cd492c39bc5c6c69e3397b82" + integrity sha512-WCNd0tTI9gb/ubgTqK1+ljZL4b3hsXVinsOAtep4nHiVb6DSDdbO2yXDD2rpYx3NE6hDRMFS9HHg6G0139pAqQ== dependencies: cosmiconfig "^5.0.5" - metro "0.45.6" - metro-cache "0.45.6" - metro-core "0.45.6" + metro "0.51.1" + metro-cache "0.51.1" + metro-core "0.51.1" + pretty-format "24.0.0-alpha.6" -metro-core@0.45.6, metro-core@^0.45.6: - version "0.45.6" - resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.45.6.tgz#b8654196cbeb28f75a23756422348f870117e4e3" - integrity sha512-M0YkGnkjStdCsSNYVW+aVlJ4WjwcqjIhQV+VzEnGZYdyo6cMi9MxUZ69iV2jIxd3LAeaQQaNe8OQtQp8dfIh/g== +metro-core@0.51.1, metro-core@^0.51.0: + version "0.51.1" + resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.51.1.tgz#e7227fb1dd1bb3f953272fad9876e6201140b038" + integrity sha512-sG1yACjdFqmIzZN50HqLTKUMp1oy0AehHhmIuYeIllo1DjX6Y2o3UAT3rGP8U+SAqJGXf/OWzl6VNyRPGDENfA== dependencies: - jest-haste-map "23.5.0" + jest-haste-map "24.0.0-alpha.6" lodash.throttle "^4.1.1" - metro-resolver "0.45.6" + metro-resolver "0.51.1" wordwrap "^1.0.0" -metro-memory-fs@^0.45.6: - version "0.45.6" - resolved "https://registry.yarnpkg.com/metro-memory-fs/-/metro-memory-fs-0.45.6.tgz#9a1fffbde2744b0a0a1d6fcd16f7cb43508f8d7b" - integrity sha512-YAGoNQVTM/vl65jR/ztucAZJIk0ejD3INZT0LiISRULBt6Rxfiqa22v5GG0Enq+95vlgmt26g+auHM2nxTUInQ== +metro-memory-fs@^0.51.0: + version "0.51.1" + resolved "https://registry.yarnpkg.com/metro-memory-fs/-/metro-memory-fs-0.51.1.tgz#624291f5956b0fd11532d80b1b85d550926f96c9" + integrity sha512-dXVUpLPLwfQcYHd1HlqHGVzBsiwvUdT92TDSbdc10152TP+iynHBqLDWbxt0MAtd6c/QXwOuGZZ1IcX3+lv5iw== -metro-minify-uglify@0.45.6: - version "0.45.6" - resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.45.6.tgz#72cd952371a50b9204fd89d89e8041640237b7c1" - integrity sha512-l+lZ7Gg6CN9XddgmwAbo7zOLT2QB9a6VALXLzmvr6gB1mc6SBZwtAh+hARvdymtcr1CgbaWADZPAA+W3oQZH4g== +metro-minify-uglify@0.51.1: + version "0.51.1" + resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.51.1.tgz#60cd8fe4d3e82d6670c717b8ddb52ae63199c0e4" + integrity sha512-HAqd/rFrQ6mnbqVAszDXIKTg2rqHlY9Fm8DReakgbkAeyMbF2mH3kEgtesPmTrhajdFk81UZcNSm6wxj1JMgVg== dependencies: uglify-es "^3.1.9" -metro-react-native-babel-preset@0.45.6: - version "0.45.6" - resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.45.6.tgz#077ce4039d6461a1b699b215612985415f9816a9" - integrity sha512-qh+iXlV2tDfvHYbhh1meihxnzXXXB8nF1fi8z2HFxqYDkFBM48XewXO6mLz97PL8lmuTGvX/2dYVuFtriENw1w== +metro-react-native-babel-preset@0.51.0: + version "0.51.0" + resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.51.0.tgz#978d960acf2d214bbbe43e59145878d663bd07de" + integrity sha512-Y/aPeLl4RzY8IEAneOyDcpdjto/8yjIuX9eUWRngjSqdHYhGQtqiSBpfTpo0BvXpwNRLwCLHyXo58gNpckTJFw== + dependencies: + "@babel/plugin-proposal-class-properties" "^7.0.0" + "@babel/plugin-proposal-export-default-from" "^7.0.0" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0" + "@babel/plugin-proposal-object-rest-spread" "^7.0.0" + "@babel/plugin-proposal-optional-catch-binding" "^7.0.0" + "@babel/plugin-proposal-optional-chaining" "^7.0.0" + "@babel/plugin-syntax-dynamic-import" "^7.0.0" + "@babel/plugin-syntax-export-default-from" "^7.0.0" + "@babel/plugin-transform-arrow-functions" "^7.0.0" + "@babel/plugin-transform-block-scoping" "^7.0.0" + "@babel/plugin-transform-classes" "^7.0.0" + "@babel/plugin-transform-computed-properties" "^7.0.0" + "@babel/plugin-transform-destructuring" "^7.0.0" + "@babel/plugin-transform-exponentiation-operator" "^7.0.0" + "@babel/plugin-transform-flow-strip-types" "^7.0.0" + "@babel/plugin-transform-for-of" "^7.0.0" + "@babel/plugin-transform-function-name" "^7.0.0" + "@babel/plugin-transform-literals" "^7.0.0" + "@babel/plugin-transform-modules-commonjs" "^7.0.0" + "@babel/plugin-transform-object-assign" "^7.0.0" + "@babel/plugin-transform-parameters" "^7.0.0" + "@babel/plugin-transform-react-display-name" "^7.0.0" + "@babel/plugin-transform-react-jsx" "^7.0.0" + "@babel/plugin-transform-react-jsx-source" "^7.0.0" + "@babel/plugin-transform-regenerator" "^7.0.0" + "@babel/plugin-transform-runtime" "^7.0.0" + "@babel/plugin-transform-shorthand-properties" "^7.0.0" + "@babel/plugin-transform-spread" "^7.0.0" + "@babel/plugin-transform-sticky-regex" "^7.0.0" + "@babel/plugin-transform-template-literals" "^7.0.0" + "@babel/plugin-transform-typescript" "^7.0.0" + "@babel/plugin-transform-unicode-regex" "^7.0.0" + "@babel/template" "^7.0.0" + metro-babel7-plugin-react-transform "0.51.0" + react-transform-hmr "^1.0.4" + +metro-react-native-babel-preset@0.51.1: + version "0.51.1" + resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.51.1.tgz#44aeeedfea37f7c2ab8f6f273fa71b90fe65f089" + integrity sha512-e9tsYDFhU70gar0jQWcZXRPJVCv4k7tEs6Pm74wXO2OO/T1MEumbvniDIGwGG8bG8RUnYdHhjcaiub2Vc5BRWw== dependencies: "@babel/plugin-proposal-class-properties" "^7.0.0" "@babel/plugin-proposal-export-default-from" "^7.0.0" @@ -5818,6 +5509,7 @@ metro-react-native-babel-preset@0.45.6: "@babel/plugin-transform-react-jsx" "^7.0.0" "@babel/plugin-transform-react-jsx-source" "^7.0.0" "@babel/plugin-transform-regenerator" "^7.0.0" + "@babel/plugin-transform-runtime" "^7.0.0" "@babel/plugin-transform-shorthand-properties" "^7.0.0" "@babel/plugin-transform-spread" "^7.0.0" "@babel/plugin-transform-sticky-regex" "^7.0.0" @@ -5825,7 +5517,7 @@ metro-react-native-babel-preset@0.45.6: "@babel/plugin-transform-typescript" "^7.0.0" "@babel/plugin-transform-unicode-regex" "^7.0.0" "@babel/template" "^7.0.0" - metro-babel7-plugin-react-transform "0.45.6" + metro-babel7-plugin-react-transform "0.51.1" react-transform-hmr "^1.0.4" metro-react-native-babel-preset@^0.49.0: @@ -5869,24 +5561,44 @@ metro-react-native-babel-preset@^0.49.0: metro-babel7-plugin-react-transform "0.49.2" react-transform-hmr "^1.0.4" -metro-resolver@0.45.6: - version "0.45.6" - resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.45.6.tgz#385407cf8c086f005775d2d28178cf36984273f9" - integrity sha512-RY4tqKxSEz4ahLPaJlx30x6vG8HVyLT3w5aUDcyB5B2eQH3ckLnyUYUpd0sT7HFoJ1T5U5DFtWvS3P4yJcRB7A== +metro-react-native-babel-transformer@0.51.0: + version "0.51.0" + resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.51.0.tgz#57a695e97a19d95de63c9633f9d0dc024ee8e99a" + integrity sha512-VFnqtE0qrVmU1HV9B04o53+NZHvDwR+CWCoEx4+7vCqJ9Tvas741biqCjah9xtifoKdElQELk6x0soOAWCDFJA== + dependencies: + "@babel/core" "^7.0.0" + babel-preset-fbjs "^3.0.1" + metro-babel-transformer "0.51.0" + metro-react-native-babel-preset "0.51.0" + +metro-react-native-babel-transformer@^0.51.0: + version "0.51.1" + resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.51.1.tgz#bac34f988c150c725cd1875c13701cc2032615f9" + integrity sha512-D0KU+JPb/Z76nUWt3+bkjKggOlGvqAVI2BpIH2JFKprpUyBjWaCRqHnkBfZGixYwUfmu93MIlKJWr6iKzzFrlg== + dependencies: + "@babel/core" "^7.0.0" + babel-preset-fbjs "^3.0.1" + metro-babel-transformer "0.51.1" + metro-react-native-babel-preset "0.51.1" + +metro-resolver@0.51.1: + version "0.51.1" + resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.51.1.tgz#4c26f0baee47d30250187adca3d34c902e627611" + integrity sha512-zmWbD/287NDA/jLPuPV0hne/YMMSG0dljzu21TYMg2lXRLur/zROJHHhyepZvuBHgInXBi4Vhr2wvuSnY39SuA== dependencies: absolute-path "^0.0.0" -metro-source-map@0.45.6: - version "0.45.6" - resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.45.6.tgz#49b20bbbc8f047ede7546b6721ab0214a1ad360d" - integrity sha512-FBubSEEitGrvUeuCPVwXTJX7Y1WjFhsUHickqQE+mXplOgREyeZ7o80ffqEWitfsMUQN9385LxIPmAdPzQXLsQ== +metro-source-map@0.51.1: + version "0.51.1" + resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.51.1.tgz#1a8da138e98e184304d5558b4f92a5c2141822d0" + integrity sha512-JyrE+RV4YumrboHPHTGsUUGERjQ681ImRLrSYDGcmNv4tfpk9nvAK26UAas4IvBYFCC9oW90m0udt3kaQGv59Q== dependencies: source-map "^0.5.6" -metro@0.45.6, metro@^0.45.6: - version "0.45.6" - resolved "https://registry.yarnpkg.com/metro/-/metro-0.45.6.tgz#b4d7bf5edc39c5f7d73a6bc4d940e03415aa919b" - integrity sha512-+RinU6Qcea/zX9xxfrgmeFBwJ3tsdgLyBJm4tQOmusU4kE8YEE4LQ3IGG60qk3wzYloflMB/8ilIGG4Z/gz2Ew== +metro@0.51.1, metro@^0.51.0: + version "0.51.1" + resolved "https://registry.yarnpkg.com/metro/-/metro-0.51.1.tgz#b0aad4731593b9f244261bad1abb2a006d1c8969" + integrity sha512-nM0dqn8LQlMjhChl2fzTUq2EWiUebZM7nkesD9vQe47W10bj/tbRLPiIIAxht6SRDbPd/hRA+t39PxLhPSKEKg== dependencies: "@babel/core" "^7.0.0" "@babel/generator" "^7.0.0" @@ -5897,30 +5609,32 @@ metro@0.45.6, metro@^0.45.6: "@babel/types" "^7.0.0" absolute-path "^0.0.0" async "^2.4.0" - babel-preset-fbjs "2.3.0" - chalk "^1.1.1" + babel-preset-fbjs "^3.0.1" + buffer-crc32 "^0.2.13" + chalk "^2.4.1" concat-stream "^1.6.0" connect "^3.6.5" debug "^2.2.0" denodeify "^1.2.1" eventemitter3 "^3.0.0" - fbjs "0.8.17" + fbjs "^1.0.0" fs-extra "^1.0.0" graceful-fs "^4.1.3" image-size "^0.6.0" - jest-docblock "23.2.0" - jest-haste-map "23.5.0" - jest-worker "23.2.0" + invariant "^2.2.4" + jest-haste-map "24.0.0-alpha.6" + jest-worker "24.0.0-alpha.6" json-stable-stringify "^1.0.1" lodash.throttle "^4.1.1" merge-stream "^1.0.1" - metro-cache "0.45.6" - metro-config "0.45.6" - metro-core "0.45.6" - metro-minify-uglify "0.45.6" - metro-react-native-babel-preset "0.45.6" - metro-resolver "0.45.6" - metro-source-map "0.45.6" + metro-babel-transformer "0.51.1" + metro-cache "0.51.1" + metro-config "0.51.1" + metro-core "0.51.1" + metro-minify-uglify "0.51.1" + metro-react-native-babel-preset "0.51.1" + metro-resolver "0.51.1" + metro-source-map "0.51.1" mime-types "2.1.11" mkdirp "^0.5.1" node-fetch "^2.2.0" @@ -5934,7 +5648,7 @@ metro@0.45.6, metro@^0.45.6: throat "^4.1.0" wordwrap "^1.0.0" write-file-atomic "^1.2.0" - ws "^1.1.0" + ws "^1.1.5" xpipe "^1.0.5" yargs "^9.0.0" @@ -6010,11 +5724,6 @@ mime@^1.3.4: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@^2.0.3: - version "2.4.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6" - integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w== - mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" @@ -6102,18 +5811,6 @@ mobx@^4.6.0: resolved "https://registry.yarnpkg.com/mobx/-/mobx-4.9.3.tgz#24294ff8ba34aeb03f1f02d8dd4984a1e55707bb" integrity sha512-+CwJp0YgEz0Q3U7jQTvLT/ikqmFD7rPMs5oLCZfCMhQp35lnel+QLyfddTm6lFt0OvkMeXoToXmCkkFeU/eZPQ== -moment-timezone@^0.5.23: - version "0.5.23" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.23.tgz#7cbb00db2c14c71b19303cb47b0fb0a6d8651463" - integrity sha512-WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w== - dependencies: - moment ">= 2.9.0" - -"moment@>= 2.9.0", moment@^2.22.2: - version "2.24.0" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" - integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== - morgan@^1.9.0: version "1.9.1" resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59" @@ -6500,7 +6197,7 @@ os-locale@^3.0.0: lcid "^2.0.0" mem "^4.0.0" -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2: +os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= @@ -6630,12 +6327,17 @@ pascalcase@^0.1.1: resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= +path-browserify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.0.tgz#40702a97af46ae00b0ea6fa8998c0b03c0af160d" + integrity sha512-Hkavx/nY4/plImrZPHRk2CL9vpOymZLgEbMNX1U0bjcBL7QN9wODxyx0yaMZURSQaUtSEvDrfAvxa9oPb0at9g== + path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= -path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: +path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= @@ -6676,11 +6378,6 @@ path-type@^3.0.0: dependencies: pify "^3.0.0" -pegjs@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/pegjs/-/pegjs-0.10.0.tgz#cf8bafae6eddff4b5a7efb185269eaaf4610ddbd" - integrity sha1-z4uvrm7d/0tafvsYUmnqr0YQ3b0= - performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -6733,7 +6430,7 @@ plist@2.0.1: xmlbuilder "8.2.2" xmldom "0.1.x" -plist@^3.0.0: +plist@^3.0.0, plist@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c" integrity sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ== @@ -6785,6 +6482,14 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" +pretty-format@24.0.0-alpha.6: + version "24.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.0.0-alpha.6.tgz#25ad2fa46b342d6278bf241c5d2114d4376fbac1" + integrity sha512-zG2m6YJeuzwBFqb5EIdmwYVf30sap+iMRuYNPytOccEXZMAJbPIFGKVJ/U0WjQegmnQbRo9CI7j6j3HtDaifiA== + dependencies: + ansi-regex "^4.0.0" + ansi-styles "^3.2.0" + pretty-format@^23.6.0: version "23.6.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760" @@ -6803,12 +6508,7 @@ pretty-format@^24.8.0: ansi-styles "^3.2.0" react-is "^16.8.4" -pretty-format@^4.2.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-4.3.1.tgz#530be5c42b3c05b36414a7a2a4337aa80acd0e8d" - integrity sha1-UwvlxCs8BbNkFKeipDN6qArNDo0= - -private@^0.1.6, private@^0.1.8: +private@^0.1.6: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== @@ -6908,6 +6608,11 @@ query-string@^6.2.0: decode-uri-component "^0.2.0" strict-uri-encode "^2.0.0" +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== + r2@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/r2/-/r2-2.0.1.tgz#94cd802ecfce9a622549c8182032d8e4a2b2e612" @@ -6956,14 +6661,31 @@ react-deep-force-update@^1.0.0: resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-1.1.2.tgz#3d2ae45c2c9040cbb1772be52f8ea1ade6ca2ee1" integrity sha512-WUSQJ4P/wWcusaH+zZmbECOk7H5N2pOIl0vzheeornkIMhu+qrNdGFm0bDZLCb0hSF0jf/kH1SgkNGfBdTc4wA== -react-devtools-core@3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-3.3.4.tgz#9e497a94b73413b91774bf3e3197e539d5f9a21d" - integrity sha512-6lsBDRInT9jU8Ya8bnKWJSsnaGg/xk1ZSfvhc/dHc3n2CUTMfGlqm2tGeZQ9WEoe0Y2K7Lg90Kvb1E8anLePaQ== +react-devtools-core@^3.6.0: + version "3.6.1" + resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-3.6.1.tgz#51af81ceada65209bbccb8b547a01187cd1cbf04" + integrity sha512-I/LSX+tpeTrGKaF1wXSfJ/kP+6iaP2JfshEjW8LtQBdz6c6HhzOJtjZXhqOUrAdysuey8M1/JgPY1flSVVt8Ig== dependencies: shell-quote "^1.6.1" ws "^3.3.1" +react-google-maps@^9.4.5: + version "9.4.5" + resolved "https://registry.yarnpkg.com/react-google-maps/-/react-google-maps-9.4.5.tgz#920c199bdc925e0ce93880edffb09428d263aafa" + integrity sha512-8z5nX9DxIcBCXuEiurmRT1VXVwnzx0C6+3Es6lxB2/OyY2SLax2/LcDu6Aldxnl3HegefTL7NJzGeaKAJ61pOA== + dependencies: + babel-runtime "^6.11.6" + can-use-dom "^0.1.0" + google-maps-infobox "^2.0.0" + invariant "^2.2.1" + lodash "^4.16.2" + marker-clusterer-plus "^2.1.4" + markerwithlabel "^2.0.1" + prop-types "^15.5.8" + recompose "^0.26.0" + scriptjs "^2.5.8" + warning "^3.0.0" + react-is@^16.5.2, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4: version "16.8.4" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2" @@ -6979,6 +6701,15 @@ react-native-branch@2.2.5: resolved "https://registry.yarnpkg.com/react-native-branch/-/react-native-branch-2.2.5.tgz#4074dd63b4973e6397d9ce50e97b57c77a518e9d" integrity sha1-QHTdY7SXPmOX2c5Q6XtXx3pRjp0= +react-native-gesture-handler@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.2.1.tgz#9c48fb1ab13d29cece24bbb77b1e847eebf27a2b" + integrity sha512-c1+L72Vjc/bwHKcIJ8a2/88SW9l3/axcAIpg3zB1qTzwdCxHZJeQn6d58cQXHPepxFBbgfTCo60B7SipSfo+zw== + dependencies: + hoist-non-react-statics "^2.3.1" + invariant "^2.2.2" + prop-types "^15.5.10" + react-native-gesture-handler@~1.0.14: version "1.0.17" resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.0.17.tgz#a046f371f277092157fc2781323d35a02a93daaf" @@ -6988,14 +6719,15 @@ react-native-gesture-handler@~1.0.14: invariant "^2.2.2" prop-types "^15.5.10" -react-native-maps@expo/react-native-maps#v0.22.1-exp.0: - version "0.22.1" - resolved "https://codeload.github.com/expo/react-native-maps/tar.gz/e6f98ff7272e5d0a7fe974a41f28593af2d77bb2" +react-native-maps@0.24.2: + version "0.24.2" + resolved "https://registry.yarnpkg.com/react-native-maps/-/react-native-maps-0.24.2.tgz#19974f967cb0c2e24dab74ca879118e0932571b2" + integrity sha512-1iNIDikp2dkCG+8DguaEviYZiMSYyvwqYT7pO2YTZvuFRDSc/P9jXMhTUnSh4wNDlEeQ47OJ09l0pwWVBZ7wxg== -react-native-reanimated@1.0.0-alpha.11: - version "1.0.0-alpha.11" - resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.0.0-alpha.11.tgz#b78c839bae878d149561b56a3c750414957ea86d" - integrity sha512-lDakjY8CXmZiSN71hyc276b3d7M9mKV9ZyYw4W/rTnnJbgBFaqdIxSHq4S4LxSbVqpAoQMfUJqPTE0BKbAz7Aw== +react-native-reanimated@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.0.1.tgz#5ecb6a2f6dad0351077ac9b771ca943b7ad6feda" + integrity sha512-RENoo6/sJc3FApP7vJ1Js7WyDuTVh97bbr5aMjJyw3kqpR2/JDHyL/dQFfOvSSAc+VjitpR9/CfPPad7tLRiIA== react-native-safe-area-view@^0.13.0: version "0.13.1" @@ -7024,14 +6756,10 @@ react-native-sentry@^0.42.0: "@sentry/wizard" "^0.12.1" raven-js "^3.24.2" -react-native-svg@8.0.10: - version "8.0.10" - resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-8.0.10.tgz#b07e2342d1486220f5fda1a584e316e7d2d1f392" - integrity sha512-gsG5GUdvlox67+ohLnq3tZSqiYBmz4M5lKKeUfnJZ8EPrMMS5ZgaVj7Zcccee1VvINS5xQaoenUJdha/GEo34w== - dependencies: - color "^2.0.1" - lodash "^4.16.6" - pegjs "^0.10.0" +react-native-svg@9.4.0: + version "9.4.0" + resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-9.4.0.tgz#e428e0eae55aebd2355f1ff4f22675dad4611960" + integrity sha512-IVJlVbS2dAPerPr927fEi4uXzrPXzlra5ddgyJXZZ2IKA2ZygyYWFZDM+vsQs+Vj20CfL8nOWszQQV57vdQgFg== react-native-tab-view@^1.0.0, react-native-tab-view@^1.2.0: version "1.3.2" @@ -7049,40 +6777,48 @@ react-native-vector-icons@6.0.0: prop-types "^15.6.2" yargs "^8.0.2" -react-native-view-shot@2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/react-native-view-shot/-/react-native-view-shot-2.5.0.tgz#428a997f470d3148d0067c5b46abd988ef1aa4c0" - integrity sha512-xFJA+N7wh8Ik/17I4QB24e0a0L3atg1ScVehvtYR5UBTgHdzTFA0ZylvXp9gkZt7V+AT5Pni0H3NQItpqSKFoQ== +react-native-view-shot@2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/react-native-view-shot/-/react-native-view-shot-2.6.0.tgz#3b23675826f67658366352c4b97b59a6aded2f43" + integrity sha512-yO9vWi/11m2hEJl8FrW1SMeVzFfPtMKh20MUInGqlsL0H8Ya2JGGlFfrBzx1KiFR2hFb5OdsTLYNtcVZtJ6pLQ== + +react-native-webview@5.8.1: + version "5.8.1" + resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-5.8.1.tgz#6f5a83dec55bbc02700155b1a16a668870f14de0" + integrity sha512-b6pSvmjoiWtcz6YspggW02X+BRXJWuquHwkh37BRx1NMW1iwMZA31SnFQvTpPzWYYIb9WF/mRsy2nGtt9C6NIg== + dependencies: + escape-string-regexp "1.0.5" + invariant "2.2.4" -"react-native@https://github.com/expo/react-native/archive/sdk-32.0.0.tar.gz": - version "0.57.1" - resolved "https://github.com/expo/react-native/archive/sdk-32.0.0.tar.gz#78bcdc7d34a2f4a58c179699e775842a74da6c6f" +"react-native@https://github.com/expo/react-native/archive/sdk-33.0.0.tar.gz": + version "0.59.8" + resolved "https://github.com/expo/react-native/archive/sdk-33.0.0.tar.gz#970a32631977dbe7158f024abc23e4c0c0975058" dependencies: + "@babel/runtime" "^7.0.0" + "@react-native-community/cli" "^1.2.1" absolute-path "^0.0.0" art "^0.10.0" base64-js "^1.1.2" - chalk "^1.1.1" + chalk "^2.4.1" commander "^2.9.0" compression "^1.7.1" connect "^3.6.5" create-react-class "^15.6.3" debug "^2.2.0" denodeify "^1.2.1" - envinfo "^5.7.0" errorhandler "^1.5.0" escape-string-regexp "^1.0.5" event-target-shim "^1.0.5" - fbjs "0.8.17" - fbjs-scripts "^0.8.1" + fbjs "^1.0.0" + fbjs-scripts "^1.0.0" fs-extra "^1.0.0" glob "^7.1.1" graceful-fs "^4.1.3" inquirer "^3.0.6" + invariant "^2.2.4" lodash "^4.17.5" - metro "^0.45.6" - metro-babel-register "^0.45.6" - metro-core "^0.45.6" - metro-memory-fs "^0.45.6" + metro-babel-register "0.51.0" + metro-react-native-babel-transformer "0.51.0" mime "^1.3.4" minimist "^1.2.0" mkdirp "^0.5.1" @@ -7090,23 +6826,22 @@ react-native-view-shot@2.5.0: node-fetch "^2.2.0" node-notifier "^5.2.1" npmlog "^2.0.4" + nullthrows "^1.1.0" opn "^3.0.2" optimist "^0.6.1" plist "^3.0.0" - pretty-format "^4.2.1" + pretty-format "24.0.0-alpha.6" promise "^7.1.1" prop-types "^15.5.8" react-clone-referenced-element "^1.0.1" - react-devtools-core "3.3.4" - react-timer-mixin "^0.13.2" + react-devtools-core "^3.6.0" regenerator-runtime "^0.11.0" rimraf "^2.5.4" semver "^5.0.3" serve-static "^1.13.1" shell-quote "1.6.1" - stacktrace-parser "^0.1.3" - ws "^1.1.0" - xcode "^0.9.1" + stacktrace-parser "0.1.4" + ws "^1.1.5" xmldoc "^0.4.0" yargs "^9.0.0" @@ -7151,11 +6886,6 @@ react-proxy@^1.1.7: lodash "^4.6.1" react-deep-force-update "^1.0.0" -react-timer-mixin@^0.13.2: - version "0.13.4" - resolved "https://registry.yarnpkg.com/react-timer-mixin/-/react-timer-mixin-0.13.4.tgz#75a00c3c94c13abe29b43d63b4c65a88fc8264d3" - integrity sha512-4+ow23tp/Tv7hBM5Az5/Be/eKKF7DIvJ09voz5LyHGQaqqz9WV8YMs31eFvcYQs7d451LSg7kDJV70XYN/Ug/Q== - react-transform-hmr@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/react-transform-hmr/-/react-transform-hmr-1.0.4.tgz#e1a40bd0aaefc72e8dfd7a7cda09af85066397bb" @@ -7164,15 +6894,15 @@ react-transform-hmr@^1.0.4: global "^4.3.0" react-proxy "^1.1.7" -react@16.5.0: - version "16.5.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.5.0.tgz#f2c1e754bf9751a549d9c6d9aca41905beb56575" - integrity sha512-nw/yB/L51kA9PsAy17T1JrzzGRk+BlFCJwFF7p+pwVxgqwPjYNeZEkkH7LXn9dmflolrYMXLWMTkQ77suKPTNQ== +react@16.8.3: + version "16.8.3" + resolved "https://registry.yarnpkg.com/react/-/react-16.8.3.tgz#c6f988a2ce895375de216edcfaedd6b9a76451d9" + integrity sha512-3UoSIsEq8yTJuSu0luO1QQWYbgGEILm+eJl2QN/VLDi7hL+EN18M3q3oVZwmVzzBJ3DkM7RMdRwBmZZ+b4IzSA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - schedule "^0.3.0" + scheduler "^0.13.3" read-env@^1.3.0: version "1.3.0" @@ -7235,6 +6965,16 @@ realpath-native@^1.1.0: dependencies: util.promisify "^1.0.0" +recompose@^0.26.0: + version "0.26.0" + resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.26.0.tgz#9babff039cb72ba5bd17366d55d7232fbdfb2d30" + integrity sha512-KwOu6ztO0mN5vy3+zDcc45lgnaUoaQse/a5yLVqtzTK13czSWnFGmXbQVmnoMgDkI5POd1EwIKSbjU1V7xdZog== + dependencies: + change-emitter "^0.1.2" + fbjs "^0.8.1" + hoist-non-react-statics "^2.3.1" + symbol-observable "^1.0.4" + regenerate-unicode-properties@^8.0.2: version "8.0.2" resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz#7b38faa296252376d363558cfbda90c9ce709662" @@ -7257,6 +6997,11 @@ regenerator-runtime@^0.12.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de" integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg== +regenerator-runtime@^0.13.2: + version "0.13.2" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447" + integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA== + regenerator-transform@^0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.4.tgz#18f6763cf1382c69c36df76c6ce122cc694284fb" @@ -7328,13 +7073,6 @@ repeat-string@^1.5.2, repeat-string@^1.6.1: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= - dependencies: - is-finite "^1.0.0" - request-promise-core@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346" @@ -7387,6 +7125,11 @@ require-main-filename@^1.0.1: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= + reselect@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147" @@ -7509,14 +7252,15 @@ safe-regex@^1.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sane@^2.0.0: - version "2.5.2" - resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa" - integrity sha1-tNwYYcIbQn6SlQej51HiosuKs/o= +sane@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/sane/-/sane-3.1.0.tgz#995193b7dc1445ef1fe41ddfca2faf9f111854c6" + integrity sha512-G5GClRRxT1cELXfdAq7UKtUsv8q/ZC5k8lQGmjEm4HcAl3HzBy68iglyNCmw4+0tiXPCBZntslHlRhbnsSws+Q== dependencies: anymatch "^2.0.0" capture-exit "^1.2.0" exec-sh "^0.2.0" + execa "^1.0.0" fb-watchman "^2.0.0" micromatch "^3.1.4" minimist "^1.1.1" @@ -7550,21 +7294,18 @@ sax@~1.1.1: resolved "https://registry.yarnpkg.com/sax/-/sax-1.1.6.tgz#5d616be8a5e607d54e114afae55b7eaf2fcc3240" integrity sha1-XWFr6KXmB9VOEUr65Vt+ry/MMkA= -schedule@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/schedule/-/schedule-0.3.0.tgz#1be2ab2fc2e768536269ce7326efb478d6c045e8" - integrity sha512-20+1KVo517sR7Nt+bYBN8a+bEJDKLPEx7Ohtts1kX05E4/HY53YUNuhfkVNItmWAnBYHcpG9vsd2/CJxG+aPCQ== +scheduler@^0.13.3: + version "0.13.6" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889" + integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ== dependencies: + loose-envify "^1.1.0" object-assign "^4.1.1" -schema-utils@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" - integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g== - dependencies: - ajv "^6.1.0" - ajv-errors "^1.0.0" - ajv-keywords "^3.1.0" +scriptjs@^2.5.8: + version "2.5.9" + resolved "https://registry.yarnpkg.com/scriptjs/-/scriptjs-2.5.9.tgz#343915cd2ec2ed9bfdde2b9875cd28f59394b35f" + integrity sha512-qGVDoreyYiP1pkQnbnFAUIS5AjenNwwQBdl7zeos9etl+hYKWahjRTfzAZZYBv5xNHx7vNKCmaLDQZ6Fr2AEXg== "semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1: version "5.6.0" @@ -7696,23 +7437,20 @@ simple-plist@^0.2.1: bplist-parser "0.1.1" plist "2.0.1" -simple-swizzle@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" - integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= +simple-plist@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/simple-plist/-/simple-plist-1.0.0.tgz#bed3085633b22f371e111f45d159a1ccf94b81eb" + integrity sha512-043L2rO80LVF7zfZ+fqhsEkoJFvW8o59rt/l4ctx1TJWoTx7/jkiS1R5TatD15Z1oYnuLJytzE7gcnnBuIPL2g== dependencies: - is-arrayish "^0.3.1" + bplist-creator "0.0.7" + bplist-parser "0.1.1" + plist "^3.0.1" sisteransi@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c" integrity sha512-N+z4pHB4AmUv0SjveWRd6q1Nj5w62m5jodv+GD8lvmbY/83T/rpbJGZOnK5T149OldDj4Db07BSv9xY4K6NTPQ== -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= - slash@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" @@ -7773,13 +7511,6 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.4.15: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" - integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== - dependencies: - source-map "^0.5.6" - source-map-support@^0.5.6, source-map-support@^0.5.9: version "0.5.11" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2" @@ -7793,7 +7524,7 @@ source-map-url@^0.4.0: resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= -source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7: +source-map@^0.5.0, source-map@^0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= @@ -7861,7 +7592,7 @@ stack-utils@^1.0.1: resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA== -stacktrace-parser@^0.1.3: +stacktrace-parser@0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.4.tgz#01397922e5f62ecf30845522c95c4fe1d25e7d4e" integrity sha1-ATl5IuX2Ls8whFUiyVxP4dJefU4= @@ -8007,6 +7738,11 @@ supports-color@^6.0.0, supports-color@^6.1.0: dependencies: has-flag "^3.0.0" +symbol-observable@^1.0.4: + version "1.2.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" + integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== + symbol-tree@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6" @@ -8098,11 +7834,6 @@ tmpl@1.0.x: resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= -to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= - to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" @@ -8256,6 +7987,51 @@ unicode-property-aliases-ecmascript@^1.0.4: resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57" integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw== +unimodules-barcode-scanner-interface@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unimodules-barcode-scanner-interface/-/unimodules-barcode-scanner-interface-2.0.1.tgz#74196fe25c366344ff101540626b8d61cc6c0438" + integrity sha512-Rp3428am/4vCcvVsreqaaGcJNcjtVOMDHVX0yjF2yr8QfD07UVzRYo8ZBhQHc/hYSVWwe+19Pbmk0b+sTnTgkg== + +unimodules-camera-interface@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unimodules-camera-interface/-/unimodules-camera-interface-2.0.1.tgz#0691ce3282fafaf87aecc3423b1d9c1b729797a4" + integrity sha512-m+sYhFFahaPWYl0aVCq9VU8u6CiLVI4cSywYl9rwbIMAifi83rO5GUKKDIaMfAqMj9z77i/RF53x3nVdpclpyA== + +unimodules-constants-interface@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unimodules-constants-interface/-/unimodules-constants-interface-2.0.1.tgz#385a8adab7f22b4aa8cca2c302516c0465a64773" + integrity sha512-Ue/5CpfHvc9jrVc9bvDRgMVMQznvgpJ27hQoNia0sUhsMtHDvnFhXrcNfLO4tG5zGgcda6fuKtTMz91vLz8uqw== + +unimodules-face-detector-interface@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unimodules-face-detector-interface/-/unimodules-face-detector-interface-2.0.1.tgz#a9f3150f69fd8061f6ea920e6ae83c544990b549" + integrity sha512-uM25vRESCRXwhmgVlkiDhxx1R0yGFjoiTYjqG7bfqzSnc964HR3Qy5KaWvJUOtFpLun50pfBw+lzutqFnshCpg== + +unimodules-file-system-interface@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unimodules-file-system-interface/-/unimodules-file-system-interface-2.0.1.tgz#5fc237b5c4adaa48bd817a9542271d4210d978a9" + integrity sha512-1z//JY7ifBxq3e4dgjID2JgX3uTYEZqVFS1PqlVb9FEmdD+nvuGI2w+ohe+3Y20FYX1lZrffGCeT/Si3xa4tkA== + +unimodules-font-interface@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unimodules-font-interface/-/unimodules-font-interface-2.0.1.tgz#c2fee253c12d8ae45594adfe8dabff3ac57884de" + integrity sha512-LirIkEZyBJMakQkYwSZBBbqXWY5KFBbBF97CCAaV/uzp6UaNawExD8kYhexajM3+uNdIPlnCIfdqQbpbXBdkVg== + +unimodules-image-loader-interface@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unimodules-image-loader-interface/-/unimodules-image-loader-interface-2.0.1.tgz#d9d9148638d594bbdb95963449b78b5d0c686eb0" + integrity sha512-o6HHXNcWmDiT8NhBR/wRB/MTf64sQ3c9sSf13BMvmKt2nt64lkhzQC7IVDl1oxx2ejHTfwhC/XK/EafaJvvHWQ== + +unimodules-permissions-interface@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unimodules-permissions-interface/-/unimodules-permissions-interface-2.0.1.tgz#a8a21807095553a0476a72028ae7f3beab090dbd" + integrity sha512-eqs6Bub19RiUHxCMrrdyro+xOpab1reHjGHBBoMOndY4bKkARpKDN7x1gDxJv3HCtP8a2hAm0xae0cDZ5S38Tw== + +unimodules-sensors-interface@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unimodules-sensors-interface/-/unimodules-sensors-interface-2.0.1.tgz#5e24964bba0a541b1d4d8d3b82e54efb1aba96b9" + integrity sha512-JvR04JZHqt+EJiGL/9KWsaTpTJQ53qqNMmZAC+MX6NUgnz1bWiUw9eY9MAAIaQbmorCwKyCqfpX9twTUM8z1yA== + union-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" @@ -8266,6 +8042,11 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^0.4.3" +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -8286,29 +8067,18 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -uri-parser@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/uri-parser/-/uri-parser-1.0.1.tgz#3307ebb50f279c11198ad09214bdaf24e29735b2" - integrity sha512-TRjjM2M83RD9jIIYttNj7ghUQTKSov+WXZbQIMM8DxY1R1QdJEGWNKKMYCxyeOw1p9re2nQ85usM6dPTVtox1g== - urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= -url-join@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a" - integrity sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo= - -url-loader@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz#b971d191b83af693c5e3fea4064be9e1f2d7f8d8" - integrity sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg== +url-parse@^1.4.4: + version "1.4.7" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" + integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== dependencies: - loader-utils "^1.1.0" - mime "^2.0.3" - schema-utils "^1.0.0" + querystringify "^2.1.1" + requires-port "^1.0.0" use@^3.1.0: version "3.1.1" @@ -8384,6 +8154,13 @@ walker@^1.0.7, walker@~1.0.5: dependencies: makeerror "1.0.x" +warning@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" + integrity sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w= + dependencies: + loose-envify "^1.0.0" + watch@~0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986" @@ -8409,11 +8186,6 @@ whatwg-fetch@>=0.10.0: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q== -whatwg-fetch@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" - integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng== - whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" @@ -8504,7 +8276,7 @@ write@1.0.3: dependencies: mkdirp "^0.5.1" -ws@^1.1.0: +ws@^1.1.0, ws@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz#cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51" integrity sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w== @@ -8528,14 +8300,13 @@ ws@^5.2.0: dependencies: async-limiter "~1.0.0" -xcode@^0.9.1: - version "0.9.3" - resolved "https://registry.yarnpkg.com/xcode/-/xcode-0.9.3.tgz#910a89c16aee6cc0b42ca805a6d0b4cf87211cf3" - integrity sha1-kQqJwWrubMC0LKgFptC0z4chHPM= +xcode@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/xcode/-/xcode-2.0.0.tgz#134f1f94c26fbfe8a9aaa9724bfb2772419da1a2" + integrity sha512-5xF6RCjAdDEiEsbbZaS/gBRt3jZ/177otZcpoLCjGN/u1LrfgH7/Sgeeavpr/jELpyDqN2im3AKosl2G2W8hfw== dependencies: - pegjs "^0.10.0" - simple-plist "^0.2.1" - uuid "3.0.1" + simple-plist "^1.0.0" + uuid "^3.3.2" "xcode@https://github.com/apache/cordova-node-xcode#e7646f0680d509b590b839e567c217590451505b": version "1.0.1-dev" From 0d0683e3d8f801c5a7b85ee41b00e9b02b01d693 Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Wed, 19 Jun 2019 23:09:38 +0200 Subject: [PATCH 30/42] Minor type changes --- App/managers/AqiHistory.js | 42 +++++++++++++++++++ .../{AqiHistoryManager.js => AqiHistoryDb.js} | 19 +++++---- App/managers/index.js | 2 +- 3 files changed, 53 insertions(+), 10 deletions(-) create mode 100644 App/managers/AqiHistory.js rename App/managers/{AqiHistoryManager.js => AqiHistoryDb.js} (73%) diff --git a/App/managers/AqiHistory.js b/App/managers/AqiHistory.js new file mode 100644 index 00000000..d50c2ce7 --- /dev/null +++ b/App/managers/AqiHistory.js @@ -0,0 +1,42 @@ +class AqiHistory { + + _id: number; + _location: string; + _lat: number; + _lng: number; + _rawPm25: number; + _creationTime: number; + + constructor({ id, location, lat, lng, rawPm25, creationTime }) { + this._id = id; + this._location = location; + this._lat = lat; + this._lng = lng; + this._rawPm25 = rawPm25; + this._creationTime = creationTime; + } + + get id(): number { + return this._id; + } + + get location(): string { + return this._location; + } + + get lat(): number { + return this._lat; + } + + get lng(): number { + return this._lng; + } + + get rawPm25(): number { + return this._rawPm25; + } + + get creationTime(): number { + return this._creationTime; + } +} diff --git a/App/managers/AqiHistoryManager.js b/App/managers/AqiHistoryDb.js similarity index 73% rename from App/managers/AqiHistoryManager.js rename to App/managers/AqiHistoryDb.js index 041aa952..17045352 100644 --- a/App/managers/AqiHistoryManager.js +++ b/App/managers/AqiHistoryDb.js @@ -7,12 +7,12 @@ export const initDb = () => { return SQLite.openDatabase(DB_AQI_HISTORY, '1.0', 'Aqi History', 5 * 1024 * 1024); }; -export const init = async () => { +export const init = async (): Promise => { const db = await initDb(); await db.transaction((tx) => { tx.executeSql( - 'create table if not exists history(id integer not null, location varchar(255) not null, lat numeric not null, lng numeric not null, rawPm25 decimal not null, creation_time timestamp not null, primary key (id))', + 'create table if not exists history(id integer not null, location varchar(255) not null, lat numeric not null, lng numeric not null, rawPm25 decimal not null, creationTime timestamp not null, primary key (id))', [], () => {}, (transaction, error) => console.log('DB init error', error) @@ -22,7 +22,7 @@ export const init = async () => { return db; }; -export const isSaveNeeded = async () => { +export const isSaveNeeded = async (): Promise => { const db = await init(); const promise = new Promise((resolve, reject) => { @@ -33,7 +33,7 @@ export const isSaveNeeded = async () => { (transaction, resultSet) => { if (resultSet.rows.length === 0) { resolve(true); - } else if ((resultSet.rows.item(0).creation_time + SAVE_DATA_INTERVAL) < Date.now()) { + } else if ((resultSet.rows.item(0).creationTime + SAVE_DATA_INTERVAL) < Date.now()) { resolve(true); } else { resolve(false); @@ -47,12 +47,12 @@ export const isSaveNeeded = async () => { return promise; }; -export const saveData = async (location, rawPm25, { lat, lng }) => { +export const saveData = async (location, rawPm25, { lat, lng }): Promise => { const db = await init(); db.transaction((tx) => { tx.executeSql( - 'insert into history (id, location, lat, lng, rawPm25, creation_time) values (?, ?, ?, ?, ?, ?)', + 'insert into history (id, location, lat, lng, rawPm25, creationTime) values (?, ?, ?, ?, ?, ?)', [Date.now(), location, lat, lng, rawPm25, Date.now()], () => {}, (transaction, error) => console.log('DB insert error', error) @@ -60,19 +60,20 @@ export const saveData = async (location, rawPm25, { lat, lng }) => { }); }; -export const getData = async (limit) => { +export const getData = async (limit): Promise> => { const db = await init(); const promise = new Promise((resolve, reject) => { db.readTransaction((tx) => { tx.executeSql( - 'select * from history order by creation_time desc limit ' + limit, + 'select * from history order by creationTime desc limit ' + limit, [], (transaction, resultSet) => { let data = []; for (let i = 0; i < resultSet.rows.length; i++) { - data.push(resultSet.rows.item(i)); + const result = new AqiHistory(resultSet.rows.item(i)); + data.push(result); } resolve(data); diff --git a/App/managers/index.js b/App/managers/index.js index e536b000..f7f0328e 100644 --- a/App/managers/index.js +++ b/App/managers/index.js @@ -1,4 +1,4 @@ -import * as AqiHistoryManager from './AqiHistoryManager'; +import * as AqiHistoryManager from './AqiHistoryDb'; export { AqiHistoryManager From cf34284007e69dc44ae46631b8fec6c7f1e44f93 Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Thu, 20 Jun 2019 00:02:07 +0200 Subject: [PATCH 31/42] Migrate expo packages --- App/App.js | 3 ++- App/Screens/About/About.js | 2 +- App/Screens/Home/SmokeVideo/SmokeVideo.js | 2 +- App/Screens/Loading/Loading.js | 4 +++- App/Screens/Search/Search.js | 2 +- App/components/CurrentLocation/CurrentLocation.js | 2 +- App/localization/index.js | 2 +- App/utils/dataSources/aqicn.js | 2 +- App/utils/theme.js | 2 +- package.json | 8 ++++++++ 10 files changed, 20 insertions(+), 9 deletions(-) diff --git a/App/App.js b/App/App.js index 924c2177..9489387a 100644 --- a/App/App.js +++ b/App/App.js @@ -15,7 +15,8 @@ // along with Sh**t! I Smoke. If not, see . import React, { PureComponent } from 'react'; -import { Constants, Font } from 'expo'; +import * as Font from 'expo-font'; +import Constants from 'expo-constants'; import { Provider } from 'mobx-react'; import Sentry from 'sentry-expo'; diff --git a/App/Screens/About/About.js b/App/Screens/About/About.js index b7ed81af..63104899 100644 --- a/App/Screens/About/About.js +++ b/App/Screens/About/About.js @@ -15,7 +15,7 @@ // along with Sh**t! I Smoke. If not, see . import React, { PureComponent } from 'react'; -import { Constants } from 'expo'; +import Constants from 'expo-constants'; import { Linking, Platform, ScrollView, StyleSheet, Text, View } from 'react-native'; import { Box } from './Box'; diff --git a/App/Screens/Home/SmokeVideo/SmokeVideo.js b/App/Screens/Home/SmokeVideo/SmokeVideo.js index 67b487cd..e669ccc2 100644 --- a/App/Screens/Home/SmokeVideo/SmokeVideo.js +++ b/App/Screens/Home/SmokeVideo/SmokeVideo.js @@ -17,7 +17,7 @@ import React, { Component } from 'react'; import { Dimensions, StyleSheet, View } from 'react-native'; import { inject, observer } from 'mobx-react'; -import { Video } from 'expo'; +import { Video } from 'expo-av'; import smokeVideo from '../../../../assets/video/smoke_bg_fafafc.mp4'; diff --git a/App/Screens/Loading/Loading.js b/App/Screens/Loading/Loading.js index 6d4de955..6080e7e6 100644 --- a/App/Screens/Loading/Loading.js +++ b/App/Screens/Loading/Loading.js @@ -16,7 +16,9 @@ import React, { Component } from 'react'; import { inject, observer } from 'mobx-react'; -import { Location, Permissions } from 'expo'; +import * as Permissions from 'expo-permissions'; +import * as TaskManager from 'expo-task-manager'; +import * as Location from 'expo-location'; import retry from 'async-retry'; import { StyleSheet, Text } from 'react-native'; diff --git a/App/Screens/Search/Search.js b/App/Screens/Search/Search.js index ea152962..f0ce5141 100644 --- a/App/Screens/Search/Search.js +++ b/App/Screens/Search/Search.js @@ -16,7 +16,7 @@ import React, { Component } from 'react'; import axios from 'axios'; -import { Constants } from 'expo'; +import Constants from 'expo-constants'; import { FlatList, StyleSheet, Text, View } from 'react-native'; import { inject, observer } from 'mobx-react'; import retry from 'async-retry'; diff --git a/App/components/CurrentLocation/CurrentLocation.js b/App/components/CurrentLocation/CurrentLocation.js index 9efaefe3..bfae3bf0 100644 --- a/App/components/CurrentLocation/CurrentLocation.js +++ b/App/components/CurrentLocation/CurrentLocation.js @@ -16,7 +16,7 @@ import React, { Component } from 'react'; import axios from 'axios'; -import { Constants } from 'expo'; +import Constants from 'expo-constants'; import { inject, observer } from 'mobx-react'; import { StyleSheet, Text } from 'react-native'; diff --git a/App/localization/index.js b/App/localization/index.js index 1c981d48..d3b8f6ec 100644 --- a/App/localization/index.js +++ b/App/localization/index.js @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Sh**t! I Smoke. If not, see . -import { Localization } from 'expo'; +import * as Localization from 'expo-localization'; import i18n from 'i18n-js'; // languages diff --git a/App/utils/dataSources/aqicn.js b/App/utils/dataSources/aqicn.js index 0f5a3a7b..bd7ef3fc 100644 --- a/App/utils/dataSources/aqicn.js +++ b/App/utils/dataSources/aqicn.js @@ -15,7 +15,7 @@ // along with Sh**t! I Smoke. If not, see . import axios from 'axios'; -import { Constants } from 'expo'; +import Constants from 'expo-constants'; import { aqiToRaw } from './utils/aqiToRaw'; diff --git a/App/utils/theme.js b/App/utils/theme.js index 722430f5..5502a749 100644 --- a/App/utils/theme.js +++ b/App/utils/theme.js @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Sh**t! I Smoke. If not, see . -import { Constants } from 'expo'; +import Constants from 'expo-constants'; import { Platform } from 'react-native'; export const backgroundColor = '#FAFAFC'; diff --git a/package.json b/package.json index 95d3461c..0443860e 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,14 @@ "axios": "^0.19.0", "date-fns": "^2.0.0-alpha.25", "expo": "^33.0.0", + "expo-av": "~5.0.2", + "expo-constants": "~5.0.1", + "expo-font": "~5.0.1", + "expo-localization": "~5.0.1", + "expo-location": "~5.0.1", + "expo-permissions": "~5.0.1", + "expo-sqlite": "~5.0.1", + "expo-task-manager": "~5.0.1", "haversine": "^1.1.0", "i18n-js": "^3.2.1", "mobx": "^4.6.0", From aa65935451a13fcaddab13d2198f459e8be322c5 Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Thu, 20 Jun 2019 00:10:08 +0200 Subject: [PATCH 32/42] Minor fixes --- App/managers/AqiHistory.js | 2 ++ App/managers/AqiHistoryDb.js | 7 ++++--- App/managers/index.js | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/App/managers/AqiHistory.js b/App/managers/AqiHistory.js index d50c2ce7..eada5c62 100644 --- a/App/managers/AqiHistory.js +++ b/App/managers/AqiHistory.js @@ -40,3 +40,5 @@ class AqiHistory { return this._creationTime; } } + +export default AqiHistory; diff --git a/App/managers/AqiHistoryDb.js b/App/managers/AqiHistoryDb.js index 17045352..db833f26 100644 --- a/App/managers/AqiHistoryDb.js +++ b/App/managers/AqiHistoryDb.js @@ -1,4 +1,5 @@ -import { SQLite } from 'expo'; ++import { SQLite } from 'expo-sqlite'; +import AqiHistory from './AqiHistory'; export const SAVE_DATA_INTERVAL = 3600000; // 1 hour const DB_AQI_HISTORY = 'aqi-history'; @@ -47,13 +48,13 @@ export const isSaveNeeded = async (): Promise => { return promise; }; -export const saveData = async (location, rawPm25, { lat, lng }): Promise => { +export const saveData = async (location, rawPm25, { latitude, longitude }): Promise => { const db = await init(); db.transaction((tx) => { tx.executeSql( 'insert into history (id, location, lat, lng, rawPm25, creationTime) values (?, ?, ?, ?, ?, ?)', - [Date.now(), location, lat, lng, rawPm25, Date.now()], + [Date.now(), location, latitude, longitude, rawPm25, Date.now()], () => {}, (transaction, error) => console.log('DB insert error', error) ); diff --git a/App/managers/index.js b/App/managers/index.js index f7f0328e..55527a86 100644 --- a/App/managers/index.js +++ b/App/managers/index.js @@ -1,5 +1,5 @@ -import * as AqiHistoryManager from './AqiHistoryDb'; +import * as AqiHistoryDb from './AqiHistoryDb'; export { - AqiHistoryManager + AqiHistoryDb }; From 3a93eabd2aa68c78f292d911a35ef2aa5ade5ab8 Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Thu, 20 Jun 2019 00:12:04 +0200 Subject: [PATCH 33/42] Update Loading.js --- App/Screens/Loading/Loading.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/App/Screens/Loading/Loading.js b/App/Screens/Loading/Loading.js index 7aa0b3bc..d49d70e9 100644 --- a/App/Screens/Loading/Loading.js +++ b/App/Screens/Loading/Loading.js @@ -16,14 +16,16 @@ import React, {Component} from 'react'; import {inject, observer} from 'mobx-react'; -import {Location, Permissions, TaskManager} from 'expo'; +import * as Permissions from 'expo-permissions'; +import * as TaskManager from 'expo-task-manager'; +import * as Location from 'expo-location'; import retry from 'async-retry'; import {StyleSheet, Text} from 'react-native'; import {Background} from './Background'; import * as dataSources from '../../utils/dataSources'; import * as theme from '../../utils/theme'; import {i18n} from '../../localization'; -import {AqiHistoryManager} from '../../managers'; +import { AqiHistoryDb } from '../../managers'; const TASK_STORE_AQI_HISTORY = 'store-aqi-history'; @@ -50,7 +52,7 @@ export class Loading extends Component { _startRecordingAqiHistory = async () => { await Location.startLocationUpdatesAsync(TASK_STORE_AQI_HISTORY, { accuracy: Location.Accuracy.BestForNavigation, - timeInterval: AqiHistoryManager.SAVE_DATA_INTERVAL, + timeInterval: AqiHistoryDb.SAVE_DATA_INTERVAL, distanceInterval: 0 }); }; @@ -200,8 +202,8 @@ TaskManager.defineTask(TASK_STORE_AQI_HISTORY, async ({ data, error }) => { {retries: 3} // 2 attempts per source ); - if (await AqiHistoryManager.isSaveNeeded()) { - await AqiHistoryManager.saveData(api.city.name, api.rawPm25, coords); + if (await AqiHistoryDb.isSaveNeeded()) { + await AqiHistoryDb.saveData(api.city.name, api.rawPm25, coords); } } }); From 99a190c62424f82e003f4acf46e0c76732bb96db Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Thu, 20 Jun 2019 00:17:25 +0200 Subject: [PATCH 34/42] Remove unused package import --- App/Screens/Loading/Loading.js | 1 - 1 file changed, 1 deletion(-) diff --git a/App/Screens/Loading/Loading.js b/App/Screens/Loading/Loading.js index 6080e7e6..96553d87 100644 --- a/App/Screens/Loading/Loading.js +++ b/App/Screens/Loading/Loading.js @@ -17,7 +17,6 @@ import React, { Component } from 'react'; import { inject, observer } from 'mobx-react'; import * as Permissions from 'expo-permissions'; -import * as TaskManager from 'expo-task-manager'; import * as Location from 'expo-location'; import retry from 'async-retry'; import { StyleSheet, Text } from 'react-native'; From f7798f9e3f2bbb2eb1ea6929da9929a3b09982a9 Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Thu, 20 Jun 2019 00:26:30 +0200 Subject: [PATCH 35/42] ESLint fixes --- App/Screens/Loading/Loading.js | 15 ++++++++------- App/managers/AqiHistory.js | 15 +++++++-------- App/managers/AqiHistoryDb.js | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/App/Screens/Loading/Loading.js b/App/Screens/Loading/Loading.js index d49d70e9..c0ebf488 100644 --- a/App/Screens/Loading/Loading.js +++ b/App/Screens/Loading/Loading.js @@ -14,17 +14,17 @@ // You should have received a copy of the GNU General Public License // along with Sh**t! I Smoke. If not, see . -import React, {Component} from 'react'; -import {inject, observer} from 'mobx-react'; +import React, { Component } from 'react'; +import { inject, observer } from 'mobx-react'; import * as Permissions from 'expo-permissions'; import * as TaskManager from 'expo-task-manager'; import * as Location from 'expo-location'; import retry from 'async-retry'; -import {StyleSheet, Text} from 'react-native'; -import {Background} from './Background'; +import { StyleSheet, Text } from 'react-native'; +import { Background } from './Background'; import * as dataSources from '../../utils/dataSources'; import * as theme from '../../utils/theme'; -import {i18n} from '../../localization'; +import { i18n } from '../../localization'; import { AqiHistoryDb } from '../../managers'; const TASK_STORE_AQI_HISTORY = 'store-aqi-history'; @@ -41,6 +41,7 @@ export class Loading extends Component { async componentDidMount () { await this.fetchData(); await this._startRecordingAqiHistory(); + console.warn(await AqiHistoryDb.getData(10)); } componentWillUnmount () { @@ -75,7 +76,7 @@ export class Loading extends Component { return result; }, - {retries: 3} // 2 attempts per source + { retries: 3 } // 2 attempts per source ); }; @@ -199,7 +200,7 @@ TaskManager.defineTask(TASK_STORE_AQI_HISTORY, async ({ data, error }) => { return result; }, - {retries: 3} // 2 attempts per source + { retries: 3 } // 2 attempts per source ); if (await AqiHistoryDb.isSaveNeeded()) { diff --git a/App/managers/AqiHistory.js b/App/managers/AqiHistory.js index eada5c62..387ea858 100644 --- a/App/managers/AqiHistory.js +++ b/App/managers/AqiHistory.js @@ -1,5 +1,4 @@ class AqiHistory { - _id: number; _location: string; _lat: number; @@ -7,7 +6,7 @@ class AqiHistory { _rawPm25: number; _creationTime: number; - constructor({ id, location, lat, lng, rawPm25, creationTime }) { + constructor ({ id, location, lat, lng, rawPm25, creationTime }) { this._id = id; this._location = location; this._lat = lat; @@ -16,27 +15,27 @@ class AqiHistory { this._creationTime = creationTime; } - get id(): number { + get id (): number { return this._id; } - get location(): string { + get location (): string { return this._location; } - get lat(): number { + get lat (): number { return this._lat; } - get lng(): number { + get lng (): number { return this._lng; } - get rawPm25(): number { + get rawPm25 (): number { return this._rawPm25; } - get creationTime(): number { + get creationTime (): number { return this._creationTime; } } diff --git a/App/managers/AqiHistoryDb.js b/App/managers/AqiHistoryDb.js index db833f26..dac0c651 100644 --- a/App/managers/AqiHistoryDb.js +++ b/App/managers/AqiHistoryDb.js @@ -1,4 +1,4 @@ -+import { SQLite } from 'expo-sqlite'; +import { SQLite } from 'expo-sqlite'; import AqiHistory from './AqiHistory'; export const SAVE_DATA_INTERVAL = 3600000; // 1 hour From cbe6233d2e06bdd343b8b0b2f47ea05a7951790a Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Sun, 23 Jun 2019 20:11:11 +0200 Subject: [PATCH 36/42] Import TaskManager --- App/Screens/Loading/Loading.js | 1 + 1 file changed, 1 insertion(+) diff --git a/App/Screens/Loading/Loading.js b/App/Screens/Loading/Loading.js index d48dad8a..c0ebf488 100644 --- a/App/Screens/Loading/Loading.js +++ b/App/Screens/Loading/Loading.js @@ -17,6 +17,7 @@ import React, { Component } from 'react'; import { inject, observer } from 'mobx-react'; import * as Permissions from 'expo-permissions'; +import * as TaskManager from 'expo-task-manager'; import * as Location from 'expo-location'; import retry from 'async-retry'; import { StyleSheet, Text } from 'react-native'; From 48e27ecdacd9a19e8a199f7544e45fa1bcea9b17 Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Sat, 29 Jun 2019 21:49:01 +0200 Subject: [PATCH 37/42] Remove TS --- App/managers/AqiHistory.js | 24 ++++++++++++------------ App/managers/AqiHistoryDb.js | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/App/managers/AqiHistory.js b/App/managers/AqiHistory.js index 387ea858..45c3f4b0 100644 --- a/App/managers/AqiHistory.js +++ b/App/managers/AqiHistory.js @@ -1,10 +1,10 @@ class AqiHistory { - _id: number; - _location: string; - _lat: number; - _lng: number; - _rawPm25: number; - _creationTime: number; + _id; + _location; + _lat; + _lng; + _rawPm25; + _creationTime; constructor ({ id, location, lat, lng, rawPm25, creationTime }) { this._id = id; @@ -15,27 +15,27 @@ class AqiHistory { this._creationTime = creationTime; } - get id (): number { + get id () { return this._id; } - get location (): string { + get location () { return this._location; } - get lat (): number { + get lat () { return this._lat; } - get lng (): number { + get lng () { return this._lng; } - get rawPm25 (): number { + get rawPm25 () { return this._rawPm25; } - get creationTime (): number { + get creationTime () { return this._creationTime; } } diff --git a/App/managers/AqiHistoryDb.js b/App/managers/AqiHistoryDb.js index dac0c651..93eed488 100644 --- a/App/managers/AqiHistoryDb.js +++ b/App/managers/AqiHistoryDb.js @@ -8,7 +8,7 @@ export const initDb = () => { return SQLite.openDatabase(DB_AQI_HISTORY, '1.0', 'Aqi History', 5 * 1024 * 1024); }; -export const init = async (): Promise => { +export const init = async () => { const db = await initDb(); await db.transaction((tx) => { @@ -23,7 +23,7 @@ export const init = async (): Promise => { return db; }; -export const isSaveNeeded = async (): Promise => { +export const isSaveNeeded = async () => { const db = await init(); const promise = new Promise((resolve, reject) => { @@ -48,7 +48,7 @@ export const isSaveNeeded = async (): Promise => { return promise; }; -export const saveData = async (location, rawPm25, { latitude, longitude }): Promise => { +export const saveData = async (location, rawPm25, { latitude, longitude }) => { const db = await init(); db.transaction((tx) => { @@ -61,7 +61,7 @@ export const saveData = async (location, rawPm25, { latitude, longitude }): Prom }); }; -export const getData = async (limit): Promise> => { +export const getData = async (limit) => { const db = await init(); const promise = new Promise((resolve, reject) => { From 28020c66695cffb18d656fbfefc2dbebf8eb8ca0 Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Sat, 29 Jun 2019 21:58:17 +0200 Subject: [PATCH 38/42] Auto increment SQL rows --- App/managers/AqiHistoryDb.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/App/managers/AqiHistoryDb.js b/App/managers/AqiHistoryDb.js index 93eed488..10f00905 100644 --- a/App/managers/AqiHistoryDb.js +++ b/App/managers/AqiHistoryDb.js @@ -13,7 +13,7 @@ export const init = async () => { await db.transaction((tx) => { tx.executeSql( - 'create table if not exists history(id integer not null, location varchar(255) not null, lat numeric not null, lng numeric not null, rawPm25 decimal not null, creationTime timestamp not null, primary key (id))', + 'create table if not exists history(id integer primary key autoincrement, location varchar(255) not null, lat numeric not null, lng numeric not null, rawPm25 decimal not null, creationTime timestamp not null)', [], () => {}, (transaction, error) => console.log('DB init error', error) @@ -53,8 +53,8 @@ export const saveData = async (location, rawPm25, { latitude, longitude }) => { db.transaction((tx) => { tx.executeSql( - 'insert into history (id, location, lat, lng, rawPm25, creationTime) values (?, ?, ?, ?, ?, ?)', - [Date.now(), location, latitude, longitude, rawPm25, Date.now()], + 'insert into history (location, lat, lng, rawPm25, creationTime) values (?, ?, ?, ?, ?)', + [location, latitude, longitude, rawPm25, Date.now()], () => {}, (transaction, error) => console.log('DB insert error', error) ); From 2e5032d499c18f690d9ae7881054835f555a9c84 Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Sat, 29 Jun 2019 21:59:13 +0200 Subject: [PATCH 39/42] Remove debug console.log --- App/Screens/Loading/Loading.js | 1 - 1 file changed, 1 deletion(-) diff --git a/App/Screens/Loading/Loading.js b/App/Screens/Loading/Loading.js index c0ebf488..e1441215 100644 --- a/App/Screens/Loading/Loading.js +++ b/App/Screens/Loading/Loading.js @@ -41,7 +41,6 @@ export class Loading extends Component { async componentDidMount () { await this.fetchData(); await this._startRecordingAqiHistory(); - console.warn(await AqiHistoryDb.getData(10)); } componentWillUnmount () { From dd34b9704aa09043c6662c43d39bfd9c71dd4822 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Sun, 30 Jun 2019 17:26:17 +0200 Subject: [PATCH 40/42] Factorize apiCall --- App/Screens/Loading/Loading.js | 72 +++++++++++++--------------------- 1 file changed, 27 insertions(+), 45 deletions(-) diff --git a/App/Screens/Loading/Loading.js b/App/Screens/Loading/Loading.js index e1441215..eda8c27f 100644 --- a/App/Screens/Loading/Loading.js +++ b/App/Screens/Loading/Loading.js @@ -29,6 +29,28 @@ import { AqiHistoryDb } from '../../managers'; const TASK_STORE_AQI_HISTORY = 'store-aqi-history'; +async function apiCall (currentPosition) { + // We currently have 2 sources, aqicn, and windWaqi + // We put them in an array + const sources = [dataSources.aqicn, dataSources.windWaqi]; + + return retry( + async (_, attempt) => { + // Attempt starts at 1 + console.log( + ` - fetchData - Attempt #${attempt}: ${ + sources[(attempt - 1) % 2].name + }` + ); + const result = await sources[(attempt - 1) % 2](currentPosition); + console.log(' - fetchData - Got result', result); + + return result; + }, + { retries: 3 } // 2 attempts per source + ); +} + @inject('stores') @observer export class Loading extends Component { @@ -57,28 +79,6 @@ export class Loading extends Component { }); }; - _apiCall = async (currentPosition) => { - // We currently have 2 sources, aqicn, and windWaqi - // We put them in an array - const sources = [dataSources.aqicn, dataSources.windWaqi]; - - return retry( - async (_, attempt) => { - // Attempt starts at 1 - console.log( - ` - fetchData - Attempt #${attempt}: ${ - sources[(attempt - 1) % 2].name - }` - ); - const result = await sources[(attempt - 1) % 2](currentPosition); - console.log(' - fetchData - Got result', result); - - return result; - }, - { retries: 3 } // 2 attempts per source - ); - }; - async fetchData () { const { stores } = this.props; const { location } = stores; @@ -125,7 +125,7 @@ export class Loading extends Component { 2000 ); - stores.setApi(await this._apiCall(currentPosition)); + stores.setApi(await apiCall(currentPosition)); } catch (error) { console.log(' - fetchData - Error', error); stores.setError(error.message); @@ -156,9 +156,9 @@ export class Loading extends Component { } = this.props; const { longWaiting } = this.state; let coughs = 0; // Number of times to show "Cough..." - if (gps)++coughs; - if (longWaiting)++coughs; - if (api)++coughs; + if (gps) ++coughs; + if (longWaiting) ++coughs; + if (api) ++coughs; return ( @@ -182,25 +182,7 @@ TaskManager.defineTask(TASK_STORE_AQI_HISTORY, async ({ data, error }) => { const { locations } = data; const { coords } = locations[0]; - // We currently have 2 sources, aqicn, and windWaqi - // We put them in an array - const sources = [dataSources.aqicn, dataSources.windWaqi]; - - const api = await retry( - async (_, attempt) => { - // Attempt starts at 1 - console.log( - ` - fetchData - Attempt #${attempt}: ${ - sources[(attempt - 1) % 2].name - }` - ); - const result = await sources[(attempt - 1) % 2](coords); - console.log(' - fetchData - Got result', result); - - return result; - }, - { retries: 3 } // 2 attempts per source - ); + const api = await apiCall(coords); if (await AqiHistoryDb.isSaveNeeded()) { await AqiHistoryDb.saveData(api.city.name, api.rawPm25, coords); From 44a04b37b7089fe0148583e488fd3db0a0d9ea77 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Sun, 30 Jun 2019 17:26:25 +0200 Subject: [PATCH 41/42] Test getData --- App/Screens/About/About.js | 45 ++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/App/Screens/About/About.js b/App/Screens/About/About.js index 63104899..422f8c50 100644 --- a/App/Screens/About/About.js +++ b/App/Screens/About/About.js @@ -16,7 +16,14 @@ import React, { PureComponent } from 'react'; import Constants from 'expo-constants'; -import { Linking, Platform, ScrollView, StyleSheet, Text, View } from 'react-native'; +import { + Linking, + Platform, + ScrollView, + StyleSheet, + Text, + View +} from 'react-native'; import { Box } from './Box'; import { BackButton } from '../../components/BackButton'; @@ -24,7 +31,18 @@ import { Language } from './Language'; import { i18n } from '../../localization'; import * as theme from '../../utils/theme'; +import { getData } from '../../managers/AqiHistoryDb'; + export class About extends PureComponent { + state = { + history: '' + }; + + async componentDidMount () { + const history = await getData(10); + this.setState({ history }); + } + handleOpenAmaury = () => Linking.openURL('https://twitter.com/amaurymartiny'); handleOpenAqi = () => Linking.openURL('http://aqicn.org/'); @@ -47,14 +65,22 @@ export class About extends PureComponent { - {i18n.t('about_how_do_you_calculate_the_number_of_cigarettes_title')} + {i18n.t( + 'about_how_do_you_calculate_the_number_of_cigarettes_title' + )} - {i18n.t('about_how_do_you_calculate_the_number_of_cigarettes_message_1')}{' '} + {i18n.t( + 'about_how_do_you_calculate_the_number_of_cigarettes_message_1' + )}{' '} - {i18n.t('about_how_do_you_calculate_the_number_of_cigarettes_link_1')} + {i18n.t( + 'about_how_do_you_calculate_the_number_of_cigarettes_link_1' + )} - {i18n.t('about_how_do_you_calculate_the_number_of_cigarettes_message_2')} + {i18n.t( + 'about_how_do_you_calculate_the_number_of_cigarettes_message_2' + )} µ g/m³ {' \u207D'} @@ -71,7 +97,9 @@ export class About extends PureComponent { - {i18n.t('about_where_does_data_come_from_title')} + + {i18n.t('about_where_does_data_come_from_title')} + {i18n.t('about_where_does_data_come_from_message_1')}{' '} @@ -91,9 +119,7 @@ export class About extends PureComponent { - - {i18n.t('about_weird_results_title')} - + {i18n.t('about_weird_results_title')} {i18n.t('about_weird_results_message_1')}{' '} @@ -130,6 +156,7 @@ export class About extends PureComponent { {'\n'} Shoot! I Smoke v{Constants.manifest.version}. + {JSON.stringify(this.state.history)} {i18n.t('about_language')}: From 71ebfa6c904cb06fa70d7ee01d3742db51991a1c Mon Sep 17 00:00:00 2001 From: Lucien Blunk-Lallet Date: Sun, 30 Jun 2019 17:39:23 +0200 Subject: [PATCH 42/42] Revert "Am feature history" --- App/Screens/About/About.js | 45 +++++---------------- App/Screens/Loading/Loading.js | 72 +++++++++++++++++++++------------- 2 files changed, 54 insertions(+), 63 deletions(-) diff --git a/App/Screens/About/About.js b/App/Screens/About/About.js index 422f8c50..63104899 100644 --- a/App/Screens/About/About.js +++ b/App/Screens/About/About.js @@ -16,14 +16,7 @@ import React, { PureComponent } from 'react'; import Constants from 'expo-constants'; -import { - Linking, - Platform, - ScrollView, - StyleSheet, - Text, - View -} from 'react-native'; +import { Linking, Platform, ScrollView, StyleSheet, Text, View } from 'react-native'; import { Box } from './Box'; import { BackButton } from '../../components/BackButton'; @@ -31,18 +24,7 @@ import { Language } from './Language'; import { i18n } from '../../localization'; import * as theme from '../../utils/theme'; -import { getData } from '../../managers/AqiHistoryDb'; - export class About extends PureComponent { - state = { - history: '' - }; - - async componentDidMount () { - const history = await getData(10); - this.setState({ history }); - } - handleOpenAmaury = () => Linking.openURL('https://twitter.com/amaurymartiny'); handleOpenAqi = () => Linking.openURL('http://aqicn.org/'); @@ -65,22 +47,14 @@ export class About extends PureComponent { - {i18n.t( - 'about_how_do_you_calculate_the_number_of_cigarettes_title' - )} + {i18n.t('about_how_do_you_calculate_the_number_of_cigarettes_title')} - {i18n.t( - 'about_how_do_you_calculate_the_number_of_cigarettes_message_1' - )}{' '} + {i18n.t('about_how_do_you_calculate_the_number_of_cigarettes_message_1')}{' '} - {i18n.t( - 'about_how_do_you_calculate_the_number_of_cigarettes_link_1' - )} + {i18n.t('about_how_do_you_calculate_the_number_of_cigarettes_link_1')} - {i18n.t( - 'about_how_do_you_calculate_the_number_of_cigarettes_message_2' - )} + {i18n.t('about_how_do_you_calculate_the_number_of_cigarettes_message_2')} µ g/m³ {' \u207D'} @@ -97,9 +71,7 @@ export class About extends PureComponent { - - {i18n.t('about_where_does_data_come_from_title')} - + {i18n.t('about_where_does_data_come_from_title')} {i18n.t('about_where_does_data_come_from_message_1')}{' '} @@ -119,7 +91,9 @@ export class About extends PureComponent { - {i18n.t('about_weird_results_title')} + + {i18n.t('about_weird_results_title')} + {i18n.t('about_weird_results_message_1')}{' '} @@ -156,7 +130,6 @@ export class About extends PureComponent { {'\n'} Shoot! I Smoke v{Constants.manifest.version}. - {JSON.stringify(this.state.history)} {i18n.t('about_language')}: diff --git a/App/Screens/Loading/Loading.js b/App/Screens/Loading/Loading.js index eda8c27f..e1441215 100644 --- a/App/Screens/Loading/Loading.js +++ b/App/Screens/Loading/Loading.js @@ -29,28 +29,6 @@ import { AqiHistoryDb } from '../../managers'; const TASK_STORE_AQI_HISTORY = 'store-aqi-history'; -async function apiCall (currentPosition) { - // We currently have 2 sources, aqicn, and windWaqi - // We put them in an array - const sources = [dataSources.aqicn, dataSources.windWaqi]; - - return retry( - async (_, attempt) => { - // Attempt starts at 1 - console.log( - ` - fetchData - Attempt #${attempt}: ${ - sources[(attempt - 1) % 2].name - }` - ); - const result = await sources[(attempt - 1) % 2](currentPosition); - console.log(' - fetchData - Got result', result); - - return result; - }, - { retries: 3 } // 2 attempts per source - ); -} - @inject('stores') @observer export class Loading extends Component { @@ -79,6 +57,28 @@ export class Loading extends Component { }); }; + _apiCall = async (currentPosition) => { + // We currently have 2 sources, aqicn, and windWaqi + // We put them in an array + const sources = [dataSources.aqicn, dataSources.windWaqi]; + + return retry( + async (_, attempt) => { + // Attempt starts at 1 + console.log( + ` - fetchData - Attempt #${attempt}: ${ + sources[(attempt - 1) % 2].name + }` + ); + const result = await sources[(attempt - 1) % 2](currentPosition); + console.log(' - fetchData - Got result', result); + + return result; + }, + { retries: 3 } // 2 attempts per source + ); + }; + async fetchData () { const { stores } = this.props; const { location } = stores; @@ -125,7 +125,7 @@ export class Loading extends Component { 2000 ); - stores.setApi(await apiCall(currentPosition)); + stores.setApi(await this._apiCall(currentPosition)); } catch (error) { console.log(' - fetchData - Error', error); stores.setError(error.message); @@ -156,9 +156,9 @@ export class Loading extends Component { } = this.props; const { longWaiting } = this.state; let coughs = 0; // Number of times to show "Cough..." - if (gps) ++coughs; - if (longWaiting) ++coughs; - if (api) ++coughs; + if (gps)++coughs; + if (longWaiting)++coughs; + if (api)++coughs; return ( @@ -182,7 +182,25 @@ TaskManager.defineTask(TASK_STORE_AQI_HISTORY, async ({ data, error }) => { const { locations } = data; const { coords } = locations[0]; - const api = await apiCall(coords); + // We currently have 2 sources, aqicn, and windWaqi + // We put them in an array + const sources = [dataSources.aqicn, dataSources.windWaqi]; + + const api = await retry( + async (_, attempt) => { + // Attempt starts at 1 + console.log( + ` - fetchData - Attempt #${attempt}: ${ + sources[(attempt - 1) % 2].name + }` + ); + const result = await sources[(attempt - 1) % 2](coords); + console.log(' - fetchData - Got result', result); + + return result; + }, + { retries: 3 } // 2 attempts per source + ); if (await AqiHistoryDb.isSaveNeeded()) { await AqiHistoryDb.saveData(api.city.name, api.rawPm25, coords);