chore: force type import (#4202)

* chore: force type import

* lint: prettier format

* lint: rollback some eslint config

* lint: fix react-query-tools

.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",

.gitattributes

@@ -1,2 +1,2 @@
 # Auto detect text files and perform LF normalization
-* text=auto
+* text=auto eol=lf

packages/query-async-storage-persister/src/index.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   PersistedClient,
   Persister,
   Promisable,

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<TData, TError> = (
   result: InfiniteQueryObserverResult<TData, TError>,

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
 

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

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'

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

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

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
 

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
 

packages/query-core/src/queryObserver.ts

@@ -1,4 +1,4 @@
-import { DefaultedQueryObserverOptions, RefetchPageFilters } from './types'
+import type { DefaultedQueryObserverOptions, RefetchPageFilters } from './types'
 import {
   isServer,
   isValidTimeout,

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
 

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', () => {

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

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

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', () => {

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

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', () => {

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

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', () => {

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

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 {

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[]
 

packages/query-sync-storage-persister/src/index.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   PersistedClient,
   Persister,
   PersistRetryer,

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,

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'

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'

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> = T extends 'button'

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<PersistQueryClientOptions, 'queryClient'>

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 => {