Merge branch 'v4' of github.com:Akryum/vue-apollo into v4

Author: Guillaume Chau

package.json

@@ -6,7 +6,7 @@
   ],
   "private": true,
   "scripts": {
-    "build": "lerna run build --concurrency 1 --scope {vue-apollo,@vue/apollo}*",
+    "build": "lerna run build --concurrency 1 --scope \"{vue-apollo,@vue/apollo}*\"",
     "test": "lerna run test --concurrency 1"
   },
   "devDependencies": {

packages/vue-apollo-composable/src/useApolloClient.ts

@@ -7,7 +7,7 @@ export const ApolloClients = Symbol('apollo-clients')
 export function useApolloClient<TCacheShape = any> (clientId: string = null) {
   const providedApolloClients: { [key: string]: ApolloClient<TCacheShape> } = inject(ApolloClients, null)
   const providedApolloClient: ApolloClient<TCacheShape> = inject(DefaultApolloClient, null)
-  
+
   function resolveClient (clientId: string = null): ApolloClient<TCacheShape> {
     let resolvedClient
     if (clientId) {
@@ -35,4 +35,4 @@ export function useApolloClient<TCacheShape = any> (clientId: string = null) {
       return resolveClient(clientId)
     }
   }
-}
+}

packages/vue-apollo-composable/src/useMutation.ts

@@ -27,7 +27,7 @@ export function useMutation<
   trackMutation(loading)
   const error = ref<Error>(null)
   const called = ref<boolean>(false)
-  
+
   const doneEvent = useEventHook<FetchResult<TResult, Record<string, any>, Record<string, any>>>()
   const errorEvent = useEventHook<Error>()
 
@@ -85,4 +85,4 @@ export function useMutation<
     onDone: doneEvent.on,
     onError: errorEvent.on,
   }
-}
+}

packages/vue-apollo-composable/src/useResult.ts

@@ -1,13 +1,15 @@
 import { Ref, computed } from '@vue/composition-api'
 
 export function useResult<
+  TReturnValue = any,
+  TDefaultValue = any,
   TResult = any
 > (
   result: Ref<TResult>,
-  defaultValue: any = null,
-  pick: (data: TResult) => any = null,
+  defaultValue: TDefaultValue = null,
+  pick: (data: TResult) => TReturnValue = null,
 ) {
-  return computed(() => {
+  return computed<TDefaultValue | TReturnValue>(() => {
     const value = result.value
     if (value) {
       if (pick) {