feat: remove @tanstack/query-core from the peerDependencies in favour of simplified installation

radist2s · radist2s · commit b8fee3b4e075 · 2025-06-07T17:29:38.000+04:00
diff --git a/packages/react-client/package.json b/packages/react-client/package.json
@@ -18,7 +18,6 @@
     "@openapi-qraft/tanstack-query-react-types": "workspace:*"
   },
   "peerDependencies": {
-    "@tanstack/query-core": "^5.0.0",
     "@tanstack/react-query": "^5.0.0",
     "react": "^18 || ^19"
   },
diff --git a/packages/react-client/src/callbacks/cancelQueries.ts b/packages/react-client/src/callbacks/cancelQueries.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationCancelQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
diff --git a/packages/react-client/src/callbacks/ensureInfiniteQueryData.ts b/packages/react-client/src/callbacks/ensureInfiniteQueryData.ts
@@ -1,5 +1,5 @@
 import type { ServiceOperationFetchInfiniteQuery } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 
diff --git a/packages/react-client/src/callbacks/ensureQueryData.ts b/packages/react-client/src/callbacks/ensureQueryData.ts
@@ -1,5 +1,5 @@
 import type { ServiceOperationFetchQuery } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 
diff --git a/packages/react-client/src/callbacks/fetchInfiniteQuery.ts b/packages/react-client/src/callbacks/fetchInfiniteQuery.ts
@@ -1,5 +1,5 @@
 import type { ServiceOperationFetchInfiniteQuery } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 
diff --git a/packages/react-client/src/callbacks/fetchQuery.ts b/packages/react-client/src/callbacks/fetchQuery.ts
@@ -1,5 +1,5 @@
 import type { ServiceOperationFetchQuery } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 
diff --git a/packages/react-client/src/callbacks/getInfiniteQueryData.ts b/packages/react-client/src/callbacks/getInfiniteQueryData.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationGetInfiniteQueryData,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { InfiniteData } from '@tanstack/query-core';
+import type { InfiniteData } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
diff --git a/packages/react-client/src/callbacks/getInfiniteQueryKey.ts b/packages/react-client/src/callbacks/getInfiniteQueryKey.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationUseInfiniteQuery,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
 import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
 
diff --git a/packages/react-client/src/callbacks/getInfiniteQueryState.ts b/packages/react-client/src/callbacks/getInfiniteQueryState.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationGetQueryState,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
diff --git a/packages/react-client/src/callbacks/getMutationKey.ts b/packages/react-client/src/callbacks/getMutationKey.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationUseMutation,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
 import { composeMutationKey } from '../lib/composeMutationKey.js';
 
diff --git a/packages/react-client/src/callbacks/getQueriesData.ts b/packages/react-client/src/callbacks/getQueriesData.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationGetQueriesData,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
diff --git a/packages/react-client/src/callbacks/getQueryKey.ts b/packages/react-client/src/callbacks/getQueryKey.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationUseQuery,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
 import { composeQueryKey } from '../lib/composeQueryKey.js';
 
diff --git a/packages/react-client/src/callbacks/getQueryState.ts b/packages/react-client/src/callbacks/getQueryState.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationGetQueryState,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
diff --git a/packages/react-client/src/callbacks/invalidateQueries.ts b/packages/react-client/src/callbacks/invalidateQueries.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationInvalidateQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
diff --git a/packages/react-client/src/callbacks/isFetching.ts b/packages/react-client/src/callbacks/isFetching.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationIsFetchingQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
diff --git a/packages/react-client/src/callbacks/isMutating.ts b/packages/react-client/src/callbacks/isMutating.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationIsMutatingQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithMutationFilters } from '../lib/callQueryClientMethodWithMutationFilters.js';
 
diff --git a/packages/react-client/src/callbacks/prefetchInfiniteQuery.ts b/packages/react-client/src/callbacks/prefetchInfiniteQuery.ts
@@ -1,5 +1,5 @@
 import type { ServiceOperationFetchInfiniteQuery } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 
diff --git a/packages/react-client/src/callbacks/prefetchQuery.ts b/packages/react-client/src/callbacks/prefetchQuery.ts
@@ -1,5 +1,5 @@
 import type { ServiceOperationFetchQuery } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 
diff --git a/packages/react-client/src/callbacks/refetchQueries.ts b/packages/react-client/src/callbacks/refetchQueries.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationRefetchQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
diff --git a/packages/react-client/src/callbacks/removeQueries.ts b/packages/react-client/src/callbacks/removeQueries.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationRemoveQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
diff --git a/packages/react-client/src/callbacks/resetQueries.ts b/packages/react-client/src/callbacks/resetQueries.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationResetQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
diff --git a/packages/react-client/src/callbacks/setInfiniteQueryData.ts b/packages/react-client/src/callbacks/setInfiniteQueryData.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationSetInfiniteQueryData,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { InfiniteData } from '@tanstack/query-core';
+import type { InfiniteData } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
diff --git a/packages/react-client/src/callbacks/setQueriesData.ts b/packages/react-client/src/callbacks/setQueriesData.ts
@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationSetQueriesData,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
diff --git a/packages/react-client/src/callbacks/useInfiniteQuery.ts b/packages/react-client/src/callbacks/useInfiniteQuery.ts
@@ -4,8 +4,11 @@ import type {
   OperationSchema,
   ServiceOperationUseInfiniteQuery,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError, InfiniteData } from '@tanstack/query-core';
-import type { UseInfiniteQueryResult } from '@tanstack/react-query';
+import type {
+  DefaultError,
+  InfiniteData,
+  UseInfiniteQueryResult,
+} from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useInfiniteQuery as useInfiniteQueryBase } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
diff --git a/packages/react-client/src/callbacks/useIsMutating.ts b/packages/react-client/src/callbacks/useIsMutating.ts
@@ -4,8 +4,7 @@ import type {
   OperationSchema,
   ServiceOperationUseIsMutating,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
-import type { UseMutationResult } from '@tanstack/react-query';
+import type { DefaultError, UseMutationResult } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useIsMutating as useIsMutatingStateTanstack } from '@tanstack/react-query';
 import { composeMutationFilters } from '../lib/composeMutationFilters.js';
diff --git a/packages/react-client/src/callbacks/useMutation.ts b/packages/react-client/src/callbacks/useMutation.ts
@@ -5,8 +5,7 @@ import type {
   ServiceOperationMutationKey,
   ServiceOperationUseMutation,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
-import type { UseMutationResult } from '@tanstack/react-query';
+import type { DefaultError, UseMutationResult } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useMutation as useMutationBase } from '@tanstack/react-query';
 import { composeMutationKey } from '../lib/composeMutationKey.js';
diff --git a/packages/react-client/src/callbacks/useMutationState.ts b/packages/react-client/src/callbacks/useMutationState.ts
@@ -4,8 +4,7 @@ import type {
   OperationSchema,
   ServiceOperationUseMutationState,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
-import type { UseMutationResult } from '@tanstack/react-query';
+import type { DefaultError, UseMutationResult } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useMutationState as useMutationStateTanstack } from '@tanstack/react-query';
 import { composeMutationFilters } from '../lib/composeMutationFilters.js';
diff --git a/packages/react-client/src/callbacks/useQueries.ts b/packages/react-client/src/callbacks/useQueries.ts
@@ -4,8 +4,7 @@ import type {
   OperationSchema,
   ServiceOperationUseQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
-import type { QueriesResults } from '@tanstack/react-query';
+import type { DefaultError, QueriesResults } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useQueries as useQueriesTanstack } from '@tanstack/react-query';
 import { composeQueryKey } from '../lib/composeQueryKey.js';
diff --git a/packages/react-client/src/callbacks/useQuery.ts b/packages/react-client/src/callbacks/useQuery.ts
@@ -4,8 +4,7 @@ import type {
   OperationSchema,
   ServiceOperationUseQuery,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
-import type { UseQueryResult } from '@tanstack/react-query';
+import type { DefaultError, UseQueryResult } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useQuery as useQueryTanstack } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
diff --git a/packages/react-client/src/callbacks/useSuspenseInfiniteQuery.ts b/packages/react-client/src/callbacks/useSuspenseInfiniteQuery.ts
@@ -4,8 +4,11 @@ import type {
   OperationSchema,
   ServiceOperationUseSuspenseInfiniteQuery,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError, InfiniteData } from '@tanstack/query-core';
-import type { UseSuspenseInfiniteQueryResult } from '@tanstack/react-query';
+import type {
+  DefaultError,
+  InfiniteData,
+  UseSuspenseInfiniteQueryResult,
+} from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useSuspenseInfiniteQuery as useSuspenseInfiniteQueryTanstack } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
diff --git a/packages/react-client/src/callbacks/useSuspenseQueries.ts b/packages/react-client/src/callbacks/useSuspenseQueries.ts
@@ -4,8 +4,10 @@ import type {
   OperationSchema,
   ServiceOperationUseSuspenseQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
-import type { SuspenseQueriesResults } from '@tanstack/react-query';
+import type {
+  DefaultError,
+  SuspenseQueriesResults,
+} from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useSuspenseQueries as useSuspenseQueriesTanstack } from '@tanstack/react-query';
 import { composeQueryKey } from '../lib/composeQueryKey.js';
diff --git a/packages/react-client/src/callbacks/useSuspenseQuery.ts b/packages/react-client/src/callbacks/useSuspenseQuery.ts
@@ -4,8 +4,7 @@ import type {
   OperationSchema,
   ServiceOperationUseSuspenseQuery,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
-import type { UseQueryResult } from '@tanstack/react-query';
+import type { DefaultError, UseQueryResult } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useSuspenseQuery as useSuspenseQueryTanstack } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
diff --git a/packages/react-client/src/lib/callQueryClientFetchMethod.ts b/packages/react-client/src/lib/callQueryClientFetchMethod.ts
@@ -1,4 +1,4 @@
-import type { QueryClient } from '@tanstack/query-core';
+import type { QueryClient } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema, RequestFn } from './requestFn.js';
 import { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';
diff --git a/packages/react-client/src/lib/callQueryClientMethodWithMutationFilters.ts b/packages/react-client/src/lib/callQueryClientMethodWithMutationFilters.ts
@@ -1,4 +1,4 @@
-import type { QueryClient } from '@tanstack/query-core';
+import type { QueryClient } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema } from './requestFn.js';
 import { composeMutationFilters } from './composeMutationFilters.js';
diff --git a/packages/react-client/src/lib/callQueryClientMethodWithQueryFilters.ts b/packages/react-client/src/lib/callQueryClientMethodWithQueryFilters.ts
@@ -1,4 +1,4 @@
-import type { QueryClient } from '@tanstack/query-core';
+import type { QueryClient } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema } from './requestFn.js';
 import { composeQueryFilters } from './composeQueryFilters.js';
diff --git a/packages/react-client/src/lib/callQueryClientMethodWithQueryKey.ts b/packages/react-client/src/lib/callQueryClientMethodWithQueryKey.ts
@@ -1,4 +1,4 @@
-import type { QueryClient } from '@tanstack/query-core';
+import type { QueryClient } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema } from './requestFn.js';
 import { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';
diff --git a/packages/react-client/src/lib/useComposeUseQueryOptions.ts b/packages/react-client/src/lib/useComposeUseQueryOptions.ts
@@ -1,8 +1,7 @@
 'use client';
 
 import type { ServiceOperationQueryKey } from '@openapi-qraft/tanstack-query-react-types';
-import type { QueryClient } from '@tanstack/query-core';
-import type { UseQueryOptions } from '@tanstack/react-query';
+import type { QueryClient, UseQueryOptions } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema } from './requestFn.js';
 import { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';
diff --git a/packages/react-client/src/qraftAPIClient.ts b/packages/react-client/src/qraftAPIClient.ts
@@ -1,5 +1,5 @@
 import type { QraftServiceOperationsToken } from '@openapi-qraft/tanstack-query-react-types';
-import type { QueryClient } from '@tanstack/query-core';
+import type { QueryClient } from '@tanstack/react-query';
 import type * as callbacks from './callbacks/index.js';
 import type * as operationInvokeModule from './callbacks/operationInvokeFn.js';
 import type {
diff --git a/packages/react-client/src/tests/createAPIClient.const-parameters.types-test.ts b/packages/react-client/src/tests/createAPIClient.const-parameters.types-test.ts
@@ -1,4 +1,4 @@
-import { QueryClient } from '@tanstack/query-core';
+import { QueryClient } from '@tanstack/react-query';
 import { requestFn } from '../index.js';
 import { createAPIClient } from './fixtures/api/index.js';
 
diff --git a/packages/react-client/src/tests/createAPIOperationClient.test.tsx b/packages/react-client/src/tests/createAPIOperationClient.test.tsx
@@ -3,7 +3,7 @@ import {
   getInfiniteQueryKey,
   getQueryKey,
 } from '@openapi-qraft/react/callbacks/index';
-import { QueryClient } from '@tanstack/query-core';
+import { QueryClient } from '@tanstack/react-query';
 import { describe, expect, it, vi } from 'vitest';
 import {
   createInternalReactAPIClient as createAPIOperationClient,
diff --git a/packages/react-client/src/tests/qraftAPIClient.queryable-write-operations.test.tsx b/packages/react-client/src/tests/qraftAPIClient.queryable-write-operations.test.tsx
@@ -1,6 +1,5 @@
 import type { paths } from './fixtures/api/index.js';
-import { QueryClient } from '@tanstack/query-core';
-import { QueryClientProvider } from '@tanstack/react-query';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { renderHook, waitFor } from '@testing-library/react';
 import React from 'react';
 import { describe, expect, it } from 'vitest';
diff --git a/packages/react-client/src/tests/qraftAPIClient.test.tsx b/packages/react-client/src/tests/qraftAPIClient.test.tsx
@@ -1,3 +1,4 @@
+import type { QueryClientConfig } from '@tanstack/react-query';
 import type { ReactNode } from 'react';
 import type { CreateAPIQueryClientOptions } from '../index.js';
 import type {
@@ -11,7 +12,6 @@ import {
   operationInvokeFn,
   useQuery,
 } from '@openapi-qraft/react/callbacks/index';
-import { type QueryClientConfig } from '@tanstack/query-core';
 import {
   hashKey,
   QueryClient,
diff --git a/packages/react-client/src/tests/qraftAPIClient.types-test.ts b/packages/react-client/src/tests/qraftAPIClient.types-test.ts
@@ -2,7 +2,7 @@
 
 import { qraftAPIClient, requestFn } from '@openapi-qraft/react';
 import * as callbacks from '@openapi-qraft/react/callbacks/index';
-import { QueryClient } from '@tanstack/query-core';
+import { QueryClient } from '@tanstack/react-query';
 import { services } from './fixtures/api/index.js';
 import {
   deleteFiles,
diff --git a/packages/tanstack-query-react-types/package.json b/packages/tanstack-query-react-types/package.json
@@ -31,14 +31,12 @@
     }
   },
   "peerDependencies": {
-    "@tanstack/query-core": "^5.0.0",
     "@tanstack/react-query": "^5.0.0",
     "react": "^18 || ^19"
   },
   "devDependencies": {
     "@openapi-qraft/eslint-config": "workspace:*",
     "@openapi-qraft/rollup-config": "workspace:*",
-    "@tanstack/query-core": "^5.80.6",
     "@tanstack/react-query": "^5.80.6",
     "eslint": "^9.24.0",
     "rimraf": "^5.0.10",
diff --git a/yarn.lock b/yarn.lock
