Deduplicate RTKQ imports

Author: markerikson

packages/toolkit/src/query/react/ApiProvider.tsx

@@ -3,8 +3,8 @@ import type { Context } from 'react'
 import { useContext, useEffect } from './reactImports'
 import * as React from 'react'
 import type { ReactReduxContextValue } from 'react-redux'
-import { Provider, ReactReduxContext } from 'react-redux'
-import { setupListeners } from '@reduxjs/toolkit/query'
+import { Provider, ReactReduxContext } from './reactReduxImports'
+import { setupListeners } from './rtkqImports'
 import type { Api } from '@reduxjs/toolkit/query'
 
 /**

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

@@ -39,7 +39,7 @@ import type {
   TSHelpersNoInfer,
   TSHelpersOverride,
 } from '@reduxjs/toolkit/query'
-import { QueryStatus, skipToken } from '@reduxjs/toolkit/query'
+import { QueryStatus, skipToken } from './rtkqImports'
 import type { DependencyList } from 'react'
 import {
   useCallback,

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

@@ -2,7 +2,7 @@
 // does not have to import this into each source file it rewrites.
 import { formatProdErrorMessage } from '@reduxjs/toolkit'
 
-import { buildCreateApi, coreModule } from '@reduxjs/toolkit/query'
+import { buildCreateApi, coreModule } from './rtkqImports'
 import { reactHooksModule, reactHooksModuleName } from './module'
 
 export * from '@reduxjs/toolkit/query'

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

@@ -1 +1 @@
-export { shallowEqual } from 'react-redux'
+export { shallowEqual, Provider, ReactReduxContext } from 'react-redux'

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

@@ -0,0 +1,8 @@
+export {
+  buildCreateApi,
+  coreModule,
+  copyWithStructuralSharing,
+  setupListeners,
+  QueryStatus,
+  skipToken,
+} from '@reduxjs/toolkit/query'

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

@@ -1,5 +1,5 @@
 import { useEffect, useRef, useMemo } from './reactImports'
-import { copyWithStructuralSharing } from '@reduxjs/toolkit/query'
+import { copyWithStructuralSharing } from './rtkqImports'
 
 export function useStableQueryArgs<T>(queryArgs: T) {
   const cache = useRef(queryArgs)