From 9ade5c39a22e0902b1725bddfac836e6862a1ee0 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sun, 16 Jul 2023 15:14:57 +1000 Subject: [PATCH] Add new eslint sorting from main --- .eslintrc.cjs | 18 ++++++++++ .../eslint-plugin-query/src/configs/index.ts | 2 +- .../exhaustive-deps/exhaustive-deps.rule.ts | 2 +- .../exhaustive-deps/exhaustive-deps.utils.ts | 2 +- .../src/utils/ast-utils.ts | 4 +-- .../src/utils/create-rule.ts | 2 +- .../src/__tests__/asyncThrottle.test.ts | 2 +- .../src/index.ts | 2 +- .../query-core/src/infiniteQueryBehavior.ts | 2 +- .../query-core/src/infiniteQueryObserver.ts | 14 ++++---- packages/query-core/src/mutation.ts | 10 +++--- packages/query-core/src/mutationCache.ts | 10 +++--- packages/query-core/src/mutationObserver.ts | 10 +++--- packages/query-core/src/queriesObserver.ts | 8 ++--- packages/query-core/src/query.ts | 16 ++++----- packages/query-core/src/queryCache.ts | 10 +++--- packages/query-core/src/queryClient.ts | 28 +++++++-------- packages/query-core/src/queryObserver.ts | 26 +++++++------- packages/query-core/src/retryer.ts | 2 +- .../src/tests/focusManager.test.tsx | 2 +- .../query-core/src/tests/hydration.test.tsx | 6 ++-- .../src/tests/infiniteQueryBehavior.test.tsx | 6 ++-- .../src/tests/infiniteQueryObserver.test.tsx | 4 +-- .../src/tests/mutationCache.test.tsx | 4 +-- .../src/tests/mutationObserver.test.tsx | 4 +-- .../query-core/src/tests/mutations.test.tsx | 8 ++--- .../src/tests/notifyManager.test.tsx | 2 +- .../src/tests/onlineManager.test.tsx | 2 +- .../src/tests/queriesObserver.test.tsx | 6 ++-- packages/query-core/src/tests/query.test.tsx | 12 +++---- .../query-core/src/tests/queryCache.test.tsx | 4 +-- .../query-core/src/tests/queryClient.test.tsx | 20 +++++------ .../src/tests/queryObserver.test.tsx | 6 ++-- packages/query-core/src/tests/utils.test.tsx | 12 +++---- packages/query-core/src/tests/utils.ts | 2 +- packages/query-core/src/types.ts | 4 +-- packages/query-devtools/src/Context.ts | 2 +- packages/query-devtools/src/Devtools.tsx | 34 +++++++++--------- packages/query-devtools/src/Explorer.tsx | 6 ++-- packages/query-devtools/src/index.tsx | 6 ++-- packages/query-devtools/src/utils.tsx | 2 +- .../src/__tests__/persist.test.ts | 8 ++--- .../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 +- .../src/__tests__/utils.tsx | 7 ++-- .../react-query-devtools/src/devtools.tsx | 12 +++---- .../src/ReactQueryStreamedHydration.tsx | 14 ++++---- .../src/PersistQueryClientProvider.tsx | 4 +-- .../PersistQueryClientProvider.test.tsx | 18 +++++----- .../src/__tests__/utils.ts | 2 +- .../react-query/src/HydrationBoundary.tsx | 2 +- .../src/__tests__/HydrationBoundary.test.tsx | 10 +++--- .../__tests__/QueryClientProvider.test.tsx | 4 +-- .../QueryResetErrorBoundary.test.tsx | 4 +-- .../src/__tests__/ssr-hydration.test.tsx | 4 +-- .../react-query/src/__tests__/ssr.test.tsx | 4 +-- .../src/__tests__/suspense.test.tsx | 4 +-- .../src/__tests__/useInfiniteQuery.test.tsx | 4 +-- .../__tests__/useInfiniteQuery.type.test.tsx | 4 +-- .../src/__tests__/useIsFetching.test.tsx | 2 +- .../src/__tests__/useMutation.test.tsx | 4 +-- .../src/__tests__/useQueries.test.tsx | 16 ++++----- .../src/__tests__/useQuery.test.tsx | 6 ++-- .../src/__tests__/useQuery.types.test.tsx | 2 +- packages/react-query/src/__tests__/utils.tsx | 4 +-- .../react-query/src/errorBoundaryUtils.ts | 4 +-- packages/react-query/src/suspense.ts | 2 +- packages/react-query/src/types.ts | 10 +++--- packages/react-query/src/useBaseQuery.ts | 6 ++-- packages/react-query/src/useInfiniteQuery.ts | 10 +++--- packages/react-query/src/useIsFetching.ts | 2 +- packages/react-query/src/useMutation.ts | 6 ++-- packages/react-query/src/useMutationState.ts | 10 +++--- packages/react-query/src/useQueries.ts | 22 ++++++------ packages/react-query/src/useQuery.ts | 4 +-- packages/solid-query/src/QueryClient.ts | 8 ++--- .../solid-query/src/QueryClientProvider.tsx | 2 +- .../__tests__/QueryClientProvider.test.tsx | 4 +-- .../__tests__/createInfiniteQuery.test.tsx | 36 +++++++++---------- .../src/__tests__/createMutation.test.tsx | 8 ++--- .../src/__tests__/createQueries.test.tsx | 18 +++++----- .../src/__tests__/createQuery.test.tsx | 26 +++++++------- .../src/__tests__/suspense.test.tsx | 22 ++++++------ .../src/__tests__/transition.test.tsx | 4 +-- .../src/__tests__/useIsFetching.test.tsx | 4 +-- .../src/__tests__/useIsMutating.test.tsx | 6 ++-- packages/solid-query/src/__tests__/utils.tsx | 6 ++-- packages/solid-query/src/createBaseQuery.ts | 16 ++++----- .../solid-query/src/createInfiniteQuery.ts | 10 +++--- packages/solid-query/src/createMutation.ts | 10 +++--- packages/solid-query/src/createQueries.ts | 16 ++++----- packages/solid-query/src/createQuery.ts | 6 ++-- packages/solid-query/src/types.ts | 12 +++---- packages/solid-query/src/useIsFetching.ts | 4 +-- packages/solid-query/src/useIsMutating.ts | 4 +-- .../svelte-query-devtools/src/Devtools.svelte | 8 ++--- .../svelte-query/src/HydrationBoundary.svelte | 2 +- .../src/QueryClientProvider.svelte | 2 +- .../src/__tests__/createMutation.test.ts | 2 +- .../src/__tests__/createQueries.test.ts | 2 +- packages/svelte-query/src/context.ts | 2 +- packages/svelte-query/src/createBaseQuery.ts | 4 +-- .../svelte-query/src/createInfiniteQuery.ts | 10 +++--- packages/svelte-query/src/createMutation.ts | 8 ++--- packages/svelte-query/src/createQueries.ts | 22 ++++++------ packages/svelte-query/src/createQuery.ts | 4 +-- packages/svelte-query/src/types.ts | 10 +++--- packages/svelte-query/src/useIsFetching.ts | 4 +-- packages/svelte-query/src/useIsMutating.ts | 2 +- packages/svelte-query/src/useQueryClient.ts | 2 +- .../vue-query/src/__mocks__/useQueryClient.ts | 2 +- .../src/__tests__/mutationCache.test.ts | 2 +- .../src/__tests__/queryCache.test.ts | 2 +- .../src/__tests__/queryClient.test.ts | 2 +- .../src/__tests__/useInfiniteQuery.test.ts | 4 +-- .../__tests__/useInfiniteQuery.types.test.tsx | 4 +-- .../src/__tests__/useIsFetching.test.ts | 4 +-- .../src/__tests__/useIsMutating.test.ts | 6 ++-- .../src/__tests__/useMutation.test.ts | 4 +-- .../src/__tests__/useQueries.test.ts | 10 +++--- .../vue-query/src/__tests__/useQuery.test.ts | 12 +++---- .../src/__tests__/useQueryClient.test.ts | 2 +- .../vue-query/src/__tests__/utils.test.ts | 2 +- .../src/__tests__/vueQueryPlugin.test.ts | 6 ++-- packages/vue-query/src/devtools/devtools.ts | 6 ++-- packages/vue-query/src/mutationCache.ts | 4 +-- packages/vue-query/src/queryCache.ts | 4 +-- packages/vue-query/src/queryClient.ts | 34 +++++++++--------- packages/vue-query/src/useBaseQuery.ts | 14 ++++---- packages/vue-query/src/useInfiniteQuery.ts | 10 +++--- packages/vue-query/src/useIsFetching.ts | 4 +-- packages/vue-query/src/useMutation.ts | 16 ++++----- packages/vue-query/src/useMutationState.ts | 10 +++--- packages/vue-query/src/useQueries.ts | 14 ++++---- packages/vue-query/src/useQuery.ts | 10 +++--- packages/vue-query/src/useQueryClient.ts | 2 +- packages/vue-query/src/vueQueryPlugin.ts | 2 +- 139 files changed, 534 insertions(+), 517 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index da53b4b473..4b45d31c2b 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -54,13 +54,31 @@ const config = { ], '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/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/__tests__/asyncThrottle.test.ts b/packages/query-async-storage-persister/src/__tests__/asyncThrottle.test.ts index 87d2f87b42..db82e8582f 100644 --- a/packages/query-async-storage-persister/src/__tests__/asyncThrottle.test.ts +++ b/packages/query-async-storage-persister/src/__tests__/asyncThrottle.test.ts @@ -1,6 +1,6 @@ +import { vi } from 'vitest' import { asyncThrottle } from '../asyncThrottle' import { sleep as delay } from './utils' -import { vi } from 'vitest' describe('asyncThrottle', () => { test('basic', async () => { diff --git a/packages/query-async-storage-persister/src/index.ts b/packages/query-async-storage-persister/src/index.ts index e914d1c607..6e5afc6855 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/infiniteQueryBehavior.ts b/packages/query-core/src/infiniteQueryBehavior.ts index 1f82f82b78..c5ebfd084e 100644 --- a/packages/query-core/src/infiniteQueryBehavior.ts +++ b/packages/query-core/src/infiniteQueryBehavior.ts @@ -1,5 +1,5 @@ -import type { QueryBehavior } from './query' import { addToEnd, addToStart } from './utils' +import type { QueryBehavior } from './query' import type { InfiniteData, InfiniteQueryPageParamsOptions, diff --git a/packages/query-core/src/infiniteQueryObserver.ts b/packages/query-core/src/infiniteQueryObserver.ts index d023733e70..dd213fa647 100644 --- a/packages/query-core/src/infiniteQueryObserver.ts +++ b/packages/query-core/src/infiniteQueryObserver.ts @@ -1,4 +1,11 @@ +import { QueryObserver } from './queryObserver' +import { + hasNextPage, + hasPreviousPage, + infiniteQueryBehavior, +} from './infiniteQueryBehavior' import type { + DefaultError, DefaultedInfiniteQueryObserverOptions, FetchNextPageOptions, FetchPreviousPageOptions, @@ -6,16 +13,9 @@ import type { InfiniteQueryObserverOptions, InfiniteQueryObserverResult, QueryKey, - DefaultError, } 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 ae85084b05..a4cf340dae 100644 --- a/packages/query-core/src/mutation.ts +++ b/packages/query-core/src/mutation.ts @@ -1,15 +1,15 @@ +import { notifyManager } from './notifyManager' +import { Removable } from './removable' +import { canFetch, createRetryer } from './retryer' import type { + DefaultError, + MutationMeta, MutationOptions, MutationStatus, - MutationMeta, - DefaultError, } from './types' import type { MutationCache } from './mutationCache' import type { MutationObserver } from './mutationObserver' -import { notifyManager } from './notifyManager' -import { Removable } from './removable' import type { Retryer } from './retryer' -import { canFetch, createRetryer } from './retryer' // TYPES diff --git a/packages/query-core/src/mutationCache.ts b/packages/query-core/src/mutationCache.ts index 64ce65cb30..e6d6fa68b5 100644 --- a/packages/query-core/src/mutationCache.ts +++ b/packages/query-core/src/mutationCache.ts @@ -1,12 +1,12 @@ -import type { MutationObserver } from './mutationObserver' -import type { NotifyEvent, MutationOptions, DefaultError } 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' +import type { MutationObserver } from './mutationObserver' +import type { DefaultError, MutationOptions, NotifyEvent } from './types' +import type { QueryClient } from './queryClient' +import type { Action, MutationState } from './mutation' +import type { MutationFilters } from './utils' // TYPES diff --git a/packages/query-core/src/mutationObserver.ts b/packages/query-core/src/mutationObserver.ts index 2f961ef2c6..4da10c2078 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 { + DefaultError, MutateOptions, - MutationObserverResult, MutationObserverOptions, - DefaultError, + 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 efd038824d..8ebb4f111e 100644 --- a/packages/query-core/src/queriesObserver.ts +++ b/packages/query-core/src/queriesObserver.ts @@ -1,14 +1,14 @@ import { notifyManager } from './notifyManager' +import { QueryObserver } from './queryObserver' +import { Subscribable } from './subscribable' +import { replaceEqualDeep } from './utils' 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' -import { replaceEqualDeep } from './utils' function difference(array1: T[], array2: T[]): T[] { return array1.filter((x) => !array2.includes(x)) diff --git a/packages/query-core/src/query.ts b/packages/query-core/src/query.ts index c38aa28f6f..37400fefc5 100644 --- a/packages/query-core/src/query.ts +++ b/packages/query-core/src/query.ts @@ -1,22 +1,22 @@ import { noop, replaceData, timeUntilStale } from './utils' +import { notifyManager } from './notifyManager' +import { canFetch, createRetryer, isCancelledError } from './retryer' +import { Removable } from './removable' import type { + CancelOptions, + DefaultError, + FetchStatus, InitialDataFunction, + QueryFunctionContext, QueryKey, + QueryMeta, QueryOptions, QueryStatus, - QueryFunctionContext, - QueryMeta, - CancelOptions, SetDataOptions, - FetchStatus, - DefaultError, } from './types' import type { QueryCache } from './queryCache' import type { QueryObserver } from './queryObserver' -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 ebc01fa3d3..fa6cc9d5e0 100644 --- a/packages/query-core/src/queryCache.ts +++ b/packages/query-core/src/queryCache.ts @@ -1,17 +1,17 @@ -import type { QueryFilters } from './utils' import { hashQueryKeyByOptions, matchQuery } from './utils' -import type { Action, QueryState } from './query' import { Query } from './query' +import { notifyManager } from './notifyManager' +import { Subscribable } from './subscribable' +import type { QueryFilters } from './utils' +import type { Action, QueryState } from './query' import type { + DefaultError, NotifyEvent, QueryKey, QueryOptions, - DefaultError, WithRequired, } from './types' -import { notifyManager } from './notifyManager' import type { QueryClient } from './queryClient' -import { Subscribable } from './subscribable' import type { QueryObserver } from './queryObserver' // TYPES diff --git a/packages/query-core/src/queryClient.ts b/packages/query-core/src/queryClient.ts index 4ff29b5b32..ef01f57024 100644 --- a/packages/query-core/src/queryClient.ts +++ b/packages/query-core/src/queryClient.ts @@ -1,14 +1,22 @@ -import type { QueryFilters, Updater, MutationFilters } from './utils' import { + functionalUpdate, hashKey, + hashQueryKeyByOptions, noop, 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 type { QueryState } from './query' import type { - QueryClientConfig, + CancelOptions, + DefaultError, DefaultOptions, + DefaultedQueryObserverOptions, FetchInfiniteQueryOptions, FetchQueryOptions, InfiniteData, @@ -17,6 +25,7 @@ import type { MutationKey, MutationObserverOptions, MutationOptions, + QueryClientConfig, QueryKey, QueryObserverOptions, QueryOptions, @@ -24,17 +33,8 @@ import type { RefetchQueryFilters, ResetOptions, SetDataOptions, - DefaultError, - CancelOptions, - DefaultedQueryObserverOptions, } 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 { MutationFilters, QueryFilters, Updater } from './utils' // TYPES diff --git a/packages/query-core/src/queryObserver.ts b/packages/query-core/src/queryObserver.ts index 58c902d580..9f06165658 100644 --- a/packages/query-core/src/queryObserver.ts +++ b/packages/query-core/src/queryObserver.ts @@ -1,14 +1,3 @@ -import type { - DefaultedQueryObserverOptions, - DefaultError, - PlaceholderDataFunction, - QueryKey, - QueryObserverBaseResult, - QueryObserverOptions, - QueryObserverResult, - QueryOptions, - RefetchOptions, -} from './types' import { isServer, isValidTimeout, @@ -18,11 +7,22 @@ import { timeUntilStale, } from './utils' import { notifyManager } from './notifyManager' -import type { Query, QueryState, FetchOptions } from './query' -import type { QueryClient } from './queryClient' import { focusManager } from './focusManager' import { Subscribable } from './subscribable' import { canFetch } from './retryer' +import type { QueryClient } from './queryClient' +import type { FetchOptions, Query, QueryState } from './query' +import type { + DefaultError, + DefaultedQueryObserverOptions, + PlaceholderDataFunction, + QueryKey, + QueryObserverBaseResult, + QueryObserverOptions, + QueryObserverResult, + QueryOptions, + RefetchOptions, +} from './types' type QueryObserverListener = ( result: QueryObserverResult, diff --git a/packages/query-core/src/retryer.ts b/packages/query-core/src/retryer.ts index 044452cd34..a4c466bf80 100644 --- a/packages/query-core/src/retryer.ts +++ b/packages/query-core/src/retryer.ts @@ -1,7 +1,7 @@ import { focusManager } from './focusManager' import { onlineManager } from './onlineManager' import { sleep } from './utils' -import type { CancelOptions, NetworkMode, DefaultError } from './types' +import type { CancelOptions, DefaultError, NetworkMode } from './types' // TYPES diff --git a/packages/query-core/src/tests/focusManager.test.tsx b/packages/query-core/src/tests/focusManager.test.tsx index aa2feea222..3bcf6ce760 100644 --- a/packages/query-core/src/tests/focusManager.test.tsx +++ b/packages/query-core/src/tests/focusManager.test.tsx @@ -1,7 +1,7 @@ +import { vi } from 'vitest' import { sleep } from '../utils' import { FocusManager } from '../focusManager' import { setIsServer } from './utils' -import { vi } from 'vitest' describe('focusManager', () => { let focusManager: FocusManager diff --git a/packages/query-core/src/tests/hydration.test.tsx b/packages/query-core/src/tests/hydration.test.tsx index a1c759858a..ec29ee8a03 100644 --- a/packages/query-core/src/tests/hydration.test.tsx +++ b/packages/query-core/src/tests/hydration.test.tsx @@ -1,12 +1,12 @@ +import { vi } from 'vitest' +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' -import { vi } from 'vitest' 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 08e7104151..d31c396187 100644 --- a/packages/query-core/src/tests/infiniteQueryBehavior.test.tsx +++ b/packages/query-core/src/tests/infiniteQueryBehavior.test.tsx @@ -1,8 +1,8 @@ import { waitFor } from '@testing-library/react' -import type { QueryClient, QueryCache, InfiniteQueryObserverResult } from '..' -import { InfiniteQueryObserver, CancelledError } from '..' -import { createQueryClient, queryKey, sleep } from './utils' import { vi } from 'vitest' +import { CancelledError, InfiniteQueryObserver } from '..' +import { createQueryClient, queryKey, sleep } from './utils' +import type { InfiniteQueryObserverResult, QueryCache, QueryClient } from '..' 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 6669eb8f72..99e1b06647 100644 --- a/packages/query-core/src/tests/infiniteQueryObserver.test.tsx +++ b/packages/query-core/src/tests/infiniteQueryObserver.test.tsx @@ -1,7 +1,7 @@ +import { vi } from 'vitest' +import { InfiniteQueryObserver } from '..' import { createQueryClient, queryKey, sleep } from './utils' import type { QueryClient } from '..' -import { InfiniteQueryObserver } from '..' -import { vi } from 'vitest' 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 19bf7fc43c..2e14e5a5f7 100644 --- a/packages/query-core/src/tests/mutationCache.test.tsx +++ b/packages/query-core/src/tests/mutationCache.test.tsx @@ -1,7 +1,7 @@ import { waitFor } from '@testing-library/react' -import { queryKey, sleep, executeMutation, createQueryClient } from './utils' -import { MutationCache, MutationObserver } from '..' import { vi } from 'vitest' +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 2bb5014a90..4c1daa0711 100644 --- a/packages/query-core/src/tests/mutationObserver.test.tsx +++ b/packages/query-core/src/tests/mutationObserver.test.tsx @@ -1,8 +1,8 @@ import { waitFor } from '@testing-library/react' +import { vi } from 'vitest' +import { MutationObserver } from '..' import { createQueryClient, sleep } from './utils' import type { QueryClient } from '..' -import { MutationObserver } from '..' -import { vi } from 'vitest' 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 2cff57ec04..5994a92a95 100644 --- a/packages/query-core/src/tests/mutations.test.tsx +++ b/packages/query-core/src/tests/mutations.test.tsx @@ -1,9 +1,9 @@ -import type { QueryClient } from '..' -import { createQueryClient, executeMutation, queryKey, sleep } from './utils' -import type { MutationState } from '../mutation' -import { MutationObserver } from '../mutationObserver' import { vi } from 'vitest' 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' describe('mutations', () => { let queryClient: QueryClient diff --git a/packages/query-core/src/tests/notifyManager.test.tsx b/packages/query-core/src/tests/notifyManager.test.tsx index 04bfaa4041..cf44193c6b 100644 --- a/packages/query-core/src/tests/notifyManager.test.tsx +++ b/packages/query-core/src/tests/notifyManager.test.tsx @@ -1,6 +1,6 @@ +import { vi } from 'vitest' import { createNotifyManager } from '../notifyManager' import { sleep } from './utils' -import { vi } from 'vitest' describe('notifyManager', () => { it('should use default notifyFn', async () => { diff --git a/packages/query-core/src/tests/onlineManager.test.tsx b/packages/query-core/src/tests/onlineManager.test.tsx index 7c42e834f6..79971d3071 100644 --- a/packages/query-core/src/tests/onlineManager.test.tsx +++ b/packages/query-core/src/tests/onlineManager.test.tsx @@ -1,6 +1,6 @@ +import { vi } from 'vitest' import { OnlineManager } from '../onlineManager' import { setIsServer, sleep } from './utils' -import { vi } from 'vitest' describe('onlineManager', () => { let onlineManager: OnlineManager diff --git a/packages/query-core/src/tests/queriesObserver.test.tsx b/packages/query-core/src/tests/queriesObserver.test.tsx index 916c8d9119..c5633e00d6 100644 --- a/packages/query-core/src/tests/queriesObserver.test.tsx +++ b/packages/query-core/src/tests/queriesObserver.test.tsx @@ -1,8 +1,8 @@ import { waitFor } from '@testing-library/react' -import { sleep, queryKey, createQueryClient } from './utils' -import type { QueryClient, QueryObserverResult } from '..' -import { QueriesObserver } from '..' import { vi } from 'vitest' +import { QueriesObserver } from '..' +import { createQueryClient, queryKey, sleep } from './utils' +import type { QueryClient, QueryObserverResult } from '..' describe('queriesObserver', () => { let queryClient: QueryClient diff --git a/packages/query-core/src/tests/query.test.tsx b/packages/query-core/src/tests/query.test.tsx index f09ed17ddf..0fbe876050 100644 --- a/packages/query-core/src/tests/query.test.tsx +++ b/packages/query-core/src/tests/query.test.tsx @@ -1,8 +1,11 @@ +import { waitFor } from '@testing-library/react' +import { vi } from 'vitest' +import { QueryObserver, isCancelledError, onlineManager } from '..' import { - sleep, - queryKey, - mockVisibilityState, createQueryClient, + mockVisibilityState, + queryKey, + sleep, } from './utils' import type { QueryCache, @@ -10,9 +13,6 @@ import type { QueryFunctionContext, QueryObserverResult, } from '..' -import { QueryObserver, isCancelledError, onlineManager } from '..' -import { waitFor } from '@testing-library/react' -import { vi } from 'vitest' 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 ade73b5c8f..c8c6d76350 100644 --- a/packages/query-core/src/tests/queryCache.test.tsx +++ b/packages/query-core/src/tests/queryCache.test.tsx @@ -1,7 +1,7 @@ -import { sleep, queryKey, createQueryClient } from './utils' -import { QueryClient, QueryCache, QueryObserver } from '..' import { waitFor } from '@testing-library/react' import { vi } from 'vitest' +import { QueryCache, QueryClient, QueryObserver } from '..' +import { createQueryClient, queryKey, sleep } from './utils' 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 82f2558abd..2821451ede 100644 --- a/packages/query-core/src/tests/queryClient.test.tsx +++ b/packages/query-core/src/tests/queryClient.test.tsx @@ -1,11 +1,19 @@ import { waitFor } from '@testing-library/react' import '@testing-library/jest-dom' +import { vi } from 'vitest' +import { + MutationObserver, + QueryObserver, + focusManager, + onlineManager, +} from '..' +import { noop } from '../utils' import { - sleep, - queryKey, createQueryClient, mockNavigatorOnLine, + queryKey, + sleep, } from './utils' import type { QueryCache, @@ -13,14 +21,6 @@ import type { QueryFunction, QueryObserverOptions, } from '..' -import { - MutationObserver, - QueryObserver, - focusManager, - onlineManager, -} from '..' -import { noop } from '../utils' -import { vi } from 'vitest' 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 020bb4e2d3..933ef3bb83 100644 --- a/packages/query-core/src/tests/queryObserver.test.tsx +++ b/packages/query-core/src/tests/queryObserver.test.tsx @@ -1,7 +1,7 @@ -import { sleep, queryKey, expectType, createQueryClient } from './utils' -import type { QueryClient, QueryObserverResult } from '..' -import { QueryObserver, focusManager } from '..' import { vi } from 'vitest' +import { QueryObserver, focusManager } from '..' +import { createQueryClient, expectType, queryKey, sleep } from './utils' +import type { QueryClient, QueryObserverResult } 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 529876a498..1b0774de48 100644 --- a/packages/query-core/src/tests/utils.test.tsx +++ b/packages/query-core/src/tests/utils.test.tsx @@ -1,17 +1,17 @@ +import { vi } from 'vitest' import { - replaceEqualDeep, - partialMatchKey, + addToEnd, + addToStart, + isPlainArray, isPlainObject, matchMutation, + partialMatchKey, + replaceEqualDeep, scheduleMicrotask, sleep, - isPlainArray, - addToEnd, - addToStart, } from '../utils' import { Mutation } from '../mutation' import { createQueryClient } from './utils' -import { vi } from 'vitest' describe('core/utils', () => { describe('isPlainObject', () => { diff --git a/packages/query-core/src/tests/utils.ts b/packages/query-core/src/tests/utils.ts index 343ba3d132..b98788f1ac 100644 --- a/packages/query-core/src/tests/utils.ts +++ b/packages/query-core/src/tests/utils.ts @@ -1,9 +1,9 @@ import { act } from '@testing-library/react' import { vi } from 'vitest' -import type { MutationOptions, QueryClientConfig } from '..' import { QueryClient } from '..' import * as utils from '../utils' +import type { MutationOptions, QueryClientConfig } from '..' export function createQueryClient(config?: QueryClientConfig): QueryClient { return new QueryClient(config) diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts index 038952de68..3658bed99b 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 { FetchDirection, QueryBehavior, Query } from './query' -import type { RetryValue, RetryDelayValue } from './retryer' +import type { FetchDirection, 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-devtools/src/Context.ts b/packages/query-devtools/src/Context.ts index 73e4af771e..2b7d052bc9 100644 --- a/packages/query-devtools/src/Context.ts +++ b/packages/query-devtools/src/Context.ts @@ -1,5 +1,5 @@ -import type { QueryClient, onlineManager, Query } from '@tanstack/query-core' import { createContext, useContext } from 'solid-js' +import type { Query, QueryClient, onlineManager } from '@tanstack/query-core' type XPosition = 'left' | 'right' type YPosition = 'top' | 'bottom' diff --git a/packages/query-devtools/src/Devtools.tsx b/packages/query-devtools/src/Devtools.tsx index 453a97eaba..6f27b3d69f 100644 --- a/packages/query-devtools/src/Devtools.tsx +++ b/packages/query-devtools/src/Devtools.tsx @@ -1,26 +1,28 @@ -import type { Accessor, Component, JSX, Setter } from 'solid-js' import { + For, + Show, createEffect, createMemo, createSignal, on, onCleanup, onMount, - For, - Show, } from 'solid-js' import { rankItem } from '@tanstack/match-sorter-utils' import { css, cx } from '@emotion/css' +import { TransitionGroup } from 'solid-transition-group' +import { Key } from '@solid-primitives/keyed' +import { createLocalStorage } from '@solid-primitives/storage' +import { createResizeObserver } from '@solid-primitives/resize-observer' import { tokens } from './theme' -import type { Query, QueryCache, QueryState } from '@tanstack/query-core' import { - getQueryStatusLabel, - getQueryStatusColor, + convertRemToPixels, displayValue, + getQueryStatusColor, getQueryStatusColorByLabel, - sortFns, - convertRemToPixels, + getQueryStatusLabel, getSidedProp, + sortFns, } from './utils' import { ArrowDown, @@ -33,19 +35,17 @@ import { Wifi, } from './icons' import Explorer from './Explorer' +import { QueryDevtoolsContext, useQueryDevtoolsContext } from './Context' +import { loadFonts } from './fonts' import type { - QueryDevtoolsProps, - DevtoolsPosition, - DevtoolsButtonPosition, DevToolsErrorType, + DevtoolsButtonPosition, + DevtoolsPosition, + QueryDevtoolsProps, } from './Context' -import { QueryDevtoolsContext, useQueryDevtoolsContext } from './Context' -import { TransitionGroup } from 'solid-transition-group' -import { loadFonts } from './fonts' -import { Key } from '@solid-primitives/keyed' +import type { Query, QueryCache, QueryState } from '@tanstack/query-core' import type { StorageObject, StorageSetter } from '@solid-primitives/storage' -import { createLocalStorage } from '@solid-primitives/storage' -import { createResizeObserver } from '@solid-primitives/resize-observer' +import type { Accessor, Component, JSX, Setter } from 'solid-js' interface DevtoolsPanelProps { localStore: StorageObject diff --git a/packages/query-devtools/src/Explorer.tsx b/packages/query-devtools/src/Explorer.tsx index a6bcfc1d44..42408c89a5 100644 --- a/packages/query-devtools/src/Explorer.tsx +++ b/packages/query-devtools/src/Explorer.tsx @@ -1,9 +1,9 @@ -import { displayValue } from './utils' import { stringify } from 'superjson' import { css, cx } from '@emotion/css' -import { tokens } from './theme' -import { createMemo, createSignal, Index, Match, Show, Switch } from 'solid-js' +import { Index, Match, Show, Switch, createMemo, createSignal } from 'solid-js' import { Key } from '@solid-primitives/keyed' +import { tokens } from './theme' +import { displayValue } from './utils' import { CopiedCopier, Copier, ErrorCopier } from './icons' /** diff --git a/packages/query-devtools/src/index.tsx b/packages/query-devtools/src/index.tsx index b343b2ee12..be10162fc3 100644 --- a/packages/query-devtools/src/index.tsx +++ b/packages/query-devtools/src/index.tsx @@ -1,17 +1,17 @@ +import { render } from 'solid-js/web' +import { createSignal, lazy } from 'solid-js' import type { QueryClient, onlineManager as TonlineManager, } from '@tanstack/query-core' import type { DevtoolsComponent } from './Devtools' -import { render } from 'solid-js/web' import type { + DevToolsErrorType, DevtoolsButtonPosition, DevtoolsPosition, QueryDevtoolsProps, - DevToolsErrorType, } from './Context' import type { Signal } from 'solid-js' -import { createSignal, lazy } from 'solid-js' export type { DevtoolsButtonPosition, DevtoolsPosition, DevToolsErrorType } export interface TanstackQueryDevtoolsConfig extends QueryDevtoolsProps {} diff --git a/packages/query-devtools/src/utils.tsx b/packages/query-devtools/src/utils.tsx index bd79260923..17614ecf70 100644 --- a/packages/query-devtools/src/utils.tsx +++ b/packages/query-devtools/src/utils.tsx @@ -1,5 +1,5 @@ -import type { Query } from '@tanstack/query-core' import { serialize } from 'superjson' +import type { Query } from '@tanstack/query-core' import type { DevtoolsPosition } from './Context' export function getQueryStatusLabel(query: Query) { 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 828a3bfbde..026de66bb3 100644 --- a/packages/query-persist-client-core/src/__tests__/persist.test.ts +++ b/packages/query-persist-client-core/src/__tests__/persist.test.ts @@ -1,11 +1,11 @@ +import { QueriesObserver } from '@tanstack/query-core' +import { vi } from 'vitest' +import { persistQueryClientSubscribe } from '../persist' import { + createMockPersister, createQueryClient, createSpyablePersister, - createMockPersister, } from './utils' -import { persistQueryClientSubscribe } from '../persist' -import { QueriesObserver } from '@tanstack/query-core' -import { vi } from 'vitest' 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 8d4850ab9c..000e0d77ef 100644 --- a/packages/query-persist-client-core/src/__tests__/utils.ts +++ b/packages/query-persist-client-core/src/__tests__/utils.ts @@ -1,7 +1,7 @@ -import type { QueryClientConfig } from '@tanstack/query-core' import { QueryClient } from '@tanstack/query-core' -import type { Persister, PersistedClient } from '../persist' import { vi } from 'vitest' +import type { QueryClientConfig } from '@tanstack/query-core' +import type { PersistedClient, Persister } from '../persist' export function createQueryClient(config?: QueryClientConfig): QueryClient { return new QueryClient(config) diff --git a/packages/query-persist-client-core/src/persist.ts b/packages/query-persist-client-core/src/persist.ts index f2b3187ddb..a52409e876 100644 --- a/packages/query-persist-client-core/src/persist.ts +++ b/packages/query-persist-client-core/src/persist.ts @@ -1,11 +1,11 @@ +import { dehydrate, hydrate } from '@tanstack/query-core' import type { - QueryClient, - DehydratedState, DehydrateOptions, + DehydratedState, HydrateOptions, NotifyEventType, + QueryClient, } from '@tanstack/query-core' -import { dehydrate, hydrate } 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 1c787ac2e2..07744e27f1 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 3161e78b91..cae028f9c2 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/__tests__/utils.tsx b/packages/react-query-devtools/src/__tests__/utils.tsx index bff9c1d945..383eda5312 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 6531da9ecb..283cab168f 100644 --- a/packages/react-query-devtools/src/devtools.tsx +++ b/packages/react-query-devtools/src/devtools.tsx @@ -1,14 +1,14 @@ 'use client' -import { useRef, useState, useEffect } from 'react' -import type { QueryClient } from '@tanstack/react-query' -import { useQueryClient, onlineManager } from '@tanstack/react-query' +import { useEffect, useRef, useState } from 'react' +import { onlineManager, useQueryClient } from '@tanstack/react-query' +import { TanstackQueryDevtools } from '@tanstack/query-devtools' +import React from 'react' import type { + DevToolsErrorType, DevtoolsButtonPosition, DevtoolsPosition, - DevToolsErrorType, } from '@tanstack/query-devtools' -import { TanstackQueryDevtools } from '@tanstack/query-devtools' -import React from 'react' +import type { QueryClient } from '@tanstack/react-query' export interface DevtoolsOptions { /** diff --git a/packages/react-query-next-experimental/src/ReactQueryStreamedHydration.tsx b/packages/react-query-next-experimental/src/ReactQueryStreamedHydration.tsx index a3b69bbb9b..3a831e0d72 100644 --- a/packages/react-query-next-experimental/src/ReactQueryStreamedHydration.tsx +++ b/packages/react-query-next-experimental/src/ReactQueryStreamedHydration.tsx @@ -1,11 +1,5 @@ 'use client' -import type { - DehydratedState, - DehydrateOptions, - HydrateOptions, - QueryClient, -} from '@tanstack/react-query' import { defaultShouldDehydrateQuery, dehydrate, @@ -13,8 +7,14 @@ import { useQueryClient, } from '@tanstack/react-query' import * as React from 'react' -import type { HydrationStreamProviderProps } from './HydrationStreamProvider' import { createHydrationStreamProvider } from './HydrationStreamProvider' +import type { HydrationStreamProviderProps } from './HydrationStreamProvider' +import type { + DehydrateOptions, + DehydratedState, + HydrateOptions, + QueryClient, +} from '@tanstack/react-query' const stream = createHydrationStreamProvider() diff --git a/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx b/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx index fa4f8ec5b9..9a4445b5c9 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 721d9bf3cb..314742e68a 100644 --- a/packages/react-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx +++ b/packages/react-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx @@ -2,19 +2,19 @@ import * as React from 'react' import { render, waitFor } from '@testing-library/react' import { vi } from 'vitest' -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, queryKey, sleep } from './utils' import type { PersistedClient, Persister, } from '@tanstack/query-persist-client-core' -import { persistQueryClientSave } from '@tanstack/query-persist-client-core' - -import { createQueryClient, 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 9bc45a3945..45f2eb49ab 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/react-query' import { QueryClient } from '@tanstack/react-query' +import type { QueryClientConfig } from '@tanstack/react-query' export function createQueryClient(config?: QueryClientConfig): QueryClient { return new QueryClient(config) diff --git a/packages/react-query/src/HydrationBoundary.tsx b/packages/react-query/src/HydrationBoundary.tsx index 2ff5f239c7..0c4b834e21 100644 --- a/packages/react-query/src/HydrationBoundary.tsx +++ b/packages/react-query/src/HydrationBoundary.tsx @@ -1,9 +1,9 @@ 'use client' import * as React from 'react' -import type { HydrateOptions, QueryClient } from '@tanstack/query-core' import { hydrate } from '@tanstack/query-core' import { useQueryClient } from './QueryClientProvider' +import type { HydrateOptions, QueryClient } from '@tanstack/query-core' export interface HydrationBoundaryProps { state?: unknown diff --git a/packages/react-query/src/__tests__/HydrationBoundary.test.tsx b/packages/react-query/src/__tests__/HydrationBoundary.test.tsx index fa34288d3b..cd296a5417 100644 --- a/packages/react-query/src/__tests__/HydrationBoundary.test.tsx +++ b/packages/react-query/src/__tests__/HydrationBoundary.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 { vi } from 'vitest' import { + HydrationBoundary, + QueryCache, QueryClient, QueryClientProvider, - QueryCache, - useQuery, dehydrate, - HydrationBoundary, + useQuery, } from '..' import { createQueryClient, sleep } from './utils' -import * as coreModule from '@tanstack/query-core' -import { vi } from 'vitest' 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 b868a1ef65..4c264ffed3 100644 --- a/packages/react-query/src/__tests__/QueryClientProvider.test.tsx +++ b/packages/react-query/src/__tests__/QueryClientProvider.test.tsx @@ -1,9 +1,9 @@ import * as React from 'react' import { render, waitFor } from '@testing-library/react' -import { sleep, queryKey, createQueryClient } from './utils' -import { QueryClientProvider, QueryCache, useQuery, useQueryClient } from '..' import { vi } from 'vitest' +import { QueryCache, QueryClientProvider, 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 ed2ff6486b..95223439f2 100644 --- a/packages/react-query/src/__tests__/QueryResetErrorBoundary.test.tsx +++ b/packages/react-query/src/__tests__/QueryResetErrorBoundary.test.tsx @@ -2,9 +2,9 @@ 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, useQuery, useQueries } from '..' import { vi } from 'vitest' +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 8c9e4c5d73..fc4733425f 100644 --- a/packages/react-query/src/__tests__/ssr-hydration.test.tsx +++ b/packages/react-query/src/__tests__/ssr-hydration.test.tsx @@ -7,11 +7,11 @@ import type {} from 'react-dom/next' import { vi } from 'vitest' 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 f7656b359c..0e6d5ff6ff 100644 --- a/packages/react-query/src/__tests__/ssr.test.tsx +++ b/packages/react-query/src/__tests__/ssr.test.tsx @@ -2,9 +2,9 @@ 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 { vi } from 'vitest' +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 864feefc23..cc44f78ce3 100644 --- a/packages/react-query/src/__tests__/suspense.test.tsx +++ b/packages/react-query/src/__tests__/suspense.test.tsx @@ -1,7 +1,7 @@ import { fireEvent, waitFor } from '@testing-library/react' import * as React from 'react' import { ErrorBoundary } from 'react-error-boundary' -import type { InfiniteData, UseInfiniteQueryResult, UseQueryResult } from '..' +import { vi } from 'vitest' import { QueryCache, QueryErrorResetBoundary, @@ -11,7 +11,7 @@ import { useQueryErrorResetBoundary, } from '..' import { createQueryClient, queryKey, renderWithClient, sleep } from './utils' -import { vi } from 'vitest' +import type { InfiniteData, 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 9644267c19..e78bc98d6b 100644 --- a/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx +++ b/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx @@ -1,6 +1,8 @@ import { fireEvent, render, waitFor } from '@testing-library/react' import * as React from 'react' +import { vi } from 'vitest' +import { QueryCache, keepPreviousData, useInfiniteQuery } from '..' import { createQueryClient, queryKey, @@ -13,8 +15,6 @@ import type { QueryFunctionContext, UseInfiniteQueryResult, } from '..' -import { QueryCache, useInfiniteQuery, keepPreviousData } from '..' -import { vi } from 'vitest' import type { Mock } from 'vitest' interface Result { diff --git a/packages/react-query/src/__tests__/useInfiniteQuery.type.test.tsx b/packages/react-query/src/__tests__/useInfiniteQuery.type.test.tsx index 73a4b63d0e..45a4cee7be 100644 --- a/packages/react-query/src/__tests__/useInfiniteQuery.type.test.tsx +++ b/packages/react-query/src/__tests__/useInfiniteQuery.type.test.tsx @@ -1,9 +1,9 @@ -import type { InfiniteData } from '@tanstack/query-core' import { QueryClient } from '@tanstack/query-core' import { useInfiniteQuery } from '../useInfiniteQuery' import { useQuery } from '../useQuery' -import type { Expect, Equal } from './utils' import { doNotExecute } from './utils' +import type { Equal, Expect } from './utils' +import type { InfiniteData } from '@tanstack/query-core' describe('pageParam', () => { it('defaultPageParam should define type of param passed to queryFunctionContext', () => { diff --git a/packages/react-query/src/__tests__/useIsFetching.test.tsx b/packages/react-query/src/__tests__/useIsFetching.test.tsx index a39a2ad775..59856364f8 100644 --- a/packages/react-query/src/__tests__/useIsFetching.test.tsx +++ b/packages/react-query/src/__tests__/useIsFetching.test.tsx @@ -1,6 +1,7 @@ import { fireEvent, render, waitFor } from '@testing-library/react' import * as React from 'react' +import { QueryCache, useIsFetching, useQuery } from '..' import { createQueryClient, queryKey, @@ -8,7 +9,6 @@ import { setActTimeout, sleep, } from './utils' -import { QueryCache, useIsFetching, useQuery } from '..' describe('useIsFetching', () => { // See https://github.com/tannerlinsley/react-query/issues/105 diff --git a/packages/react-query/src/__tests__/useMutation.test.tsx b/packages/react-query/src/__tests__/useMutation.test.tsx index a1650bfc80..f0cdab589e 100644 --- a/packages/react-query/src/__tests__/useMutation.test.tsx +++ b/packages/react-query/src/__tests__/useMutation.test.tsx @@ -3,8 +3,8 @@ import '@testing-library/jest-dom' import * as React from 'react' import { ErrorBoundary } from 'react-error-boundary' +import { vi } from 'vitest' import { MutationCache, QueryCache, useMutation } from '..' -import type { UseMutationResult } from '../types' import { createQueryClient, mockNavigatorOnLine, @@ -13,7 +13,7 @@ import { setActTimeout, sleep, } from './utils' -import { vi } from 'vitest' +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 83fa79e173..dff71b21c8 100644 --- a/packages/react-query/src/__tests__/useQueries.test.tsx +++ b/packages/react-query/src/__tests__/useQueries.test.tsx @@ -2,15 +2,7 @@ import { fireEvent, render, waitFor } from '@testing-library/react' import * as React from 'react' import { ErrorBoundary } from 'react-error-boundary' -import type { QueryFunctionContext } from '@tanstack/query-core' import { vi } from 'vitest' -import type { - QueryFunction, - QueryKey, - QueryObserverResult, - UseQueryOptions, - UseQueryResult, -} from '..' import { QueryCache, useQueries } from '..' import { createQueryClient, @@ -20,6 +12,14 @@ import { renderWithClient, sleep, } from './utils' +import type { + QueryFunction, + QueryKey, + QueryObserverResult, + UseQueryOptions, + UseQueryResult, +} from '..' +import type { QueryFunctionContext } from '@tanstack/query-core' describe('useQueries', () => { const queryCache = new QueryCache() diff --git a/packages/react-query/src/__tests__/useQuery.test.tsx b/packages/react-query/src/__tests__/useQuery.test.tsx index 94aad908f7..58b1562008 100644 --- a/packages/react-query/src/__tests__/useQuery.test.tsx +++ b/packages/react-query/src/__tests__/useQuery.test.tsx @@ -1,6 +1,9 @@ import { act, fireEvent, render, waitFor } from '@testing-library/react' import '@testing-library/jest-dom' import * as React from 'react' +import { ErrorBoundary } from 'react-error-boundary' +import { vi } from 'vitest' +import { QueryCache, keepPreviousData, useQuery } from '..' import { Blink, createQueryClient, @@ -19,9 +22,6 @@ import type { UseQueryOptions, UseQueryResult, } from '..' -import { QueryCache, useQuery, keepPreviousData } from '..' -import { ErrorBoundary } from 'react-error-boundary' -import { vi } from 'vitest' import type { Mock } from 'vitest' describe('useQuery', () => { diff --git a/packages/react-query/src/__tests__/useQuery.types.test.tsx b/packages/react-query/src/__tests__/useQuery.types.test.tsx index bf5699d0ad..ebcc3c1a24 100644 --- a/packages/react-query/src/__tests__/useQuery.types.test.tsx +++ b/packages/react-query/src/__tests__/useQuery.types.test.tsx @@ -1,7 +1,7 @@ import { useQuery } from '../useQuery' import { queryOptions } from '../queryOptions' -import type { Expect, Equal } from './utils' import { doNotExecute } from './utils' +import type { Equal, Expect } from './utils' describe('initialData', () => { describe('Config object overload', () => { diff --git a/packages/react-query/src/__tests__/utils.tsx b/packages/react-query/src/__tests__/utils.tsx index 268b60672b..0876f54f73 100644 --- a/packages/react-query/src/__tests__/utils.tsx +++ b/packages/react-query/src/__tests__/utils.tsx @@ -1,9 +1,9 @@ import * as React from 'react' import { act, render } from '@testing-library/react' -import type { QueryClientConfig } from '..' -import { QueryClient, QueryClientProvider } from '..' import * as utils from '@tanstack/query-core' import { vi } from 'vitest' +import { QueryClient, QueryClientProvider } from '..' +import type { QueryClientConfig } from '..' export function renderWithClient( client: QueryClient, diff --git a/packages/react-query/src/errorBoundaryUtils.ts b/packages/react-query/src/errorBoundaryUtils.ts index 9f4bb5320b..d46784341b 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 { ThrowOnError, } 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/suspense.ts b/packages/react-query/src/suspense.ts index e29d369abe..60679a09ce 100644 --- a/packages/react-query/src/suspense.ts +++ b/packages/react-query/src/suspense.ts @@ -1,8 +1,8 @@ import type { DefaultedQueryObserverOptions, - QueryObserverResult, QueryKey, QueryObserver, + QueryObserverResult, } from '@tanstack/query-core' import type { QueryErrorResetBoundaryValue } from './QueryErrorResetBoundary' diff --git a/packages/react-query/src/types.ts b/packages/react-query/src/types.ts index 50f566d1fa..4736d667f9 100644 --- a/packages/react-query/src/types.ts +++ b/packages/react-query/src/types.ts @@ -1,17 +1,17 @@ /* istanbul ignore file */ import type { + DefaultError, + DefinedQueryObserverResult, InfiniteQueryObserverOptions, InfiniteQueryObserverResult, + MutateFunction, + MutationObserverOptions, MutationObserverResult, + QueryKey, QueryObserverOptions, QueryObserverResult, - QueryKey, - MutationObserverOptions, - MutateFunction, - DefinedQueryObserverResult, WithRequired, - DefaultError, } from '@tanstack/query-core' export interface UseBaseQueryOptions< diff --git a/packages/react-query/src/useBaseQuery.ts b/packages/react-query/src/useBaseQuery.ts index 6a7e9d531d..535a69c6aa 100644 --- a/packages/react-query/src/useBaseQuery.ts +++ b/packages/react-query/src/useBaseQuery.ts @@ -1,18 +1,18 @@ 'use client' import * as React from 'react' -import type { QueryClient, QueryKey, QueryObserver } from '@tanstack/query-core' import { notifyManager } from '@tanstack/query-core' 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 { UseBaseQueryOptions } from './types' +import type { QueryClient, QueryKey, QueryObserver } from '@tanstack/query-core' export function useBaseQuery< TQueryFnData, diff --git a/packages/react-query/src/useInfiniteQuery.ts b/packages/react-query/src/useInfiniteQuery.ts index f1828e97c7..a320ccfd52 100644 --- a/packages/react-query/src/useInfiniteQuery.ts +++ b/packages/react-query/src/useInfiniteQuery.ts @@ -1,14 +1,14 @@ 'use client' +import { InfiniteQueryObserver } from '@tanstack/query-core' +import { useBaseQuery } from './useBaseQuery' import type { - QueryObserver, - QueryKey, - QueryClient, DefaultError, InfiniteData, + QueryClient, + QueryKey, + QueryObserver, } from '@tanstack/query-core' -import { InfiniteQueryObserver } from '@tanstack/query-core' import type { UseInfiniteQueryOptions, UseInfiniteQueryResult } from './types' -import { useBaseQuery } from './useBaseQuery' // HOOK export function useInfiniteQuery< diff --git a/packages/react-query/src/useIsFetching.ts b/packages/react-query/src/useIsFetching.ts index 6e1604aeae..a6252912f2 100644 --- a/packages/react-query/src/useIsFetching.ts +++ b/packages/react-query/src/useIsFetching.ts @@ -1,9 +1,9 @@ 'use client' import * as React from 'react' -import type { QueryClient, QueryFilters } from '@tanstack/query-core' import { notifyManager } from '@tanstack/query-core' import { useQueryClient } from './QueryClientProvider' +import type { QueryClient, QueryFilters } from '@tanstack/query-core' export function useIsFetching( filters?: QueryFilters, diff --git a/packages/react-query/src/useMutation.ts b/packages/react-query/src/useMutation.ts index e8236769f9..406882ff6f 100644 --- a/packages/react-query/src/useMutation.ts +++ b/packages/react-query/src/useMutation.ts @@ -1,14 +1,14 @@ 'use client' import * as React from 'react' -import type { QueryClient, DefaultError } from '@tanstack/query-core' -import { notifyManager, MutationObserver } from '@tanstack/query-core' +import { MutationObserver, notifyManager } from '@tanstack/query-core' import { useQueryClient } from './QueryClientProvider' +import { shouldThrowError } from './utils' import type { UseMutateFunction, UseMutationOptions, UseMutationResult, } from './types' -import { shouldThrowError } from './utils' +import type { DefaultError, QueryClient } from '@tanstack/query-core' // HOOK diff --git a/packages/react-query/src/useMutationState.ts b/packages/react-query/src/useMutationState.ts index f8feb21b58..d14ebc46b7 100644 --- a/packages/react-query/src/useMutationState.ts +++ b/packages/react-query/src/useMutationState.ts @@ -1,16 +1,16 @@ 'use client' import * as React from 'react' +import { notifyManager, replaceEqualDeep } from '@tanstack/query-core' +import { useQueryClient } from './QueryClientProvider' import type { - MutationFilters, - QueryClient, + DefaultError, Mutation, MutationCache, - DefaultError, + MutationFilters, MutationState, + QueryClient, } from '@tanstack/query-core' -import { notifyManager, replaceEqualDeep } from '@tanstack/query-core' -import { useQueryClient } from './QueryClientProvider' export function useIsMutating( filters?: MutationFilters, diff --git a/packages/react-query/src/useQueries.ts b/packages/react-query/src/useQueries.ts index 50843fc5a4..834b59cebf 100644 --- a/packages/react-query/src/useQueries.ts +++ b/packages/react-query/src/useQueries.ts @@ -1,17 +1,8 @@ 'use client' import * as React from 'react' -import type { - QueryKey, - QueryFunction, - QueriesPlaceholderDataFunction, - QueryClient, - DefaultError, - QueriesObserverOptions, -} from '@tanstack/query-core' -import { notifyManager, QueriesObserver } from '@tanstack/query-core' +import { QueriesObserver, notifyManager } from '@tanstack/query-core' import { useQueryClient } from './QueryClientProvider' -import type { UseQueryOptions, UseQueryResult } from './types' import { useIsRestoring } from './isRestoring' import { useQueryErrorResetBoundary } from './QueryErrorResetBoundary' import { @@ -21,10 +12,19 @@ import { } from './errorBoundaryUtils' import { ensureStaleTime, - shouldSuspend, fetchOptimistic, + shouldSuspend, willFetch, } from './suspense' +import type { UseQueryOptions, UseQueryResult } from './types' +import type { + DefaultError, + QueriesObserverOptions, + QueriesPlaceholderDataFunction, + QueryClient, + QueryFunction, + QueryKey, +} from '@tanstack/query-core' // This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`. // `placeholderData` function does not have a parameter diff --git a/packages/react-query/src/useQuery.ts b/packages/react-query/src/useQuery.ts index d9726f6e87..b25d049c73 100644 --- a/packages/react-query/src/useQuery.ts +++ b/packages/react-query/src/useQuery.ts @@ -1,12 +1,12 @@ 'use client' -import type { QueryClient, QueryKey, DefaultError } from '@tanstack/query-core' import { QueryObserver } from '@tanstack/query-core' +import { useBaseQuery } from './useBaseQuery' +import type { DefaultError, QueryClient, QueryKey } from '@tanstack/query-core' import type { DefinedUseQueryResult, UseQueryOptions, UseQueryResult, } from './types' -import { useBaseQuery } from './useBaseQuery' import type { DefinedInitialDataOptions, UndefinedInitialDataOptions, diff --git a/packages/solid-query/src/QueryClient.ts b/packages/solid-query/src/QueryClient.ts index 6d78f17f24..0c9a29afcc 100644 --- a/packages/solid-query/src/QueryClient.ts +++ b/packages/solid-query/src/QueryClient.ts @@ -1,12 +1,12 @@ +import { QueryClient as QueryCoreClient } from '@tanstack/query-core' import type { - QueryClientConfig as QueryCoreClientConfig, DefaultOptions as CoreDefaultOptions, - QueryObserverOptions as QueryCoreObserverOptions, - InfiniteQueryObserverOptions as QueryCoreInfiniteQueryObserverOptions, DefaultError, + QueryClientConfig as QueryCoreClientConfig, + InfiniteQueryObserverOptions as QueryCoreInfiniteQueryObserverOptions, + QueryObserverOptions as QueryCoreObserverOptions, QueryKey, } from '@tanstack/query-core' -import { QueryClient as QueryCoreClient } from '@tanstack/query-core' export interface QueryObserverOptions< TQueryFnData = unknown, diff --git a/packages/solid-query/src/QueryClientProvider.tsx b/packages/solid-query/src/QueryClientProvider.tsx index 1ee3735df9..6f44fb2c8c 100644 --- a/packages/solid-query/src/QueryClientProvider.tsx +++ b/packages/solid-query/src/QueryClientProvider.tsx @@ -1,6 +1,6 @@ +import { createContext, onCleanup, onMount, useContext } from 'solid-js' import type { QueryClient } from './QueryClient' import type { JSX } from 'solid-js' -import { createContext, useContext, onMount, onCleanup } from 'solid-js' export const QueryClientContext = createContext( undefined, diff --git a/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx b/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx index 9ee34dd604..4ece37cbfb 100644 --- a/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx +++ b/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx @@ -1,9 +1,9 @@ import { render, screen, waitFor } from '@solidjs/testing-library' -import { createQueryClient, sleep, queryKey } from './utils' import { QueryCache } from '@tanstack/query-core' -import { createQuery, QueryClientProvider, useQueryClient } from '..' import { vi } from 'vitest' +import { QueryClientProvider, createQuery, useQueryClient } from '..' +import { createQueryClient, queryKey, sleep } from './utils' 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 00ad1e6011..c381254624 100644 --- a/packages/solid-query/src/__tests__/createInfiniteQuery.test.tsx +++ b/packages/solid-query/src/__tests__/createInfiniteQuery.test.tsx @@ -1,35 +1,35 @@ import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library' import { - createQueryClient, - sleep, - Blink, - queryKey, - setActTimeout, -} from './utils' - -import { - createEffect, - createRenderEffect, - createSignal, For, Index, Match, Switch, + createEffect, + createRenderEffect, + createSignal, on, } from 'solid-js' -import type { - CreateInfiniteQueryResult, - InfiniteData, - QueryFunctionContext, -} from '..' +import { vi } from 'vitest' import { - createInfiniteQuery, QueryCache, QueryClientProvider, + createInfiniteQuery, keepPreviousData, } from '..' -import { vi } from 'vitest' +import { + Blink, + createQueryClient, + queryKey, + setActTimeout, + sleep, +} from './utils' + +import type { + CreateInfiniteQueryResult, + InfiniteData, + QueryFunctionContext, +} from '..' import type { Mock } from 'vitest' interface Result { diff --git a/packages/solid-query/src/__tests__/createMutation.test.tsx b/packages/solid-query/src/__tests__/createMutation.test.tsx index 9bd1959a5e..1cc0b2f720 100644 --- a/packages/solid-query/src/__tests__/createMutation.test.tsx +++ b/packages/solid-query/src/__tests__/createMutation.test.tsx @@ -1,18 +1,18 @@ import '@testing-library/jest-dom' import { + ErrorBoundary, createEffect, createRenderEffect, createSignal, - ErrorBoundary, } from 'solid-js' import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library' +import { vi } from 'vitest' import { - createMutation, MutationCache, QueryCache, QueryClientProvider, + createMutation, } from '..' -import type { CreateMutationResult } from '../types' import { createQueryClient, mockNavigatorOnLine, @@ -20,7 +20,7 @@ import { setActTimeout, sleep, } from './utils' -import { vi } from 'vitest' +import type { CreateMutationResult } from '../types' describe('createMutation', () => { 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 a56c8a3a20..3ea9125ecf 100644 --- a/packages/solid-query/src/__tests__/createQueries.test.tsx +++ b/packages/solid-query/src/__tests__/createQueries.test.tsx @@ -1,19 +1,13 @@ import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library' import * as QueryCore from '@tanstack/query-core' -import type { QueryFunctionContext, QueryKey } from '@tanstack/query-core' import { createRenderEffect, createSignal } from 'solid-js' -import type { - CreateQueryResult, - QueryFunction, - QueryObserverResult, - SolidQueryOptions, -} from '..' +import { vi } from 'vitest' import { - createQueries, QueriesObserver, QueryCache, QueryClientProvider, + createQueries, } from '..' import { createQueryClient, @@ -22,7 +16,13 @@ import { queryKey, sleep, } from './utils' -import { vi } from 'vitest' +import type { QueryFunctionContext, QueryKey } from '@tanstack/query-core' +import type { + CreateQueryResult, + QueryFunction, + QueryObserverResult, + SolidQueryOptions, +} 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 d0b608ef61..48225f89e0 100644 --- a/packages/solid-query/src/__tests__/createQuery.test.tsx +++ b/packages/solid-query/src/__tests__/createQuery.test.tsx @@ -1,26 +1,21 @@ 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 '@solidjs/testing-library' -import type { - CreateQueryOptions, - CreateQueryResult, - DefinedCreateQueryResult, - QueryFunction, -} from '..' +import { vi } from 'vitest' +import { reconcile } from 'solid-js/store' import { - createQuery, QueryCache, QueryClientProvider, + createQuery, keepPreviousData, } from '..' import { @@ -33,9 +28,14 @@ import { setActTimeout, sleep, } from './utils' -import { vi } from 'vitest' +import type { + CreateQueryOptions, + CreateQueryResult, + DefinedCreateQueryResult, + QueryFunction, +} from '..' import type { Mock } from 'vitest' -import { reconcile } from 'solid-js/store' +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 c1f2545a4f..570098b28a 100644 --- a/packages/solid-query/src/__tests__/suspense.test.tsx +++ b/packages/solid-query/src/__tests__/suspense.test.tsx @@ -1,26 +1,26 @@ import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library' import { - createRenderEffect, - createSignal, ErrorBoundary, - on, Show, Suspense, + createRenderEffect, + createSignal, + on, } from 'solid-js' -import type { - CreateInfiniteQueryResult, - CreateQueryResult, - InfiniteData, -} from '..' +import { vi } from 'vitest' import { - createInfiniteQuery, - createQuery, QueryCache, QueryClientProvider, + createInfiniteQuery, + createQuery, } from '..' import { createQueryClient, queryKey, sleep } from './utils' -import { vi } from 'vitest' +import type { + CreateInfiniteQueryResult, + CreateQueryResult, + InfiniteData, +} 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 4cf0006d19..97c3c3e471 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 '@solidjs/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 0b37fa7d0d..d451beaab9 100644 --- a/packages/solid-query/src/__tests__/useIsFetching.test.tsx +++ b/packages/solid-query/src/__tests__/useIsFetching.test.tsx @@ -1,7 +1,7 @@ import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library' -import { createEffect, createRenderEffect, createSignal, Show } from 'solid-js' -import { createQuery, QueryCache, QueryClientProvider, useIsFetching } from '..' +import { Show, createEffect, createRenderEffect, createSignal } from 'solid-js' +import { QueryCache, QueryClientProvider, createQuery, useIsFetching } from '..' import { createQueryClient, queryKey, setActTimeout, sleep } from './utils' describe('useIsFetching', () => { diff --git a/packages/solid-query/src/__tests__/useIsMutating.test.tsx b/packages/solid-query/src/__tests__/useIsMutating.test.tsx index 8fb5101e1b..e87d11ebd8 100644 --- a/packages/solid-query/src/__tests__/useIsMutating.test.tsx +++ b/packages/solid-query/src/__tests__/useIsMutating.test.tsx @@ -1,10 +1,10 @@ import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library' -import { createMutation, QueryClientProvider, useIsMutating } from '..' -import { createQueryClient, sleep, setActTimeout } from './utils' -import { createEffect, createRenderEffect, createSignal, Show } from 'solid-js' +import { Show, createEffect, createRenderEffect, createSignal } from 'solid-js' import * as QueryCore from '@tanstack/query-core' import { vi } from 'vitest' +import { QueryClientProvider, createMutation, useIsMutating } from '..' +import { createQueryClient, setActTimeout, sleep } from './utils' describe('useIsMutating', () => { it('should return the number of fetching mutations', async () => { diff --git a/packages/solid-query/src/__tests__/utils.tsx b/packages/solid-query/src/__tests__/utils.tsx index 3d28152f9f..d6eb5f17f2 100644 --- a/packages/solid-query/src/__tests__/utils.tsx +++ b/packages/solid-query/src/__tests__/utils.tsx @@ -1,8 +1,8 @@ -import type { QueryClientConfig } from '@tanstack/query-core' +import { Show, createEffect, createSignal, onCleanup } from 'solid-js' +import { vi } from 'vitest' import { QueryClient } from '../QueryClient' +import type { QueryClientConfig } from '@tanstack/query-core' import type { ParentProps } from 'solid-js' -import { createEffect, createSignal, onCleanup, Show } from 'solid-js' -import { vi } from 'vitest' let queryKeyCount = 0 export function queryKey(): Array { diff --git a/packages/solid-query/src/createBaseQuery.ts b/packages/solid-query/src/createBaseQuery.ts index 843194ecbf..222d867aa7 100644 --- a/packages/solid-query/src/createBaseQuery.ts +++ b/packages/solid-query/src/createBaseQuery.ts @@ -2,14 +2,7 @@ // Had to disable the lint rule because isServer type is defined as false // in solid-js/web package. I'll create a GitHub issue with them to see // why that happens. -import type { - QueryKey, - QueryObserver, - QueryObserverResult, -} from '@tanstack/query-core' -import type { QueryClient } from './QueryClient' import { hydrate, notifyManager } from '@tanstack/query-core' -import type { Accessor } from 'solid-js' import { isServer } from 'solid-js/web' import { createComputed, @@ -20,8 +13,15 @@ import { } from 'solid-js' import { createStore, reconcile, unwrap } from 'solid-js/store' import { useQueryClient } from './QueryClientProvider' -import type { CreateBaseQueryOptions } from './types' import { shouldThrowError } from './utils' +import type { CreateBaseQueryOptions } from './types' +import type { Accessor } from 'solid-js' +import type { QueryClient } from './QueryClient' +import type { + QueryKey, + QueryObserver, + QueryObserverResult, +} from '@tanstack/query-core' function reconcileFn( store: QueryObserverResult, diff --git a/packages/solid-query/src/createInfiniteQuery.ts b/packages/solid-query/src/createInfiniteQuery.ts index b35ef20efc..d65a322f3c 100644 --- a/packages/solid-query/src/createInfiniteQuery.ts +++ b/packages/solid-query/src/createInfiniteQuery.ts @@ -1,17 +1,17 @@ +import { InfiniteQueryObserver } from '@tanstack/query-core' +import { createMemo } from 'solid-js' +import { createBaseQuery } from './createBaseQuery' import type { - QueryObserver, - QueryKey, DefaultError, InfiniteData, + QueryKey, + QueryObserver, } from '@tanstack/query-core' import type { QueryClient } from './QueryClient' -import { InfiniteQueryObserver } from '@tanstack/query-core' import type { CreateInfiniteQueryOptions, CreateInfiniteQueryResult, } from './types' -import { createBaseQuery } from './createBaseQuery' -import { createMemo } from 'solid-js' import type { Accessor } from 'solid-js' export function createInfiniteQuery< diff --git a/packages/solid-query/src/createMutation.ts b/packages/solid-query/src/createMutation.ts index 9ed3fb3d15..b65eb095f7 100644 --- a/packages/solid-query/src/createMutation.ts +++ b/packages/solid-query/src/createMutation.ts @@ -1,16 +1,16 @@ -import type { DefaultError } from '@tanstack/query-core' -import type { QueryClient } from './QueryClient' import { MutationObserver } 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 { DefaultError } from '@tanstack/query-core' +import type { QueryClient } from './QueryClient' import type { CreateMutateFunction, CreateMutationOptions, CreateMutationResult, } from './types' import type { Accessor } from 'solid-js' -import { createComputed, onCleanup, on } from 'solid-js' -import { createStore } from 'solid-js/store' -import { shouldThrowError } from './utils' // HOOK export function createMutation< diff --git a/packages/solid-query/src/createQueries.ts b/packages/solid-query/src/createQueries.ts index 64889f80c1..1df884b4e9 100644 --- a/packages/solid-query/src/createQueries.ts +++ b/packages/solid-query/src/createQueries.ts @@ -1,16 +1,16 @@ +import { QueriesObserver, notifyManager } from '@tanstack/query-core' +import { createComputed, onCleanup } from 'solid-js' +import { createStore, unwrap } from 'solid-js/store' +import { useQueryClient } from './QueryClientProvider' +import type { Accessor } from 'solid-js' +import type { QueryClient } from './QueryClient' import type { + DefaultError, + QueriesObserverOptions, QueriesPlaceholderDataFunction, QueryFunction, QueryKey, - DefaultError, - QueriesObserverOptions, } from '@tanstack/query-core' -import { notifyManager, QueriesObserver } from '@tanstack/query-core' -import type { QueryClient } from './QueryClient' -import type { Accessor } from 'solid-js' -import { createComputed, onCleanup } from 'solid-js' -import { createStore, unwrap } from 'solid-js/store' -import { useQueryClient } from './QueryClientProvider' import type { CreateQueryResult, SolidQueryOptions } from './types' // This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`. diff --git a/packages/solid-query/src/createQuery.ts b/packages/solid-query/src/createQuery.ts index 97cd690d26..6eb48eb1c0 100644 --- a/packages/solid-query/src/createQuery.ts +++ b/packages/solid-query/src/createQuery.ts @@ -1,9 +1,9 @@ -import type { QueryKey, DefaultError } from '@tanstack/query-core' import { QueryObserver } from '@tanstack/query-core' -import type { QueryClient } from './QueryClient' -import type { Accessor } from 'solid-js' import { createMemo } from 'solid-js' import { createBaseQuery } from './createBaseQuery' +import type { DefaultError, QueryKey } from '@tanstack/query-core' +import type { QueryClient } from './QueryClient' +import type { Accessor } from 'solid-js' import type { CreateQueryOptions, CreateQueryResult, diff --git a/packages/solid-query/src/types.ts b/packages/solid-query/src/types.ts index b5545a9b00..49d11db8af 100644 --- a/packages/solid-query/src/types.ts +++ b/packages/solid-query/src/types.ts @@ -1,19 +1,19 @@ /* istanbul ignore file */ import type { - QueryKey, - QueryObserverResult, + DefaultError, + DefinedQueryObserverResult, + InfiniteQueryObserverResult, MutateFunction, MutationObserverOptions, MutationObserverResult, - DefinedQueryObserverResult, - InfiniteQueryObserverResult, + QueryKey, + QueryObserverResult, WithRequired, - DefaultError, } from '@tanstack/query-core' import type { - QueryObserverOptions, InfiniteQueryObserverOptions, + QueryObserverOptions, } from './QueryClient' export type FunctionedParams = () => T diff --git a/packages/solid-query/src/useIsFetching.ts b/packages/solid-query/src/useIsFetching.ts index 809505139b..e118a5d076 100644 --- a/packages/solid-query/src/useIsFetching.ts +++ b/packages/solid-query/src/useIsFetching.ts @@ -1,8 +1,8 @@ +import { createMemo, createSignal, onCleanup } from 'solid-js' +import { useQueryClient } from './QueryClientProvider' import type { QueryFilters } from '@tanstack/query-core' import type { QueryClient } from './QueryClient' import type { Accessor } from 'solid-js' -import { createMemo, createSignal, onCleanup } from 'solid-js' -import { useQueryClient } from './QueryClientProvider' export function useIsFetching( filters?: Accessor, diff --git a/packages/solid-query/src/useIsMutating.ts b/packages/solid-query/src/useIsMutating.ts index 1c4093833b..57ec870e45 100644 --- a/packages/solid-query/src/useIsMutating.ts +++ b/packages/solid-query/src/useIsMutating.ts @@ -1,8 +1,8 @@ +import { createMemo, createSignal, onCleanup } from 'solid-js' +import { useQueryClient } from './QueryClientProvider' import type { MutationFilters } from '@tanstack/query-core' import type { QueryClient } from './QueryClient' -import { useQueryClient } from './QueryClientProvider' import type { Accessor } from 'solid-js' -import { createSignal, onCleanup, createMemo } from 'solid-js' export function useIsMutating( filters?: Accessor, diff --git a/packages/svelte-query-devtools/src/Devtools.svelte b/packages/svelte-query-devtools/src/Devtools.svelte index d62bec1eba..bb2189da12 100644 --- a/packages/svelte-query-devtools/src/Devtools.svelte +++ b/packages/svelte-query-devtools/src/Devtools.svelte @@ -1,13 +1,13 @@