Fix exports

# Conflicts:
#	packages/toolkit/src/query/core/buildThunks.ts
#	packages/toolkit/src/query/index.ts
#	packages/toolkit/src/query/react/buildHooks.ts

Author: aryaemami59

packages/toolkit/src/query/core/buildInitiate.ts

@@ -21,10 +21,9 @@ import type {
 } from '../endpointDefinitions'
 import { countObjectKeys, getOrInsert, isNotNullish } from '../utils'
 import type {
-  SubscriptionOptions,
-  RootState,
-  InfiniteQueryConfigOptions,
   InfiniteData,
+  InfiniteQueryConfigOptions,
+  SubscriptionOptions,
 } from './apiState'
 import type {
   InfiniteQueryResultSelectorResult,

packages/toolkit/src/query/core/buildMiddleware/types.ts

@@ -23,7 +23,7 @@ import type {
   MutationThunk,
   QueryThunk,
   QueryThunkArg,
-  ThunkResult
+  ThunkResult,
 } from '../buildThunks'
 import type { QueryActionCreatorResult } from '../buildInitiate'
 
@@ -66,7 +66,7 @@ export interface BuildSubMiddlewareInput
     querySubState: Exclude<
       QuerySubState<any>,
       { status: QueryStatus.uninitialized }
-    >
+    >,
   ): ThunkAction<QueryActionCreatorResult<any>, any, any, UnknownAction>
   isThisApiSliceAction: (action: Action) => boolean
 }

packages/toolkit/src/query/core/buildThunks.ts

@@ -19,6 +19,7 @@ import type {
   AssertTagTypes,
   EndpointDefinition,
   EndpointDefinitions,
+  InfiniteQueryDefinition,
   MutationDefinition,
   QueryArgFrom,
   QueryDefinition,
@@ -27,7 +28,6 @@ import type {
 import { calculateProvidedBy, isQueryDefinition } from '../endpointDefinitions'
 import { HandledError } from '../HandledError'
 import type { UnwrapPromise } from '../tsHelpers'
-import type { InfiniteQueryDefinition } from '../endpointDefinitions'
 import type {
   RootState,
   QueryKeys,

packages/toolkit/src/query/core/index.ts

@@ -29,6 +29,7 @@ export type {
 } from './buildMiddleware/index'
 export { skipToken } from './buildSelectors'
 export type {
+  InfiniteQueryResultSelectorResult,
   MutationResultSelectorResult,
   QueryResultSelectorResult,
   SkipToken,

packages/toolkit/src/query/index.ts

@@ -5,6 +5,7 @@ import { formatProdErrorMessage } from '@reduxjs/toolkit'
 export type {
   CombinedState,
   InfiniteData,
+  InfiniteQueryConfigOptions,
   QueryCacheKey,
   QueryKeys,
   QuerySubState,
@@ -63,6 +64,7 @@ export type {
   SkipToken,
 } from './core/buildSelectors'
 export type {
+  InfiniteQueryActionCreatorResult,
   QueryActionCreatorResult,
   MutationActionCreatorResult,
   StartQueryActionCreatorOptions,

packages/toolkit/src/query/react/buildHooks.ts

@@ -7,12 +7,15 @@ import type {
 import type {
   Api,
   ApiContext,
-  ApiEndpointMutation,
   ApiEndpointInfiniteQuery,
+  ApiEndpointMutation,
   ApiEndpointQuery,
   BaseQueryFn,
   CoreModule,
   EndpointDefinitions,
+  InfiniteData,
+  InfiniteQueryActionCreatorResult,
+  InfiniteQueryConfigOptions,
   InfiniteQueryDefinition,
   MutationActionCreatorResult,
   MutationDefinition,
@@ -46,25 +49,19 @@ import {
   useState,
 } from 'react'
 import { shallowEqual } from 'react-redux'
-import type { SubscriptionSelectors } from '../core'
+import type { InfiniteQueryResultSelectorResult } from '../core/buildSelectors'
+import type { SubscriptionSelectors } from '../core/index'
 import { defaultSerializeQueryArgs } from '../defaultSerializeQueryArgs'
+import type {
+  InfiniteQueryArgFrom,
+  PageParamFrom,
+} from '../endpointDefinitions'
 import type { UninitializedValue } from './constants'
 import { UNINITIALIZED_VALUE } from './constants'
 import type { ReactHooksModuleOptions } from './module'
 import { useStableQueryArgs } from './useSerializedStableValue'
 import { useShallowStableValue } from './useShallowStableValue'
-
-import type { InfiniteQueryActionCreatorResult } from '@internal/query/core/buildInitiate'
-import type {
-  InfiniteData,
-  InfiniteQueryConfigOptions,
-  InfiniteQuerySubState,
-} from '@internal/query/core/apiState'
-import type { InfiniteQueryResultSelectorResult } from '../core/buildSelectors'
-import type {
-  InfiniteQueryArgFrom,
-  PageParamFrom,
-} from '../endpointDefinitions'
+import type { InfiniteQuerySubState } from '../core/apiState'
 
 // Copy-pasted from React-Redux
 const canUseDOM = () =>

packages/toolkit/src/query/react/module.ts

@@ -2,6 +2,7 @@ import type {
   Api,
   BaseQueryFn,
   EndpointDefinitions,
+  InfiniteQueryDefinition,
   Module,
   MutationDefinition,
   PrefetchOptions,
@@ -16,7 +17,6 @@ import {
   useStore as rrUseStore,
 } from 'react-redux'
 import { createSelector as _createSelector } from 'reselect'
-import type { InfiniteQueryDefinition } from '../endpointDefinitions'
 import {
   isInfiniteQueryDefinition,
   isMutationDefinition,