From a645b366e968204af27eca5eacdd628e7850eabb Mon Sep 17 00:00:00 2001
From: Negezor <negezor@gmail.com>
Date: Tue, 17 Aug 2021 01:49:10 +1100
Subject: [PATCH] fix(composable): fix infinite loading in ssr

---
 packages/vue-apollo-composable/src/useQuery.ts        | 2 +-
 packages/vue-apollo-composable/src/useSubscription.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/vue-apollo-composable/src/useQuery.ts b/packages/vue-apollo-composable/src/useQuery.ts
index 29bef6e9..76e367f1 100644
--- a/packages/vue-apollo-composable/src/useQuery.ts
+++ b/packages/vue-apollo-composable/src/useQuery.ts
@@ -142,7 +142,7 @@ export function useQueryImpl<
 ): UseQueryReturn<TResult, TVariables> {
   // Is on server?
   const vm = getCurrentInstance() as CurrentInstance | null
-  const isServer = vm?.$isServer ?? false
+  const isServer = vm?.$isServer ?? (vm?.proxy as CurrentInstance | null)?.$isServer ?? false
 
   const currentOptions = ref<UseQueryOptions<TResult, TVariables>>()
 
diff --git a/packages/vue-apollo-composable/src/useSubscription.ts b/packages/vue-apollo-composable/src/useSubscription.ts
index 179f1ad2..7846165d 100644
--- a/packages/vue-apollo-composable/src/useSubscription.ts
+++ b/packages/vue-apollo-composable/src/useSubscription.ts
@@ -113,7 +113,7 @@ export function useSubscription <
 ): UseSubscriptionReturn<TResult, TVariables> {
   // Is on server?
   const vm = getCurrentInstance() as CurrentInstance | null
-  const isServer = vm?.$isServer ?? false
+  const isServer = vm?.$isServer ?? (vm?.proxy as CurrentInstance | null)?.$isServer ?? false
 
   const documentRef = paramToRef(document)
   const variablesRef = paramToRef(variables)