From ca767771f3720ba9abb541871c22ea106172e9ab Mon Sep 17 00:00:00 2001 From: Jungzl <35426360+Jungzl@users.noreply.github.com> Date: Fri, 23 Sep 2022 16:55:22 +0800 Subject: [PATCH] chore: force type import (#4202) * chore: force type import * lint: prettier format * lint: rollback some eslint config * lint: fix react-query-tools --- .eslintrc | 1 + .gitattributes | 2 +- .../query-async-storage-persister/src/index.ts | 2 +- packages/query-core/src/infiniteQueryObserver.ts | 9 +++------ packages/query-core/src/mutation.ts | 6 ++++-- packages/query-core/src/mutationCache.ts | 8 +++++--- packages/query-core/src/mutationObserver.ts | 3 ++- packages/query-core/src/queriesObserver.ts | 3 ++- packages/query-core/src/query.ts | 6 ++++-- packages/query-core/src/queryCache.ts | 13 +++++-------- packages/query-core/src/queryClient.ts | 9 ++++----- packages/query-core/src/queryObserver.ts | 2 +- packages/query-core/src/retryer.ts | 2 +- .../src/tests/infiniteQueryBehavior.test.tsx | 4 ++-- .../src/tests/infiniteQueryObserver.test.tsx | 3 ++- .../query-core/src/tests/mutationObserver.test.tsx | 3 ++- packages/query-core/src/tests/mutations.test.tsx | 4 ++-- .../query-core/src/tests/queriesObserver.test.tsx | 10 +++------- packages/query-core/src/tests/query.test.tsx | 7 ++----- packages/query-core/src/tests/queryCache.test.tsx | 5 +++-- packages/query-core/src/tests/queryClient.test.tsx | 5 ++--- .../query-core/src/tests/queryObserver.test.tsx | 8 ++------ packages/query-core/src/tests/utils.ts | 7 ++----- packages/query-core/src/types.ts | 2 +- packages/query-sync-storage-persister/src/index.ts | 2 +- .../src/__tests__/devtools.test.tsx | 3 ++- .../react-query-devtools/src/__tests__/utils.tsx | 2 +- packages/react-query-devtools/src/devtools.tsx | 10 ++++++---- packages/react-query-devtools/src/utils.ts | 3 ++- .../src/PersistQueryClientProvider.tsx | 10 ++++------ .../__tests__/PersistQueryClientProvider.test.tsx | 9 ++++----- .../src/__tests__/persist.test.tsx | 7 ++----- .../src/__tests__/utils.ts | 3 ++- packages/react-query-persist-client/src/persist.ts | 5 ++--- .../src/retryStrategies.ts | 2 +- packages/react-query/src/Hydrate.tsx | 5 +++-- packages/react-query/src/QueryClientProvider.tsx | 4 ++-- .../react-query/src/__tests__/suspense.test.tsx | 3 +-- .../src/__tests__/useInfiniteQuery.test.tsx | 5 ++--- .../src/__tests__/useIsFetching.test.tsx | 3 ++- .../react-query/src/__tests__/useMutation.test.tsx | 5 +++-- .../react-query/src/__tests__/useQueries.test.tsx | 8 +++----- .../react-query/src/__tests__/useQuery.test.tsx | 5 ++--- packages/react-query/src/__tests__/utils.tsx | 9 ++------- packages/react-query/src/types.ts | 4 ++-- packages/react-query/src/useBaseQuery.ts | 5 +++-- packages/react-query/src/useInfiniteQuery.ts | 7 +++---- packages/react-query/src/useIsFetching.ts | 10 +++------- packages/react-query/src/useIsMutating.ts | 10 +++------- packages/react-query/src/useMutation.ts | 5 ++--- packages/react-query/src/useQueries.ts | 10 +++------- packages/react-query/src/useQuery.ts | 14 +++++++------- 52 files changed, 130 insertions(+), 162 deletions(-) diff --git a/.eslintrc b/.eslintrc index 1e64b9db54..97c3fc3abd 100644 --- a/.eslintrc +++ b/.eslintrc @@ -34,6 +34,7 @@ "react/jsx-key": ["error", { "checkFragmentShorthand": true }], "@typescript-eslint/ban-types": "off", "@typescript-eslint/ban-ts-comment": "off", + "@typescript-eslint/consistent-type-imports": "error", "@typescript-eslint/explicit-module-boundary-types": "off", "@typescript-eslint/no-empty-interface": "off", "@typescript-eslint/no-explicit-any": "off", diff --git a/.gitattributes b/.gitattributes index dfe0770424..5a0d5e480b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ # Auto detect text files and perform LF normalization -* text=auto +* text=auto eol=lf diff --git a/packages/query-async-storage-persister/src/index.ts b/packages/query-async-storage-persister/src/index.ts index 680affae69..6dd0603d84 100644 --- a/packages/query-async-storage-persister/src/index.ts +++ b/packages/query-async-storage-persister/src/index.ts @@ -1,4 +1,4 @@ -import { +import type { PersistedClient, Persister, Promisable, diff --git a/packages/query-core/src/infiniteQueryObserver.ts b/packages/query-core/src/infiniteQueryObserver.ts index a7a00d0a1e..1db0170e65 100644 --- a/packages/query-core/src/infiniteQueryObserver.ts +++ b/packages/query-core/src/infiniteQueryObserver.ts @@ -8,17 +8,14 @@ import type { QueryKey, } from './types' import type { QueryClient } from './queryClient' -import { - NotifyOptions, - ObserverFetchOptions, - QueryObserver, -} from './queryObserver' +import type { NotifyOptions, ObserverFetchOptions } from './queryObserver' +import { QueryObserver } from './queryObserver' import { hasNextPage, hasPreviousPage, infiniteQueryBehavior, } from './infiniteQueryBehavior' -import { Query } from './query' +import type { Query } from './query' type InfiniteQueryObserverListener = ( result: InfiniteQueryObserverResult, diff --git a/packages/query-core/src/mutation.ts b/packages/query-core/src/mutation.ts index b374281c15..810b856e86 100644 --- a/packages/query-core/src/mutation.ts +++ b/packages/query-core/src/mutation.ts @@ -1,10 +1,12 @@ import type { MutationOptions, MutationStatus, MutationMeta } from './types' import type { MutationCache } from './mutationCache' import type { MutationObserver } from './mutationObserver' -import { defaultLogger, Logger } from './logger' +import type { Logger } from './logger' +import { defaultLogger } from './logger' import { notifyManager } from './notifyManager' import { Removable } from './removable' -import { canFetch, Retryer, createRetryer } from './retryer' +import type { Retryer } from './retryer' +import { canFetch, createRetryer } from './retryer' // TYPES diff --git a/packages/query-core/src/mutationCache.ts b/packages/query-core/src/mutationCache.ts index f4490c8fd7..90d0f57016 100644 --- a/packages/query-core/src/mutationCache.ts +++ b/packages/query-core/src/mutationCache.ts @@ -1,9 +1,11 @@ -import { MutationObserver } from './mutationObserver' +import type { MutationObserver } from './mutationObserver' import type { MutationOptions } from './types' import type { QueryClient } from './queryClient' import { notifyManager } from './notifyManager' -import { Action, Mutation, MutationState } from './mutation' -import { matchMutation, MutationFilters, noop } from './utils' +import type { Action, MutationState } from './mutation' +import { Mutation } from './mutation' +import type { MutationFilters } from './utils' +import { matchMutation, noop } from './utils' import { Subscribable } from './subscribable' // TYPES diff --git a/packages/query-core/src/mutationObserver.ts b/packages/query-core/src/mutationObserver.ts index 0e9646955f..20f7e62da2 100644 --- a/packages/query-core/src/mutationObserver.ts +++ b/packages/query-core/src/mutationObserver.ts @@ -1,4 +1,5 @@ -import { Action, getDefaultState, Mutation } from './mutation' +import type { Action, Mutation } from './mutation' +import { getDefaultState } from './mutation' import { notifyManager } from './notifyManager' import type { QueryClient } from './queryClient' import { Subscribable } from './subscribable' diff --git a/packages/query-core/src/queriesObserver.ts b/packages/query-core/src/queriesObserver.ts index 71416ab8d5..67d25162b6 100644 --- a/packages/query-core/src/queriesObserver.ts +++ b/packages/query-core/src/queriesObserver.ts @@ -6,7 +6,8 @@ import type { DefaultedQueryObserverOptions, } from './types' import type { QueryClient } from './queryClient' -import { NotifyOptions, QueryObserver } from './queryObserver' +import type { NotifyOptions } from './queryObserver' +import { QueryObserver } from './queryObserver' import { Subscribable } from './subscribable' type QueriesObserverListener = (result: QueryObserverResult[]) => void diff --git a/packages/query-core/src/query.ts b/packages/query-core/src/query.ts index 087f50cd2a..fae716a0b1 100644 --- a/packages/query-core/src/query.ts +++ b/packages/query-core/src/query.ts @@ -12,9 +12,11 @@ import type { } from './types' import type { QueryCache } from './queryCache' import type { QueryObserver } from './queryObserver' -import { defaultLogger, Logger } from './logger' +import type { Logger } from './logger' +import { defaultLogger } from './logger' import { notifyManager } from './notifyManager' -import { Retryer, isCancelledError, canFetch, createRetryer } from './retryer' +import type { Retryer } from './retryer' +import { isCancelledError, canFetch, createRetryer } from './retryer' import { Removable } from './removable' // TYPES diff --git a/packages/query-core/src/queryCache.ts b/packages/query-core/src/queryCache.ts index 3f262672e0..b6a1a37f82 100644 --- a/packages/query-core/src/queryCache.ts +++ b/packages/query-core/src/queryCache.ts @@ -1,15 +1,12 @@ -import { - QueryFilters, - hashQueryKeyByOptions, - matchQuery, - parseFilterArgs, -} from './utils' -import { Action, Query, QueryState } from './query' +import type { QueryFilters } from './utils' +import { hashQueryKeyByOptions, matchQuery, parseFilterArgs } from './utils' +import type { Action, QueryState } from './query' +import { Query } from './query' import type { QueryKey, QueryOptions } from './types' import { notifyManager } from './notifyManager' import type { QueryClient } from './queryClient' import { Subscribable } from './subscribable' -import { QueryObserver } from './queryObserver' +import type { QueryObserver } from './queryObserver' // TYPES diff --git a/packages/query-core/src/queryClient.ts b/packages/query-core/src/queryClient.ts index caf70d060b..5680b230ce 100644 --- a/packages/query-core/src/queryClient.ts +++ b/packages/query-core/src/queryClient.ts @@ -1,13 +1,11 @@ +import type { QueryFilters, Updater, MutationFilters } from './utils' import { - QueryFilters, - Updater, hashQueryKey, noop, parseFilterArgs, parseQueryArgs, partialMatchKey, hashQueryKeyByOptions, - MutationFilters, functionalUpdate, } from './utils' import type { @@ -38,8 +36,9 @@ import { focusManager } from './focusManager' import { onlineManager } from './onlineManager' import { notifyManager } from './notifyManager' import { infiniteQueryBehavior } from './infiniteQueryBehavior' -import { CancelOptions, DefaultedQueryObserverOptions } from './types' -import { defaultLogger, Logger } from './logger' +import type { CancelOptions, DefaultedQueryObserverOptions } from './types' +import type { Logger } from './logger' +import { defaultLogger } from './logger' // TYPES diff --git a/packages/query-core/src/queryObserver.ts b/packages/query-core/src/queryObserver.ts index 1babfb05d7..d10d84762b 100644 --- a/packages/query-core/src/queryObserver.ts +++ b/packages/query-core/src/queryObserver.ts @@ -1,4 +1,4 @@ -import { DefaultedQueryObserverOptions, RefetchPageFilters } from './types' +import type { DefaultedQueryObserverOptions, RefetchPageFilters } from './types' import { isServer, isValidTimeout, diff --git a/packages/query-core/src/retryer.ts b/packages/query-core/src/retryer.ts index 9a3cf8f09a..fd50dea6e6 100644 --- a/packages/query-core/src/retryer.ts +++ b/packages/query-core/src/retryer.ts @@ -1,7 +1,7 @@ import { focusManager } from './focusManager' import { onlineManager } from './onlineManager' import { sleep } from './utils' -import { CancelOptions, NetworkMode } from './types' +import type { CancelOptions, NetworkMode } from './types' // TYPES diff --git a/packages/query-core/src/tests/infiniteQueryBehavior.test.tsx b/packages/query-core/src/tests/infiniteQueryBehavior.test.tsx index 3f7eabdc47..f52023136a 100644 --- a/packages/query-core/src/tests/infiniteQueryBehavior.test.tsx +++ b/packages/query-core/src/tests/infiniteQueryBehavior.test.tsx @@ -1,9 +1,9 @@ import { waitFor } from '@testing-library/react' -import { +import type { QueryClient, - InfiniteQueryObserver, InfiniteQueryObserverResult, } from '@tanstack/query-core' +import { InfiniteQueryObserver } from '@tanstack/query-core' import { createQueryClient, queryKey } from './utils' describe('InfiniteQueryBehavior', () => { diff --git a/packages/query-core/src/tests/infiniteQueryObserver.test.tsx b/packages/query-core/src/tests/infiniteQueryObserver.test.tsx index 7009f07c0f..ed3485ab0b 100644 --- a/packages/query-core/src/tests/infiniteQueryObserver.test.tsx +++ b/packages/query-core/src/tests/infiniteQueryObserver.test.tsx @@ -1,5 +1,6 @@ import { createQueryClient, queryKey, sleep } from './utils' -import { QueryClient, InfiniteQueryObserver } from '..' +import type { QueryClient } from '..' +import { InfiniteQueryObserver } from '..' describe('InfiniteQueryObserver', () => { let queryClient: QueryClient diff --git a/packages/query-core/src/tests/mutationObserver.test.tsx b/packages/query-core/src/tests/mutationObserver.test.tsx index 99045b44bc..12d1153ab6 100644 --- a/packages/query-core/src/tests/mutationObserver.test.tsx +++ b/packages/query-core/src/tests/mutationObserver.test.tsx @@ -1,6 +1,7 @@ import { waitFor } from '@testing-library/react' import { createQueryClient, sleep } from './utils' -import { QueryClient, MutationObserver } from '..' +import type { QueryClient } from '..' +import { MutationObserver } from '..' describe('mutationObserver', () => { let queryClient: QueryClient diff --git a/packages/query-core/src/tests/mutations.test.tsx b/packages/query-core/src/tests/mutations.test.tsx index ddf5397a88..311ea1cb40 100644 --- a/packages/query-core/src/tests/mutations.test.tsx +++ b/packages/query-core/src/tests/mutations.test.tsx @@ -1,6 +1,6 @@ -import { QueryClient } from '..' +import type { QueryClient } from '..' import { createQueryClient, executeMutation, queryKey, sleep } from './utils' -import { MutationState } from '../mutation' +import type { MutationState } from '../mutation' import { MutationObserver } from '../mutationObserver' describe('mutations', () => { diff --git a/packages/query-core/src/tests/queriesObserver.test.tsx b/packages/query-core/src/tests/queriesObserver.test.tsx index c8e23b8540..4994a6cbc8 100644 --- a/packages/query-core/src/tests/queriesObserver.test.tsx +++ b/packages/query-core/src/tests/queriesObserver.test.tsx @@ -1,12 +1,8 @@ import { waitFor } from '@testing-library/react' import { sleep, queryKey, createQueryClient, mockLogger } from './utils' -import { - QueryClient, - QueriesObserver, - QueryObserverResult, - QueryObserver, -} from '..' -import { QueryKey } from '..' +import type { QueryClient, QueryObserverResult } from '..' +import { QueriesObserver, QueryObserver } from '..' +import type { QueryKey } from '..' describe('queriesObserver', () => { let queryClient: QueryClient diff --git a/packages/query-core/src/tests/query.test.tsx b/packages/query-core/src/tests/query.test.tsx index ec88924fe4..a2fc966e22 100644 --- a/packages/query-core/src/tests/query.test.tsx +++ b/packages/query-core/src/tests/query.test.tsx @@ -5,16 +5,13 @@ import { mockLogger, createQueryClient, } from './utils' -import { +import type { QueryCache, QueryClient, - QueryObserver, - isCancelledError, - isError, - onlineManager, QueryFunctionContext, QueryObserverResult, } from '..' +import { QueryObserver, isCancelledError, isError, onlineManager } from '..' import { waitFor } from '@testing-library/react' describe('query', () => { diff --git a/packages/query-core/src/tests/queryCache.test.tsx b/packages/query-core/src/tests/queryCache.test.tsx index 39d5a59b09..3707856ed2 100644 --- a/packages/query-core/src/tests/queryCache.test.tsx +++ b/packages/query-core/src/tests/queryCache.test.tsx @@ -1,6 +1,7 @@ import { sleep, queryKey, createQueryClient } from './utils' -import { QueryCache, QueryClient } from '..' -import { Query } from '.././query' +import type { QueryClient } from '..' +import { QueryCache } from '..' +import type { Query } from '.././query' describe('queryCache', () => { let queryClient: QueryClient diff --git a/packages/query-core/src/tests/queryClient.test.tsx b/packages/query-core/src/tests/queryClient.test.tsx index 1944da4370..b98c00daca 100644 --- a/packages/query-core/src/tests/queryClient.test.tsx +++ b/packages/query-core/src/tests/queryClient.test.tsx @@ -2,14 +2,13 @@ import { waitFor } from '@testing-library/react' import '@testing-library/jest-dom' import { sleep, queryKey, mockLogger, createQueryClient } from './utils' -import { - InfiniteQueryObserver, +import type { QueryCache, QueryClient, QueryFunction, - QueryObserver, QueryObserverOptions, } from '..' +import { InfiniteQueryObserver, QueryObserver } from '..' import { focusManager, onlineManager } from '..' describe('queryClient', () => { diff --git a/packages/query-core/src/tests/queryObserver.test.tsx b/packages/query-core/src/tests/queryObserver.test.tsx index e8de1224eb..82a031bee6 100644 --- a/packages/query-core/src/tests/queryObserver.test.tsx +++ b/packages/query-core/src/tests/queryObserver.test.tsx @@ -5,12 +5,8 @@ import { mockLogger, createQueryClient, } from './utils' -import { - QueryClient, - QueryObserver, - QueryObserverResult, - focusManager, -} from '..' +import type { QueryClient, QueryObserverResult } from '..' +import { QueryObserver, focusManager } from '..' describe('queryObserver', () => { let queryClient: QueryClient diff --git a/packages/query-core/src/tests/utils.ts b/packages/query-core/src/tests/utils.ts index b4f28ddce0..404fee2312 100644 --- a/packages/query-core/src/tests/utils.ts +++ b/packages/query-core/src/tests/utils.ts @@ -1,10 +1,7 @@ import { act } from '@testing-library/react' -import { - MutationOptions, - QueryClient, - QueryClientConfig, -} from '@tanstack/query-core' +import type { MutationOptions, QueryClientConfig } from '@tanstack/query-core' +import { QueryClient } from '@tanstack/query-core' import * as utils from '../utils' export function createQueryClient(config?: QueryClientConfig): QueryClient { diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts index 3d100aa1cd..ca07fbffe3 100644 --- a/packages/query-core/src/types.ts +++ b/packages/query-core/src/types.ts @@ -4,7 +4,7 @@ import type { RetryValue, RetryDelayValue } from './retryer' import type { QueryFilters, QueryTypeFilter } from './utils' import type { QueryCache } from './queryCache' import type { MutationCache } from './mutationCache' -import { Logger } from './logger' +import type { Logger } from './logger' export type QueryKey = readonly unknown[] diff --git a/packages/query-sync-storage-persister/src/index.ts b/packages/query-sync-storage-persister/src/index.ts index ea16c877ec..9fe8aa1408 100644 --- a/packages/query-sync-storage-persister/src/index.ts +++ b/packages/query-sync-storage-persister/src/index.ts @@ -1,4 +1,4 @@ -import { +import type { PersistedClient, Persister, PersistRetryer, diff --git a/packages/react-query-devtools/src/__tests__/devtools.test.tsx b/packages/react-query-devtools/src/__tests__/devtools.test.tsx index 3e0758b2bc..e7e052a7be 100644 --- a/packages/react-query-devtools/src/__tests__/devtools.test.tsx +++ b/packages/react-query-devtools/src/__tests__/devtools.test.tsx @@ -2,7 +2,8 @@ import * as React from 'react' import { fireEvent, screen, waitFor, act } from '@testing-library/react' import { ErrorBoundary } from 'react-error-boundary' import '@testing-library/jest-dom' -import { useQuery, QueryClient } from '@tanstack/react-query' +import type { QueryClient } from '@tanstack/react-query' +import { useQuery } from '@tanstack/react-query' import { sortFns } from '../utils' import { getByTextContent, diff --git a/packages/react-query-devtools/src/__tests__/utils.tsx b/packages/react-query-devtools/src/__tests__/utils.tsx index 4e6827e4ba..1b0009e641 100644 --- a/packages/react-query-devtools/src/__tests__/utils.tsx +++ b/packages/react-query-devtools/src/__tests__/utils.tsx @@ -1,4 +1,4 @@ -import { MatcherFunction } from '@testing-library/dom/types/matches' +import type { MatcherFunction } from '@testing-library/dom/types/matches' import { render } from '@testing-library/react' import * as React from 'react' import { ReactQueryDevtools } from '../devtools' diff --git a/packages/react-query-devtools/src/devtools.tsx b/packages/react-query-devtools/src/devtools.tsx index f98eec97dd..8871ed657f 100644 --- a/packages/react-query-devtools/src/devtools.tsx +++ b/packages/react-query-devtools/src/devtools.tsx @@ -1,14 +1,16 @@ import * as React from 'react' import { useSyncExternalStore } from './useSyncExternalStore' -import { - useQueryClient, - onlineManager, - notifyManager, +import type { QueryCache, QueryClient, QueryKey as QueryKeyType, ContextOptions, } from '@tanstack/react-query' +import { + useQueryClient, + onlineManager, + notifyManager, +} from '@tanstack/react-query' import { rankItem, compareItems } from '@tanstack/match-sorter-utils' import useLocalStorage from './useLocalStorage' import { sortFns, useIsMounted } from './utils' diff --git a/packages/react-query-devtools/src/utils.ts b/packages/react-query-devtools/src/utils.ts index 51da0c3b4e..d7252036c0 100644 --- a/packages/react-query-devtools/src/utils.ts +++ b/packages/react-query-devtools/src/utils.ts @@ -1,7 +1,8 @@ import * as React from 'react' import type { Query } from '@tanstack/react-query' -import { Theme, useTheme } from './theme' +import type { Theme } from './theme' +import { useTheme } from './theme' import useMediaQuery from './useMediaQuery' type StyledComponent = T extends 'button' diff --git a/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx b/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx index e3619a66a8..87be05dbf7 100644 --- a/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx +++ b/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx @@ -1,11 +1,9 @@ import * as React from 'react' -import { persistQueryClient, PersistQueryClientOptions } from './persist' -import { - QueryClientProvider, - QueryClientProviderProps, - IsRestoringProvider, -} from '@tanstack/react-query' +import type { PersistQueryClientOptions } from './persist' +import { persistQueryClient } from './persist' +import type { QueryClientProviderProps } from '@tanstack/react-query' +import { QueryClientProvider, IsRestoringProvider } from '@tanstack/react-query' export type PersistQueryClientProviderProps = QueryClientProviderProps & { persistOptions: Omit diff --git a/packages/react-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx b/packages/react-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx index 089b7d974f..0206cdfc71 100644 --- a/packages/react-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx +++ b/packages/react-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx @@ -1,15 +1,14 @@ import * as React from 'react' import { render, waitFor } from '@testing-library/react' -import { - QueryClient, - useQuery, +import type { UseQueryResult, - useQueries, DefinedUseQueryResult, } from '@tanstack/react-query' +import { QueryClient, useQuery, useQueries } from '@tanstack/react-query' import { createQueryClient, mockLogger, queryKey, sleep } from './utils' -import { PersistedClient, Persister, persistQueryClientSave } from '../persist' +import type { PersistedClient, Persister } from '../persist' +import { persistQueryClientSave } from '../persist' import { PersistQueryClientProvider } from '../PersistQueryClientProvider' const createMockPersister = (): Persister => { diff --git a/packages/react-query-persist-client/src/__tests__/persist.test.tsx b/packages/react-query-persist-client/src/__tests__/persist.test.tsx index dad2878f58..4c1b2a44a8 100644 --- a/packages/react-query-persist-client/src/__tests__/persist.test.tsx +++ b/packages/react-query-persist-client/src/__tests__/persist.test.tsx @@ -1,9 +1,6 @@ import { createQueryClient, sleep } from './utils' -import { - PersistedClient, - Persister, - persistQueryClientSubscribe, -} from '../persist' +import type { PersistedClient, Persister } from '../persist' +import { persistQueryClientSubscribe } from '../persist' const createMockPersister = (): Persister => { let storedState: PersistedClient | undefined diff --git a/packages/react-query-persist-client/src/__tests__/utils.ts b/packages/react-query-persist-client/src/__tests__/utils.ts index 436c834222..312280698a 100644 --- a/packages/react-query-persist-client/src/__tests__/utils.ts +++ b/packages/react-query-persist-client/src/__tests__/utils.ts @@ -1,6 +1,7 @@ import { act } from '@testing-library/react' -import { QueryClient, QueryClientConfig } from '@tanstack/query-core' +import type { QueryClientConfig } from '@tanstack/query-core' +import { QueryClient } from '@tanstack/query-core' export function createQueryClient(config?: QueryClientConfig): QueryClient { jest.spyOn(console, 'error').mockImplementation(() => undefined) diff --git a/packages/react-query-persist-client/src/persist.ts b/packages/react-query-persist-client/src/persist.ts index 1e0edaf214..48a5ccb2ac 100644 --- a/packages/react-query-persist-client/src/persist.ts +++ b/packages/react-query-persist-client/src/persist.ts @@ -1,11 +1,10 @@ -import { +import type { QueryClient, - dehydrate, DehydratedState, DehydrateOptions, HydrateOptions, - hydrate, } from '@tanstack/query-core' +import { dehydrate, hydrate } from '@tanstack/query-core' export type Promisable = T | PromiseLike diff --git a/packages/react-query-persist-client/src/retryStrategies.ts b/packages/react-query-persist-client/src/retryStrategies.ts index 2fe39c8c7c..1c6438e7f6 100644 --- a/packages/react-query-persist-client/src/retryStrategies.ts +++ b/packages/react-query-persist-client/src/retryStrategies.ts @@ -1,4 +1,4 @@ -import { PersistedClient } from './persist' +import type { PersistedClient } from './persist' export type PersistRetryer = (props: { persistedClient: PersistedClient diff --git a/packages/react-query/src/Hydrate.tsx b/packages/react-query/src/Hydrate.tsx index 875cb514b2..a1b9fed01f 100644 --- a/packages/react-query/src/Hydrate.tsx +++ b/packages/react-query/src/Hydrate.tsx @@ -1,8 +1,9 @@ import * as React from 'react' -import { hydrate, HydrateOptions } from '@tanstack/query-core' +import type { HydrateOptions } from '@tanstack/query-core' +import { hydrate } from '@tanstack/query-core' import { useQueryClient } from './QueryClientProvider' -import { ContextOptions } from './types' +import type { ContextOptions } from './types' export function useHydrate( state: unknown, diff --git a/packages/react-query/src/QueryClientProvider.tsx b/packages/react-query/src/QueryClientProvider.tsx index 07dcd2f1ce..5746e0b8e9 100644 --- a/packages/react-query/src/QueryClientProvider.tsx +++ b/packages/react-query/src/QueryClientProvider.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { QueryClient } from '@tanstack/query-core' -import { ContextOptions } from './types' +import type { QueryClient } from '@tanstack/query-core' +import type { ContextOptions } from './types' declare global { interface Window { diff --git a/packages/react-query/src/__tests__/suspense.test.tsx b/packages/react-query/src/__tests__/suspense.test.tsx index 6eede91ef5..220a11b179 100644 --- a/packages/react-query/src/__tests__/suspense.test.tsx +++ b/packages/react-query/src/__tests__/suspense.test.tsx @@ -3,14 +3,13 @@ import { ErrorBoundary } from 'react-error-boundary' import * as React from 'react' import { createQueryClient, queryKey, renderWithClient, sleep } from './utils' +import type { UseInfiniteQueryResult, UseQueryResult } from '..' import { QueryCache, QueryErrorResetBoundary, useInfiniteQuery, - UseInfiniteQueryResult, useQuery, useQueryErrorResetBoundary, - UseQueryResult, } from '..' describe("useQuery's in Suspense mode", () => { diff --git a/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx b/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx index 7b506254cc..4c526ee9c8 100644 --- a/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx +++ b/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx @@ -9,13 +9,12 @@ import { setActTimeout, sleep, } from './utils' -import { +import type { InfiniteData, - QueryCache, QueryFunctionContext, - useInfiniteQuery, UseInfiniteQueryResult, } from '..' +import { QueryCache, useInfiniteQuery } from '..' interface Result { items: number[] diff --git a/packages/react-query/src/__tests__/useIsFetching.test.tsx b/packages/react-query/src/__tests__/useIsFetching.test.tsx index 7c8e25f122..05e953836d 100644 --- a/packages/react-query/src/__tests__/useIsFetching.test.tsx +++ b/packages/react-query/src/__tests__/useIsFetching.test.tsx @@ -9,7 +9,8 @@ import { setActTimeout, sleep, } from './utils' -import { QueryCache, QueryClient, useIsFetching, useQuery } from '..' +import type { QueryClient } from '..' +import { QueryCache, useIsFetching, useQuery } from '..' describe('useIsFetching', () => { // See https://github.com/tannerlinsley/react-query/issues/105 diff --git a/packages/react-query/src/__tests__/useMutation.test.tsx b/packages/react-query/src/__tests__/useMutation.test.tsx index 12c451748d..29b5995efb 100644 --- a/packages/react-query/src/__tests__/useMutation.test.tsx +++ b/packages/react-query/src/__tests__/useMutation.test.tsx @@ -3,8 +3,9 @@ import '@testing-library/jest-dom' import * as React from 'react' import { ErrorBoundary } from 'react-error-boundary' -import { MutationCache, QueryCache, QueryClient, useMutation } from '..' -import { UseMutationResult } from '../types' +import type { QueryClient } from '..' +import { MutationCache, QueryCache, useMutation } from '..' +import type { UseMutationResult } from '../types' import { createQueryClient, mockNavigatorOnLine, diff --git a/packages/react-query/src/__tests__/useQueries.test.tsx b/packages/react-query/src/__tests__/useQueries.test.tsx index a7f6badd5f..c129e2e16c 100644 --- a/packages/react-query/src/__tests__/useQueries.test.tsx +++ b/packages/react-query/src/__tests__/useQueries.test.tsx @@ -12,18 +12,16 @@ import { renderWithClient, sleep, } from './utils' -import { - QueriesObserver, - QueryCache, +import type { QueryClient, QueryFunction, QueryKey, QueryObserverResult, - useQueries, UseQueryOptions, UseQueryResult, } from '..' -import { QueryFunctionContext } from '@tanstack/query-core' +import { QueriesObserver, QueryCache, useQueries } from '..' +import type { QueryFunctionContext } from '@tanstack/query-core' describe('useQueries', () => { const queryCache = new QueryCache() diff --git a/packages/react-query/src/__tests__/useQuery.test.tsx b/packages/react-query/src/__tests__/useQuery.test.tsx index 75966a6f43..eecddc21bc 100644 --- a/packages/react-query/src/__tests__/useQuery.test.tsx +++ b/packages/react-query/src/__tests__/useQuery.test.tsx @@ -13,15 +13,14 @@ import { setActTimeout, sleep, } from './utils' -import { +import type { DefinedUseQueryResult, - QueryCache, QueryFunction, QueryFunctionContext, - useQuery, UseQueryOptions, UseQueryResult, } from '..' +import { QueryCache, useQuery } from '..' import { ErrorBoundary } from 'react-error-boundary' describe('useQuery', () => { diff --git a/packages/react-query/src/__tests__/utils.tsx b/packages/react-query/src/__tests__/utils.tsx index 33729be963..604bc3b983 100644 --- a/packages/react-query/src/__tests__/utils.tsx +++ b/packages/react-query/src/__tests__/utils.tsx @@ -1,12 +1,7 @@ import * as React from 'react' import { act, render } from '@testing-library/react' -import { - QueryClient, - ContextOptions, - QueryClientProvider, - QueryClientConfig, - MutationOptions, -} from '..' +import type { ContextOptions, QueryClientConfig, MutationOptions } from '..' +import { QueryClient, QueryClientProvider } from '..' import * as utils from '@tanstack/query-core' export function renderWithClient( diff --git a/packages/react-query/src/types.ts b/packages/react-query/src/types.ts index cd626fc3e1..83828a56ab 100644 --- a/packages/react-query/src/types.ts +++ b/packages/react-query/src/types.ts @@ -1,5 +1,5 @@ -import * as React from 'react' -import { +import type * as React from 'react' +import type { InfiniteQueryObserverOptions, InfiniteQueryObserverResult, MutationObserverResult, diff --git a/packages/react-query/src/useBaseQuery.ts b/packages/react-query/src/useBaseQuery.ts index 7272a4b817..a14966e5ba 100644 --- a/packages/react-query/src/useBaseQuery.ts +++ b/packages/react-query/src/useBaseQuery.ts @@ -1,10 +1,11 @@ import * as React from 'react' import { useSyncExternalStore } from './useSyncExternalStore' -import { QueryKey, notifyManager, QueryObserver } from '@tanstack/query-core' +import type { QueryKey, QueryObserver } from '@tanstack/query-core' +import { notifyManager } from '@tanstack/query-core' import { useQueryErrorResetBoundary } from './QueryErrorResetBoundary' import { useQueryClient } from './QueryClientProvider' -import { UseBaseQueryOptions } from './types' +import type { UseBaseQueryOptions } from './types' import { shouldThrowError } from './utils' import { useIsRestoring } from './isRestoring' diff --git a/packages/react-query/src/useInfiniteQuery.ts b/packages/react-query/src/useInfiniteQuery.ts index f711465ba1..e7c23f5c43 100644 --- a/packages/react-query/src/useInfiniteQuery.ts +++ b/packages/react-query/src/useInfiniteQuery.ts @@ -1,11 +1,10 @@ -import { +import type { QueryObserver, - InfiniteQueryObserver, QueryFunction, QueryKey, - parseQueryArgs, } from '@tanstack/query-core' -import { UseInfiniteQueryOptions, UseInfiniteQueryResult } from './types' +import { InfiniteQueryObserver, parseQueryArgs } from '@tanstack/query-core' +import type { UseInfiniteQueryOptions, UseInfiniteQueryResult } from './types' import { useBaseQuery } from './useBaseQuery' // HOOK diff --git a/packages/react-query/src/useIsFetching.ts b/packages/react-query/src/useIsFetching.ts index c5332008ac..e72e5c0ea8 100644 --- a/packages/react-query/src/useIsFetching.ts +++ b/packages/react-query/src/useIsFetching.ts @@ -1,13 +1,9 @@ import * as React from 'react' -import { - QueryKey, - notifyManager, - parseFilterArgs, - QueryFilters, -} from '@tanstack/query-core' +import type { QueryKey, QueryFilters } from '@tanstack/query-core' +import { notifyManager, parseFilterArgs } from '@tanstack/query-core' import { useSyncExternalStore } from './useSyncExternalStore' -import { ContextOptions } from './types' +import type { ContextOptions } from './types' import { useQueryClient } from './QueryClientProvider' interface Options extends ContextOptions {} diff --git a/packages/react-query/src/useIsMutating.ts b/packages/react-query/src/useIsMutating.ts index 04710c9796..46c23a274c 100644 --- a/packages/react-query/src/useIsMutating.ts +++ b/packages/react-query/src/useIsMutating.ts @@ -1,13 +1,9 @@ import * as React from 'react' import { useSyncExternalStore } from './useSyncExternalStore' -import { - notifyManager, - MutationKey, - MutationFilters, - parseMutationFilterArgs, -} from '@tanstack/query-core' -import { ContextOptions } from './types' +import type { MutationKey, MutationFilters } from '@tanstack/query-core' +import { notifyManager, parseMutationFilterArgs } from '@tanstack/query-core' +import type { ContextOptions } from './types' import { useQueryClient } from './QueryClientProvider' interface Options extends ContextOptions {} diff --git a/packages/react-query/src/useMutation.ts b/packages/react-query/src/useMutation.ts index cfd26f8661..8ba94a3bfb 100644 --- a/packages/react-query/src/useMutation.ts +++ b/packages/react-query/src/useMutation.ts @@ -1,15 +1,14 @@ import * as React from 'react' import { useSyncExternalStore } from './useSyncExternalStore' +import type { MutationFunction, MutationKey } from '@tanstack/query-core' import { notifyManager, parseMutationArgs, MutationObserver, - MutationFunction, - MutationKey, } from '@tanstack/query-core' import { useQueryClient } from './QueryClientProvider' -import { +import type { UseMutateFunction, UseMutationOptions, UseMutationResult, diff --git a/packages/react-query/src/useQueries.ts b/packages/react-query/src/useQueries.ts index cebaf05086..1d33981c24 100644 --- a/packages/react-query/src/useQueries.ts +++ b/packages/react-query/src/useQueries.ts @@ -1,14 +1,10 @@ import * as React from 'react' import { useSyncExternalStore } from './useSyncExternalStore' -import { - QueryKey, - QueryFunction, - notifyManager, - QueriesObserver, -} from '@tanstack/query-core' +import type { QueryKey, QueryFunction } from '@tanstack/query-core' +import { notifyManager, QueriesObserver } from '@tanstack/query-core' import { useQueryClient } from './QueryClientProvider' -import { UseQueryOptions, UseQueryResult } from './types' +import type { UseQueryOptions, UseQueryResult } from './types' import { useIsRestoring } from './isRestoring' // This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`. diff --git a/packages/react-query/src/useQuery.ts b/packages/react-query/src/useQuery.ts index 624a9edd48..1ccf7099ed 100644 --- a/packages/react-query/src/useQuery.ts +++ b/packages/react-query/src/useQuery.ts @@ -1,10 +1,10 @@ -import { - parseQueryArgs, - QueryFunction, - QueryKey, - QueryObserver, -} from '@tanstack/query-core' -import { DefinedUseQueryResult, UseQueryOptions, UseQueryResult } from './types' +import type { QueryFunction, QueryKey } from '@tanstack/query-core' +import { parseQueryArgs, QueryObserver } from '@tanstack/query-core' +import type { + DefinedUseQueryResult, + UseQueryOptions, + UseQueryResult, +} from './types' import { useBaseQuery } from './useBaseQuery' // HOOK