Merge branch 'main' into alpha

TkDodo · TkDodo · commit 95e13ca67e78 · 2023-06-27T09:29:02.000+02:00
# Conflicts:
#	package.json
#	packages/react-query-devtools/package.json
#	packages/react-query-persist-client/package.json
#	packages/react-query/package.json
#	packages/react-query/src/useIsMutating.ts
#	packages/react-query/src/useQuery.ts
#	packages/vue-query/package.json
#	packages/vue-query/src/__mocks__/useQueryClient.ts
#	packages/vue-query/src/__tests__/useQuery.test.ts
#	packages/vue-query/src/useBaseQuery.ts
#	packages/vue-query/src/useIsFetching.ts
#	packages/vue-query/src/useIsMutating.ts
#	packages/vue-query/src/useMutation.ts
#	packages/vue-query/src/useQueries.ts
#	pnpm-lock.yaml
diff --git a/packages/react-query-persist-client/package.json b/packages/react-query-persist-client/package.json
@@ -40,8 +40,7 @@
     "build:types": "tsc --emitDeclarationOnly"
   },
   "dependencies": {
-    "@tanstack/query-persist-client-core": "workspace:*",
-    "client-only": "0.0.1"
+    "@tanstack/query-persist-client-core": "workspace:*"
   },
   "devDependencies": {
     "@tanstack/react-query": "workspace:*",
diff --git a/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx b/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx
@@ -1,4 +1,4 @@
-import 'client-only'
+'use client'
 import * as React from 'react'
 
 import type { PersistQueryClientOptions } from '@tanstack/query-persist-client-core'
diff --git a/packages/react-query/src/QueryClientProvider.tsx b/packages/react-query/src/QueryClientProvider.tsx
@@ -1,4 +1,4 @@
-import 'client-only'
+'use client'
 import * as React from 'react'
 
 import type { QueryClient } from '@tanstack/query-core'
diff --git a/packages/react-query/src/useBaseQuery.ts b/packages/react-query/src/useBaseQuery.ts
@@ -1,4 +1,4 @@
-import 'client-only'
+'use client'
 import * as React from 'react'
 
 import type { QueryClient, QueryKey, QueryObserver } from '@tanstack/query-core'
diff --git a/packages/react-query/src/useInfiniteQuery.ts b/packages/react-query/src/useInfiniteQuery.ts
@@ -1,4 +1,4 @@
-import 'client-only'
+'use client'
 import type {
   QueryObserver,
   QueryKey,
diff --git a/packages/react-query/src/useIsFetching.ts b/packages/react-query/src/useIsFetching.ts
@@ -1,4 +1,4 @@
-import 'client-only'
+'use client'
 import * as React from 'react'
 import type { QueryClient, QueryFilters } from '@tanstack/query-core'
 import { notifyManager } from '@tanstack/query-core'
diff --git a/packages/react-query/src/useMutation.ts b/packages/react-query/src/useMutation.ts
@@ -1,4 +1,4 @@
-import 'client-only'
+'use client'
 import * as React from 'react'
 import type { QueryClient, DefaultError } from '@tanstack/query-core'
 import { notifyManager, MutationObserver } from '@tanstack/query-core'
diff --git a/packages/react-query/src/useMutationState.ts b/packages/react-query/src/useMutationState.ts
@@ -1,4 +1,4 @@
-import 'client-only'
+'use client'
 import * as React from 'react'
 
 import type {
diff --git a/packages/react-query/src/useQueries.ts b/packages/react-query/src/useQueries.ts
@@ -1,4 +1,4 @@
-import 'client-only'
+'use client'
 import * as React from 'react'
 
 import type {
diff --git a/packages/react-query/src/useQuery.ts b/packages/react-query/src/useQuery.ts
@@ -1,4 +1,4 @@
-import 'client-only'
+'use client'
 import type { QueryClient, QueryKey, DefaultError } from '@tanstack/query-core'
 import { QueryObserver } from '@tanstack/query-core'
 import type {
diff --git a/packages/vue-query/src/useBaseQuery.ts b/packages/vue-query/src/useBaseQuery.ts
@@ -14,9 +14,8 @@ import type {
   QueryObserverResult,
   DefaultedQueryObserverOptions,
 } from '@tanstack/query-core'
-import { isServer } from '@tanstack/query-core'
 import { useQueryClient } from './useQueryClient'
-import { updateState, cloneDeepUnref, noop } from './utils'
+import { updateState, cloneDeepUnref } from './utils'
 import type { QueryClient } from './queryClient'
 import type { UseQueryOptions } from './useQuery'
 import type { UseInfiniteQueryOptions } from './useInfiniteQuery'
@@ -87,20 +86,19 @@ export function useBaseQuery<
   const observer = new Observer(client, defaultedOptions.value)
   const state = reactive(observer.getCurrentResult())
 
-  const unsubscribe = ref(noop)
+  const unsubscribe = ref(() => {
+    // noop
+  })
 
   watch(
     client.isRestoring,
     (isRestoring) => {
       // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
       if (!isRestoring) {
         unsubscribe.value()
-        // Nuxt2 memory leak fix - do not subscribe on server
-        if (!isServer) {
-          unsubscribe.value = observer.subscribe((result) => {
-            updateState(state, result)
-          })
-        }
+        unsubscribe.value = observer.subscribe((result) => {
+          updateState(state, result)
+        })
       }
     },
     { immediate: true },
@@ -121,7 +119,9 @@ export function useBaseQuery<
 
   const suspense = () => {
     return new Promise<QueryObserverResult<TData, TError>>((resolve) => {
-      let stopWatch = noop
+      let stopWatch = () => {
+        //noop
+      }
       const run = () => {
         if (defaultedOptions.value.enabled !== false) {
           const optimisticResult = observer.getOptimisticResult(
diff --git a/packages/vue-query/src/useIsFetching.ts b/packages/vue-query/src/useIsFetching.ts
@@ -1,9 +1,8 @@
 import { computed, onScopeDispose, ref, watch } from 'vue-demi'
 import type { Ref } from 'vue-demi'
 import type { QueryFilters as QF } from '@tanstack/query-core'
-import { isServer } from '@tanstack/query-core'
 import { useQueryClient } from './useQueryClient'
-import { cloneDeepUnref, noop } from './utils'
+import { cloneDeepUnref } from './utils'
 import type { MaybeRefDeep } from './types'
 import type { QueryClient } from './queryClient'
 
@@ -18,12 +17,9 @@ export function useIsFetching(
 
   const isFetching = ref(client.isFetching(filters))
 
-  // Nuxt2 memory leak fix - do not subscribe on server
-  const unsubscribe = isServer
-    ? noop
-    : client.getQueryCache().subscribe(() => {
-        isFetching.value = client.isFetching(filters)
-      })
+  const unsubscribe = client.getQueryCache().subscribe(() => {
+    isFetching.value = client.isFetching(filters)
+  })
 
   watch(
     filters,
diff --git a/packages/vue-query/src/useMutation.ts b/packages/vue-query/src/useMutation.ts
@@ -14,10 +14,9 @@ import type {
   MutationObserverOptions,
   DefaultError,
 } from '@tanstack/query-core'
-import { isServer } from '@tanstack/query-core'
 import type { MaybeRefDeep, DistributiveOmit } from './types'
 import { MutationObserver } from '@tanstack/query-core'
-import { cloneDeepUnref, updateState, noop } from './utils'
+import { cloneDeepUnref, updateState } from './utils'
 import { useQueryClient } from './useQueryClient'
 import type { QueryClient } from './queryClient'
 
@@ -72,12 +71,9 @@ export function useMutation<
   const observer = new MutationObserver(client, options.value)
   const state = reactive(observer.getCurrentResult())
 
-  // Nuxt2 memory leak fix - do not subscribe on server
-  const unsubscribe = isServer
-    ? noop
-    : observer.subscribe((result) => {
-        updateState(state, result)
-      })
+  const unsubscribe = observer.subscribe((result) => {
+    updateState(state, result)
+  })
 
   const mutate = (
     variables: TVariables,
diff --git a/packages/vue-query/src/useQueries.ts b/packages/vue-query/src/useQueries.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { isServer, QueriesObserver } from '@tanstack/query-core'
+import { QueriesObserver } from '@tanstack/query-core'
 import type {
   QueriesPlaceholderDataFunction,
   QueryKey,
@@ -11,7 +11,7 @@ import type { Ref } from 'vue-demi'
 import { computed, onScopeDispose, readonly, ref, watch } from 'vue-demi'
 
 import { useQueryClient } from './useQueryClient'
-import { cloneDeepUnref, noop } from './utils'
+import { cloneDeepUnref } from './utils'
 import type { UseQueryOptions } from './useQuery'
 import type { QueryClient } from './queryClient'
 import type { DistributiveOmit, MaybeRefDeep } from './types'
@@ -182,22 +182,21 @@ export function useQueries<
   )
   const state = ref(getCombinedResult()) as Ref<TCombinedResult>
 
-  const unsubscribe = ref(noop)
+  const unsubscribe = ref(() => {
+    // noop
+  })
 
   watch(
     client.isRestoring,
     (isRestoring) => {
       if (!isRestoring) {
         unsubscribe.value()
-        // Nuxt2 memory leak fix - do not subscribe on server
-        if (!isServer) {
-          unsubscribe.value = observer.subscribe(() => {
-            const [, getCombinedResultRestoring] = observer.getOptimisticResult(
-              defaultedQueries.value,
-            )
-            state.value = getCombinedResultRestoring()
-          })
-        }
+        unsubscribe.value = observer.subscribe(() => {
+          const [, getCombinedResultRestoring] = observer.getOptimisticResult(
+            defaultedQueries.value,
+          )
+          state.value = getCombinedResultRestoring()
+        })
         // Subscription would not fire for persisted results
         const [, getCombinedResultPersisted] = observer.getOptimisticResult(
           defaultedQueries.value,
diff --git a/packages/vue-query/src/utils.ts b/packages/vue-query/src/utils.ts
@@ -65,7 +65,3 @@ function isPlainObject(value: unknown): value is Object {
   const prototype = Object.getPrototypeOf(value)
   return prototype === null || prototype === Object.prototype
 }
-
-export function noop(): void {
-  return undefined
-}
diff --git a/packages/vue-query/src/vueQueryPlugin.ts b/packages/vue-query/src/vueQueryPlugin.ts
@@ -3,7 +3,7 @@ import { isServer } from '@tanstack/query-core'
 import type { QueryClientConfig } from '@tanstack/query-core'
 
 import { QueryClient } from './queryClient'
-import { getClientKey, noop } from './utils'
+import { getClientKey } from './utils'
 import { setupDevtools } from './devtools/devtools'
 import type { MaybeRefDeep } from './types'
 
@@ -41,7 +41,9 @@ export const VueQueryPlugin = {
       client.mount()
     }
 
-    let persisterUnmount = noop
+    let persisterUnmount = () => {
+      // noop
+    }
 
     if (options.clientPersister) {
       client.isRestoring.value = true
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import 'client-only'`
	`1`	`+'use client'`
`2`	`2`	`import * as React from 'react'`
`3`	`3`
`4`	`4`	`import type { PersistQueryClientOptions } from '@tanstack/query-persist-client-core'`