Fix OverrideResultType imports in test files

reduxjs · Jan 29, 2024 · 3418c5a · 3418c5a
1 parent 5a43739
commit 3418c5a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 23 deletions.
diff --git a/packages/toolkit/src/query/tests/createApi.test-d.ts b/packages/toolkit/src/query/tests/createApi.test-d.ts
@@ -3,14 +3,12 @@ import type { SerializedError } from '@reduxjs/toolkit'
 import { configureStore } from '@reduxjs/toolkit'
 import type {
   DefinitionsFromApi,
-  OverrideResultType,
-  TagTypesFromApi,
-} from '@reduxjs/toolkit/dist/query/endpointDefinitions'
-import type {
   FetchBaseQueryError,
   MutationDefinition,
+  OverrideResultType,
   QueryDefinition,
   TagDescription,
+  TagTypesFromApi,
 } from '@reduxjs/toolkit/query'
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query'
 

diff --git a/packages/toolkit/src/query/tests/createApi.test.ts b/packages/toolkit/src/query/tests/createApi.test.ts
@@ -1,23 +1,20 @@
+import { server } from '@internal/query/tests/mocks/server'
+import {
+  getSerializedHeaders,
+  setupApiStore,
+} from '@internal/tests/utils/helpers'
 import { configureStore, createAction, createReducer } from '@reduxjs/toolkit'
 import type {
+  DefinitionsFromApi,
   FetchBaseQueryMeta,
+  OverrideResultType,
   SerializeQueryArgs,
+  TagTypesFromApi,
 } from '@reduxjs/toolkit/query'
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query'
-import type { MockInstance } from 'vitest'
-
-import type {
-  DefinitionsFromApi,
-  OverrideResultType,
-  TagTypesFromApi,
-} from '@reduxjs/toolkit/dist/query/endpointDefinitions'
-import { server } from '@internal/query/tests/mocks/server'
-import {
-  getSerializedHeaders,
-  setupApiStore,
-} from '@internal/tests/utils/helpers'
 import { HttpResponse, delay, http } from 'msw'
 import nodeFetch from 'node-fetch'
+import type { MockInstance } from 'vitest'
 
 beforeAll(() => {
   vi.stubEnv('NODE_ENV', 'development')

diff --git a/packages/toolkit/src/query/tests/invalidation.test.tsx b/packages/toolkit/src/query/tests/invalidation.test.tsx
@@ -1,4 +1,4 @@
-import type { TagDescription } from '@reduxjs/toolkit/dist/query/endpointDefinitions'
+import type { TagDescription } from '@reduxjs/toolkit/query'
 import { createApi, fakeBaseQuery } from '@reduxjs/toolkit/query'
 import { waitFor } from '@testing-library/react'
 import { delay } from 'msw'
@@ -13,7 +13,7 @@ const tagTypes = [
   'dog',
   'giraffe',
 ] as const
-type TagTypes = typeof tagTypes[number]
+type TagTypes = (typeof tagTypes)[number]
 type Tags = TagDescription<TagTypes>[]
 
 /** providesTags, invalidatesTags, shouldInvalidate */
@@ -103,23 +103,23 @@ test.each(caseMatrix)(
         }),
       }),
       undefined,
-      { withoutTestLifecycles: true }
+      { withoutTestLifecycles: true },
     )
 
     store.dispatch(providing.initiate())
     store.dispatch(unrelated.initiate())
     expect(queryCount).toBe(1)
     await waitFor(() => {
       expect(api.endpoints.providing.select()(store.getState()).status).toBe(
-        'fulfilled'
+        'fulfilled',
       )
       expect(api.endpoints.unrelated.select()(store.getState()).status).toBe(
-        'fulfilled'
+        'fulfilled',
       )
     })
     const toInvalidate = api.util.selectInvalidatedBy(
       store.getState(),
-      invalidatesTags
+      invalidatesTags,
     )
 
     if (shouldInvalidate) {
@@ -138,5 +138,5 @@ test.each(caseMatrix)(
     expect(queryCount).toBe(1)
     await delay(2)
     expect(queryCount).toBe(shouldInvalidate ? 2 : 1)
-  }
+  },
 )