fix: onServerPrefetch calls outside components setup

vuejs · Aug 22, 2024 · faf8af8 · faf8af8
1 parent 732e66e
commit faf8af8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/packages/vue-apollo-composable/src/useQuery.ts b/packages/vue-apollo-composable/src/useQuery.ts
@@ -6,6 +6,7 @@ import {
   watch,
   onServerPrefetch,
   getCurrentScope,
+  getCurrentInstance,
   onScopeDispose,
   nextTick,
   shallowRef,
@@ -152,6 +153,7 @@ export function useQueryImpl<
   lazy = false,
 ): UseQueryReturn<TResult, TVariables> {
   const currentScope = getCurrentScope()
+  const currentInstance = getCurrentInstance()
 
   const currentOptions = ref<UseQueryOptions<TResult, TVariables>>()
 
@@ -200,7 +202,7 @@ export function useQueryImpl<
     firstRejectError = undefined
   }
 
-  currentScope && onServerPrefetch?.(() => {
+  currentInstance && onServerPrefetch?.(() => {
     if (!isEnabled.value || (isServer && currentOptions.value?.prefetch === false)) return
 
     return new Promise<void>((resolve, reject) => {