diff --git a/packages/vue-apollo-composable/src/useQuery.ts b/packages/vue-apollo-composable/src/useQuery.ts index f62c5050..3f4a2373 100644 --- a/packages/vue-apollo-composable/src/useQuery.ts +++ b/packages/vue-apollo-composable/src/useQuery.ts @@ -19,8 +19,8 @@ import { SubscribeToMoreOptions, FetchMoreQueryOptions, FetchMoreOptions, + ObservableSubscription, } from '@apollo/client/core' -import { ObservableSubscription as Subscription } from '@apollo/client/utilities/observables/Observable' import { throttle, debounce } from 'throttle-debounce' import { useApolloClient } from './useApolloClient' import { ReactiveFunction } from './util/ReactiveFunction' @@ -170,7 +170,7 @@ export function useQuery< // Query const query: Ref> = ref() - let observer: Subscription + let observer: ObservableSubscription let started = false /** diff --git a/packages/vue-apollo-composable/src/useSubscription.ts b/packages/vue-apollo-composable/src/useSubscription.ts index 1691a1a0..5f8bc625 100644 --- a/packages/vue-apollo-composable/src/useSubscription.ts +++ b/packages/vue-apollo-composable/src/useSubscription.ts @@ -1,7 +1,21 @@ import { DocumentNode } from 'graphql' -import { Ref, ref, watch, isRef, computed, getCurrentInstance, onBeforeUnmount, nextTick } from 'vue-demi' -import { OperationVariables, SubscriptionOptions, FetchResult } from '@apollo/client/core' -import { Observable, ObservableSubscription as Subscription } from '@apollo/client/utilities/observables/Observable' +import { + Ref, + ref, + watch, + isRef, + computed, + getCurrentInstance, + onBeforeUnmount, + nextTick, +} from 'vue-demi' +import { + OperationVariables, + SubscriptionOptions, + FetchResult, + Observable, + ObservableSubscription, +} from '@apollo/client/core' import { throttle, debounce } from 'throttle-debounce' import { ReactiveFunction } from './util/ReactiveFunction' import { paramToRef } from './util/paramToRef' @@ -110,7 +124,7 @@ export function useSubscription < const { resolveClient } = useApolloClient() const subscription: Ref>> = ref() - let observer: Subscription + let observer: ObservableSubscription let started = false function start () {