fix(solid-query): use QueryClient from query-core (TanStack#8943)

* fix(solid-query): use QueryClient from query-core

* ci: apply automated fixes

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

Author: birkskyum

packages/solid-query/src/QueryClient.ts

@@ -4,7 +4,8 @@ import {
   onCleanup,
   useContext,
 } from 'solid-js'
-import type { QueryClient } from './QueryClient'
+import type { QueryClient } from '@tanstack/query-core'
+
 import type { JSX } from 'solid-js'
 
 export const QueryClientContext = createContext<

packages/solid-query/src/QueryClientProvider.tsx

@@ -1051,7 +1051,7 @@ describe('useQuery', () => {
           count++
           return count === 1 ? result1 : result2
         },
-        reconcile: (oldData, newData) => {
+        reconcile: (oldData: any, newData: any) => {
           return reconcile(newData)(oldData)
         },
       }))
@@ -4472,7 +4472,7 @@ describe('useQuery', () => {
           return [1, 2]
         },
         select: (res) => res.map((x) => x + 1),
-        reconcile(oldData, newData) {
+        reconcile(oldData: any, newData: any) {
           return reconcile(newData)(oldData)
         },
       }))

packages/solid-query/src/__tests__/useQuery.test.tsx

@@ -1,8 +1,7 @@
 import { vi } from 'vitest'
 import { Show, createEffect, createSignal, onCleanup } from 'solid-js'
-import { onlineManager } from '@tanstack/query-core'
-import { QueryClient } from '../QueryClient'
-import type { QueryClientConfig } from '..'
+import { QueryClient, onlineManager } from '@tanstack/query-core'
+import type { QueryClientConfig } from '@tanstack/query-core'
 import type { ParentProps } from 'solid-js'
 import type { MockInstance } from 'vitest'
 

packages/solid-query/src/__tests__/utils.tsx

@@ -44,13 +44,6 @@ export type {
   UseBaseQueryOptions as CreateBaseQueryOptions,
 } from './types'
 
-export { QueryClient } from './QueryClient'
-export type {
-  QueryObserverOptions,
-  DefaultOptions,
-  QueryClientConfig,
-  InfiniteQueryObserverOptions,
-} from './QueryClient'
 export { useQuery } from './useQuery'
 export { useQuery as createQuery } from './useQuery'
 export { queryOptions } from './queryOptions'

packages/solid-query/src/index.ts

@@ -4,19 +4,18 @@ import type {
   DefaultError,
   DefinedInfiniteQueryObserverResult,
   DefinedQueryObserverResult,
+  InfiniteQueryObserverOptions,
   InfiniteQueryObserverResult,
   MutateFunction,
   MutationObserverOptions,
   MutationObserverResult,
   OmitKeyof,
   Override,
   QueryKey,
+  QueryObserverOptions,
   QueryObserverResult,
 } from '@tanstack/query-core'
-import type {
-  InfiniteQueryObserverOptions,
-  QueryObserverOptions,
-} from './QueryClient'
+
 import type { Accessor } from 'solid-js'
 
 export interface UseBaseQueryOptions<

packages/solid-query/src/types.ts

@@ -17,9 +17,10 @@ import { shouldThrowError } from './utils'
 import { useIsRestoring } from './isRestoring'
 import type { UseBaseQueryOptions } from './types'
 import type { Accessor, Signal } from 'solid-js'
-import type { QueryClient } from './QueryClient'
+
 import type {
   Query,
+  QueryClient,
   QueryKey,
   QueryObserver,
   QueryObserverResult,

packages/solid-query/src/useBaseQuery.ts

@@ -4,10 +4,11 @@ import { useBaseQuery } from './useBaseQuery'
 import type {
   DefaultError,
   InfiniteData,
+  QueryClient,
   QueryKey,
   QueryObserver,
 } from '@tanstack/query-core'
-import type { QueryClient } from './QueryClient'
+
 import type {
   DefinedUseInfiniteQueryResult,
   UseInfiniteQueryOptions,

packages/solid-query/src/useInfiniteQuery.ts

@@ -1,7 +1,6 @@
 import { createMemo, createSignal, onCleanup } from 'solid-js'
 import { useQueryClient } from './QueryClientProvider'
-import type { QueryFilters } from '@tanstack/query-core'
-import type { QueryClient } from './QueryClient'
+import type { QueryClient, QueryFilters } from '@tanstack/query-core'
 import type { Accessor } from 'solid-js'
 
 export function useIsFetching(

packages/solid-query/src/useIsFetching.ts

@@ -1,7 +1,6 @@
 import { createMemo, createSignal, onCleanup } from 'solid-js'
 import { useQueryClient } from './QueryClientProvider'
-import type { MutationFilters } from '@tanstack/query-core'
-import type { QueryClient } from './QueryClient'
+import type { MutationFilters, QueryClient } from '@tanstack/query-core'
 import type { Accessor } from 'solid-js'
 
 export function useIsMutating(