From 9c721e548f500be924da8ef6da041a919f513140 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sun, 16 Jul 2023 14:51:42 +1000 Subject: [PATCH] refactor: Sort imports with eslint (#5634) --- .eslintrc.cjs | 24 ++++++++++ .../eslint-plugin-query/src/configs/index.ts | 2 +- .../exhaustive-deps/exhaustive-deps.rule.ts | 2 +- .../exhaustive-deps/exhaustive-deps.utils.ts | 2 +- .../prefer-query-object-syntax.test.ts | 4 +- .../prefer-query-object-syntax.ts | 2 +- .../src/utils/ast-utils.ts | 4 +- .../src/utils/create-rule.ts | 2 +- .../src/index.ts | 2 +- .../query-core/src/infiniteQueryObserver.ts | 12 ++--- packages/query-core/src/mutation.ts | 10 ++-- packages/query-core/src/mutationCache.ts | 8 ++-- packages/query-core/src/mutationObserver.ts | 8 ++-- packages/query-core/src/queriesObserver.ts | 6 +-- packages/query-core/src/query.ts | 16 +++---- packages/query-core/src/queryCache.ts | 8 ++-- packages/query-core/src/queryClient.ts | 28 +++++------ packages/query-core/src/queryObserver.ts | 10 ++-- .../query-core/src/tests/hydration.test.tsx | 4 +- .../src/tests/infiniteQueryBehavior.test.tsx | 6 +-- .../src/tests/infiniteQueryObserver.test.tsx | 2 +- .../src/tests/mutationCache.test.tsx | 2 +- .../src/tests/mutationObserver.test.tsx | 2 +- .../query-core/src/tests/mutations.test.tsx | 6 +-- .../src/tests/queriesObserver.test.tsx | 4 +- packages/query-core/src/tests/query.test.tsx | 12 ++--- .../query-core/src/tests/queryCache.test.tsx | 6 +-- .../query-core/src/tests/queryClient.test.tsx | 8 ++-- .../src/tests/queryObserver.test.tsx | 8 ++-- packages/query-core/src/tests/utils.test.tsx | 8 ++-- packages/query-core/src/tests/utils.ts | 2 +- packages/query-core/src/types.ts | 4 +- .../src/__tests__/persist.test.ts | 6 +-- .../src/__tests__/utils.ts | 4 +- .../query-persist-client-core/src/persist.ts | 6 +-- .../src/__tests__/storageIsFull.test.ts | 2 +- .../query-sync-storage-persister/src/index.ts | 2 +- .../react-query-devtools/src/Explorer.tsx | 2 +- .../src/__tests__/Explorer.test.tsx | 4 +- .../src/__tests__/devtools.test.tsx | 8 ++-- .../src/__tests__/utils.tsx | 7 ++- .../react-query-devtools/src/devtools.tsx | 46 +++++++++---------- packages/react-query-devtools/src/utils.ts | 4 +- .../src/PersistQueryClientProvider.tsx | 4 +- .../PersistQueryClientProvider.test.tsx | 18 ++++---- .../src/__tests__/utils.ts | 2 +- packages/react-query/src/Hydrate.tsx | 2 +- .../src/__tests__/Hydrate.test.tsx | 8 ++-- .../__tests__/QueryClientProvider.test.tsx | 4 +- .../QueryResetErrorBoundary.test.tsx | 2 +- .../src/__tests__/ssr-hydration.test.tsx | 4 +- .../react-query/src/__tests__/ssr.test.tsx | 4 +- .../src/__tests__/suspense.test.tsx | 2 +- .../src/__tests__/useInfiniteQuery.test.tsx | 2 +- .../src/__tests__/useIsFetching.test.tsx | 2 +- .../src/__tests__/useIsMutating.test.tsx | 6 +-- .../src/__tests__/useMutation.test.tsx | 4 +- .../src/__tests__/useQueries.test.tsx | 2 +- .../src/__tests__/useQuery.test.tsx | 4 +- packages/react-query/src/__tests__/utils.tsx | 4 +- .../react-query/src/errorBoundaryUtils.ts | 4 +- .../src/reactBatchedUpdates.native.ts | 1 + .../react-query/src/reactBatchedUpdates.ts | 1 + packages/react-query/src/types.ts | 8 ++-- packages/react-query/src/useBaseQuery.ts | 8 ++-- packages/react-query/src/useInfiniteQuery.ts | 6 +-- packages/react-query/src/useIsFetching.ts | 4 +- packages/react-query/src/useIsMutating.ts | 6 +-- packages/react-query/src/useMutation.ts | 10 ++-- packages/react-query/src/useQueries.ts | 10 ++-- packages/react-query/src/useQuery.ts | 4 +- .../solid-query/src/QueryClientProvider.tsx | 10 ++-- .../__tests__/QueryClientProvider.test.tsx | 6 +-- .../__tests__/createInfiniteQuery.test.tsx | 13 +++--- .../src/__tests__/createMutation.test.tsx | 8 ++-- .../src/__tests__/createQueries.test.tsx | 26 +++++------ .../src/__tests__/createQuery.test.tsx | 22 ++++----- .../src/__tests__/suspense.test.tsx | 12 ++--- .../src/__tests__/transition.test.tsx | 4 +- .../src/__tests__/useIsFetching.test.tsx | 8 ++-- .../src/__tests__/useIsMutating.test.tsx | 18 ++++---- packages/solid-query/src/__tests__/utils.tsx | 4 +- packages/solid-query/src/createBaseQuery.ts | 14 +++--- .../solid-query/src/createInfiniteQuery.ts | 18 ++++---- packages/solid-query/src/createMutation.ts | 10 ++-- packages/solid-query/src/createQueries.ts | 6 +-- packages/solid-query/src/createQuery.ts | 10 ++-- packages/solid-query/src/types.ts | 14 +++--- packages/solid-query/src/useIsFetching.ts | 8 ++-- packages/solid-query/src/useIsMutating.ts | 6 +-- packages/solid-query/src/utils.ts | 4 +- packages/svelte-query/src/Hydrate.svelte | 2 +- .../src/QueryClientProvider.svelte | 2 +- .../src/__tests__/createMutation.test.ts | 2 +- .../src/__tests__/createQueries.test.ts | 2 +- .../src/__tests__/createQuery.test.ts | 2 +- packages/svelte-query/src/__tests__/utils.ts | 2 +- packages/svelte-query/src/context.ts | 2 +- packages/svelte-query/src/createBaseQuery.ts | 6 +-- .../svelte-query/src/createInfiniteQuery.ts | 6 +-- packages/svelte-query/src/createMutation.ts | 4 +- packages/svelte-query/src/createQueries.ts | 15 +++--- packages/svelte-query/src/createQuery.ts | 4 +- packages/svelte-query/src/types.ts | 8 ++-- packages/svelte-query/src/useIsFetching.ts | 4 +- packages/svelte-query/src/useQueryClient.ts | 2 +- .../src/__tests__/useInfiniteQuery.test.ts | 2 +- .../src/__tests__/useIsFetching.test.ts | 2 +- .../src/__tests__/useIsMutating.test.ts | 2 +- .../src/__tests__/useMutation.test.ts | 2 +- .../src/__tests__/useQueries.test.ts | 8 ++-- .../vue-query/src/__tests__/useQuery.test.ts | 10 ++-- .../vue-query/src/__tests__/utils.test.ts | 2 +- .../src/__tests__/vueQueryPlugin.test.ts | 4 +- packages/vue-query/src/devtools/devtools.ts | 6 +-- packages/vue-query/src/mutationCache.ts | 2 +- packages/vue-query/src/queryCache.ts | 4 +- packages/vue-query/src/queryClient.ts | 36 +++++++-------- packages/vue-query/src/types.ts | 2 +- packages/vue-query/src/useBaseQuery.ts | 16 +++---- packages/vue-query/src/useInfiniteQuery.ts | 10 ++-- packages/vue-query/src/useIsFetching.ts | 8 ++-- packages/vue-query/src/useIsMutating.ts | 8 ++-- packages/vue-query/src/useMutation.ts | 18 ++++---- packages/vue-query/src/useQueries.ts | 4 +- packages/vue-query/src/useQuery.ts | 10 ++-- packages/vue-query/src/useQueryClient.ts | 2 +- packages/vue-query/src/utils.ts | 2 +- packages/vue-query/src/vueQueryPlugin.ts | 2 +- 129 files changed, 460 insertions(+), 437 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 1dcd1c34ac..b2653165af 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -5,6 +5,7 @@ const config = { extends: [ 'plugin:@typescript-eslint/eslint-recommended', 'plugin:@typescript-eslint/recommended', + 'plugin:import/recommended', 'plugin:import/typescript', 'prettier', ], @@ -41,15 +42,38 @@ const config = { '@typescript-eslint/no-explicit-any': 'off', '@typescript-eslint/no-non-null-assertion': 'off', '@typescript-eslint/no-unnecessary-condition': 'error', + '@typescript-eslint/no-unused-vars': 'off', '@typescript-eslint/no-inferrable-types': [ 'error', { ignoreParameters: true }, ], + 'import/default': 'off', + 'import/export': 'off', + 'import/namespace': 'off', + 'import/newline-after-import': 'error', 'import/no-cycle': 'error', + 'import/no-duplicates': 'off', + 'import/no-named-as-default-member': 'off', 'import/no-unresolved': ['error', { ignore: ['^@tanstack/'] }], 'import/no-unused-modules': ['off', { unusedExports: true }], + 'import/order': [ + 'error', + { + groups: [ + 'builtin', + 'external', + 'internal', + 'parent', + 'sibling', + 'index', + 'object', + 'type', + ], + }, + ], 'no-redeclare': 'off', 'no-shadow': 'error', + 'sort-imports': ['error', { ignoreDeclarationSort: true }], }, overrides: [ { diff --git a/packages/eslint-plugin-query/src/configs/index.ts b/packages/eslint-plugin-query/src/configs/index.ts index e5e5aba260..04503290a1 100644 --- a/packages/eslint-plugin-query/src/configs/index.ts +++ b/packages/eslint-plugin-query/src/configs/index.ts @@ -1,5 +1,5 @@ -import type { TSESLint } from '@typescript-eslint/utils' import { rules } from '../rules' +import type { TSESLint } from '@typescript-eslint/utils' function generateRecommendedConfig( allRules: Record>, diff --git a/packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.rule.ts b/packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.rule.ts index 4ce3b30c98..472bdeb9f9 100644 --- a/packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.rule.ts +++ b/packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.rule.ts @@ -1,9 +1,9 @@ -import type { TSESLint } from '@typescript-eslint/utils' import { AST_NODE_TYPES } from '@typescript-eslint/utils' import { ASTUtils } from '../../utils/ast-utils' import { createRule } from '../../utils/create-rule' import { uniqueBy } from '../../utils/unique-by' import { ExhaustiveDepsUtils } from './exhaustive-deps.utils' +import type { TSESLint } from '@typescript-eslint/utils' const QUERY_KEY = 'queryKey' const QUERY_FN = 'queryFn' diff --git a/packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.utils.ts b/packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.utils.ts index f60bf20cab..8b146b0b5d 100644 --- a/packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.utils.ts +++ b/packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.utils.ts @@ -1,6 +1,6 @@ -import type { TSESLint } from '@typescript-eslint/utils' import { AST_NODE_TYPES } from '@typescript-eslint/utils' import { ASTUtils } from '../../utils/ast-utils' +import type { TSESLint } from '@typescript-eslint/utils' export const ExhaustiveDepsUtils = { isRelevantReference(params: { diff --git a/packages/eslint-plugin-query/src/rules/prefer-query-object-syntax/prefer-query-object-syntax.test.ts b/packages/eslint-plugin-query/src/rules/prefer-query-object-syntax/prefer-query-object-syntax.test.ts index 0c893688e9..9f8f372929 100644 --- a/packages/eslint-plugin-query/src/rules/prefer-query-object-syntax/prefer-query-object-syntax.test.ts +++ b/packages/eslint-plugin-query/src/rules/prefer-query-object-syntax/prefer-query-object-syntax.test.ts @@ -1,6 +1,6 @@ -import { rule, name } from './prefer-query-object-syntax' -import { normalizeIndent } from '../../utils/test-utils' import { ESLintUtils } from '@typescript-eslint/utils' +import { normalizeIndent } from '../../utils/test-utils' +import { name, rule } from './prefer-query-object-syntax' const ruleTester = new ESLintUtils.RuleTester({ parser: '@typescript-eslint/parser', diff --git a/packages/eslint-plugin-query/src/rules/prefer-query-object-syntax/prefer-query-object-syntax.ts b/packages/eslint-plugin-query/src/rules/prefer-query-object-syntax/prefer-query-object-syntax.ts index b55b861d12..abef567f92 100644 --- a/packages/eslint-plugin-query/src/rules/prefer-query-object-syntax/prefer-query-object-syntax.ts +++ b/packages/eslint-plugin-query/src/rules/prefer-query-object-syntax/prefer-query-object-syntax.ts @@ -1,8 +1,8 @@ -import type { TSESLint, TSESTree } from '@typescript-eslint/utils' import { AST_NODE_TYPES } from '@typescript-eslint/utils' import { createRule } from '../../utils/create-rule' import { ASTUtils } from '../../utils/ast-utils' import { objectKeys } from '../../utils/object-utils' +import type { TSESLint, TSESTree } from '@typescript-eslint/utils' const QUERY_CALLS = { useQuery: { key: 'queryKey', fn: 'queryFn', type: 'query' }, diff --git a/packages/eslint-plugin-query/src/utils/ast-utils.ts b/packages/eslint-plugin-query/src/utils/ast-utils.ts index 540063325b..29d18f54fe 100644 --- a/packages/eslint-plugin-query/src/utils/ast-utils.ts +++ b/packages/eslint-plugin-query/src/utils/ast-utils.ts @@ -1,8 +1,8 @@ +import { AST_NODE_TYPES } from '@typescript-eslint/utils' +import { uniqueBy } from './unique-by' import type { TSESLint, TSESTree } from '@typescript-eslint/utils' import type TSESLintScopeManager from '@typescript-eslint/scope-manager' -import { AST_NODE_TYPES } from '@typescript-eslint/utils' import type { RuleContext } from '@typescript-eslint/utils/dist/ts-eslint' -import { uniqueBy } from './unique-by' export const ASTUtils = { isNodeOfOneOf( diff --git a/packages/eslint-plugin-query/src/utils/create-rule.ts b/packages/eslint-plugin-query/src/utils/create-rule.ts index f2aab9298b..f8962fafca 100644 --- a/packages/eslint-plugin-query/src/utils/create-rule.ts +++ b/packages/eslint-plugin-query/src/utils/create-rule.ts @@ -1,6 +1,6 @@ import { ESLintUtils } from '@typescript-eslint/utils' -import type { EnhancedCreate } from './detect-react-query-imports' import { detectTanstackQueryImports } from './detect-react-query-imports' +import type { EnhancedCreate } from './detect-react-query-imports' const getDocsUrl = (ruleName: string): string => `https://tanstack.com/query/v4/docs/eslint/${ruleName}` diff --git a/packages/query-async-storage-persister/src/index.ts b/packages/query-async-storage-persister/src/index.ts index bc92f11419..cb477c49f8 100644 --- a/packages/query-async-storage-persister/src/index.ts +++ b/packages/query-async-storage-persister/src/index.ts @@ -1,9 +1,9 @@ +import { asyncThrottle } from './asyncThrottle' import type { PersistedClient, Persister, Promisable, } from '@tanstack/query-persist-client-core' -import { asyncThrottle } from './asyncThrottle' interface AsyncStorage { getItem: (key: string) => Promise diff --git a/packages/query-core/src/infiniteQueryObserver.ts b/packages/query-core/src/infiniteQueryObserver.ts index 921f5dc8d2..832c79a266 100644 --- a/packages/query-core/src/infiniteQueryObserver.ts +++ b/packages/query-core/src/infiniteQueryObserver.ts @@ -1,3 +1,9 @@ +import { QueryObserver } from './queryObserver' +import { + hasNextPage, + hasPreviousPage, + infiniteQueryBehavior, +} from './infiniteQueryBehavior' import type { DefaultedInfiniteQueryObserverOptions, FetchNextPageOptions, @@ -9,12 +15,6 @@ import type { } from './types' import type { QueryClient } from './queryClient' import type { NotifyOptions, ObserverFetchOptions } from './queryObserver' -import { QueryObserver } from './queryObserver' -import { - hasNextPage, - hasPreviousPage, - infiniteQueryBehavior, -} from './infiniteQueryBehavior' import type { Query } from './query' type InfiniteQueryObserverListener = ( diff --git a/packages/query-core/src/mutation.ts b/packages/query-core/src/mutation.ts index fef628165e..40ad641a54 100644 --- a/packages/query-core/src/mutation.ts +++ b/packages/query-core/src/mutation.ts @@ -1,12 +1,12 @@ -import type { MutationOptions, MutationStatus, MutationMeta } from './types' -import type { MutationCache } from './mutationCache' -import type { MutationObserver } from './mutationObserver' -import type { Logger } from './logger' import { defaultLogger } from './logger' import { notifyManager } from './notifyManager' import { Removable } from './removable' -import type { Retryer } from './retryer' import { canFetch, createRetryer } from './retryer' +import type { MutationMeta, MutationOptions, MutationStatus } from './types' +import type { MutationCache } from './mutationCache' +import type { MutationObserver } from './mutationObserver' +import type { Logger } from './logger' +import type { Retryer } from './retryer' // TYPES diff --git a/packages/query-core/src/mutationCache.ts b/packages/query-core/src/mutationCache.ts index 4fc27c1544..76658234ba 100644 --- a/packages/query-core/src/mutationCache.ts +++ b/packages/query-core/src/mutationCache.ts @@ -1,12 +1,12 @@ +import { notifyManager } from './notifyManager' +import { Mutation } from './mutation' +import { matchMutation, noop } from './utils' +import { Subscribable } from './subscribable' import type { MutationObserver } from './mutationObserver' import type { MutationOptions, NotifyEvent } from './types' import type { QueryClient } from './queryClient' -import { notifyManager } from './notifyManager' 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 e5431d703f..5b0c0eba4e 100644 --- a/packages/query-core/src/mutationObserver.ts +++ b/packages/query-core/src/mutationObserver.ts @@ -1,15 +1,15 @@ -import type { Action, Mutation } from './mutation' import { getDefaultState } from './mutation' import { notifyManager } from './notifyManager' -import type { QueryClient } from './queryClient' import { Subscribable } from './subscribable' +import { shallowEqualObjects } from './utils' +import type { QueryClient } from './queryClient' import type { MutateOptions, MutationObserverBaseResult, - MutationObserverResult, MutationObserverOptions, + MutationObserverResult, } from './types' -import { shallowEqualObjects } from './utils' +import type { Action, Mutation } from './mutation' // TYPES diff --git a/packages/query-core/src/queriesObserver.ts b/packages/query-core/src/queriesObserver.ts index 46c83e97db..8e07c4d9a8 100644 --- a/packages/query-core/src/queriesObserver.ts +++ b/packages/query-core/src/queriesObserver.ts @@ -1,14 +1,14 @@ import { difference, replaceAt } from './utils' import { notifyManager } from './notifyManager' +import { QueryObserver } from './queryObserver' +import { Subscribable } from './subscribable' import type { + DefaultedQueryObserverOptions, QueryObserverOptions, QueryObserverResult, - DefaultedQueryObserverOptions, } from './types' import type { QueryClient } from './queryClient' 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 686d8af904..8b8b5ecabd 100644 --- a/packages/query-core/src/query.ts +++ b/packages/query-core/src/query.ts @@ -1,23 +1,23 @@ import { getAbortController, noop, replaceData, timeUntilStale } from './utils' +import { defaultLogger } from './logger' +import { notifyManager } from './notifyManager' +import { canFetch, createRetryer, isCancelledError } from './retryer' +import { Removable } from './removable' import type { + CancelOptions, + FetchStatus, InitialDataFunction, + QueryFunctionContext, QueryKey, + QueryMeta, QueryOptions, QueryStatus, - QueryFunctionContext, - QueryMeta, - CancelOptions, SetDataOptions, - FetchStatus, } from './types' import type { QueryCache } from './queryCache' import type { QueryObserver } from './queryObserver' import type { Logger } from './logger' -import { defaultLogger } from './logger' -import { notifyManager } from './notifyManager' 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 8245d4d2cf..91e66e2787 100644 --- a/packages/query-core/src/queryCache.ts +++ b/packages/query-core/src/queryCache.ts @@ -1,11 +1,11 @@ -import type { QueryFilters } from './utils' import { hashQueryKeyByOptions, matchQuery, parseFilterArgs } from './utils' -import type { Action, QueryState } from './query' import { Query } from './query' -import type { NotifyEvent, QueryKey, QueryOptions } from './types' import { notifyManager } from './notifyManager' -import type { QueryClient } from './queryClient' import { Subscribable } from './subscribable' +import type { QueryFilters } from './utils' +import type { Action, QueryState } from './query' +import type { NotifyEvent, QueryKey, QueryOptions } from './types' +import type { QueryClient } from './queryClient' import type { QueryObserver } from './queryObserver' // TYPES diff --git a/packages/query-core/src/queryClient.ts b/packages/query-core/src/queryClient.ts index 1df365a4ef..cadc1fd0e6 100644 --- a/packages/query-core/src/queryClient.ts +++ b/packages/query-core/src/queryClient.ts @@ -1,15 +1,23 @@ -import type { QueryFilters, Updater, MutationFilters } from './utils' import { + functionalUpdate, hashQueryKey, + hashQueryKeyByOptions, noop, parseFilterArgs, parseQueryArgs, partialMatchKey, - hashQueryKeyByOptions, - functionalUpdate, } from './utils' +import { QueryCache } from './queryCache' +import { MutationCache } from './mutationCache' +import { focusManager } from './focusManager' +import { onlineManager } from './onlineManager' +import { notifyManager } from './notifyManager' +import { infiniteQueryBehavior } from './infiniteQueryBehavior' +import { defaultLogger } from './logger' +import type { CancelOptions, DefaultedQueryObserverOptions } from './types' +import type { Logger } from './logger' +import type { QueryState } from './query' import type { - QueryClientConfig, DefaultOptions, FetchInfiniteQueryOptions, FetchQueryOptions, @@ -19,6 +27,7 @@ import type { MutationKey, MutationObserverOptions, MutationOptions, + QueryClientConfig, QueryFunction, QueryKey, QueryObserverOptions, @@ -30,16 +39,7 @@ import type { SetDataOptions, WithRequired, } from './types' -import type { QueryState } from './query' -import { QueryCache } from './queryCache' -import { MutationCache } from './mutationCache' -import { focusManager } from './focusManager' -import { onlineManager } from './onlineManager' -import { notifyManager } from './notifyManager' -import { infiniteQueryBehavior } from './infiniteQueryBehavior' -import type { CancelOptions, DefaultedQueryObserverOptions } from './types' -import type { Logger } from './logger' -import { defaultLogger } from './logger' +import type { MutationFilters, QueryFilters, Updater } from './utils' // TYPES diff --git a/packages/query-core/src/queryObserver.ts b/packages/query-core/src/queryObserver.ts index 4e4ace8f8b..7d68795298 100644 --- a/packages/query-core/src/queryObserver.ts +++ b/packages/query-core/src/queryObserver.ts @@ -1,4 +1,3 @@ -import type { DefaultedQueryObserverOptions, RefetchPageFilters } from './types' import { isServer, isValidTimeout, @@ -8,6 +7,9 @@ import { timeUntilStale, } from './utils' import { notifyManager } from './notifyManager' +import { focusManager } from './focusManager' +import { Subscribable } from './subscribable' +import { canFetch, isCancelledError } from './retryer' import type { PlaceholderDataFunction, QueryKey, @@ -17,11 +19,9 @@ import type { QueryOptions, RefetchOptions, } from './types' -import type { Query, QueryState, Action, FetchOptions } from './query' +import type { Action, FetchOptions, Query, QueryState } from './query' import type { QueryClient } from './queryClient' -import { focusManager } from './focusManager' -import { Subscribable } from './subscribable' -import { canFetch, isCancelledError } from './retryer' +import type { DefaultedQueryObserverOptions, RefetchPageFilters } from './types' type QueryObserverListener = ( result: QueryObserverResult, diff --git a/packages/query-core/src/tests/hydration.test.tsx b/packages/query-core/src/tests/hydration.test.tsx index f4c863936e..90d268e2ef 100644 --- a/packages/query-core/src/tests/hydration.test.tsx +++ b/packages/query-core/src/tests/hydration.test.tsx @@ -1,11 +1,11 @@ +import { QueryCache } from '../queryCache' +import { dehydrate, hydrate } from '../hydration' import { createQueryClient, executeMutation, mockNavigatorOnLine, sleep, } from './utils' -import { QueryCache } from '../queryCache' -import { dehydrate, hydrate } from '../hydration' async function fetchData(value: TData, ms?: number): Promise { await sleep(ms || 0) diff --git a/packages/query-core/src/tests/infiniteQueryBehavior.test.tsx b/packages/query-core/src/tests/infiniteQueryBehavior.test.tsx index 8e215fe411..1370187baf 100644 --- a/packages/query-core/src/tests/infiniteQueryBehavior.test.tsx +++ b/packages/query-core/src/tests/infiniteQueryBehavior.test.tsx @@ -1,11 +1,11 @@ import { waitFor } from '@testing-library/react' +import { InfiniteQueryObserver } from '@tanstack/query-core' +import { createQueryClient, queryKey } from './utils' import type { - QueryClient, InfiniteQueryObserverResult, QueryCache, + QueryClient, } from '@tanstack/query-core' -import { InfiniteQueryObserver } from '@tanstack/query-core' -import { createQueryClient, queryKey } from './utils' describe('InfiniteQueryBehavior', () => { let queryClient: QueryClient diff --git a/packages/query-core/src/tests/infiniteQueryObserver.test.tsx b/packages/query-core/src/tests/infiniteQueryObserver.test.tsx index ed3485ab0b..82aeaa6393 100644 --- a/packages/query-core/src/tests/infiniteQueryObserver.test.tsx +++ b/packages/query-core/src/tests/infiniteQueryObserver.test.tsx @@ -1,6 +1,6 @@ +import { InfiniteQueryObserver } from '..' import { createQueryClient, queryKey, sleep } from './utils' import type { QueryClient } from '..' -import { InfiniteQueryObserver } from '..' describe('InfiniteQueryObserver', () => { let queryClient: QueryClient diff --git a/packages/query-core/src/tests/mutationCache.test.tsx b/packages/query-core/src/tests/mutationCache.test.tsx index fce78b2a79..4086f59a56 100644 --- a/packages/query-core/src/tests/mutationCache.test.tsx +++ b/packages/query-core/src/tests/mutationCache.test.tsx @@ -1,6 +1,6 @@ import { waitFor } from '@testing-library/react' -import { queryKey, sleep, executeMutation, createQueryClient } from './utils' import { MutationCache, MutationObserver } from '..' +import { createQueryClient, executeMutation, queryKey, sleep } from './utils' describe('mutationCache', () => { describe('MutationCacheConfig error callbacks', () => { diff --git a/packages/query-core/src/tests/mutationObserver.test.tsx b/packages/query-core/src/tests/mutationObserver.test.tsx index 12d1153ab6..e09fb3c147 100644 --- a/packages/query-core/src/tests/mutationObserver.test.tsx +++ b/packages/query-core/src/tests/mutationObserver.test.tsx @@ -1,7 +1,7 @@ import { waitFor } from '@testing-library/react' +import { MutationObserver } from '..' import { createQueryClient, sleep } from './utils' 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 e9bcc32852..651f9e33a3 100644 --- a/packages/query-core/src/tests/mutations.test.tsx +++ b/packages/query-core/src/tests/mutations.test.tsx @@ -1,8 +1,8 @@ -import type { QueryClient } from '..' +import { waitFor } from '@testing-library/react' +import { MutationObserver } from '../mutationObserver' import { createQueryClient, executeMutation, queryKey, sleep } from './utils' +import type { QueryClient } from '..' import type { MutationState } from '../mutation' -import { MutationObserver } from '../mutationObserver' -import { waitFor } from '@testing-library/react' describe('mutations', () => { let queryClient: QueryClient diff --git a/packages/query-core/src/tests/queriesObserver.test.tsx b/packages/query-core/src/tests/queriesObserver.test.tsx index 5be415ae03..9d0a4d334e 100644 --- a/packages/query-core/src/tests/queriesObserver.test.tsx +++ b/packages/query-core/src/tests/queriesObserver.test.tsx @@ -1,7 +1,7 @@ import { waitFor } from '@testing-library/react' -import { sleep, queryKey, createQueryClient, mockLogger } from './utils' -import type { QueryClient, QueryObserverResult } from '..' import { QueriesObserver, QueryObserver } from '..' +import { createQueryClient, mockLogger, queryKey, sleep } from './utils' +import type { QueryClient, QueryObserverResult } from '..' import type { QueryKey } from '..' describe('queriesObserver', () => { diff --git a/packages/query-core/src/tests/query.test.tsx b/packages/query-core/src/tests/query.test.tsx index df02050c5b..dc2b2bfb23 100644 --- a/packages/query-core/src/tests/query.test.tsx +++ b/packages/query-core/src/tests/query.test.tsx @@ -1,9 +1,11 @@ +import { waitFor } from '@testing-library/react' +import { QueryObserver, isCancelledError, isError, onlineManager } from '..' import { - sleep, - queryKey, - mockVisibilityState, - mockLogger, createQueryClient, + mockLogger, + mockVisibilityState, + queryKey, + sleep, } from './utils' import type { QueryCache, @@ -11,8 +13,6 @@ import type { QueryFunctionContext, QueryObserverResult, } from '..' -import { QueryObserver, isCancelledError, isError, onlineManager } from '..' -import { waitFor } from '@testing-library/react' describe('query', () => { let queryClient: QueryClient diff --git a/packages/query-core/src/tests/queryCache.test.tsx b/packages/query-core/src/tests/queryCache.test.tsx index 9aad38c113..289382346c 100644 --- a/packages/query-core/src/tests/queryCache.test.tsx +++ b/packages/query-core/src/tests/queryCache.test.tsx @@ -1,8 +1,8 @@ -import { sleep, queryKey, createQueryClient } from './utils' -import type { QueryClient } from '..' +import { waitFor } from '@testing-library/react' import { QueryCache, QueryObserver } from '..' +import { createQueryClient, queryKey, sleep } from './utils' +import type { QueryClient } from '..' import type { Query } from '.././query' -import { waitFor } from '@testing-library/react' 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 a927020096..86731291d5 100644 --- a/packages/query-core/src/tests/queryClient.test.tsx +++ b/packages/query-core/src/tests/queryClient.test.tsx @@ -1,16 +1,16 @@ import { waitFor } from '@testing-library/react' import '@testing-library/jest-dom' -import { sleep, queryKey, mockLogger, createQueryClient } from './utils' +import { InfiniteQueryObserver, MutationObserver, QueryObserver } from '..' +import { focusManager, onlineManager } from '..' +import { noop } from '../utils' +import { createQueryClient, mockLogger, queryKey, sleep } from './utils' import type { QueryCache, QueryClient, QueryFunction, QueryObserverOptions, } from '..' -import { InfiniteQueryObserver, MutationObserver, QueryObserver } from '..' -import { focusManager, onlineManager } from '..' -import { noop } from '../utils' describe('queryClient', () => { let queryClient: QueryClient diff --git a/packages/query-core/src/tests/queryObserver.test.tsx b/packages/query-core/src/tests/queryObserver.test.tsx index 89e9841664..7e3cc8de08 100644 --- a/packages/query-core/src/tests/queryObserver.test.tsx +++ b/packages/query-core/src/tests/queryObserver.test.tsx @@ -1,12 +1,12 @@ +import { QueryObserver, focusManager } from '..' import { - sleep, - queryKey, + createQueryClient, expectType, mockLogger, - createQueryClient, + queryKey, + sleep, } from './utils' import type { QueryClient, QueryObserverResult } from '..' -import { QueryObserver, focusManager } from '..' describe('queryObserver', () => { let queryClient: QueryClient diff --git a/packages/query-core/src/tests/utils.test.tsx b/packages/query-core/src/tests/utils.test.tsx index 415dc0f1c6..3cfd7b1c50 100644 --- a/packages/query-core/src/tests/utils.test.tsx +++ b/packages/query-core/src/tests/utils.test.tsx @@ -1,12 +1,12 @@ import { - replaceEqualDeep, - partialDeepEqual, + isPlainArray, isPlainObject, - parseMutationArgs, matchMutation, + parseMutationArgs, + partialDeepEqual, + replaceEqualDeep, scheduleMicrotask, sleep, - isPlainArray, } from '../utils' import { Mutation } from '../mutation' import { createQueryClient } from './utils' diff --git a/packages/query-core/src/tests/utils.ts b/packages/query-core/src/tests/utils.ts index 9659fb1683..a6b20b5117 100644 --- a/packages/query-core/src/tests/utils.ts +++ b/packages/query-core/src/tests/utils.ts @@ -1,8 +1,8 @@ import { act } from '@testing-library/react' -import type { MutationOptions, QueryClientConfig } from '@tanstack/query-core' import { QueryClient } from '@tanstack/query-core' import * as utils from '../utils' +import type { MutationOptions, QueryClientConfig } from '@tanstack/query-core' export function createQueryClient(config?: QueryClientConfig): QueryClient { jest.spyOn(console, 'error').mockImplementation(() => undefined) diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts index 95dedcda3f..057cb40d6d 100644 --- a/packages/query-core/src/types.ts +++ b/packages/query-core/src/types.ts @@ -1,8 +1,8 @@ /* istanbul ignore file */ import type { MutationState } from './mutation' -import type { QueryBehavior, Query } from './query' -import type { RetryValue, RetryDelayValue } from './retryer' +import type { Query, QueryBehavior } from './query' +import type { RetryDelayValue, RetryValue } from './retryer' import type { QueryFilters, QueryTypeFilter } from './utils' import type { QueryCache } from './queryCache' import type { MutationCache } from './mutationCache' diff --git a/packages/query-persist-client-core/src/__tests__/persist.test.ts b/packages/query-persist-client-core/src/__tests__/persist.test.ts index 5bfe4cccbf..d1fc542e4c 100644 --- a/packages/query-persist-client-core/src/__tests__/persist.test.ts +++ b/packages/query-persist-client-core/src/__tests__/persist.test.ts @@ -1,10 +1,10 @@ +import { QueriesObserver } from '@tanstack/query-core' +import { persistQueryClientSubscribe } from '../persist' import { + createMockPersister, createQueryClient, createSpyablePersister, - createMockPersister, } from './utils' -import { persistQueryClientSubscribe } from '../persist' -import { QueriesObserver } from '@tanstack/query-core' describe('persistQueryClientSubscribe', () => { test('should persist mutations', async () => { diff --git a/packages/query-persist-client-core/src/__tests__/utils.ts b/packages/query-persist-client-core/src/__tests__/utils.ts index fae201a01f..05c7399c33 100644 --- a/packages/query-persist-client-core/src/__tests__/utils.ts +++ b/packages/query-persist-client-core/src/__tests__/utils.ts @@ -1,8 +1,8 @@ -import type { QueryClientConfig } from '@tanstack/query-core' import { QueryClient } from '@tanstack/query-core' +import type { QueryClientConfig } from '@tanstack/query-core' import type { - Persister, PersistedClient, + Persister, } from '@tanstack/query-persist-client-core' export function createQueryClient(config?: QueryClientConfig): QueryClient { diff --git a/packages/query-persist-client-core/src/persist.ts b/packages/query-persist-client-core/src/persist.ts index 9b4230404b..409bb21fc0 100644 --- a/packages/query-persist-client-core/src/persist.ts +++ b/packages/query-persist-client-core/src/persist.ts @@ -1,10 +1,10 @@ +import { dehydrate, hydrate } from '@tanstack/query-core' import type { - QueryClient, - DehydratedState, DehydrateOptions, + DehydratedState, HydrateOptions, + QueryClient, } from '@tanstack/query-core' -import { dehydrate, hydrate } from '@tanstack/query-core' import type { NotifyEventType } from '@tanstack/query-core' export type Promisable = T | PromiseLike diff --git a/packages/query-sync-storage-persister/src/__tests__/storageIsFull.test.ts b/packages/query-sync-storage-persister/src/__tests__/storageIsFull.test.ts index 0eb795c3ce..a19f7df7e7 100644 --- a/packages/query-sync-storage-persister/src/__tests__/storageIsFull.test.ts +++ b/packages/query-sync-storage-persister/src/__tests__/storageIsFull.test.ts @@ -1,8 +1,8 @@ import { - dehydrate, MutationCache, QueryCache, QueryClient, + dehydrate, } from '@tanstack/query-core' import { removeOldestQuery } from '@tanstack/query-persist-client-core' import { createSyncStoragePersister } from '../index' diff --git a/packages/query-sync-storage-persister/src/index.ts b/packages/query-sync-storage-persister/src/index.ts index 095b50480f..a97fefb323 100644 --- a/packages/query-sync-storage-persister/src/index.ts +++ b/packages/query-sync-storage-persister/src/index.ts @@ -1,7 +1,7 @@ import type { + PersistRetryer, PersistedClient, Persister, - PersistRetryer, } from '@tanstack/query-persist-client-core' interface Storage { diff --git a/packages/react-query-devtools/src/Explorer.tsx b/packages/react-query-devtools/src/Explorer.tsx index 5c40e54000..e08a589cef 100644 --- a/packages/react-query-devtools/src/Explorer.tsx +++ b/packages/react-query-devtools/src/Explorer.tsx @@ -1,8 +1,8 @@ 'use client' import * as React from 'react' -import { displayValue, styled } from './utils' import superjson from 'superjson' +import { displayValue, styled } from './utils' export const Entry = styled('div', { fontFamily: 'Menlo, monospace', diff --git a/packages/react-query-devtools/src/__tests__/Explorer.test.tsx b/packages/react-query-devtools/src/__tests__/Explorer.test.tsx index 7d4dd7e00e..e0aefcc63b 100644 --- a/packages/react-query-devtools/src/__tests__/Explorer.test.tsx +++ b/packages/react-query-devtools/src/__tests__/Explorer.test.tsx @@ -1,7 +1,7 @@ -import { fireEvent, render, screen, act } from '@testing-library/react' +import { act, fireEvent, render, screen } from '@testing-library/react' import * as React from 'react' -import { chunkArray, CopyButton, DefaultRenderer } from '../Explorer' +import { CopyButton, DefaultRenderer, chunkArray } from '../Explorer' import { displayValue } from '../utils' describe('Explorer', () => { diff --git a/packages/react-query-devtools/src/__tests__/devtools.test.tsx b/packages/react-query-devtools/src/__tests__/devtools.test.tsx index 0e79aee4d7..1287cc2931 100644 --- a/packages/react-query-devtools/src/__tests__/devtools.test.tsx +++ b/packages/react-query-devtools/src/__tests__/devtools.test.tsx @@ -1,17 +1,17 @@ import * as React from 'react' -import { fireEvent, screen, waitFor, act } from '@testing-library/react' +import { act, fireEvent, screen, waitFor } from '@testing-library/react' import { ErrorBoundary } from 'react-error-boundary' import '@testing-library/jest-dom' -import type { QueryClient } from '@tanstack/react-query' import { useQuery } from '@tanstack/react-query' +import UserEvent from '@testing-library/user-event' import { defaultPanelSize, sortFns } from '../utils' import { + createQueryClient, getByTextContent, renderWithClient, sleep, - createQueryClient, } from './utils' -import UserEvent from '@testing-library/user-event' +import type { QueryClient } from '@tanstack/react-query' // TODO: This should be removed with the types for react-error-boundary get updated. declare module 'react-error-boundary' { diff --git a/packages/react-query-devtools/src/__tests__/utils.tsx b/packages/react-query-devtools/src/__tests__/utils.tsx index 197b782afd..76c9d7d654 100644 --- a/packages/react-query-devtools/src/__tests__/utils.tsx +++ b/packages/react-query-devtools/src/__tests__/utils.tsx @@ -1,12 +1,11 @@ -import { render, type RenderOptions } from '@testing-library/react' +import { type RenderOptions, render } from '@testing-library/react' import * as React from 'react' -import { ReactQueryDevtools } from '../devtools' - import { + QueryCache, QueryClient, QueryClientProvider, - QueryCache, } from '@tanstack/react-query' +import { ReactQueryDevtools } from '../devtools' export function renderWithClient( client: QueryClient, diff --git a/packages/react-query-devtools/src/devtools.tsx b/packages/react-query-devtools/src/devtools.tsx index e0bb68ec1a..5abee8a364 100644 --- a/packages/react-query-devtools/src/devtools.tsx +++ b/packages/react-query-devtools/src/devtools.tsx @@ -1,48 +1,48 @@ 'use client' import * as React from 'react' -import { useSyncExternalStore } from './useSyncExternalStore' -import type { - QueryCache, - QueryClient, - QueryKey as QueryKeyType, - ContextOptions, - Query, -} from '@tanstack/react-query' import { - useQueryClient, - onlineManager, notifyManager, + onlineManager, + useQueryClient, } from '@tanstack/react-query' import { rankItem } from '@tanstack/match-sorter-utils' +import { useMemo } from 'react' +import { useSyncExternalStore } from './useSyncExternalStore' import useLocalStorage from './useLocalStorage' import { + defaultPanelSize, + displayValue, + getResizeHandleStyle, + getSidePanelStyle, + getSidedProp, isVerticalSide, + minPanelSize, sortFns, useIsMounted, - getSidePanelStyle, - minPanelSize, - getResizeHandleStyle, - getSidedProp, - defaultPanelSize, - displayValue, } from './utils' -import type { Corner, Side } from './utils' import { - Panel, - QueryKeys, - QueryKey, + ActiveQueryPanel, Button, Code, Input, + Panel, + QueryKey, + QueryKeys, Select, - ActiveQueryPanel, } from './styledComponents' import ScreenReader from './screenreader' import { ThemeProvider, defaultTheme as theme } from './theme' -import { getQueryStatusLabel, getQueryStatusColor } from './utils' +import { getQueryStatusColor, getQueryStatusLabel } from './utils' import Explorer from './Explorer' import Logo from './Logo' -import { useMemo } from 'react' +import type { Corner, Side } from './utils' +import type { + ContextOptions, + Query, + QueryCache, + QueryClient, + QueryKey as QueryKeyType, +} from '@tanstack/react-query' export interface DevToolsErrorType { /** diff --git a/packages/react-query-devtools/src/utils.ts b/packages/react-query-devtools/src/utils.ts index 1bcad75982..25c8a6961d 100644 --- a/packages/react-query-devtools/src/utils.ts +++ b/packages/react-query-devtools/src/utils.ts @@ -1,10 +1,10 @@ import * as React from 'react' -import type { Query } from '@tanstack/react-query' import SuperJSON from 'superjson' -import type { Theme } from './theme' import { useTheme } from './theme' import useMediaQuery from './useMediaQuery' +import type { Theme } from './theme' +import type { Query } from '@tanstack/react-query' type StyledComponent = T extends 'button' ? React.DetailedHTMLProps< diff --git a/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx b/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx index ecfc916a2b..ac6ee41428 100644 --- a/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx +++ b/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx @@ -1,10 +1,10 @@ 'use client' import * as React from 'react' -import type { PersistQueryClientOptions } from '@tanstack/query-persist-client-core' import { persistQueryClient } from '@tanstack/query-persist-client-core' +import { IsRestoringProvider, QueryClientProvider } from '@tanstack/react-query' +import type { PersistQueryClientOptions } from '@tanstack/query-persist-client-core' 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 bce3257568..0dc4bb843c 100644 --- a/packages/react-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx +++ b/packages/react-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx @@ -1,19 +1,19 @@ import * as React from 'react' import { render, waitFor } from '@testing-library/react' -import type { - UseQueryResult, - DefinedUseQueryResult, -} from '@tanstack/react-query' -import { QueryClient, useQuery, useQueries } from '@tanstack/react-query' +import { QueryClient, useQueries, useQuery } from '@tanstack/react-query' +import { persistQueryClientSave } from '@tanstack/query-persist-client-core' + +import { PersistQueryClientProvider } from '../PersistQueryClientProvider' +import { createQueryClient, mockLogger, queryKey, sleep } from './utils' import type { PersistedClient, Persister, } from '@tanstack/query-persist-client-core' -import { persistQueryClientSave } from '@tanstack/query-persist-client-core' - -import { createQueryClient, mockLogger, queryKey, sleep } from './utils' -import { PersistQueryClientProvider } from '../PersistQueryClientProvider' +import type { + DefinedUseQueryResult, + UseQueryResult, +} from '@tanstack/react-query' 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 312280698a..fc94f8c9ef 100644 --- a/packages/react-query-persist-client/src/__tests__/utils.ts +++ b/packages/react-query-persist-client/src/__tests__/utils.ts @@ -1,7 +1,7 @@ import { act } from '@testing-library/react' -import type { QueryClientConfig } from '@tanstack/query-core' import { QueryClient } from '@tanstack/query-core' +import type { QueryClientConfig } from '@tanstack/query-core' export function createQueryClient(config?: QueryClientConfig): QueryClient { jest.spyOn(console, 'error').mockImplementation(() => undefined) diff --git a/packages/react-query/src/Hydrate.tsx b/packages/react-query/src/Hydrate.tsx index 19d94a3681..01bebe8100 100644 --- a/packages/react-query/src/Hydrate.tsx +++ b/packages/react-query/src/Hydrate.tsx @@ -1,9 +1,9 @@ 'use client' import * as React from 'react' -import type { HydrateOptions } from '@tanstack/query-core' import { hydrate } from '@tanstack/query-core' import { useQueryClient } from './QueryClientProvider' +import type { HydrateOptions } from '@tanstack/query-core' import type { ContextOptions } from './types' export function useHydrate( diff --git a/packages/react-query/src/__tests__/Hydrate.test.tsx b/packages/react-query/src/__tests__/Hydrate.test.tsx index ab8939574f..1a5c90cd90 100644 --- a/packages/react-query/src/__tests__/Hydrate.test.tsx +++ b/packages/react-query/src/__tests__/Hydrate.test.tsx @@ -1,17 +1,17 @@ import * as React from 'react' import { render } from '@testing-library/react' +import * as coreModule from '@tanstack/query-core' import { + Hydrate, + QueryCache, QueryClient, QueryClientProvider, - QueryCache, - useQuery, dehydrate, useHydrate, - Hydrate, + useQuery, } from '@tanstack/react-query' import { createQueryClient, sleep } from './utils' -import * as coreModule from '@tanstack/query-core' describe('React hydration', () => { const fetchData: (value: string) => Promise = (value) => diff --git a/packages/react-query/src/__tests__/QueryClientProvider.test.tsx b/packages/react-query/src/__tests__/QueryClientProvider.test.tsx index 32c1d67020..306807c5e9 100644 --- a/packages/react-query/src/__tests__/QueryClientProvider.test.tsx +++ b/packages/react-query/src/__tests__/QueryClientProvider.test.tsx @@ -2,14 +2,14 @@ import * as React from 'react' import { render, waitFor } from '@testing-library/react' import { renderToString } from 'react-dom/server' -import { sleep, queryKey, createQueryClient } from './utils' import { + QueryCache, QueryClient, QueryClientProvider, - QueryCache, useQuery, useQueryClient, } from '..' +import { createQueryClient, queryKey, sleep } from './utils' describe('QueryClientProvider', () => { test('sets a specific cache for all queries to use', async () => { diff --git a/packages/react-query/src/__tests__/QueryResetErrorBoundary.test.tsx b/packages/react-query/src/__tests__/QueryResetErrorBoundary.test.tsx index bfb835c54b..9295ad099b 100644 --- a/packages/react-query/src/__tests__/QueryResetErrorBoundary.test.tsx +++ b/packages/react-query/src/__tests__/QueryResetErrorBoundary.test.tsx @@ -2,8 +2,8 @@ import { fireEvent, waitFor } from '@testing-library/react' import { ErrorBoundary } from 'react-error-boundary' import * as React from 'react' -import { createQueryClient, queryKey, renderWithClient, sleep } from './utils' import { QueryCache, QueryErrorResetBoundary, useQueries, useQuery } from '..' +import { createQueryClient, queryKey, renderWithClient, sleep } from './utils' // TODO: This should be removed with the types for react-error-boundary get updated. declare module 'react-error-boundary' { diff --git a/packages/react-query/src/__tests__/ssr-hydration.test.tsx b/packages/react-query/src/__tests__/ssr-hydration.test.tsx index 0fcc46b3d8..d86124b579 100644 --- a/packages/react-query/src/__tests__/ssr-hydration.test.tsx +++ b/packages/react-query/src/__tests__/ssr-hydration.test.tsx @@ -6,11 +6,11 @@ import ReactDOMServer from 'react-dom/server' import type {} from 'react-dom/next' import { - useQuery, - QueryClientProvider, QueryCache, + QueryClientProvider, dehydrate, hydrate, + useQuery, } from '..' import { createQueryClient, setIsServer, sleep } from './utils' diff --git a/packages/react-query/src/__tests__/ssr.test.tsx b/packages/react-query/src/__tests__/ssr.test.tsx index 4bc097de75..2245d52aa7 100644 --- a/packages/react-query/src/__tests__/ssr.test.tsx +++ b/packages/react-query/src/__tests__/ssr.test.tsx @@ -6,8 +6,8 @@ import * as React from 'react' // @ts-ignore import { renderToString } from 'react-dom/server' -import { sleep, queryKey, createQueryClient } from './utils' -import { useQuery, QueryClientProvider, QueryCache, useInfiniteQuery } from '..' +import { QueryCache, QueryClientProvider, useInfiniteQuery, useQuery } from '..' +import { createQueryClient, queryKey, sleep } from './utils' describe('Server Side Rendering', () => { it('should not trigger fetch', () => { diff --git a/packages/react-query/src/__tests__/suspense.test.tsx b/packages/react-query/src/__tests__/suspense.test.tsx index 0335d30beb..52ab4d6c4e 100644 --- a/packages/react-query/src/__tests__/suspense.test.tsx +++ b/packages/react-query/src/__tests__/suspense.test.tsx @@ -1,7 +1,6 @@ import { fireEvent, waitFor } from '@testing-library/react' import * as React from 'react' import { ErrorBoundary } from 'react-error-boundary' -import type { UseInfiniteQueryResult, UseQueryResult } from '..' import { QueryCache, QueryErrorResetBoundary, @@ -11,6 +10,7 @@ import { useQueryErrorResetBoundary, } from '..' import { createQueryClient, queryKey, renderWithClient, sleep } from './utils' +import type { UseInfiniteQueryResult, UseQueryResult } from '..' describe("useQuery's in Suspense mode", () => { const queryCache = new QueryCache() diff --git a/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx b/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx index 122a251818..90c663bbab 100644 --- a/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx +++ b/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx @@ -1,6 +1,7 @@ import { fireEvent, waitFor } from '@testing-library/react' import * as React from 'react' +import { QueryCache, useInfiniteQuery } from '..' import { createQueryClient, queryKey, @@ -13,7 +14,6 @@ import type { QueryFunctionContext, 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 05e953836d..3a041135f3 100644 --- a/packages/react-query/src/__tests__/useIsFetching.test.tsx +++ b/packages/react-query/src/__tests__/useIsFetching.test.tsx @@ -2,6 +2,7 @@ import { fireEvent, waitFor } from '@testing-library/react' import * as React from 'react' import { ErrorBoundary } from 'react-error-boundary' +import { QueryCache, useIsFetching, useQuery } from '..' import { createQueryClient, queryKey, @@ -10,7 +11,6 @@ import { sleep, } from './utils' 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__/useIsMutating.test.tsx b/packages/react-query/src/__tests__/useIsMutating.test.tsx index 6e65de2612..7f1b4f59fc 100644 --- a/packages/react-query/src/__tests__/useIsMutating.test.tsx +++ b/packages/react-query/src/__tests__/useIsMutating.test.tsx @@ -1,16 +1,16 @@ import { fireEvent, waitFor } from '@testing-library/react' import * as React from 'react' +import { ErrorBoundary } from 'react-error-boundary' +import { QueryClient } from '@tanstack/query-core' import { useIsMutating } from '../useIsMutating' import { useMutation } from '../useMutation' +import * as MutationCacheModule from '../../../query-core/src/mutationCache' import { createQueryClient, renderWithClient, setActTimeout, sleep, } from './utils' -import { ErrorBoundary } from 'react-error-boundary' -import { QueryClient } from '@tanstack/query-core' -import * as MutationCacheModule from '../../../query-core/src/mutationCache' describe('useIsMutating', () => { it('should return the number of fetching mutations', async () => { diff --git a/packages/react-query/src/__tests__/useMutation.test.tsx b/packages/react-query/src/__tests__/useMutation.test.tsx index ff32046f0e..e929445614 100644 --- a/packages/react-query/src/__tests__/useMutation.test.tsx +++ b/packages/react-query/src/__tests__/useMutation.test.tsx @@ -3,9 +3,7 @@ import '@testing-library/jest-dom' import * as React from 'react' import { ErrorBoundary } from 'react-error-boundary' -import type { QueryClient } from '..' import { MutationCache, QueryCache, useMutation } from '..' -import type { UseMutationResult } from '../types' import { createQueryClient, mockNavigatorOnLine, @@ -14,6 +12,8 @@ import { setActTimeout, sleep, } from './utils' +import type { QueryClient } from '..' +import type { UseMutationResult } from '../types' describe('useMutation', () => { const queryCache = new QueryCache() diff --git a/packages/react-query/src/__tests__/useQueries.test.tsx b/packages/react-query/src/__tests__/useQueries.test.tsx index 1452ee0305..6d6fd1a8a4 100644 --- a/packages/react-query/src/__tests__/useQueries.test.tsx +++ b/packages/react-query/src/__tests__/useQueries.test.tsx @@ -4,6 +4,7 @@ import { ErrorBoundary } from 'react-error-boundary' import * as QueriesObserverModule from '../../../query-core/src/queriesObserver' +import { QueriesObserver, QueryCache, useQueries } from '..' import { createQueryClient, expectType, @@ -20,7 +21,6 @@ import type { UseQueryOptions, UseQueryResult, } from '..' -import { QueriesObserver, QueryCache, useQueries } from '..' import type { QueryFunctionContext } from '@tanstack/query-core' describe('useQueries', () => { diff --git a/packages/react-query/src/__tests__/useQuery.test.tsx b/packages/react-query/src/__tests__/useQuery.test.tsx index b5550d8858..592349defb 100644 --- a/packages/react-query/src/__tests__/useQuery.test.tsx +++ b/packages/react-query/src/__tests__/useQuery.test.tsx @@ -1,6 +1,8 @@ import { act, fireEvent, waitFor } from '@testing-library/react' import '@testing-library/jest-dom' import * as React from 'react' +import { ErrorBoundary } from 'react-error-boundary' +import { QueryCache, useQuery } from '..' import { Blink, createQueryClient, @@ -20,8 +22,6 @@ import type { UseQueryOptions, UseQueryResult, } from '..' -import { QueryCache, useQuery } from '..' -import { ErrorBoundary } from 'react-error-boundary' describe('useQuery', () => { const queryCache = new QueryCache() diff --git a/packages/react-query/src/__tests__/utils.tsx b/packages/react-query/src/__tests__/utils.tsx index d5502a3e29..264c21269c 100644 --- a/packages/react-query/src/__tests__/utils.tsx +++ b/packages/react-query/src/__tests__/utils.tsx @@ -1,8 +1,8 @@ import * as React from 'react' import { act, render } from '@testing-library/react' -import type { ContextOptions, QueryClientConfig, MutationOptions } from '..' -import { QueryClient, QueryClientProvider } from '..' import * as utils from '@tanstack/query-core' +import { QueryClient, QueryClientProvider } from '..' +import type { ContextOptions, MutationOptions, QueryClientConfig } from '..' export function renderWithClient( client: QueryClient, diff --git a/packages/react-query/src/errorBoundaryUtils.ts b/packages/react-query/src/errorBoundaryUtils.ts index 68ed341bf3..a50b7784a1 100644 --- a/packages/react-query/src/errorBoundaryUtils.ts +++ b/packages/react-query/src/errorBoundaryUtils.ts @@ -1,4 +1,6 @@ 'use client' +import * as React from 'react' +import { shouldThrowError } from './utils' import type { DefaultedQueryObserverOptions, Query, @@ -7,8 +9,6 @@ import type { UseErrorBoundary, } from '@tanstack/query-core' import type { QueryErrorResetBoundaryValue } from './QueryErrorResetBoundary' -import * as React from 'react' -import { shouldThrowError } from './utils' export const ensurePreventErrorBoundaryRetry = < TQueryFnData, diff --git a/packages/react-query/src/reactBatchedUpdates.native.ts b/packages/react-query/src/reactBatchedUpdates.native.ts index 7ca91f79f4..059b46f2af 100644 --- a/packages/react-query/src/reactBatchedUpdates.native.ts +++ b/packages/react-query/src/reactBatchedUpdates.native.ts @@ -1,4 +1,5 @@ // @ts-ignore // eslint-disable-next-line import/no-unresolved import { unstable_batchedUpdates } from 'react-native' + export { unstable_batchedUpdates } diff --git a/packages/react-query/src/reactBatchedUpdates.ts b/packages/react-query/src/reactBatchedUpdates.ts index 5cc1911268..baffc0c240 100644 --- a/packages/react-query/src/reactBatchedUpdates.ts +++ b/packages/react-query/src/reactBatchedUpdates.ts @@ -1,3 +1,4 @@ 'use client' import * as ReactDOM from 'react-dom' + export const unstable_batchedUpdates = ReactDOM.unstable_batchedUpdates diff --git a/packages/react-query/src/types.ts b/packages/react-query/src/types.ts index 3525d3d72c..648c0db85c 100644 --- a/packages/react-query/src/types.ts +++ b/packages/react-query/src/types.ts @@ -2,15 +2,15 @@ import type * as React from 'react' import type { + DefinedQueryObserverResult, InfiniteQueryObserverOptions, InfiniteQueryObserverResult, + MutateFunction, + MutationObserverOptions, MutationObserverResult, + QueryKey, QueryObserverOptions, QueryObserverResult, - QueryKey, - MutationObserverOptions, - MutateFunction, - DefinedQueryObserverResult, } from '@tanstack/query-core' import type { QueryClient } from '@tanstack/query-core' diff --git a/packages/react-query/src/useBaseQuery.ts b/packages/react-query/src/useBaseQuery.ts index 87d3ff5eca..834103f096 100644 --- a/packages/react-query/src/useBaseQuery.ts +++ b/packages/react-query/src/useBaseQuery.ts @@ -1,19 +1,19 @@ 'use client' import * as React from 'react' -import { useSyncExternalStore } from './useSyncExternalStore' -import type { QueryKey, QueryObserver } from '@tanstack/query-core' import { notifyManager } from '@tanstack/query-core' +import { useSyncExternalStore } from './useSyncExternalStore' import { useQueryErrorResetBoundary } from './QueryErrorResetBoundary' import { useQueryClient } from './QueryClientProvider' -import type { UseBaseQueryOptions } from './types' import { useIsRestoring } from './isRestoring' import { ensurePreventErrorBoundaryRetry, getHasError, useClearResetErrorBoundary, } from './errorBoundaryUtils' -import { ensureStaleTime, shouldSuspend, fetchOptimistic } from './suspense' +import { ensureStaleTime, fetchOptimistic, shouldSuspend } from './suspense' +import type { QueryKey, QueryObserver } from '@tanstack/query-core' +import type { UseBaseQueryOptions } from './types' export function useBaseQuery< TQueryFnData, diff --git a/packages/react-query/src/useInfiniteQuery.ts b/packages/react-query/src/useInfiniteQuery.ts index 85e78699bd..cffc36f0dc 100644 --- a/packages/react-query/src/useInfiniteQuery.ts +++ b/packages/react-query/src/useInfiniteQuery.ts @@ -1,12 +1,12 @@ 'use client' +import { InfiniteQueryObserver, parseQueryArgs } from '@tanstack/query-core' +import { useBaseQuery } from './useBaseQuery' import type { - QueryObserver, QueryFunction, QueryKey, + QueryObserver, } from '@tanstack/query-core' -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 ceac657496..e54fdcb2eb 100644 --- a/packages/react-query/src/useIsFetching.ts +++ b/packages/react-query/src/useIsFetching.ts @@ -1,11 +1,11 @@ 'use client' import * as React from 'react' -import type { QueryKey, QueryFilters } from '@tanstack/query-core' import { notifyManager, parseFilterArgs } from '@tanstack/query-core' import { useSyncExternalStore } from './useSyncExternalStore' -import type { ContextOptions } from './types' import { useQueryClient } from './QueryClientProvider' +import type { ContextOptions } from './types' +import type { QueryFilters, QueryKey } from '@tanstack/query-core' interface Options extends ContextOptions {} diff --git a/packages/react-query/src/useIsMutating.ts b/packages/react-query/src/useIsMutating.ts index 97c3ad2e4b..e20b0ec726 100644 --- a/packages/react-query/src/useIsMutating.ts +++ b/packages/react-query/src/useIsMutating.ts @@ -1,11 +1,11 @@ 'use client' import * as React from 'react' +import { notifyManager, parseMutationFilterArgs } from '@tanstack/query-core' import { useSyncExternalStore } from './useSyncExternalStore' -import type { MutationKey, MutationFilters } from '@tanstack/query-core' -import { notifyManager, parseMutationFilterArgs } from '@tanstack/query-core' -import type { ContextOptions } from './types' import { useQueryClient } from './QueryClientProvider' +import type { MutationFilters, MutationKey } from '@tanstack/query-core' +import type { ContextOptions } from './types' interface Options extends ContextOptions {} diff --git a/packages/react-query/src/useMutation.ts b/packages/react-query/src/useMutation.ts index 0f10dbf74a..c841d93466 100644 --- a/packages/react-query/src/useMutation.ts +++ b/packages/react-query/src/useMutation.ts @@ -1,20 +1,20 @@ 'use client' import * as React from 'react' -import { useSyncExternalStore } from './useSyncExternalStore' - -import type { MutationFunction, MutationKey } from '@tanstack/query-core' import { + MutationObserver, notifyManager, parseMutationArgs, - MutationObserver, } from '@tanstack/query-core' +import { useSyncExternalStore } from './useSyncExternalStore' + import { useQueryClient } from './QueryClientProvider' +import { shouldThrowError } from './utils' +import type { MutationFunction, MutationKey } from '@tanstack/query-core' import type { UseMutateFunction, UseMutationOptions, UseMutationResult, } from './types' -import { shouldThrowError } from './utils' // HOOK diff --git a/packages/react-query/src/useQueries.ts b/packages/react-query/src/useQueries.ts index 46d4c3e5e1..f867627c85 100644 --- a/packages/react-query/src/useQueries.ts +++ b/packages/react-query/src/useQueries.ts @@ -1,11 +1,9 @@ 'use client' import * as React from 'react' -import { useSyncExternalStore } from './useSyncExternalStore' -import type { QueryKey, QueryFunction } from '@tanstack/query-core' -import { notifyManager, QueriesObserver } from '@tanstack/query-core' +import { QueriesObserver, notifyManager } from '@tanstack/query-core' +import { useSyncExternalStore } from './useSyncExternalStore' import { useQueryClient } from './QueryClientProvider' -import type { UseQueryOptions, UseQueryResult } from './types' import { useIsRestoring } from './isRestoring' import { useQueryErrorResetBoundary } from './QueryErrorResetBoundary' import { @@ -15,10 +13,12 @@ import { } from './errorBoundaryUtils' import { ensureStaleTime, - shouldSuspend, fetchOptimistic, + shouldSuspend, willFetch, } from './suspense' +import type { QueryFunction, QueryKey } from '@tanstack/query-core' +import type { UseQueryOptions, UseQueryResult } from './types' // This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`. // - `context` is omitted as it is passed as a root-level option to `useQueries` instead. diff --git a/packages/react-query/src/useQuery.ts b/packages/react-query/src/useQuery.ts index ae23e9016f..c6ec05abca 100644 --- a/packages/react-query/src/useQuery.ts +++ b/packages/react-query/src/useQuery.ts @@ -1,12 +1,12 @@ 'use client' +import { QueryObserver, parseQueryArgs } from '@tanstack/query-core' +import { useBaseQuery } from './useBaseQuery' 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 diff --git a/packages/solid-query/src/QueryClientProvider.tsx b/packages/solid-query/src/QueryClientProvider.tsx index 48688fe977..396835ab34 100644 --- a/packages/solid-query/src/QueryClientProvider.tsx +++ b/packages/solid-query/src/QueryClientProvider.tsx @@ -1,12 +1,12 @@ -import type { QueryClient } from '@tanstack/query-core' -import type { Context, JSX } from 'solid-js' import { createContext, - useContext, - onMount, - onCleanup, mergeProps, + onCleanup, + onMount, + useContext, } from 'solid-js' +import type { QueryClient } from '@tanstack/query-core' +import type { Context, JSX } from 'solid-js' import type { ContextOptions } from './types' declare global { diff --git a/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx b/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx index 1ac05227c5..2c9c4ae9e6 100644 --- a/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx +++ b/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx @@ -1,12 +1,12 @@ import { render, screen, waitFor } from 'solid-testing-library' -import { queryKey } from './utils' import { QueryCache, QueryClient } from '@tanstack/query-core' -import type { Context } from 'solid-js' import { createContext, useContext } from 'solid-js' import { renderToString } from 'solid-js/web' -import { createQuery, QueryClientProvider, useQueryClient } from '..' +import { QueryClientProvider, createQuery, useQueryClient } from '..' +import { queryKey } from './utils' import { createQueryClient, sleep } from './utils' +import type { Context } from 'solid-js' describe('QueryClientProvider', () => { it('sets a specific cache for all queries to use', async () => { diff --git a/packages/solid-query/src/__tests__/createInfiniteQuery.test.tsx b/packages/solid-query/src/__tests__/createInfiniteQuery.test.tsx index 0c3802d840..32ff10446e 100644 --- a/packages/solid-query/src/__tests__/createInfiniteQuery.test.tsx +++ b/packages/solid-query/src/__tests__/createInfiniteQuery.test.tsx @@ -1,23 +1,22 @@ import { fireEvent, render, screen, waitFor } from 'solid-testing-library' -import { createQueryClient, sleep } from './utils' - import { - createEffect, - createRenderEffect, - createSignal, For, Index, Match, Switch, + createEffect, + createRenderEffect, + createSignal, } from 'solid-js' +import { QueryCache, QueryClientProvider, createInfiniteQuery } from '..' +import { createQueryClient, sleep } from './utils' +import { Blink, queryKey, setActTimeout } from './utils' import type { CreateInfiniteQueryResult, InfiniteData, QueryFunctionContext, } from '..' -import { createInfiniteQuery, QueryCache, QueryClientProvider } from '..' -import { Blink, queryKey, setActTimeout } from './utils' interface Result { items: number[] diff --git a/packages/solid-query/src/__tests__/createMutation.test.tsx b/packages/solid-query/src/__tests__/createMutation.test.tsx index ffe7c1ca09..031e803aec 100644 --- a/packages/solid-query/src/__tests__/createMutation.test.tsx +++ b/packages/solid-query/src/__tests__/createMutation.test.tsx @@ -1,20 +1,18 @@ import '@testing-library/jest-dom' import { + ErrorBoundary, createContext, createEffect, createRenderEffect, createSignal, - ErrorBoundary, } from 'solid-js' import { fireEvent, render, screen, waitFor } from 'solid-testing-library' -import type { QueryClient } from '..' import { - createMutation, MutationCache, QueryCache, QueryClientProvider, + createMutation, } from '..' -import type { CreateMutationResult } from '../types' import { createQueryClient, mockNavigatorOnLine, @@ -22,6 +20,8 @@ import { setActTimeout, sleep, } from './utils' +import type { QueryClient } from '..' +import type { CreateMutationResult } from '../types' describe('useMutation', () => { const queryCache = new QueryCache() diff --git a/packages/solid-query/src/__tests__/createQueries.test.tsx b/packages/solid-query/src/__tests__/createQueries.test.tsx index 836943a968..43c911be81 100644 --- a/packages/solid-query/src/__tests__/createQueries.test.tsx +++ b/packages/solid-query/src/__tests__/createQueries.test.tsx @@ -1,28 +1,19 @@ import { fireEvent, render, screen, waitFor } from 'solid-testing-library' -import * as QueriesObserverModule from '../../../query-core/src/queriesObserver' - -import type { QueryFunctionContext } from '@tanstack/query-core' import { + ErrorBoundary, createContext, createMemo, createRenderEffect, createSignal, - ErrorBoundary, } from 'solid-js' -import type { - CreateQueryOptions, - CreateQueryResult, - QueryClient, - QueryFunction, - QueryObserverResult, - SolidQueryKey, -} from '..' +import * as QueriesObserverModule from '../../../query-core/src/queriesObserver' + import { - createQueries, QueriesObserver, QueryCache, QueryClientProvider, + createQueries, } from '..' import { createQueryClient, @@ -31,6 +22,15 @@ import { queryKey, sleep, } from './utils' +import type { QueryFunctionContext } from '@tanstack/query-core' +import type { + CreateQueryOptions, + CreateQueryResult, + QueryClient, + QueryFunction, + QueryObserverResult, + SolidQueryKey, +} from '..' describe('useQueries', () => { const queryCache = new QueryCache() diff --git a/packages/solid-query/src/__tests__/createQuery.test.tsx b/packages/solid-query/src/__tests__/createQuery.test.tsx index 21b80ad554..6bcc8906ee 100644 --- a/packages/solid-query/src/__tests__/createQuery.test.tsx +++ b/packages/solid-query/src/__tests__/createQuery.test.tsx @@ -1,23 +1,16 @@ import '@testing-library/jest-dom' -import type { JSX } from 'solid-js' import { + ErrorBoundary, + Match, + Switch, createEffect, createMemo, createRenderEffect, createSignal, - ErrorBoundary, - Match, on, - Switch, } from 'solid-js' import { fireEvent, render, screen, waitFor } from 'solid-testing-library' -import type { - CreateQueryOptions, - CreateQueryResult, - DefinedCreateQueryResult, - QueryFunction, -} from '..' -import { createQuery, QueryCache, QueryClientProvider } from '..' +import { QueryCache, QueryClientProvider, createQuery } from '..' import { Blink, createQueryClient, @@ -29,6 +22,13 @@ import { setActTimeout, sleep, } from './utils' +import type { + CreateQueryOptions, + CreateQueryResult, + DefinedCreateQueryResult, + QueryFunction, +} from '..' +import type { JSX } from 'solid-js' describe('createQuery', () => { const queryCache = new QueryCache() diff --git a/packages/solid-query/src/__tests__/suspense.test.tsx b/packages/solid-query/src/__tests__/suspense.test.tsx index 95eccb1e6b..f21f326a1c 100644 --- a/packages/solid-query/src/__tests__/suspense.test.tsx +++ b/packages/solid-query/src/__tests__/suspense.test.tsx @@ -1,21 +1,21 @@ import { fireEvent, render, screen, waitFor } from 'solid-testing-library' import { - createRenderEffect, - createSignal, ErrorBoundary, - on, Show, Suspense, + createRenderEffect, + createSignal, + on, } from 'solid-js' -import type { CreateInfiniteQueryResult, CreateQueryResult } from '..' import { - createInfiniteQuery, - createQuery, QueryCache, QueryClientProvider, + createInfiniteQuery, + createQuery, } from '..' import { createQueryClient, queryKey, sleep } from './utils' +import type { CreateInfiniteQueryResult, CreateQueryResult } from '..' describe("useQuery's in Suspense mode", () => { const queryCache = new QueryCache() diff --git a/packages/solid-query/src/__tests__/transition.test.tsx b/packages/solid-query/src/__tests__/transition.test.tsx index af26437cef..5cf1b1ec50 100644 --- a/packages/solid-query/src/__tests__/transition.test.tsx +++ b/packages/solid-query/src/__tests__/transition.test.tsx @@ -1,7 +1,7 @@ import { fireEvent, render, screen, waitFor } from 'solid-testing-library' -import { createSignal, Show, startTransition, Suspense } from 'solid-js' -import { createQuery, QueryCache, QueryClientProvider } from '..' +import { Show, Suspense, createSignal, startTransition } from 'solid-js' +import { QueryCache, QueryClientProvider, createQuery } from '..' import { createQueryClient, queryKey, sleep } from './utils' describe("useQuery's in Suspense mode with transitions", () => { diff --git a/packages/solid-query/src/__tests__/useIsFetching.test.tsx b/packages/solid-query/src/__tests__/useIsFetching.test.tsx index 2099a385ef..8e5e8198a3 100644 --- a/packages/solid-query/src/__tests__/useIsFetching.test.tsx +++ b/packages/solid-query/src/__tests__/useIsFetching.test.tsx @@ -1,16 +1,16 @@ import { fireEvent, render, screen, waitFor } from 'solid-testing-library' import { + ErrorBoundary, + Show, createContext, createEffect, createRenderEffect, createSignal, - ErrorBoundary, - Show, } from 'solid-js' -import type { QueryClient } from '..' -import { createQuery, QueryCache, QueryClientProvider, useIsFetching } from '..' +import { QueryCache, QueryClientProvider, createQuery, useIsFetching } from '..' import { createQueryClient, queryKey, setActTimeout, sleep } from './utils' +import type { QueryClient } from '..' describe('useIsFetching', () => { // See https://github.com/tannerlinsley/react-query/issues/105 diff --git a/packages/solid-query/src/__tests__/useIsMutating.test.tsx b/packages/solid-query/src/__tests__/useIsMutating.test.tsx index 64e1f9f6dd..b2c1fc708b 100644 --- a/packages/solid-query/src/__tests__/useIsMutating.test.tsx +++ b/packages/solid-query/src/__tests__/useIsMutating.test.tsx @@ -1,22 +1,22 @@ import { fireEvent, screen, waitFor } from 'solid-testing-library' -import { - createMutation, - QueryClient, - QueryClientProvider, - useIsMutating, -} from '..' -import { createQueryClient, sleep } from './utils' import { + ErrorBoundary, + Show, createContext, createEffect, createRenderEffect, createSignal, - ErrorBoundary, - Show, } from 'solid-js' import { render } from 'solid-testing-library' +import { + QueryClient, + QueryClientProvider, + createMutation, + useIsMutating, +} from '..' import * as MutationCacheModule from '../../../query-core/src/mutationCache' +import { createQueryClient, sleep } from './utils' import { setActTimeout } from './utils' describe('useIsMutating', () => { diff --git a/packages/solid-query/src/__tests__/utils.tsx b/packages/solid-query/src/__tests__/utils.tsx index 41c904f127..212a023a4a 100644 --- a/packages/solid-query/src/__tests__/utils.tsx +++ b/packages/solid-query/src/__tests__/utils.tsx @@ -1,7 +1,7 @@ -import type { QueryClientConfig } from '@tanstack/query-core' import { QueryClient } from '@tanstack/query-core' +import { Show, createEffect, createSignal, onCleanup } from 'solid-js' +import type { QueryClientConfig } from '@tanstack/query-core' import type { ParentProps } from 'solid-js' -import { createEffect, createSignal, onCleanup, Show } from 'solid-js' let queryKeyCount = 0 export function queryKey(): () => Array { diff --git a/packages/solid-query/src/createBaseQuery.ts b/packages/solid-query/src/createBaseQuery.ts index 209c70532c..d73c0b57e5 100644 --- a/packages/solid-query/src/createBaseQuery.ts +++ b/packages/solid-query/src/createBaseQuery.ts @@ -1,17 +1,17 @@ -import type { QueryObserver } from '@tanstack/query-core' -import type { QueryKey, QueryObserverResult } from '@tanstack/query-core' -import type { CreateBaseQueryOptions } from './types' -import { useQueryClient } from './QueryClientProvider' import { - onMount, - onCleanup, + batch, createComputed, createResource, on, - batch, + onCleanup, + onMount, } from 'solid-js' import { createStore, unwrap } from 'solid-js/store' +import { useQueryClient } from './QueryClientProvider' import { shouldThrowError } from './utils' +import type { QueryObserver } from '@tanstack/query-core' +import type { QueryKey, QueryObserverResult } from '@tanstack/query-core' +import type { CreateBaseQueryOptions } from './types' // Base Query Function that is used to create the query. export function createBaseQuery< diff --git a/packages/solid-query/src/createInfiniteQuery.ts b/packages/solid-query/src/createInfiniteQuery.ts index fbef03ea6c..5852629185 100644 --- a/packages/solid-query/src/createInfiniteQuery.ts +++ b/packages/solid-query/src/createInfiniteQuery.ts @@ -1,18 +1,18 @@ -import type { - QueryObserver, - QueryFunction, - QueryOptions, -} from '@tanstack/query-core' import { InfiniteQueryObserver } from '@tanstack/query-core' +import { createComputed } from 'solid-js' +import { createStore } from 'solid-js/store' +import { createBaseQuery } from './createBaseQuery' +import { parseQueryArgs } from './utils' import type { CreateInfiniteQueryOptions, CreateInfiniteQueryResult, SolidQueryKey, } from './types' -import { createBaseQuery } from './createBaseQuery' -import { createComputed } from 'solid-js' -import { createStore } from 'solid-js/store' -import { parseQueryArgs } from './utils' +import type { + QueryFunction, + QueryObserver, + QueryOptions, +} from '@tanstack/query-core' export function createInfiniteQuery< TQueryFnData = unknown, diff --git a/packages/solid-query/src/createMutation.ts b/packages/solid-query/src/createMutation.ts index 2ecb4ad34d..c0aa65bc1d 100644 --- a/packages/solid-query/src/createMutation.ts +++ b/packages/solid-query/src/createMutation.ts @@ -1,14 +1,14 @@ -import type { MutationFunction, MutationKey } from '@tanstack/query-core' -import { parseMutationArgs, MutationObserver } from '@tanstack/query-core' +import { MutationObserver, parseMutationArgs } from '@tanstack/query-core' +import { createComputed, on, onCleanup } from 'solid-js' +import { createStore } from 'solid-js/store' import { useQueryClient } from './QueryClientProvider' +import { shouldThrowError } from './utils' import type { CreateMutateFunction, CreateMutationOptions, CreateMutationResult, } from './types' -import { createComputed, onCleanup, on } from 'solid-js' -import { createStore } from 'solid-js/store' -import { shouldThrowError } from './utils' +import type { MutationFunction, MutationKey } from '@tanstack/query-core' // HOOK export function createMutation< diff --git a/packages/solid-query/src/createQueries.ts b/packages/solid-query/src/createQueries.ts index 1fc449641d..d8f466720c 100644 --- a/packages/solid-query/src/createQueries.ts +++ b/packages/solid-query/src/createQueries.ts @@ -1,14 +1,14 @@ import { createComputed, onCleanup, onMount } from 'solid-js' -import type { QueryFunction } from '@tanstack/query-core' import { QueriesObserver } from '@tanstack/query-core' +import { createStore, unwrap } from 'solid-js/store' import { useQueryClient } from './QueryClientProvider' +import { scheduleMicrotask } from './utils' import type { CreateQueryOptions, CreateQueryResult, SolidQueryKey, } from './types' -import { createStore, unwrap } from 'solid-js/store' -import { scheduleMicrotask } from './utils' +import type { QueryFunction } from '@tanstack/query-core' // This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`. // - `context` is omitted as it is passed as a root-level option to `useQueries` instead. diff --git a/packages/solid-query/src/createQuery.ts b/packages/solid-query/src/createQuery.ts index 387c63a543..e2fbc1c45b 100644 --- a/packages/solid-query/src/createQuery.ts +++ b/packages/solid-query/src/createQuery.ts @@ -1,15 +1,15 @@ -import type { QueryFunction, QueryOptions } from '@tanstack/query-core' import { QueryObserver } from '@tanstack/query-core' +import { createComputed } from 'solid-js' +import { createStore } from 'solid-js/store' +import { parseQueryArgs } from './utils' +import { createBaseQuery } from './createBaseQuery' import type { CreateQueryOptions, CreateQueryResult, DefinedCreateQueryResult, SolidQueryKey, } from './types' -import { createComputed } from 'solid-js' -import { createStore } from 'solid-js/store' -import { parseQueryArgs } from './utils' -import { createBaseQuery } from './createBaseQuery' +import type { QueryFunction, QueryOptions } from '@tanstack/query-core' // There are several ways to create a query. // 1. createQuery(options: CreateQueryOptions) diff --git a/packages/solid-query/src/types.ts b/packages/solid-query/src/types.ts index 817c599e84..ae88516c37 100644 --- a/packages/solid-query/src/types.ts +++ b/packages/solid-query/src/types.ts @@ -2,17 +2,17 @@ import type { Context } from 'solid-js' import type { - QueryClient, - QueryKey, - QueryObserverOptions, - QueryObserverResult, - MutateFunction, - MutationObserverOptions, - MutationObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverOptions, InfiniteQueryObserverResult, + MutateFunction, + MutationObserverOptions, + MutationObserverResult, + QueryClient, QueryFilters, + QueryKey, + QueryObserverOptions, + QueryObserverResult, QueryOptions, } from '@tanstack/query-core' diff --git a/packages/solid-query/src/useIsFetching.ts b/packages/solid-query/src/useIsFetching.ts index 06844a3796..6944f736ae 100644 --- a/packages/solid-query/src/useIsFetching.ts +++ b/packages/solid-query/src/useIsFetching.ts @@ -1,10 +1,10 @@ +import { createComputed, createMemo, createSignal, onCleanup } from 'solid-js' +import { useQueryClient } from './QueryClientProvider' +import { parseFilterArgs } from './utils' import type { QueryFilters } from '@tanstack/query-core' -import type { ContextOptions, SolidQueryKey, SolidQueryFilters } from './types' -import { useQueryClient } from './QueryClientProvider' +import type { ContextOptions, SolidQueryFilters, SolidQueryKey } from './types' import type { Accessor } from 'solid-js' -import { createSignal, onCleanup, createComputed, createMemo } from 'solid-js' -import { parseFilterArgs } from './utils' interface Options extends ContextOptions {} diff --git a/packages/solid-query/src/useIsMutating.ts b/packages/solid-query/src/useIsMutating.ts index 5fe0bc91ca..e4f80aac76 100644 --- a/packages/solid-query/src/useIsMutating.ts +++ b/packages/solid-query/src/useIsMutating.ts @@ -1,9 +1,9 @@ -import type { MutationKey, MutationFilters } from '@tanstack/query-core' import { parseMutationFilterArgs } from '@tanstack/query-core' -import type { ContextOptions } from './types' +import { createSignal, onCleanup } from 'solid-js' import { useQueryClient } from './QueryClientProvider' +import type { MutationFilters, MutationKey } from '@tanstack/query-core' +import type { ContextOptions } from './types' import type { Accessor } from 'solid-js' -import { createSignal, onCleanup } from 'solid-js' interface Options extends ContextOptions {} diff --git a/packages/solid-query/src/utils.ts b/packages/solid-query/src/utils.ts index 6e418e5911..a0882419b8 100644 --- a/packages/solid-query/src/utils.ts +++ b/packages/solid-query/src/utils.ts @@ -1,8 +1,8 @@ import type { - SolidQueryKey, - SolidQueryFilters, ParseFilterArgs, ParseQueryArgs, + SolidQueryFilters, + SolidQueryKey, } from './types' import type { QueryFunction, QueryOptions } from '@tanstack/query-core' diff --git a/packages/svelte-query/src/Hydrate.svelte b/packages/svelte-query/src/Hydrate.svelte index de3e6ca7c1..1790154d75 100644 --- a/packages/svelte-query/src/Hydrate.svelte +++ b/packages/svelte-query/src/Hydrate.svelte @@ -1,6 +1,6 @@