Merge branch 'main' into alpha

# Conflicts:
#	packages/query-async-storage-persister/package.json
#	packages/query-broadcast-client-experimental/package.json
#	packages/query-core/package.json
#	packages/query-core/src/types.ts
#	packages/query-persist-client-core/package.json
#	packages/query-sync-storage-persister/package.json
#	packages/react-query-devtools/package.json
#	packages/react-query-persist-client/package.json
#	packages/react-query/package.json
#	packages/solid-query/package.json
#	packages/svelte-query/package.json
#	packages/vue-query/package.json
#	packages/vue-query/src/useQueries.ts

Author: lachlancollins

packages/vue-query/src/useBaseQuery.ts

@@ -4,7 +4,6 @@ import {
   readonly,
   reactive,
   watch,
-  ref,
   computed,
 } from 'vue-demi'
 import type { ToRefs } from 'vue-demi'
@@ -86,17 +85,17 @@ export function useBaseQuery<
   const observer = new Observer(client, defaultedOptions.value)
   const state = reactive(observer.getCurrentResult())
 
-  const unsubscribe = ref(() => {
+  let unsubscribe = () => {
     // noop
-  })
+  }
 
   watch(
     client.isRestoring,
     (isRestoring) => {
       // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
       if (!isRestoring) {
-        unsubscribe.value()
-        unsubscribe.value = observer.subscribe((result) => {
+        unsubscribe()
+        unsubscribe = observer.subscribe((result) => {
           updateState(state, result)
         })
       }
@@ -114,7 +113,7 @@ export function useBaseQuery<
   )
 
   onScopeDispose(() => {
-    unsubscribe.value()
+    unsubscribe()
   })
 
   const suspense = () => {

packages/vue-query/src/useQueries.ts

@@ -8,7 +8,7 @@ import type {
   QueryObserverResult,
 } from '@tanstack/query-core'
 import type { Ref } from 'vue-demi'
-import { computed, onScopeDispose, readonly, ref, watch } from 'vue-demi'
+import { computed, onScopeDispose, readonly, watch } from 'vue-demi'
 
 import { useQueryClient } from './useQueryClient'
 import { cloneDeepUnref } from './utils'
@@ -182,16 +182,16 @@ export function useQueries<
   )
   const state = ref(getCombinedResult()) as Ref<TCombinedResult>
 
-  const unsubscribe = ref(() => {
+  let unsubscribe = () => {
     // noop
-  })
+  }
 
   watch(
     client.isRestoring,
     (isRestoring) => {
       if (!isRestoring) {
-        unsubscribe.value()
-        unsubscribe.value = observer.subscribe(() => {
+        unsubscribe()
+        unsubscribe = observer.subscribe(() => {
           const [, getCombinedResultRestoring] = observer.getOptimisticResult(
             defaultedQueries.value,
           )
@@ -220,7 +220,7 @@ export function useQueries<
   )
 
   onScopeDispose(() => {
-    unsubscribe.value()
+    unsubscribe()
   })
 
   return readonly(state) as Readonly<Ref<TCombinedResult>>