From cb8ea1c6dd199560ad04fb7c95aa91d562776ce6 Mon Sep 17 00:00:00 2001 From: aroerick Date: Wed, 12 Sep 2018 09:29:01 -0700 Subject: [PATCH] Create user chat and singlelisting --- .../project.pbxproj | 19 + js/App.js | 5 +- js/components/ChatInput/ChatInput.js | 110 ++ js/components/ChatInput/index.js | 3 + js/components/ChatInput/styles.js | 61 + js/components/CreateItemNav/styles.js | 1 + js/components/ItemMeta/ItemMeta.js | 42 + js/components/ItemMeta/index.js | 3 + js/components/ItemMeta/styles.js | 76 ++ js/components/ItemsList/ItemsList.js | 8 +- js/components/ItemsList/styles.js | 11 +- js/config/api.js | 33 +- js/config/queries.js | 123 +- js/config/styles.js | 1 + js/context/UserContext/UserContext.js | 57 + js/context/UserContext/index.js | 5 + js/navigation/NavigationLayout.js | 23 +- js/screens/Chat/Chat.js | 64 + js/screens/Chat/ChatContainer.js | 90 ++ js/screens/Chat/index.js | 3 + js/screens/Chat/styles.js | 54 + js/screens/Listings/Listings.js | 7 +- js/screens/Listings/ListingsContainer.js | 5 +- js/screens/Messages/Messages.js | 50 +- js/screens/Messages/MessagesContainer.js | 42 +- js/screens/Messages/styles.js | 45 + js/screens/Notifications/index.js | 4 +- js/screens/Profile/Profile.js | 4 +- js/screens/SingleListing/SingleListing.js | 26 + .../SingleListing/SingleListingContainer.js | 58 + js/screens/SingleListing/index.js | 3 + js/screens/SingleListing/styles.js | 76 ++ package.json | 11 +- server/package.json | 12 +- server/types.graphql | 16 +- server/yarn.lock | 36 +- yarn.lock | 1030 ++++++++--------- 37 files changed, 1616 insertions(+), 601 deletions(-) create mode 100644 js/components/ChatInput/ChatInput.js create mode 100644 js/components/ChatInput/index.js create mode 100644 js/components/ChatInput/styles.js create mode 100644 js/components/ItemMeta/ItemMeta.js create mode 100644 js/components/ItemMeta/index.js create mode 100644 js/components/ItemMeta/styles.js create mode 100644 js/context/UserContext/UserContext.js create mode 100644 js/context/UserContext/index.js create mode 100644 js/screens/Chat/Chat.js create mode 100644 js/screens/Chat/ChatContainer.js create mode 100644 js/screens/Chat/index.js create mode 100644 js/screens/Chat/styles.js create mode 100644 js/screens/SingleListing/SingleListing.js create mode 100644 js/screens/SingleListing/SingleListingContainer.js create mode 100644 js/screens/SingleListing/index.js create mode 100644 js/screens/SingleListing/styles.js diff --git a/ios/assistlistSummer2018.xcodeproj/project.pbxproj b/ios/assistlistSummer2018.xcodeproj/project.pbxproj index 565dcec..819e9ea 100644 --- a/ios/assistlistSummer2018.xcodeproj/project.pbxproj +++ b/ios/assistlistSummer2018.xcodeproj/project.pbxproj @@ -60,6 +60,7 @@ 3A7E84A1DAC0412DA5702B6A /* libRealmReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AE821F4D9C2D42C3A48C7E72 /* libRealmReact.a */; }; 566D52FCF6284152A7DC3EA3 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 574D966CC6694BEFAF7F7CE5 /* libc++.tbd */; }; 7D75C3866D004A4085AC86B0 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 554FB438BC7641458892DD49 /* libz.tbd */; }; + 238D8D7B940C4300890A0BCA /* libRNBlur.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B0DF87B94DB453F8BFBDF4C /* libRNBlur.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -405,6 +406,8 @@ AE821F4D9C2D42C3A48C7E72 /* libRealmReact.a */ = {isa = PBXFileReference; name = "libRealmReact.a"; path = "libRealmReact.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; 574D966CC6694BEFAF7F7CE5 /* libc++.tbd */ = {isa = PBXFileReference; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = sourcecode.text-based-dylib-definition; explicitFileType = undefined; includeInIndex = 0; }; 554FB438BC7641458892DD49 /* libz.tbd */ = {isa = PBXFileReference; name = "libz.tbd"; path = "usr/lib/libz.tbd"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = sourcecode.text-based-dylib-definition; explicitFileType = undefined; includeInIndex = 0; }; + 9783996AA3FC4B28B91DF745 /* RNBlur.xcodeproj */ = {isa = PBXFileReference; name = "RNBlur.xcodeproj"; path = "../node_modules/react-native-blur/ios/RNBlur.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; + 5B0DF87B94DB453F8BFBDF4C /* libRNBlur.a */ = {isa = PBXFileReference; name = "libRNBlur.a"; path = "libRNBlur.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -438,6 +441,7 @@ 3A7E84A1DAC0412DA5702B6A /* libRealmReact.a in Frameworks */, 566D52FCF6284152A7DC3EA3 /* libc++.tbd in Frameworks */, 7D75C3866D004A4085AC86B0 /* libz.tbd in Frameworks */, + 238D8D7B940C4300890A0BCA /* libRNBlur.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -662,6 +666,7 @@ E804CC7222194D5D8B5750E5 /* RNVectorIcons.xcodeproj */, 90703C6F07E7470997B01529 /* SplashScreen.xcodeproj */, 3D9FCF06744B4BE2903823FF /* RealmReact.xcodeproj */, + 9783996AA3FC4B28B91DF745 /* RNBlur.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -1341,6 +1346,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", "$(SRCROOT)/../node_modules/realm/src/**", + "$(SRCROOT)/../node_modules/react-native-blur/ios", ); INFOPLIST_FILE = assistlistSummer2018Tests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -1350,6 +1356,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -1370,6 +1377,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", "$(SRCROOT)/../node_modules/realm/src/**", + "$(SRCROOT)/../node_modules/react-native-blur/ios", ); INFOPLIST_FILE = assistlistSummer2018Tests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -1379,6 +1387,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -1400,6 +1409,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", "$(SRCROOT)/../node_modules/realm/src/**", + "$(SRCROOT)/../node_modules/react-native-blur/ios", ); INFOPLIST_FILE = assistlistSummer2018/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -1423,6 +1433,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", "$(SRCROOT)/../node_modules/realm/src/**", + "$(SRCROOT)/../node_modules/react-native-blur/ios", ); INFOPLIST_FILE = assistlistSummer2018/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -1453,6 +1464,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", "$(SRCROOT)/../node_modules/realm/src/**", + "$(SRCROOT)/../node_modules/react-native-blur/ios", ); INFOPLIST_FILE = "assistlistSummer2018-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -1461,6 +1473,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -1491,6 +1504,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", "$(SRCROOT)/../node_modules/realm/src/**", + "$(SRCROOT)/../node_modules/react-native-blur/ios", ); INFOPLIST_FILE = "assistlistSummer2018-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -1499,6 +1513,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -1528,6 +1543,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", "$(SRCROOT)/../node_modules/realm/src/**", + "$(SRCROOT)/../node_modules/react-native-blur/ios", ); INFOPLIST_FILE = "assistlistSummer2018-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1536,6 +1552,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -1565,6 +1582,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", "$(SRCROOT)/../node_modules/realm/src/**", + "$(SRCROOT)/../node_modules/react-native-blur/ios", ); INFOPLIST_FILE = "assistlistSummer2018-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1573,6 +1591,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", diff --git a/js/App.js b/js/App.js index 9b7986a..f4e1f95 100644 --- a/js/App.js +++ b/js/App.js @@ -4,6 +4,7 @@ import { ApolloProvider } from 'react-apollo'; import SplashScreen from 'react-native-splash-screen'; import createRootNavigator from './navigation/RootStackNavigation'; import { getUser } from './config/models'; +import { UserProvider } from './context/UserContext'; export default class App extends Component { constructor(props) { @@ -24,7 +25,9 @@ export default class App extends Component { const Layout = createRootNavigator(this.state.signedIn); return ( - + + + ); } diff --git a/js/components/ChatInput/ChatInput.js b/js/components/ChatInput/ChatInput.js new file mode 100644 index 0000000..a8a9a08 --- /dev/null +++ b/js/components/ChatInput/ChatInput.js @@ -0,0 +1,110 @@ +import React from 'react'; +import { + View, + Text, + TouchableOpacity, + TextInput, + KeyboardAvoidingView, +} from 'react-native'; +import { Form, Field } from 'react-final-form'; +import PropTypes from 'prop-types' +import styles from './styles'; + +const ChatInput = ({ + navigation, + createMessage, + currentUser, + messages, + item, +}) => { + let messageContent = []; + messages && messages.map(message => messageContent.push(message.content)); + return ( +
+ createMessage({ + variables: { + from: currentUser, + chatId: navigation.getParam('chatId'), + content: values.content, + }, + }).then(this.textInput.clear()) + } + render={({ handleSubmit }) => ( + + {currentUser !== item.user.id && ( + + {!messageContent.includes('What condition is it in?') && ( + + createMessage({ + variables: { + from: currentUser, + chatId: navigation.getParam('chatId'), + content: 'What condition is it in?', + }, + }) + } + style={styles.quickMessage} + > + + What condition is it in? + + + )} + {!messageContent.includes('Hi! Is this still available?') && ( + + createMessage({ + variables: { + from: currentUser, + chatId: navigation.getParam('chatId'), + content: 'Hi! Is this still available?', + }, + }) + } + style={styles.quickMessage} + > + + Hi! Is this still available? + + + )} + + )} + + + {({ input }) => ( + { + this.textInput = input; + }} + /> + )} + + + Send + + + + )} + /> + ); +}; + +ChatInput.propTypes = { + navigation: PropTypes.object.isRequired, + createMessage: PropTypes.func.isRequired, + currentUser: PropTypes.string.isRequired, + messages: PropTypes.array, + item: PropTypes.object.isRequired, +} + +export default ChatInput; diff --git a/js/components/ChatInput/index.js b/js/components/ChatInput/index.js new file mode 100644 index 0000000..294eb7b --- /dev/null +++ b/js/components/ChatInput/index.js @@ -0,0 +1,3 @@ +import ChatInput from './ChatInput'; + +export default ChatInput; diff --git a/js/components/ChatInput/styles.js b/js/components/ChatInput/styles.js new file mode 100644 index 0000000..c25131b --- /dev/null +++ b/js/components/ChatInput/styles.js @@ -0,0 +1,61 @@ +import { StyleSheet, Dimensions } from 'react-native'; +import { fonts, colors } from '../../config/styles'; + +const { width } = Dimensions.get('window'); + +const styles = StyleSheet.create({ + sendMessageContainer: { + justifyContent: 'flex-end', + width: width, + height: 75, + paddingVertical: 8, + paddingHorizontal: 8, + }, + quickMessageContainer: { + flexDirection: 'row', + justifyContent: 'space-between', + }, + quickMessage: { + backgroundColor: colors.lightBlue, + borderRadius: 5, + padding: 5, + marginVertical: 8, + }, + messageText: { + fontFamily: fonts.main, + color: 'white', + fontSize: 16, + }, + sendMessage: { + flexDirection: 'row', + alignItems: 'center', + }, + messageInput: { + flex: 1, + backgroundColor: 'white', + borderColor: colors.darkBlue, + marginRight: 5, + borderRadius: 7, + borderWidth: 1, + color: colors.darkBlue, + paddingVertical: 3, + paddingLeft: 10, + fontSize: 16, + }, + sendButton: { + backgroundColor: colors.green, + borderRadius: 7, + paddingBottom: 4, + paddingTop: 2, + flex: 0.2, + }, + sendButtonText: { + color: 'white', + fontFamily: fonts.main, + fontWeight: '700', + fontSize: 18, + textAlign: 'center' + } +}); + +export default styles; diff --git a/js/components/CreateItemNav/styles.js b/js/components/CreateItemNav/styles.js index 1b2cb5c..96d07bc 100644 --- a/js/components/CreateItemNav/styles.js +++ b/js/components/CreateItemNav/styles.js @@ -8,6 +8,7 @@ const styles = StyleSheet.create({ width: width / 8, padding: 7, marginBottom: 10, + overflow: 'visible' }, container: { backgroundColor: 'white', diff --git a/js/components/ItemMeta/ItemMeta.js b/js/components/ItemMeta/ItemMeta.js new file mode 100644 index 0000000..831ee1f --- /dev/null +++ b/js/components/ItemMeta/ItemMeta.js @@ -0,0 +1,42 @@ +import React from 'react'; +import { View, Image, Text } from 'react-native'; +import styles from './styles'; + +const capitalizeFirstLetter = str => { + return str + .split(' ') + .map(string => { + return string[0].toUpperCase() + string.slice(1); + }) + .join(' '); +}; + +const ItemMeta = ({ itemData }) => { + return ( + + + + + {capitalizeFirstLetter(itemData.title)} + {itemData.subCategory.title} + + ${itemData.price} + + + {itemData.location.title} + + + + ); +}; + +export default ItemMeta; diff --git a/js/components/ItemMeta/index.js b/js/components/ItemMeta/index.js new file mode 100644 index 0000000..68e6c68 --- /dev/null +++ b/js/components/ItemMeta/index.js @@ -0,0 +1,3 @@ +import ItemMeta from './ItemMeta' + +export default ItemMeta \ No newline at end of file diff --git a/js/components/ItemMeta/styles.js b/js/components/ItemMeta/styles.js new file mode 100644 index 0000000..61a3bb8 --- /dev/null +++ b/js/components/ItemMeta/styles.js @@ -0,0 +1,76 @@ +import { StyleSheet, Dimensions } from 'react-native'; +import { fonts, colors } from '../../config/styles'; +const { height, width } = Dimensions.get('window'); + +const styles = StyleSheet.create({ + container: { + backgroundColor: 'white', + height: height, + paddingHorizontal: width / 8, + }, + image: { + flex: 0.8, + resizeMode: 'contain', + }, + imageBorder: { + height: height / 3, + justifyContent: 'center', + borderColor: colors.darkBlue, + borderRadius: 10, + borderWidth: 1, + marginVertical: 15, + }, + title: { + fontFamily: fonts.main, + fontSize: 18, + fontWeight: '700', + textAlign: 'center', + alignSelf: 'center', + }, + priceLocationContainer: { + marginVertical: 15, + flexDirection: 'row', + justifyContent: 'space-between', + }, + price: { + color: colors.darkBlue, + fontSize: 20, + fontWeight: '700', + fontFamily: fonts.main, + }, + locationContainer: { + flexDirection: 'row', + justifyContent: 'center', + }, + locationIcon: { + height: 15, + width: 10, + marginRight: 5, + }, + location: { + color: colors.grey, + fontSize: 16, + fontFamily: fonts.main, + }, + description: { + marginBottom: 15, + fontFamily: fonts.main, + color: colors.greyText, + fontSize: 16, + }, + contactButton: { + backgroundColor: colors.green, + textAlign: 'center', + alignSelf: 'center', + padding: 5, + paddingHorizontal: width / 8, + borderRadius: 7, + }, + buttonText: { + color: 'white', + fontSize: 24, + fontFamily: fonts.main, + }, +}); + +export default styles; diff --git a/js/components/ItemsList/ItemsList.js b/js/components/ItemsList/ItemsList.js index 6f6c2a5..269eaea 100644 --- a/js/components/ItemsList/ItemsList.js +++ b/js/components/ItemsList/ItemsList.js @@ -18,7 +18,7 @@ const capitalizeFirstLetter = str => { .join(' '); }; -export const ItemsList = ({ data }) => { +export const ItemsList = ({ data, navigation }) => { return ( { keyExtractor={item => '' + item.id} renderItem={({ item }) => ( console.log('clicked item: ', item.id)} + onPress={() => navigation.navigate('SingleListing', { id: item.id })} > - { 'https://cdn2.iconfinder.com/data/icons/font-awesome/1792/wheelchair-512.png', }} /> - {capitalizeFirstLetter(item.title)} - {item.category.title} + {item.subCategory.title} ${item.price} { + const { kind, operation } = getMainDefinition(query); + return kind === 'OperationDefinition' && operation === 'subscription'; + }, + wsLink, + httpLink, +); + +const client = new ApolloClient({ + link, + cache: new InMemoryCache() +}); + +export default client \ No newline at end of file diff --git a/js/config/queries.js b/js/config/queries.js index 82517c1..8d062fb 100644 --- a/js/config/queries.js +++ b/js/config/queries.js @@ -8,6 +8,7 @@ export const SIGNUP_USER = gql` } } `; + export const AUTH_USER = gql` mutation AuthenticateUser($email: String!, $password: String!) { authenticateUser(email: $email, password: $password) { @@ -17,6 +18,52 @@ export const AUTH_USER = gql` } `; +export const GET_CHAT = gql` + query($id: ID!) { + Chat(id: $id) { + participants { + id + } + } + } +`; + +export const USER_CHATS = gql` + query UserChats($id: ID!) { + allChats(filter: { participants_some: { id: $id } }) { + id + item { + title + id + createdAt + price + location { + title + } + subCategory { + title + } + user { + id + } + } + messages(last: 1) { + content + } + } + } +`; + +export const CHAT_MESSAGES = gql` + query ChatMessages($chatId: ID!) { + allMessages(filter: { chat: { id: $chatId } }, orderBy: createdAt_ASC) { + content + from + id + } + } +`; + export const GET_ITEMS = gql` { allItems { @@ -27,7 +74,7 @@ export const GET_ITEMS = gql` location { title } - category { + subCategory { title } user { @@ -37,3 +84,77 @@ export const GET_ITEMS = gql` } } `; + +export const GET_ITEM = gql` + query GetItem($id: ID!) { + Item(id: $id) { + title + id + price + subCategory { + title + } + location { + title + } + user { + username + id + } + } + } +`; + +export const MESSAGES_SUBSCRIPTION = gql` + subscription newMessage($chatId: ID!) { + Message( + filter: { mutation_in: [CREATED], node: { chat: { id: $chatId } } } + ) { + node { + id + content + from + } + } + } +`; + +export const CHATS_SUBSCRIPTION = gql` + subscription newMessage($userId: ID!) { + Message( + filter: { + mutation_in: [CREATED] + node: { chat: { participants_some: { id: $userId } } } + } + ) { + node { + id + content + } + } + } +`; + +export const CREATE_CHAT = gql` + mutation CreateChat( + $participantsIdOne: ID! + $participantsIdTwo: ID! + $itemId: ID! + ) { + createChat( + itemId: $itemId + messagesIds: [] + participantsIds: [$participantsIdOne, $participantsIdTwo] + ) { + id + } + } +`; + +export const CREATE_MESSAGE = gql` + mutation CreateMessage($content: String!, $chatId: ID!, $from: String!) { + createMessage(content: $content, chatId: $chatId, from: $from) { + id + } + } +`; diff --git a/js/config/styles.js b/js/config/styles.js index 648b139..d1edbb7 100644 --- a/js/config/styles.js +++ b/js/config/styles.js @@ -4,6 +4,7 @@ export const colors = { green: '#5Da50A', black: '#333333', grey: '#B1B1B1', + greyText: '#515151', red: '#D84934', }; diff --git a/js/context/UserContext/UserContext.js b/js/context/UserContext/UserContext.js new file mode 100644 index 0000000..b0bf169 --- /dev/null +++ b/js/context/UserContext/UserContext.js @@ -0,0 +1,57 @@ +import React, { Component, createContext } from 'react'; +import { addUser, getUser, removeUser } from '../../config/models'; + +const UserContext = createContext(); + +class UserProvider extends Component { + constructor(props) { + super(props); + this.state = { + currentUser: undefined, + }; + } + + addUser = () => { + try { + addUser(); + this.getCurrentUser(); + } catch (error) { + console.log(error); + } + }; + removeCurrentUser = () => { + try { + removeUser(); + } catch (error) { + console.log(error); + } + }; + getCurrentUser = () => { + try { + let currentUser; + getUser().map(user => currentUser = user) + this.setState({ currentUser }) + } catch (error) { + console.log(error); + } + }; + componentDidMount() { + this.getCurrentUser(); + } + render() { + return ( + + {this.props.children} + + ); + } +} +export { UserProvider }; +export default UserContext; diff --git a/js/context/UserContext/index.js b/js/context/UserContext/index.js new file mode 100644 index 0000000..74f2d3a --- /dev/null +++ b/js/context/UserContext/index.js @@ -0,0 +1,5 @@ + +import UserContext from "./UserContext"; +import { UserProvider } from "./UserContext"; +export { UserProvider }; +export default UserContext; \ No newline at end of file diff --git a/js/navigation/NavigationLayout.js b/js/navigation/NavigationLayout.js index 67cfbb2..e48ffc4 100644 --- a/js/navigation/NavigationLayout.js +++ b/js/navigation/NavigationLayout.js @@ -12,11 +12,13 @@ import Profile from './../screens/Profile'; import EditProfile from './../screens/EditProfile'; import MyListings from './../screens/MyListings'; import Notifications from './../screens/Notifications'; -import AccountForm from '../screens/AccountForm'; -import OnBoarding from '../screens/OnBoarding'; +import AccountForm from './../screens/AccountForm'; +import OnBoarding from './../screens/OnBoarding'; import CommunityPartners from './../screens/CommunityPartners'; import AboutUs from './../screens/AboutUs'; import CreateItemNav from '../components/CreateItemNav/CreateItemNav'; +import SingleListing from './../screens/SingleListing'; +import Chat from './../screens/Chat'; export const authStack = createStackNavigator( { @@ -51,12 +53,20 @@ const listingsStack = createStackNavigator({ Listings: { screen: Listings, }, -}); -const messagesStack = createStackNavigator({ - Messages: { - screen: Messages, + SingleListing: { + screen: SingleListing, }, }); +const messagesStack = createStackNavigator( + { + Messages: { + screen: Messages, + }, + Chat: { + screen: Chat, + }, + }, +); const profileStack = createStackNavigator({ Profile: { screen: Profile, @@ -150,6 +160,7 @@ export default createBottomTabNavigator( ); }, + tabBarVisible: navigation.state.routes[navigation.state.index].routeName !== 'Chat' }), tabBarOptions: { showLabel: false, diff --git a/js/screens/Chat/Chat.js b/js/screens/Chat/Chat.js new file mode 100644 index 0000000..68f1631 --- /dev/null +++ b/js/screens/Chat/Chat.js @@ -0,0 +1,64 @@ +import React from 'react'; +import { + ScrollView, + View, + Text, + KeyboardAvoidingView, +} from 'react-native'; +import ItemMeta from '../../components/ItemMeta'; +import Icon from 'react-native-vector-icons/Ionicons'; +import styles from './styles'; +import PropTypes from 'prop-types' + +const ChatBox = ({ messages, currentUser, item }) => { + return ( + + (this.scrollView = ref)} + onContentSizeChange={() => { + this.scrollView.scrollToEnd({ animated: true }); + }} + > + + + + {messages.map(message => { + const messageStyle = () => { + let from, icon; + currentUser === message.from + ? ((from = 'fromMe'), (icon = 'md-arrow-dropleft')) + : ((from = 'fromYou'), (icon = 'md-arrow-dropright')); + return { from, icon }; + }; + return ( + + {message.content} + + + ); + })} + + + ); +}; + +ChatBox.propTypes = { + messages: PropTypes.array, + currentUser: PropTypes.string.isRequired, + item: PropTypes.object.isRequired +} + +export default ChatBox; diff --git a/js/screens/Chat/ChatContainer.js b/js/screens/Chat/ChatContainer.js new file mode 100644 index 0000000..8b8899f --- /dev/null +++ b/js/screens/Chat/ChatContainer.js @@ -0,0 +1,90 @@ +import React, { Component, Fragment } from 'react'; +import ChatBox from './Chat'; +import ChatInput from '../../components/ChatInput' +import UserContext from '../../context/UserContext'; +import { Mutation, Subscription, Query } from 'react-apollo'; +import { View, KeyboardAvoidingView } from 'react-native'; +import styles from './styles'; +import LoadingIndicator from '../../components/LoadingIndicator'; +import { + CREATE_MESSAGE, + CHAT_MESSAGES, + MESSAGES_SUBSCRIPTION, +} from '../../config/queries'; + +export default class ChatContainer extends Component { + render() { + return ( + + {values => { + return ( + + + {({ data: { allMessages }, error, loading, refetch }) => { + if (loading) + return ( + + + + ); + if (error) { + console.log(error); + } + return ( + + refetch()} + > + {({ data }) => { + return ( + + ); + }} + + [ + { + query: CHAT_MESSAGES, + variables: { + chatId: this.props.navigation.getParam('chatId'), + }, + }, + ]} + > + {createMessage => { + return ( + + ); + }} + + + ); + }} + + + ); + }} + + ); + } +} diff --git a/js/screens/Chat/index.js b/js/screens/Chat/index.js new file mode 100644 index 0000000..64ddcbd --- /dev/null +++ b/js/screens/Chat/index.js @@ -0,0 +1,3 @@ +import ChatContainer from './ChatContainer'; + +export default ChatContainer; \ No newline at end of file diff --git a/js/screens/Chat/styles.js b/js/screens/Chat/styles.js new file mode 100644 index 0000000..cb7638e --- /dev/null +++ b/js/screens/Chat/styles.js @@ -0,0 +1,54 @@ +import { StyleSheet, Dimensions } from 'react-native'; +import { fonts, colors } from '../../config/styles'; + +const { height, width } = Dimensions.get('window'); + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: 'white' + }, + chatContainer: { + flex: 1, + }, + itemMeta: { + paddingHorizontal: width / 8, + }, + loading: { + height: height, + justifyContent: 'center', + }, + message: { + borderRadius: 5, + maxWidth: width / 2, + padding: 10, + marginHorizontal: 30, + marginVertical: 8, + backgroundColor: colors.lightBlue, + }, + messageText: { + fontFamily: fonts.main, + color: 'white', + fontSize: 16, + }, + fromMe: { + alignSelf: 'flex-end', + }, + fromMeIcon: { + color: colors.lightBlue, + position: 'absolute', + right: 0, + bottom: -20, + }, + fromYou: { + alignSelf: 'flex-start', + }, + fromYouIcon: { + color: colors.lightBlue, + position: 'absolute', + left: 0, + bottom: -20, + }, +}); + +export default styles; diff --git a/js/screens/Listings/Listings.js b/js/screens/Listings/Listings.js index c47f769..c98ff78 100644 --- a/js/screens/Listings/Listings.js +++ b/js/screens/Listings/Listings.js @@ -1,10 +1,9 @@ import React from 'react'; -import { Text, View, TextInput, Image, TouchableOpacity } from 'react-native'; +import { View, TextInput, Image, TouchableOpacity } from 'react-native'; import ItemList from '../../components/ItemsList'; import styles from './styles'; -import { colors } from '../../config/styles'; -const Listings = ({ data }) => { +const Listings = ({ data, navigation }) => { return ( @@ -25,7 +24,7 @@ const Listings = ({ data }) => { /> - + ); }; diff --git a/js/screens/Listings/ListingsContainer.js b/js/screens/Listings/ListingsContainer.js index 47ec6b5..877541c 100644 --- a/js/screens/Listings/ListingsContainer.js +++ b/js/screens/Listings/ListingsContainer.js @@ -1,10 +1,9 @@ import React, { Component } from 'react'; import Listings from './Listings'; import { Query } from 'react-apollo'; -import gql from 'graphql-tag'; import LoadingIndicator from '../../components/LoadingIndicator'; import { GET_ITEMS } from '../../config/queries'; -import {Text} from 'react-native' +import { Text } from 'react-native' export default class ListingsContainer extends Component { static navigationOptions = { @@ -16,7 +15,7 @@ export default class ListingsContainer extends Component { {({ data, loading, error }) => { if (loading) return ; if (error) return Error :; - return ; + return ; }} ); diff --git a/js/screens/Messages/Messages.js b/js/screens/Messages/Messages.js index 28b45e8..5c03760 100644 --- a/js/screens/Messages/Messages.js +++ b/js/screens/Messages/Messages.js @@ -1,27 +1,59 @@ import React, { Component } from 'react'; -import { View, Text, TouchableOpacity } from 'react-native'; +import { ScrollView, View, Text, TouchableOpacity, Image } from 'react-native'; import SafetyTips from '../../components/SafetyTips'; +import PropTypes from 'prop-types' +import styles from './styles'; -export default class Messages extends Component { +class Messages extends Component { state = { modalVisible: false }; toggleModal = () => { this.setState(PrevState => ({ modalVisible: !PrevState.modalVisible, })); }; - render() { return ( - - messagese here - - Open saftey tips - + + {this.props.data.map(chat => { + return ( + + this.props.navigation.navigate('Chat', { + chatId: chat.id, + item: chat.item, + }) + } + style={styles.singleChat} + key={chat.id} + > + + + {chat.item.title} + + {(chat.messages.length > 0 && chat.messages[0].content) || ''} + + + + ); + })} - + ); } } + +Messages.propTypes = { + data: PropTypes.array.isRequired, + navigation: PropTypes.object.isRequired, +} + +export default Messages \ No newline at end of file diff --git a/js/screens/Messages/MessagesContainer.js b/js/screens/Messages/MessagesContainer.js index 3616c82..4a9e233 100644 --- a/js/screens/Messages/MessagesContainer.js +++ b/js/screens/Messages/MessagesContainer.js @@ -1,14 +1,50 @@ import React, { Component } from 'react'; import Messages from './Messages'; -import { View, Text } from 'react-native'; +import { Query, Subscription } from 'react-apollo'; +import LoadingIndicator from '../../components/LoadingIndicator'; import ChatMenu from '../../components/ChatMenu'; - +import { USER_CHATS, CHATS_SUBSCRIPTION } from '../../config/queries'; +import UserContext from '../../context/UserContext'; export default class MessagesContainer extends Component { static navigationOptions = { title: 'Messages', headerRight: , }; render() { - return ; + return ( + + {userData => { + return ( + + {({ data: { allChats }, loading, error, refetch }) => { + if (loading) return ; + if (error) return console.log(error); + return ( + refetch()} + > + {({ data }) => { + return ( + + ); + }} + + ); + }} + + ); + }} + + ); } } diff --git a/js/screens/Messages/styles.js b/js/screens/Messages/styles.js index e69de29..ea37f86 100644 --- a/js/screens/Messages/styles.js +++ b/js/screens/Messages/styles.js @@ -0,0 +1,45 @@ +import { StyleSheet, Dimensions } from 'react-native'; +import { fonts, colors } from '../../config/styles'; +const { height, width } = Dimensions.get('window'); + +const styles = StyleSheet.create({ + container: { + width: width, + height: height, + backgroundColor: 'white', + }, + singleChat: { + height: height / 5, + flexDirection: 'row', + justifyContent: 'space-around', + borderBottomColor: colors.darkBlue, + borderBottomWidth: 0.5, + }, + listImage: { + resizeMode: 'contain', + alignSelf: 'stretch', + flex: 0.35, + marginLeft: width / 12, + }, + textArea: { + flex: 1, + flexDirection: 'column', + marginLeft: width / 7, + marginTop: 20, + justifyContent: 'flex-start', + }, + title: { + fontFamily: fonts.main, + color: '#515151', + fontSize: 18, + fontWeight: '700', + paddingBottom: 10, + }, + lastMessage: { + fontFamily: fonts.main, + fontSize: 14, + color: colors.darkBlue, + }, +}); + +export default styles; diff --git a/js/screens/Notifications/index.js b/js/screens/Notifications/index.js index e498fa1..09f4d22 100644 --- a/js/screens/Notifications/index.js +++ b/js/screens/Notifications/index.js @@ -1,3 +1,3 @@ -import Notifications from './Notifications'; +import NotificationsContainer from './NotificationsContainer'; -export default Notifications; +export default NotificationsContainer; diff --git a/js/screens/Profile/Profile.js b/js/screens/Profile/Profile.js index 08fb06b..c6857b2 100644 --- a/js/screens/Profile/Profile.js +++ b/js/screens/Profile/Profile.js @@ -28,7 +28,9 @@ const Profile = ({ navigation }) => { navigation.navigate('Notifications')}> - + Notifications diff --git a/js/screens/SingleListing/SingleListing.js b/js/screens/SingleListing/SingleListing.js new file mode 100644 index 0000000..1731cc2 --- /dev/null +++ b/js/screens/SingleListing/SingleListing.js @@ -0,0 +1,26 @@ +import React from 'react'; +import { View, Text, TouchableOpacity, Image } from 'react-native'; +import ItemMeta from '../../components/ItemMeta' +import styles from './styles'; + +const SingleListing = ({ createChat, itemData }) => { + return ( + + + + This is a sample item description and must be added properly in the item + schema and add item + + { + createChat(); + }} + > + Contact Seller + + + ); +}; + +export default SingleListing; diff --git a/js/screens/SingleListing/SingleListingContainer.js b/js/screens/SingleListing/SingleListingContainer.js new file mode 100644 index 0000000..a6967fe --- /dev/null +++ b/js/screens/SingleListing/SingleListingContainer.js @@ -0,0 +1,58 @@ +import React, { Component } from 'react'; +import { Mutation, Query } from 'react-apollo'; +import SingleListing from './SingleListing'; +import LoadingIndicator from '../../components/LoadingIndicator'; +import { GET_ITEM, CREATE_CHAT } from '../../config/queries'; +import UserContext from '../../context/UserContext'; + +export default class SingleListingContainer extends Component { + render() { + return ( + + {values => { + return ( + + {({ data: { Item }, loading, error }) => { + if (loading) return ; + if (error) console.log(error); + return ( + { + if (loading) return ; + data && + this.props.navigation.navigate('Chat', { + chatId: data.createChat.id, + item: Item, + }); + }} + > + {createChat => { + return ( + + await createChat({ + variables: { + participantsIdOne: values.currentUser.id, + participantsIdTwo: Item.user.id, + itemId: Item.id, + }, + }) + } + itemData={Item} + /> + ); + }} + + ); + }} + + ); + }} + + ); + } +} diff --git a/js/screens/SingleListing/index.js b/js/screens/SingleListing/index.js new file mode 100644 index 0000000..b65c87f --- /dev/null +++ b/js/screens/SingleListing/index.js @@ -0,0 +1,3 @@ +import SingleListingContainer from './SingleListingContainer'; + +export default SingleListingContainer; diff --git a/js/screens/SingleListing/styles.js b/js/screens/SingleListing/styles.js new file mode 100644 index 0000000..9df087e --- /dev/null +++ b/js/screens/SingleListing/styles.js @@ -0,0 +1,76 @@ +import { StyleSheet, Dimensions } from 'react-native'; +import { fonts, colors } from '../../config/styles'; +const { height, width } = Dimensions.get('window'); + +const styles = StyleSheet.create({ + container: { + backgroundColor: 'white', + height: height, + paddingHorizontal: width / 8, + }, + image: { + flex: 0.8, + resizeMode: 'contain', + }, + imageBoarder: { + height: height / 3, + justifyContent: 'center', + borderColor: colors.darkBlue, + borderRadius: 10, + borderWidth: 1, + marginVertical: 15, + }, + title: { + fontFamily: fonts.main, + fontSize: 18, + fontWeight: '700', + textAlign: 'center', + alignSelf: 'center', + }, + priceLocationContainer: { + marginVertical: 15, + flexDirection: 'row', + justifyContent: 'space-between', + }, + price: { + color: colors.darkBlue, + fontSize: 20, + fontWeight: '700', + fontFamily: fonts.main, + }, + locationContainer: { + flexDirection: 'row', + justifyContent: 'center', + }, + locationIcon: { + height: 15, + width: 10, + marginRight: 5, + }, + location: { + color: colors.grey, + fontSize: 16, + fontFamily: fonts.main, + }, + description: { + marginBottom: 15, + fontFamily: fonts.main, + color: colors.greyText, + fontSize: 16, + }, + contactButton: { + backgroundColor: colors.green, + textAlign: 'center', + alignSelf: 'center', + padding: 5, + paddingHorizontal: width / 8, + borderRadius: 7, + }, + buttonText: { + color: 'white', + fontSize: 24, + fontFamily: fonts.main, + }, +}); + +export default styles; diff --git a/package.json b/package.json index bb84007..368cf84 100644 --- a/package.json +++ b/package.json @@ -8,13 +8,19 @@ }, "dependencies": { "apollo-boost": "^0.1.15", + "apollo-cache-inmemory": "^1.2.10", + "apollo-client": "^2.4.2", + "apollo-link": "^1.2.2", + "apollo-link-error": "^1.1.0", + "apollo-link-http": "^1.5.4", + "apollo-link-ws": "^1.0.8", "final-form": "^4.10.0", "graphql": "^14.0.2", "graphql-tag": "^2.9.2", "moment": "^2.22.2", "react": "16.4.1", "react-adopt": "^0.6.0", - "react-apollo": "^2.1.11", + "react-apollo": "apollographql/react-apollo", "react-final-form": "^3.6.5", "react-native": "0.56.0", "react-native-app-intro": "^1.1.5", @@ -24,7 +30,8 @@ "react-native-splash-screen": "3.0.6", "react-native-vector-icons": "^5.0.0", "react-navigation": "^2.12.1", - "realm": "^2.15.3" + "realm": "^2.15.3", + "subscriptions-transport-ws": "^0.9.14" }, "devDependencies": { "babel-jest": "23.4.2", diff --git a/server/package.json b/server/package.json index a7dce2e..2b8a991 100644 --- a/server/package.json +++ b/server/package.json @@ -1,5 +1,13 @@ { "name": "server", "version": "1.0.0", - "description": "My Graphcool Service" -} \ No newline at end of file + "description": "My Graphcool Service", + "dependencies": { + "@types/bcryptjs": "^2.4.1", + "@types/validator": "^6.3.0", + "bcryptjs": "^2.4.3", + "graphcool-lib": "^0.1.4", + "graphql-request": "^1.4.0", + "validator": "^9.0.0" + } +} diff --git a/server/types.graphql b/server/types.graphql index ecdf79a..c468442 100644 --- a/server/types.graphql +++ b/server/types.graphql @@ -10,28 +10,22 @@ type User @model { email: String! @isUnique password: String! chats: [Chat!]! @relation(name: "UserChats") - profilePic: Image @relation(name: "UserImage") + profilePic: String } type Item @model { id: ID! @isUnique title: String! + description: String price: Int createdAt: DateTime! updatedAt: DateTime! subCategory: SubCategory! @relation(name: "ItemCategory") location: Location! @relation(name: "ItemLocation") user: User! @relation(name: "UserItems") - images: [Image!]! @relation(name: "ItemImages") + images: [String!]! postStatus: DateTime -} - -type Image @model { - id: ID! @isUnique - data: String! - imageUser: User @relation(name: "UserImage") - imageItem: Item @relation(name: "ItemImages") - ownerType: OwnerType! + chats: [Chat!]! @relation(name: "ItemChats") } enum OwnerType { @@ -60,7 +54,7 @@ type Location @model { type Chat @model { id: ID! @isUnique - item: String! + item: Item! @relation(name: "ItemChats") participants: [User!]! @relation(name: "UserChats") messages: [Message!]! @relation(name: "ChatMessages") } diff --git a/server/yarn.lock b/server/yarn.lock index 3ab26a5..4e7a495 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -6,10 +6,6 @@ version "2.4.1" resolved "https://registry.yarnpkg.com/@types/bcryptjs/-/bcryptjs-2.4.1.tgz#7fb63922b5b106edacdcfe084cd38850f78aacfc" -"@types/graphql@0.12.6": - version "0.12.6" - resolved "http://registry.npmjs.org/@types/graphql/-/graphql-0.12.6.tgz#3d619198585fcabe5f4e1adfb5cf5f3388c66c13" - "@types/validator@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@types/validator/-/validator-6.3.0.tgz#d7454bd67c6a933a9dbe939ae16edbf0f6894e70" @@ -36,22 +32,22 @@ apollo-link@^0.7.0: zen-observable-ts "^0.5.0" apollo-link@^1.2.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.2.tgz#54c84199b18ac1af8d63553a68ca389c05217a03" + version "1.2.3" + resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.3.tgz#9bd8d5fe1d88d31dc91dae9ecc22474d451fb70d" dependencies: - "@types/graphql" "0.12.6" apollo-utilities "^1.0.0" - zen-observable-ts "^0.8.9" + zen-observable-ts "^0.8.10" apollo-utilities@^0.2.0-beta.0: version "0.2.0-rc.3" resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-0.2.0-rc.3.tgz#7bd93be0f587f20c5b46e21880272e305759fdc2" apollo-utilities@^1.0.0, apollo-utilities@^1.0.1: - version "1.0.20" - resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.20.tgz#b14318686cb67838279fb5f009cca0ec97a4d140" + version "1.0.21" + resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.21.tgz#cb8b5779fe275850b16046ff8373f4af2de90765" dependencies: fast-json-stable-stringify "^2.0.0" + fclone "^1.0.11" bcryptjs@^2.4.3: version "2.4.3" @@ -78,7 +74,11 @@ fast-json-stable-stringify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" -graphcool-lib@^0.1.0: +fclone@^1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/fclone/-/fclone-1.0.11.tgz#10e85da38bfea7fc599341c296ee1d77266ee640" + +graphcool-lib@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/graphcool-lib/-/graphcool-lib-0.1.4.tgz#0028b6d9b10dbf4d4f50c0d3ce4ccfcac18acaff" dependencies: @@ -170,17 +170,21 @@ validator@^9.0.0: version "9.4.1" resolved "http://registry.npmjs.org/validator/-/validator-9.4.1.tgz#abf466d398b561cd243050112c6ff1de6cc12663" -whatwg-fetch@2.0.4, whatwg-fetch@>=0.10.0: +whatwg-fetch@2.0.4: version "2.0.4" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" + resolved "http://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" + +whatwg-fetch@>=0.10.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" zen-observable-ts@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.5.0.tgz#c5021e7ac486fc281f6126d574673cfb6daf0069" -zen-observable-ts@^0.8.9: - version "0.8.9" - resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.9.tgz#d3c97af08c0afdca37ebcadf7cc3ee96bda9bab1" +zen-observable-ts@^0.8.10: + version "0.8.10" + resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.10.tgz#18e2ce1c89fe026e9621fd83cc05168228fce829" dependencies: zen-observable "^0.8.0" diff --git a/yarn.lock b/yarn.lock index fecc233..4b03b6d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8,12 +8,6 @@ dependencies: "@babel/highlight" "7.0.0-beta.47" -"@babel/code-frame@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.51.tgz#bd71d9b192af978df915829d39d4094456439a0c" - dependencies: - "@babel/highlight" "7.0.0-beta.51" - "@babel/code-frame@^7.0.0-beta.35": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8" @@ -50,16 +44,6 @@ source-map "^0.5.0" trim-right "^1.0.1" -"@babel/generator@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.51.tgz#6c7575ffde761d07485e04baedc0392c6d9e30f6" - dependencies: - "@babel/types" "7.0.0-beta.51" - jsesc "^2.5.1" - lodash "^4.17.5" - source-map "^0.5.0" - trim-right "^1.0.1" - "@babel/helper-annotate-as-pure@7.0.0-beta.47": version "7.0.0-beta.47" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-beta.47.tgz#354fb596055d9db369211bf075f0d5e93904d6f6" @@ -111,26 +95,12 @@ "@babel/template" "7.0.0-beta.47" "@babel/types" "7.0.0-beta.47" -"@babel/helper-function-name@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.51.tgz#21b4874a227cf99ecafcc30a90302da5a2640561" - dependencies: - "@babel/helper-get-function-arity" "7.0.0-beta.51" - "@babel/template" "7.0.0-beta.51" - "@babel/types" "7.0.0-beta.51" - "@babel/helper-get-function-arity@7.0.0-beta.47": version "7.0.0-beta.47" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.47.tgz#2de04f97c14b094b55899d3fa83144a16d207510" dependencies: "@babel/types" "7.0.0-beta.47" -"@babel/helper-get-function-arity@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.51.tgz#3281b2d045af95c172ce91b20825d85ea4676411" - dependencies: - "@babel/types" "7.0.0-beta.51" - "@babel/helper-hoist-variables@7.0.0-beta.47": version "7.0.0-beta.47" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0-beta.47.tgz#ce295d1d723fe22b2820eaec748ed701aa5ae3d0" @@ -210,12 +180,6 @@ dependencies: "@babel/types" "7.0.0-beta.47" -"@babel/helper-split-export-declaration@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.51.tgz#8a6c3f66c4d265352fc077484f9f6e80a51ab978" - dependencies: - "@babel/types" "7.0.0-beta.51" - "@babel/helper-wrap-function@7.0.0-beta.47": version "7.0.0-beta.47" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.0.0-beta.47.tgz#6528b44a3ccb4f3aeeb79add0a88192f7eb81161" @@ -241,14 +205,6 @@ esutils "^2.0.2" js-tokens "^3.0.0" -"@babel/highlight@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.51.tgz#e8844ae25a1595ccfd42b89623b4376ca06d225d" - dependencies: - chalk "^2.0.0" - esutils "^2.0.2" - js-tokens "^3.0.0" - "@babel/highlight@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4" @@ -257,10 +213,6 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0-beta.51.tgz#27cec2df409df60af58270ed8f6aa55409ea86f6" - "@babel/plugin-external-helpers@7.0.0-beta.47": version "7.0.0-beta.47" resolved "https://registry.yarnpkg.com/@babel/plugin-external-helpers/-/plugin-external-helpers-7.0.0-beta.47.tgz#b348b80da9b5fa3acebbe21979aa3839f6f7b875" @@ -515,15 +467,6 @@ babylon "7.0.0-beta.47" lodash "^4.17.5" -"@babel/template@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.51.tgz#9602a40aebcf357ae9677e2532ef5fc810f5fbff" - dependencies: - "@babel/code-frame" "7.0.0-beta.51" - "@babel/parser" "7.0.0-beta.51" - "@babel/types" "7.0.0-beta.51" - lodash "^4.17.5" - "@babel/traverse@7.0.0-beta.47": version "7.0.0-beta.47" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.47.tgz#0e57fdbb9ff3a909188b6ebf1e529c641e6c82a4" @@ -539,21 +482,6 @@ invariant "^2.2.0" lodash "^4.17.5" -"@babel/traverse@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.51.tgz#981daf2cec347a6231d3aa1d9e1803b03aaaa4a8" - dependencies: - "@babel/code-frame" "7.0.0-beta.51" - "@babel/generator" "7.0.0-beta.51" - "@babel/helper-function-name" "7.0.0-beta.51" - "@babel/helper-split-export-declaration" "7.0.0-beta.51" - "@babel/parser" "7.0.0-beta.51" - "@babel/types" "7.0.0-beta.51" - debug "^3.1.0" - globals "^11.1.0" - invariant "^2.2.0" - lodash "^4.17.5" - "@babel/types@7.0.0-beta.47": version "7.0.0-beta.47" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.47.tgz#e6fcc1a691459002c2671d558a586706dddaeef8" @@ -562,22 +490,10 @@ lodash "^4.17.5" to-fast-properties "^2.0.0" -"@babel/types@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.51.tgz#d802b7b543b5836c778aa691797abf00f3d97ea9" - dependencies: - esutils "^2.0.2" - lodash "^4.17.5" - to-fast-properties "^2.0.0" - "@types/async@2.0.49": version "2.0.49" resolved "https://registry.yarnpkg.com/@types/async/-/async-2.0.49.tgz#92e33d13f74c895cb9a7f38ba97db8431ed14bc0" -"@types/graphql@0.12.6": - version "0.12.6" - resolved "http://registry.npmjs.org/@types/graphql/-/graphql-0.12.6.tgz#3d619198585fcabe5f4e1adfb5cf5f3388c66c13" - "@types/zen-observable@^0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d" @@ -602,14 +518,23 @@ accepts@~1.3.3, accepts@~1.3.5: negotiator "0.6.1" acorn-globals@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.1.0.tgz#ab716025dbe17c54d3ef81d32ece2b2d99fe2538" + version "4.3.0" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.0.tgz#e3b6f8da3c1552a95ae627571f7dd6923bb54103" dependencies: - acorn "^5.0.0" + acorn "^6.0.1" + acorn-walk "^6.0.1" + +acorn-walk@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.0.1.tgz#c7827bdbb8e21aa97b609adfa225400d9ae348ba" + +acorn@^5.5.3: + version "5.7.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" -acorn@^5.0.0, acorn@^5.5.3: - version "5.7.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.2.tgz#91fa871883485d06708800318404e72bfb26dcc5" +acorn@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.1.tgz#66e6147e1027704479dc6d9b20d884c572db3cc1" ajv@^5.3.0: version "5.5.2" @@ -620,18 +545,6 @@ ajv@^5.3.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" -align-text@^0.1.1, align-text@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" - dependencies: - kind-of "^3.0.2" - longest "^1.0.1" - repeat-string "^1.5.2" - -amdefine@>=0.0.4: - version "1.0.1" - resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" - ansi-colors@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9" @@ -694,97 +607,128 @@ anymatch@^2.0.0: normalize-path "^2.1.1" apollo-boost@^0.1.15: - version "0.1.15" - resolved "https://registry.yarnpkg.com/apollo-boost/-/apollo-boost-0.1.15.tgz#86357437fe150383d9c75f483cf656013c243258" + version "0.1.16" + resolved "https://registry.yarnpkg.com/apollo-boost/-/apollo-boost-0.1.16.tgz#77f73a30c49ab6d749ddc3e5683a7e322c15f07d" dependencies: - apollo-cache "^1.1.16" - apollo-cache-inmemory "^1.2.9" - apollo-client "^2.4.1" + apollo-cache "^1.1.17" + apollo-cache-inmemory "^1.2.10" + apollo-client "^2.4.2" apollo-link "^1.0.6" apollo-link-error "^1.0.3" apollo-link-http "^1.3.1" apollo-link-state "^0.4.0" graphql-tag "^2.4.2" -apollo-cache-inmemory@^1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.2.9.tgz#26e0c8c6a6c865bf9987d741114388cdbc3fae23" +apollo-cache-inmemory@^1.2.10: + version "1.2.10" + resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.2.10.tgz#362d6c36cfd815a309b966f71e5d2b6c770c7989" dependencies: - apollo-cache "^1.1.16" - apollo-utilities "^1.0.20" - graphql-anywhere "^4.1.18" + apollo-cache "^1.1.17" + apollo-utilities "^1.0.21" + graphql-anywhere "^4.1.19" -apollo-cache@1.1.16, apollo-cache@^1.1.16: - version "1.1.16" - resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.16.tgz#0c7460ee8eff1898462979143b4e922aaba73cf8" +apollo-cache@1.1.17, apollo-cache@^1.1.17: + version "1.1.17" + resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.17.tgz#1fcca8423125223723b97fd72808be91a1a76490" dependencies: - apollo-utilities "^1.0.20" + apollo-utilities "^1.0.21" -apollo-client@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.4.1.tgz#d2ebaac1831fa170f7d0070bb9d581cccb5f64e3" +apollo-client@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.4.2.tgz#d2f044d8740723bf98a6d8d8b9684ee8c36150e6" dependencies: "@types/zen-observable" "^0.8.0" - apollo-cache "1.1.16" + apollo-cache "1.1.17" apollo-link "^1.0.0" apollo-link-dedup "^1.0.0" - apollo-utilities "1.0.20" + apollo-utilities "1.0.21" symbol-observable "^1.0.2" zen-observable "^0.8.0" optionalDependencies: "@types/async" "2.0.49" +apollo-fetch@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/apollo-fetch/-/apollo-fetch-0.6.0.tgz#aae9b28c117af344b091ec8ba4d1a5aa0474dc5d" + dependencies: + isomorphic-fetch "^2.2.1" + apollo-link-dedup@^1.0.0: - version "1.0.9" - resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.9.tgz#3c4e4af88ef027cbddfdb857c043fd0574051dad" + version "1.0.10" + resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.10.tgz#7b94589fe7f969777efd18a129043c78430800ae" dependencies: - apollo-link "^1.2.2" + apollo-link "^1.2.3" -apollo-link-error@^1.0.3: - version "1.1.0" - resolved "https://registry.yarnpkg.com/apollo-link-error/-/apollo-link-error-1.1.0.tgz#ef8a64411361314364db40c1d4023b987a84860f" +apollo-link-error@^1.0.3, apollo-link-error@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/apollo-link-error/-/apollo-link-error-1.1.1.tgz#69d7124d4dc11ce60f505c940f05d4f1aa0945fb" dependencies: - apollo-link "^1.2.2" + apollo-link "^1.2.3" -apollo-link-http-common@^0.2.4: - version "0.2.4" - resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.4.tgz#877603f7904dc8f70242cac61808b1f8d034b2c3" +apollo-link-http-common@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.5.tgz#d094beb7971523203359bf830bfbfa7b4e7c30ed" dependencies: - apollo-link "^1.2.2" + apollo-link "^1.2.3" -apollo-link-http@^1.3.1: - version "1.5.4" - resolved "https://registry.yarnpkg.com/apollo-link-http/-/apollo-link-http-1.5.4.tgz#b80b7b4b342c655b6a5614624b076a36be368f43" +apollo-link-http@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/apollo-link-http/-/apollo-link-http-0.7.0.tgz#cf75e9e2537d785deefff2cd1ae2ff0dc1c88300" dependencies: - apollo-link "^1.2.2" - apollo-link-http-common "^0.2.4" + apollo-fetch "^0.6.0" + graphql "^0.11.0" + +apollo-link-http@^1.3.1, apollo-link-http@^1.5.4: + version "1.5.5" + resolved "https://registry.yarnpkg.com/apollo-link-http/-/apollo-link-http-1.5.5.tgz#7dbe851821771ad67fa29e3900c57f38cbd80da8" + dependencies: + apollo-link "^1.2.3" + apollo-link-http-common "^0.2.5" apollo-link-state@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/apollo-link-state/-/apollo-link-state-0.4.1.tgz#65e9e0e12c67936b8c4b12b8438434f393104579" + version "0.4.2" + resolved "https://registry.yarnpkg.com/apollo-link-state/-/apollo-link-state-0.4.2.tgz#ac00e9be9b0ca89eae0be6ba31fe904b80bbe2e8" dependencies: apollo-utilities "^1.0.8" graphql-anywhere "^4.1.0-alpha.0" -apollo-link@^1.0.0, apollo-link@^1.0.6, apollo-link@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.2.tgz#54c84199b18ac1af8d63553a68ca389c05217a03" +apollo-link-ws@^1.0.8: + version "1.0.9" + resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.9.tgz#e2198abd6d3900e83fd842fdee335a28b347ea2d" + dependencies: + apollo-link "^1.2.3" + +apollo-link@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-0.7.0.tgz#a8f09069b31821c27285584264356b1b6e6be6f2" + dependencies: + apollo-utilities "^0.2.0-beta.0" + graphql "^0.11.3" + zen-observable-ts "^0.5.0" + +apollo-link@^1.0.0, apollo-link@^1.0.6, apollo-link@^1.2.1, apollo-link@^1.2.2, apollo-link@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.3.tgz#9bd8d5fe1d88d31dc91dae9ecc22474d451fb70d" dependencies: - "@types/graphql" "0.12.6" apollo-utilities "^1.0.0" - zen-observable-ts "^0.8.9" + zen-observable-ts "^0.8.10" -apollo-utilities@1.0.20, apollo-utilities@^1.0.0, apollo-utilities@^1.0.20, apollo-utilities@^1.0.8: - version "1.0.20" - resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.20.tgz#b14318686cb67838279fb5f009cca0ec97a4d140" +apollo-utilities@1.0.21, apollo-utilities@^1.0.0, apollo-utilities@^1.0.1, apollo-utilities@^1.0.21, apollo-utilities@^1.0.8: + version "1.0.21" + resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.21.tgz#cb8b5779fe275850b16046ff8373f4af2de90765" dependencies: fast-json-stable-stringify "^2.0.0" + fclone "^1.0.11" -append-transform@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab" +apollo-utilities@^0.2.0-beta.0: + version "0.2.0-rc.3" + resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-0.2.0-rc.3.tgz#7bd93be0f587f20c5b46e21880272e305759fdc2" + +append-transform@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991" dependencies: - default-require-extensions "^2.0.0" + default-require-extensions "^1.0.0" aproba@^1.0.3: version "1.2.0" @@ -918,11 +862,7 @@ async-limiter@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" -async@^1.4.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" - -async@^2.1.4, async@^2.4.0: +async@^2.1.4, async@^2.4.0, async@^2.5.0: version "2.6.1" resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" dependencies: @@ -1072,13 +1012,20 @@ babel-helpers@^6.24.1: babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-jest@23.4.2, babel-jest@^23.4.2: +babel-jest@23.4.2: version "23.4.2" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.4.2.tgz#f276de67798a5d68f2d6e87ff518c2f6e1609877" dependencies: babel-plugin-istanbul "^4.1.6" babel-preset-jest "^23.2.0" +babel-jest@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.6.0.tgz#a644232366557a2240a0c083da6b25786185a2f1" + dependencies: + babel-plugin-istanbul "^4.1.6" + babel-preset-jest "^23.2.0" + babel-messages@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" @@ -1099,7 +1046,7 @@ babel-plugin-external-helpers@^6.22.0: babel-plugin-istanbul@^4.1.6: version "4.1.6" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45" + resolved "http://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45" dependencies: babel-plugin-syntax-object-rest-spread "^6.13.0" find-up "^2.1.0" @@ -1463,6 +1410,10 @@ babylon@^6.18.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" +backo2@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" + balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -1504,8 +1455,8 @@ bcrypt-pbkdf@^1.0.0: tweetnacl "^0.14.3" big-integer@^1.6.7: - version "1.6.34" - resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.34.tgz#701affc8f0d73c490930a6b482dc23ed6ffc7484" + version "1.6.36" + resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.36.tgz#78631076265d4ae3555c04f85e7d9d2f3a071a36" bl@^1.0.0: version "1.2.2" @@ -1629,10 +1580,6 @@ callsites@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" -camelcase@^1.0.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" - camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" @@ -1651,13 +1598,6 @@ caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" -center-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" - dependencies: - align-text "^0.1.3" - lazy-cache "^1.0.3" - chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -1681,12 +1621,12 @@ chardet@^0.4.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" chownr@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" + version "1.1.1" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" -ci-info@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.4.0.tgz#4841d53cad49f11b827b648ebde27a6e189b412f" +ci-info@^1.5.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.5.1.tgz#17e8eb5de6f8b2b6038f0cbb714d410bfa9f3030" clamp@^1.0.1: version "1.0.1" @@ -1711,14 +1651,6 @@ cli-width@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" -cliui@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" - dependencies: - center-align "^0.1.1" - right-align "^0.1.1" - wordwrap "0.0.2" - cliui@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" @@ -1779,13 +1711,17 @@ command-line-args@^4.0.6: typical "^2.6.1" commander@^2.9.0: - version "2.17.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" + version "2.18.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970" commander@~2.13.0: version "2.13.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" +commander@~2.17.1: + version "2.17.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" + commander@~2.8.1: version "2.8.1" resolved "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4" @@ -1796,19 +1732,15 @@ commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" -compare-versions@^3.1.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.3.1.tgz#1ede3172b713c15f7c7beb98cb74d2d82576dad3" - component-emitter@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" compressible@~2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.14.tgz#326c5f507fbb055f54116782b969a81b67a29da7" + version "2.0.15" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz#857a9ab0a7e5a07d8d837ed43fe2defff64fe212" dependencies: - mime-db ">= 1.34.0 < 2" + mime-db ">= 1.36.0 < 2" compression@^1.7.1: version "1.7.3" @@ -1849,8 +1781,10 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" + version "1.6.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" + dependencies: + safe-buffer "~5.1.1" copy-descriptor@^0.1.0: version "0.1.1" @@ -1876,13 +1810,20 @@ create-react-class@^15.6.3: loose-envify "^1.3.1" object-assign "^4.1.1" -create-react-context@^0.2.1: - version "0.2.3" - resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.3.tgz#9ec140a6914a22ef04b8b09b7771de89567cb6f3" +create-react-context@0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.2.tgz#9836542f9aaa22868cd7d4a6f82667df38019dca" dependencies: fbjs "^0.8.0" gud "^1.0.0" +cross-fetch@2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.2.tgz#a47ff4f7fc712daba8f6a695a11c948440d45723" + dependencies: + node-fetch "2.1.2" + whatwg-fetch "2.0.4" + cross-spawn@^5.0.1, cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -1922,12 +1863,12 @@ debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6. ms "2.0.0" debug@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + version "3.2.5" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407" dependencies: - ms "2.0.0" + ms "^2.1.1" -decamelize@^1.0.0, decamelize@^1.1.1: +decamelize@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -1995,11 +1936,11 @@ deepmerge@2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.0.tgz#511a54fff405fc346f0240bb270a3e9533a31102" -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" +default-require-extensions@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8" dependencies: - strip-bom "^3.0.0" + strip-bom "^2.0.0" define-properties@^1.1.2: version "1.1.3" @@ -2038,10 +1979,14 @@ denodeify@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631" -depd@~1.1.1, depd@~1.1.2: +depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" +deprecated-decorator@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz#00966317b7a12fe92f3cc831f7583af329b86c37" + destroy@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" @@ -2105,7 +2050,7 @@ envinfo@^5.7.0: version "5.10.0" resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-5.10.0.tgz#503a9774ae15b93ea68bdfae2ccd6306624ea6df" -error-ex@^1.2.0, error-ex@^1.3.1: +error-ex@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" dependencies: @@ -2179,7 +2124,7 @@ event-target-shim@^1.0.5: version "1.1.1" resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-1.1.1.tgz#a86e5ee6bdaa16054475da797ccddf0c55698491" -eventemitter3@^3.0.0: +eventemitter3@^3.0.0, eventemitter3@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163" @@ -2229,14 +2174,14 @@ expand-range@^1.8.1: dependencies: fill-range "^2.1.0" -expect@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-23.5.0.tgz#18999a0eef8f8acf99023fde766d9c323c2562ed" +expect@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-23.6.0.tgz#1e0c8d3ba9a581c87bd71fb9bc8862d443425f98" dependencies: ansi-styles "^3.2.0" - jest-diff "^23.5.0" + jest-diff "^23.6.0" jest-get-type "^22.1.0" - jest-matcher-utils "^23.5.0" + jest-matcher-utils "^23.6.0" jest-message-util "^23.4.0" jest-regex-util "^23.3.0" @@ -2363,6 +2308,10 @@ fbjs@^0.8.0, fbjs@^0.8.14, fbjs@^0.8.16, fbjs@^0.8.9: setimmediate "^1.0.5" ua-parser-js "^0.7.18" +fclone@^1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/fclone/-/fclone-1.0.11.tgz#10e85da38bfea7fc599341c296ee1d77266ee640" + fd-slicer@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" @@ -2448,6 +2397,13 @@ find-replace@^1.0.3: array-back "^1.0.4" test-value "^2.1.0" +find-up@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" + dependencies: + path-exists "^2.0.0" + pinkie-promise "^2.0.0" + find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -2622,16 +2578,50 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3 version "1.0.1" resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" -graphql-anywhere@^4.1.0-alpha.0, graphql-anywhere@^4.1.18: - version "4.1.18" - resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-4.1.18.tgz#29bfc5d42bf8ee1f5cdc9a9857c98c3eb4b7fab4" +graphcool-lib@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/graphcool-lib/-/graphcool-lib-0.1.4.tgz#0028b6d9b10dbf4d4f50c0d3ce4ccfcac18acaff" + dependencies: + apollo-link "^0.7.0" + apollo-link-http "^0.7.0" + graphql "^0.11.2" + graphql-request "^1.3.4" + graphql-tools "^2.4.0" + node-fetch "^1.7.3" + source-map-support "^0.4.17" + +graphql-anywhere@^4.1.0-alpha.0, graphql-anywhere@^4.1.19: + version "4.1.19" + resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-4.1.19.tgz#5f6ca3b58218e5449f4798e3c6d942fcd2fef082" + dependencies: + apollo-utilities "^1.0.21" + +graphql-request@^1.3.4: + version "1.8.2" + resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-1.8.2.tgz#398d10ae15c585676741bde3fc01d5ca948f8fbe" dependencies: - apollo-utilities "^1.0.20" + cross-fetch "2.2.2" graphql-tag@^2.4.2, graphql-tag@^2.9.2: version "2.9.2" resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.9.2.tgz#2f60a5a981375f430bf1e6e95992427dc18af686" +graphql-tools@^2.4.0: + version "2.24.0" + resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-2.24.0.tgz#bbacaad03924012a0edb8735a5e65df5d5563675" + dependencies: + apollo-link "^1.2.1" + apollo-utilities "^1.0.1" + deprecated-decorator "^0.1.6" + iterall "^1.1.3" + uuid "^3.1.0" + +graphql@^0.11.0, graphql@^0.11.2, graphql@^0.11.3: + version "0.11.7" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.11.7.tgz#e5abaa9cb7b7cccb84e9f0836bf4370d268750c6" + dependencies: + iterall "1.1.3" + graphql@^14.0.2: version "14.0.2" resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.0.2.tgz#7dded337a4c3fd2d075692323384034b357f5650" @@ -2646,15 +2636,15 @@ gud@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0" -handlebars@^4.0.11: - version "4.0.11" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc" +handlebars@^4.0.3: + version "4.0.12" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5" dependencies: - async "^1.4.0" + async "^2.5.0" optimist "^0.6.1" - source-map "^0.4.4" + source-map "^0.6.1" optionalDependencies: - uglify-js "^2.6" + uglify-js "^3.1.4" har-schema@^2.0.0: version "2.0.0" @@ -2722,6 +2712,12 @@ hoist-non-react-statics@^2.2.0, hoist-non-react-statics@^2.3.1, hoist-non-react- version "2.5.5" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47" +hoist-non-react-statics@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.0.1.tgz#fba3e7df0210eb9447757ca1a7cb607162f0a364" + dependencies: + react-is "^16.3.2" + 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" @@ -2753,7 +2749,7 @@ http-basic@^2.5.1: http-errors@~1.6.2: version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + resolved "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" dependencies: depd "~1.1.2" inherits "2.0.3" @@ -2884,10 +2880,10 @@ is-callable@^1.1.1, is-callable@^1.1.3: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" is-ci@^1.0.10: - version "1.2.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.0.tgz#3f4a08d6303a09882cef3f0fb97439c5f5ce2d53" + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" dependencies: - ci-info "^1.3.0" + ci-info "^1.5.0" is-data-descriptor@^0.1.4: version "0.1.4" @@ -3027,6 +3023,10 @@ is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" +is-utf8@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" + is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -3053,7 +3053,7 @@ isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" -isomorphic-fetch@^2.1.1: +isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" dependencies: @@ -3065,86 +3065,73 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" istanbul-api@^1.3.1: - version "1.3.6" - resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.6.tgz#0c695f17e533131de8c49e0657175dcfd8af8a8f" + version "1.3.7" + resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.7.tgz#a86c770d2b03e11e3f778cd7aedd82d2722092aa" dependencies: async "^2.1.4" - compare-versions "^3.1.0" fileset "^2.0.2" - istanbul-lib-coverage "^1.2.0" - istanbul-lib-hook "^1.2.0" - istanbul-lib-instrument "^2.1.0" - istanbul-lib-report "^1.1.4" - istanbul-lib-source-maps "^1.2.5" - istanbul-reports "^1.4.1" + istanbul-lib-coverage "^1.2.1" + istanbul-lib-hook "^1.2.2" + istanbul-lib-instrument "^1.10.2" + istanbul-lib-report "^1.1.5" + istanbul-lib-source-maps "^1.2.6" + istanbul-reports "^1.5.1" js-yaml "^3.7.0" mkdirp "^0.5.1" once "^1.4.0" -istanbul-lib-coverage@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341" - -istanbul-lib-coverage@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#2aee0e073ad8c5f6a0b00e0dfbf52b4667472eda" - -istanbul-lib-hook@^1.2.0: +istanbul-lib-coverage@^1.2.0, istanbul-lib-coverage@^1.2.1: version "1.2.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.1.tgz#f614ec45287b2a8fc4f07f5660af787575601805" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0" + +istanbul-lib-hook@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz#bc6bf07f12a641fbf1c85391d0daa8f0aea6bf86" dependencies: - append-transform "^1.0.0" + append-transform "^0.4.0" -istanbul-lib-instrument@^1.10.1: - version "1.10.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b" +istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca" dependencies: babel-generator "^6.18.0" babel-template "^6.16.0" babel-traverse "^6.18.0" babel-types "^6.18.0" babylon "^6.18.0" - istanbul-lib-coverage "^1.2.0" + istanbul-lib-coverage "^1.2.1" semver "^5.3.0" -istanbul-lib-instrument@^2.1.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-2.3.2.tgz#b287cbae2b5f65f3567b05e2e29b275eaf92d25e" - dependencies: - "@babel/generator" "7.0.0-beta.51" - "@babel/parser" "7.0.0-beta.51" - "@babel/template" "7.0.0-beta.51" - "@babel/traverse" "7.0.0-beta.51" - "@babel/types" "7.0.0-beta.51" - istanbul-lib-coverage "^2.0.1" - semver "^5.5.0" - -istanbul-lib-report@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz#e886cdf505c4ebbd8e099e4396a90d0a28e2acb5" +istanbul-lib-report@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz#f2a657fc6282f96170aaf281eb30a458f7f4170c" dependencies: - istanbul-lib-coverage "^1.2.0" + istanbul-lib-coverage "^1.2.1" mkdirp "^0.5.1" path-parse "^1.0.5" supports-color "^3.1.2" -istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.5.tgz#ffe6be4e7ab86d3603e4290d54990b14506fc9b1" +istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz#37b9ff661580f8fca11232752ee42e08c6675d8f" dependencies: debug "^3.1.0" - istanbul-lib-coverage "^1.2.0" + istanbul-lib-coverage "^1.2.1" mkdirp "^0.5.1" rimraf "^2.6.1" source-map "^0.5.3" -istanbul-reports@^1.4.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.5.0.tgz#c6c2867fa65f59eb7dcedb7f845dfc76aaee70f9" +istanbul-reports@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.5.1.tgz#97e4dbf3b515e8c484caea15d6524eebd3ff4e1a" dependencies: - handlebars "^4.0.11" + handlebars "^4.0.3" -iterall@^1.2.2: +iterall@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.3.tgz#1cbbff96204056dde6656e2ed2e2226d0e6d72c9" + +iterall@^1.1.3, iterall@^1.2.1, iterall@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7" @@ -3155,8 +3142,8 @@ jest-changed-files@^23.4.2: throat "^4.0.0" jest-cli@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.5.0.tgz#d316b8e34a38a610a1efc4f0403d8ef8a55e4492" + version "23.6.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.6.0.tgz#61ab917744338f443ef2baa282ddffdd658a5da4" dependencies: ansi-escapes "^3.0.0" chalk "^2.0.1" @@ -3170,18 +3157,18 @@ jest-cli@^23.5.0: istanbul-lib-instrument "^1.10.1" istanbul-lib-source-maps "^1.2.4" jest-changed-files "^23.4.2" - jest-config "^23.5.0" + jest-config "^23.6.0" jest-environment-jsdom "^23.4.0" jest-get-type "^22.1.0" - jest-haste-map "^23.5.0" + jest-haste-map "^23.6.0" jest-message-util "^23.4.0" jest-regex-util "^23.3.0" - jest-resolve-dependencies "^23.5.0" - jest-runner "^23.5.0" - jest-runtime "^23.5.0" - jest-snapshot "^23.5.0" + jest-resolve-dependencies "^23.6.0" + jest-runner "^23.6.0" + jest-runtime "^23.6.0" + jest-snapshot "^23.6.0" jest-util "^23.4.0" - jest-validate "^23.5.0" + jest-validate "^23.6.0" jest-watcher "^23.4.0" jest-worker "^23.2.0" micromatch "^2.3.11" @@ -3195,33 +3182,33 @@ jest-cli@^23.5.0: which "^1.2.12" yargs "^11.0.0" -jest-config@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.5.0.tgz#3770fba03f7507ee15f3b8867c742e48f31a9773" +jest-config@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.6.0.tgz#f82546a90ade2d8c7026fbf6ac5207fc22f8eb1d" dependencies: babel-core "^6.0.0" - babel-jest "^23.4.2" + babel-jest "^23.6.0" chalk "^2.0.1" glob "^7.1.1" jest-environment-jsdom "^23.4.0" jest-environment-node "^23.4.0" jest-get-type "^22.1.0" - jest-jasmine2 "^23.5.0" + jest-jasmine2 "^23.6.0" jest-regex-util "^23.3.0" - jest-resolve "^23.5.0" + jest-resolve "^23.6.0" jest-util "^23.4.0" - jest-validate "^23.5.0" + jest-validate "^23.6.0" micromatch "^2.3.11" - pretty-format "^23.5.0" + pretty-format "^23.6.0" -jest-diff@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.5.0.tgz#250651a433dd0050290a07642946cc9baaf06fba" +jest-diff@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.6.0.tgz#1500f3f16e850bb3d71233408089be099f610c7d" dependencies: chalk "^2.0.1" diff "^3.2.0" jest-get-type "^22.1.0" - pretty-format "^23.5.0" + pretty-format "^23.6.0" jest-docblock@23.0.1: version "23.0.1" @@ -3235,12 +3222,12 @@ jest-docblock@^23.0.1, jest-docblock@^23.2.0: dependencies: detect-newline "^2.1.0" -jest-each@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.5.0.tgz#77f7e2afe6132a80954b920006e78239862b10ba" +jest-each@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.6.0.tgz#ba0c3a82a8054387016139c733a05242d3d71575" dependencies: chalk "^2.0.1" - pretty-format "^23.5.0" + pretty-format "^23.6.0" jest-environment-jsdom@^23.4.0: version "23.4.0" @@ -3273,9 +3260,9 @@ jest-haste-map@23.1.0: micromatch "^2.3.11" sane "^2.0.0" -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" +jest-haste-map@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.6.0.tgz#2e3eb997814ca696d62afdb3f2529f5bbc935e16" dependencies: fb-watchman "^2.0.0" graceful-fs "^4.1.11" @@ -3286,36 +3273,36 @@ jest-haste-map@^23.5.0: micromatch "^2.3.11" sane "^2.0.0" -jest-jasmine2@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.5.0.tgz#05fe7f1788e650eeb5a03929e6461ea2e9f3db53" +jest-jasmine2@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.6.0.tgz#840e937f848a6c8638df24360ab869cc718592e0" dependencies: babel-traverse "^6.0.0" chalk "^2.0.1" co "^4.6.0" - expect "^23.5.0" + expect "^23.6.0" is-generator-fn "^1.0.0" - jest-diff "^23.5.0" - jest-each "^23.5.0" - jest-matcher-utils "^23.5.0" + jest-diff "^23.6.0" + jest-each "^23.6.0" + jest-matcher-utils "^23.6.0" jest-message-util "^23.4.0" - jest-snapshot "^23.5.0" + jest-snapshot "^23.6.0" jest-util "^23.4.0" - pretty-format "^23.5.0" + pretty-format "^23.6.0" -jest-leak-detector@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.5.0.tgz#14ac2a785bd625160a2ea968fd5d98b7dcea3e64" +jest-leak-detector@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.6.0.tgz#e4230fd42cf381a1a1971237ad56897de7e171de" dependencies: - pretty-format "^23.5.0" + pretty-format "^23.6.0" -jest-matcher-utils@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.5.0.tgz#0e2ea67744cab78c9ab15011c4d888bdd3e49e2a" +jest-matcher-utils@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.6.0.tgz#726bcea0c5294261a7417afb6da3186b4b8cac80" dependencies: chalk "^2.0.1" jest-get-type "^22.1.0" - pretty-format "^23.5.0" + pretty-format "^23.6.0" jest-message-util@^23.4.0: version "23.4.0" @@ -3335,42 +3322,42 @@ jest-regex-util@^23.3.0: version "23.3.0" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5" -jest-resolve-dependencies@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.5.0.tgz#10c4d135beb9d2256de1fedc7094916c3ad74af7" +jest-resolve-dependencies@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.6.0.tgz#b4526af24c8540d9a3fab102c15081cf509b723d" dependencies: jest-regex-util "^23.3.0" - jest-snapshot "^23.5.0" + jest-snapshot "^23.6.0" -jest-resolve@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.5.0.tgz#3b8e7f67e84598f0caf63d1530bd8534a189d0e6" +jest-resolve@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.6.0.tgz#cf1d1a24ce7ee7b23d661c33ba2150f3aebfa0ae" dependencies: browser-resolve "^1.11.3" chalk "^2.0.1" realpath-native "^1.0.0" -jest-runner@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.5.0.tgz#570f7a044da91648b5bb9b6baacdd511076c71d7" +jest-runner@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.6.0.tgz#3894bd219ffc3f3cb94dc48a4170a2e6f23a5a38" dependencies: exit "^0.1.2" graceful-fs "^4.1.11" - jest-config "^23.5.0" + jest-config "^23.6.0" jest-docblock "^23.2.0" - jest-haste-map "^23.5.0" - jest-jasmine2 "^23.5.0" - jest-leak-detector "^23.5.0" + jest-haste-map "^23.6.0" + jest-jasmine2 "^23.6.0" + jest-leak-detector "^23.6.0" jest-message-util "^23.4.0" - jest-runtime "^23.5.0" + jest-runtime "^23.6.0" jest-util "^23.4.0" jest-worker "^23.2.0" source-map-support "^0.5.6" throat "^4.0.0" -jest-runtime@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.5.0.tgz#eb503525a196dc32f2f9974e3482d26bdf7b63ce" +jest-runtime@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.6.0.tgz#059e58c8ab445917cd0e0d84ac2ba68de8f23082" dependencies: babel-core "^6.0.0" babel-plugin-istanbul "^4.1.6" @@ -3379,14 +3366,14 @@ jest-runtime@^23.5.0: exit "^0.1.2" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.1.11" - jest-config "^23.5.0" - jest-haste-map "^23.5.0" + jest-config "^23.6.0" + jest-haste-map "^23.6.0" jest-message-util "^23.4.0" jest-regex-util "^23.3.0" - jest-resolve "^23.5.0" - jest-snapshot "^23.5.0" + jest-resolve "^23.6.0" + jest-snapshot "^23.6.0" jest-util "^23.4.0" - jest-validate "^23.5.0" + jest-validate "^23.6.0" micromatch "^2.3.11" realpath-native "^1.0.0" slash "^1.0.0" @@ -3398,19 +3385,19 @@ 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" -jest-snapshot@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.5.0.tgz#cc368ebd8513e1175e2a7277f37a801b7358ae79" +jest-snapshot@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.6.0.tgz#f9c2625d1b18acda01ec2d2b826c0ce58a5aa17a" dependencies: babel-types "^6.0.0" chalk "^2.0.1" - jest-diff "^23.5.0" - jest-matcher-utils "^23.5.0" + jest-diff "^23.6.0" + jest-matcher-utils "^23.6.0" jest-message-util "^23.4.0" - jest-resolve "^23.5.0" + jest-resolve "^23.6.0" mkdirp "^0.5.1" natural-compare "^1.4.0" - pretty-format "^23.5.0" + pretty-format "^23.6.0" semver "^5.5.0" jest-util@^23.4.0: @@ -3426,14 +3413,14 @@ jest-util@^23.4.0: slash "^1.0.0" source-map "^0.6.0" -jest-validate@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.5.0.tgz#f5df8f761cf43155e1b2e21d6e9de8a2852d0231" +jest-validate@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474" dependencies: chalk "^2.0.1" jest-get-type "^22.1.0" leven "^2.1.0" - pretty-format "^23.5.0" + pretty-format "^23.6.0" jest-watcher@^23.4.0: version "23.4.0" @@ -3524,10 +3511,6 @@ jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" -json-parse-better-errors@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - json-schema-traverse@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" @@ -3556,7 +3539,7 @@ json5@^0.5.0, json5@^0.5.1: jsonfile@^2.1.0: version "2.4.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" + resolved "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" optionalDependencies: graceful-fs "^4.1.6" @@ -3613,10 +3596,6 @@ kleur@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300" -lazy-cache@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" - lcid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" @@ -3638,22 +3617,23 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" +load-json-file@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" dependencies: graceful-fs "^4.1.2" parse-json "^2.2.0" pify "^2.0.0" - strip-bom "^3.0.0" + pinkie-promise "^2.0.0" + strip-bom "^2.0.0" -load-json-file@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" +load-json-file@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" dependencies: graceful-fs "^4.1.2" - parse-json "^4.0.0" - pify "^3.0.0" + parse-json "^2.2.0" + pify "^2.0.0" strip-bom "^3.0.0" locate-path@^2.0.0: @@ -3684,12 +3664,8 @@ lodash.throttle@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.6.1: - version "4.17.10" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" - -longest@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" + version "4.17.11" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1: version "1.4.0" @@ -3939,7 +3915,7 @@ micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -"mime-db@>= 1.34.0 < 2", mime-db@~1.36.0: +"mime-db@>= 1.36.0 < 2", mime-db@~1.36.0: version "1.36.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397" @@ -3985,15 +3961,15 @@ minimatch@^3.0.3, minimatch@^3.0.4: minimist@0.0.8: version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" minimist@^1.1.1, minimist@^1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" minimist@~0.0.1: version "0.0.10" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" + resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" minipass@^2.2.1, minipass@^2.3.3: version "2.3.4" @@ -4026,12 +4002,12 @@ moment@^2.22.2: resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66" morgan@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.0.tgz#d01fa6c65859b76fcf31b3cb53a3821a311d8051" + version "1.9.1" + resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59" dependencies: basic-auth "~2.0.0" debug "2.6.9" - depd "~1.1.1" + depd "~1.1.2" on-finished "~2.3.0" on-headers "~1.0.1" @@ -4039,6 +4015,10 @@ ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" +ms@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" @@ -4072,8 +4052,8 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" needle@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.2.tgz#1120ca4c41f2fcc6976fd28a8968afe239929418" + version "2.2.3" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.3.tgz#c1b04da378cd634d8befe2de965dc2cfb0fd65ca" dependencies: debug "^2.1.2" iconv-lite "^0.4.4" @@ -4083,7 +4063,11 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" -node-fetch@^1.0.1, node-fetch@^1.3.3, node-fetch@^1.6.3: +node-fetch@2.1.2: + version "2.1.2" + resolved "http://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5" + +node-fetch@^1.0.1, node-fetch@^1.3.3, node-fetch@^1.6.3, node-fetch@^1.7.3: version "1.7.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" dependencies: @@ -4198,8 +4182,8 @@ number-is-nan@^1.0.0: resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" nwsapi@^2.0.7: - version "2.0.8" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.8.tgz#e3603579b7e162b3dbedae4fb24e46f771d8fa24" + version "2.0.9" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz#77ac0cdfdcad52b6a1151a84e73254edc33ed016" oauth-sign@~0.9.0: version "0.9.0" @@ -4355,13 +4339,6 @@ parse-json@^2.2.0: dependencies: error-ex "^1.2.0" -parse-json@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" - dependencies: - error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" - parse5@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" @@ -4374,6 +4351,12 @@ pascalcase@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" +path-exists@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" + dependencies: + pinkie-promise "^2.0.0" + path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -4396,18 +4379,20 @@ path-to-regexp@^1.7.0: dependencies: isarray "0.0.1" +path-type@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" + dependencies: + graceful-fs "^4.1.2" + pify "^2.0.0" + pinkie-promise "^2.0.0" + path-type@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" dependencies: pify "^2.0.0" -path-type@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" - 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" @@ -4492,16 +4477,16 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -pretty-format@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.5.0.tgz#0f9601ad9da70fe690a269cd3efca732c210687c" +pretty-format@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760" dependencies: ansi-regex "^3.0.0" ansi-styles "^3.2.0" pretty-format@^4.2.1: version "4.3.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-4.3.1.tgz#530be5c42b3c05b36414a7a2a4337aa80acd0e8d" + resolved "http://registry.npmjs.org/pretty-format/-/pretty-format-4.3.1.tgz#530be5c42b3c05b36414a7a2a4337aa80acd0e8d" private@^0.1.6, private@^0.1.8: version "0.1.8" @@ -4599,27 +4584,27 @@ react-adopt@^0.6.0: react "^16.3.2" react-display-name "^0.2.4" -react-apollo@^2.1.11: +react-apollo@apollographql/react-apollo: version "2.1.11" - resolved "https://registry.yarnpkg.com/react-apollo/-/react-apollo-2.1.11.tgz#ef4805f07af1d732ec94caebf7ba0728e2d162ca" + resolved "https://codeload.github.com/apollographql/react-apollo/tar.gz/7654d148f72f7989355ebc48b5cf31869698dec9" dependencies: fbjs "^0.8.16" - hoist-non-react-statics "^2.5.0" + hoist-non-react-statics "^3.0.0" invariant "^2.2.2" lodash "^4.17.10" prop-types "^15.6.0" react-clone-referenced-element@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/react-clone-referenced-element/-/react-clone-referenced-element-1.0.1.tgz#2bba8c69404c5e4a944398600bcc4c941f860682" + version "1.1.0" + resolved "https://registry.yarnpkg.com/react-clone-referenced-element/-/react-clone-referenced-element-1.1.0.tgz#9cdda7f2aeb54fea791f3ab8c6ab96c7a77d0158" react-deep-force-update@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-1.1.2.tgz#3d2ae45c2c9040cbb1772be52f8ea1ade6ca2ee1" react-devtools-core@^3.2.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-3.3.2.tgz#a8acc19a14cd465734dcc8d4821743b71320560e" + version "3.3.4" + resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-3.3.4.tgz#9e497a94b73413b91774bf3e3197e539d5f9a21d" dependencies: shell-quote "^1.6.1" ws "^3.3.1" @@ -4632,9 +4617,9 @@ react-final-form@^3.6.5: version "3.6.5" resolved "https://registry.yarnpkg.com/react-final-form/-/react-final-form-3.6.5.tgz#191324bc686b20e9e49c929a79949f34b38ba8e5" -react-is@^16.4.1: - version "16.4.2" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.4.2.tgz#84891b56c2b6d9efdee577cc83501dfc5ecead88" +react-is@^16.3.2, react-is@^16.4.1: + version "16.5.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.5.1.tgz#c6e8734fd548a22e1cef4fd0833afbeb433b85ee" react-lifecycles-compat@^3, react-lifecycles-compat@^3.0.4: version "3.0.4" @@ -4688,17 +4673,15 @@ react-native-onboarding-swiper@^0.7.1: dependencies: tinycolor2 "^1.4.1" -react-native-safe-area-view@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.7.0.tgz#38f5ab9368d6ef9e5d18ab64212938af3ec39421" +react-native-safe-area-view@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.10.0.tgz#e8e9228d22698c0f82ad1202d24a4e4977260489" dependencies: hoist-non-react-statics "^2.3.1" -react-native-safe-area-view@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.9.0.tgz#10ece2ecac70e7005a5b0b3f06c8833060e6d21f" - dependencies: - hoist-non-react-statics "^2.3.1" +react-native-screens@^1.0.0-alpha.10: + version "1.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-1.0.0-alpha.11.tgz#4f4faeb5607b1e08cc70d76a04c2f8da0b241200" react-native-splash-screen@3.0.6: version "3.0.6" @@ -4798,35 +4781,36 @@ react-navigation-drawer@0.5.0: dependencies: react-native-drawer-layout-polyfill "^1.3.2" -react-navigation-stack@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-0.2.3.tgz#9d1e2524aa1d178302c938948b8ece49d713f12b" +react-navigation-stack@0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-0.5.1.tgz#acc3c84c7b5209c7d89380d7f4576f17624f683c" + dependencies: + react-native-screens "^1.0.0-alpha.10" -react-navigation-tabs@0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.6.0.tgz#2f526194f4360e56c2702e736887449acc2080dc" +react-navigation-tabs@0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.7.0.tgz#c89d41e501043f7fdb38550de85814452c3e6104" dependencies: hoist-non-react-statics "^2.5.0" prop-types "^15.6.1" react-lifecycles-compat "^3.0.4" - react-native-safe-area-view "^0.7.0" react-native-tab-view "^1.0.0" react-navigation@^2.12.1: - version "2.12.1" - resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-2.12.1.tgz#17122a4162cd5a65d79814385cd61c2c0cb7ebb5" + version "2.14.2" + resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-2.14.2.tgz#e3c933b15efdc6bcb1e9b014aeacfb2a08997d5b" dependencies: clamp "^1.0.1" - create-react-context "^0.2.1" + create-react-context "0.2.2" hoist-non-react-statics "^2.2.0" path-to-regexp "^1.7.0" query-string "^6.1.0" react-lifecycles-compat "^3" - react-native-safe-area-view "^0.9.0" + react-native-safe-area-view "^0.10.0" react-navigation-deprecated-tab-navigator "1.3.0" react-navigation-drawer "0.5.0" - react-navigation-stack "0.2.3" - react-navigation-tabs "0.6.0" + react-navigation-stack "0.5.1" + react-navigation-tabs "0.7.0" react-proxy@^1.1.7: version "1.1.8" @@ -4865,13 +4849,20 @@ react@16.4.1: prop-types "^15.6.0" react@^16.3.2: - version "16.5.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.5.0.tgz#f2c1e754bf9751a549d9c6d9aca41905beb56575" + version "16.5.1" + resolved "https://registry.yarnpkg.com/react/-/react-16.5.1.tgz#8cb8e9f8cdcb4bde41c9a138bfbf907e66132372" dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - schedule "^0.3.0" + schedule "^0.4.0" + +read-pkg-up@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" + dependencies: + find-up "^1.0.0" + read-pkg "^1.0.0" read-pkg-up@^2.0.0: version "2.0.0" @@ -4880,12 +4871,13 @@ read-pkg-up@^2.0.0: find-up "^2.0.0" read-pkg "^2.0.0" -read-pkg-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" +read-pkg@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" dependencies: - find-up "^2.0.0" - read-pkg "^3.0.0" + load-json-file "^1.0.0" + normalize-package-data "^2.3.2" + path-type "^1.0.0" read-pkg@^2.0.0: version "2.0.0" @@ -4895,17 +4887,9 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -read-pkg@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" - dependencies: - load-json-file "^4.0.0" - normalize-package-data "^2.3.2" - path-type "^3.0.0" - readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5: version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" + resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -4935,8 +4919,8 @@ realm@^2.15.3: url-parse "^1.2.0" realpath-native@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.1.tgz#07f40a0cce8f8261e2e8b7ebebf5c95965d7b633" + version "1.0.2" + resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.2.tgz#cd51ce089b513b45cf9b1516c82989b51ccc6560" dependencies: util.promisify "^1.0.0" @@ -5116,12 +5100,6 @@ ret@~0.1.10: version "0.1.15" resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" -right-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" - dependencies: - align-text "^0.1.1" - rimraf@^2.5.4, rimraf@^2.6.1: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" @@ -5191,11 +5169,11 @@ sax@^1.2.4: sax@~1.1.1: version "1.1.6" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.1.6.tgz#5d616be8a5e607d54e114afae55b7eaf2fcc3240" + resolved "http://registry.npmjs.org/sax/-/sax-1.1.6.tgz#5d616be8a5e607d54e114afae55b7eaf2fcc3240" -schedule@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/schedule/-/schedule-0.3.0.tgz#1be2ab2fc2e768536269ce7326efb478d6c045e8" +schedule@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/schedule/-/schedule-0.4.0.tgz#fa20cfd0bfbf91c47d02272fd7096780d3170bbb" dependencies: object-assign "^4.1.1" @@ -5354,7 +5332,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.4.15, source-map-support@^0.4.2: +source-map-support@^0.4.15, source-map-support@^0.4.17, source-map-support@^0.4.2: version "0.4.18" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" dependencies: @@ -5371,17 +5349,11 @@ source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" -source-map@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" - dependencies: - amdefine ">=0.0.4" - -source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: +source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" -source-map@^0.6.0, source-map@~0.6.1: +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" @@ -5404,8 +5376,8 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87" + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f" split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -5519,6 +5491,12 @@ strip-bom@3.0.0, strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" +strip-bom@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" + dependencies: + is-utf8 "^0.2.0" + strip-dirs@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5" @@ -5533,6 +5511,16 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" +subscriptions-transport-ws@^0.9.14: + version "0.9.14" + resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.14.tgz#a39e08edba89ee4cfd95f30484c55d865f5d8451" + dependencies: + backo2 "^1.0.2" + eventemitter3 "^3.1.0" + iterall "^1.2.1" + symbol-observable "^1.0.4" + ws "^5.2.0" + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -5549,7 +5537,7 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" -symbol-observable@^1.0.2: +symbol-observable@^1.0.2, symbol-observable@^1.0.4: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" @@ -5597,12 +5585,13 @@ temp@0.8.3: rimraf "~2.2.6" test-exclude@^4.2.1: - version "4.2.2" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.2.tgz#8b67aa8408f84afc225b06669e25c510f8582820" + version "4.2.3" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.3.tgz#a9a5e64474e4398339245a0a769ad7c2f4a97c20" dependencies: arrify "^1.0.1" - minimatch "^3.0.4" - read-pkg-up "^3.0.0" + micromatch "^2.3.11" + object-assign "^4.1.0" + read-pkg-up "^1.0.1" require-main-filename "^1.0.1" test-value@^2.1.0: @@ -5636,7 +5625,7 @@ through2@^2.0.0: through@^2.3.6: version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" time-stamp@^1.0.0: version "1.1.0" @@ -5742,18 +5731,12 @@ uglify-es@^3.1.9: commander "~2.13.0" source-map "~0.6.1" -uglify-js@^2.6: - version "2.8.29" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" +uglify-js@^3.1.4: + version "3.4.9" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3" dependencies: - source-map "~0.5.1" - yargs "~3.10.0" - optionalDependencies: - uglify-to-browserify "~1.0.0" - -uglify-to-browserify@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" + commander "~2.17.1" + source-map "~0.6.1" ultron@1.0.x: version "1.0.2" @@ -5764,8 +5747,8 @@ ultron@~1.1.0: resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" unbzip2-stream@^1.0.9: - version "1.2.5" - resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz#73a033a567bbbde59654b193c44d48a7e4f43c47" + version "1.3.0" + resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.0.tgz#745ad5745bc4d8f1ac2eb6fc707cfa51d52ab215" dependencies: buffer "^3.0.1" through "^2.3.6" @@ -5847,7 +5830,7 @@ uuid@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" -uuid@^3.3.2: +uuid@^3.1.0, uuid@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" @@ -5899,13 +5882,17 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3: dependencies: iconv-lite "0.4.23" -whatwg-fetch@>=0.10.0: +whatwg-fetch@2.0.4: version "2.0.4" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" + resolved "http://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" + +whatwg-fetch@>=0.10.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" whatwg-mimetype@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.1.0.tgz#f0f21d76cbba72362eb609dbed2a30cd17fcc7d4" + version "2.2.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.2.0.tgz#a3d58ef10b76009b042d03e25591ece89b88d171" whatwg-url@^6.4.1: version "6.5.0" @@ -5939,14 +5926,6 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2 || 2" -window-size@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" - -wordwrap@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" - wordwrap@^1.0.0, wordwrap@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" @@ -5957,7 +5936,7 @@ wordwrap@~0.0.2: wrap-ansi@^2.0.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" + resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" dependencies: string-width "^1.0.1" strip-ansi "^3.0.1" @@ -6067,7 +6046,7 @@ yargs-parser@^9.0.2: yargs@^11.0.0: version "11.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77" + resolved "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77" dependencies: cliui "^4.0.0" decamelize "^1.1.1" @@ -6118,15 +6097,6 @@ yargs@^9.0.0: y18n "^3.2.1" yargs-parser "^7.0.0" -yargs@~3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" - dependencies: - camelcase "^1.0.2" - cliui "^2.1.0" - decamelize "^1.0.0" - window-size "0.1.0" - yauzl@^2.4.2: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" @@ -6134,9 +6104,13 @@ yauzl@^2.4.2: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -zen-observable-ts@^0.8.9: - version "0.8.9" - resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.9.tgz#d3c97af08c0afdca37ebcadf7cc3ee96bda9bab1" +zen-observable-ts@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.5.0.tgz#c5021e7ac486fc281f6126d574673cfb6daf0069" + +zen-observable-ts@^0.8.10: + version "0.8.10" + resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.10.tgz#18e2ce1c89fe026e9621fd83cc05168228fce829" dependencies: zen-observable "^0.8.0"