diff --git a/packages/query-core/src/infiniteQueryBehavior.ts b/packages/query-core/src/infiniteQueryBehavior.ts index f6db4b9569..9314406b54 100644 --- a/packages/query-core/src/infiniteQueryBehavior.ts +++ b/packages/query-core/src/infiniteQueryBehavior.ts @@ -4,6 +4,7 @@ import type { InfiniteData, InfiniteQueryOptions, QueryFunctionContext, + QueryKey, } from './types' export function infiniteQueryBehavior< @@ -74,7 +75,10 @@ export function infiniteQueryBehavior< return Promise.resolve(pages) } - const queryFnContext: Omit = { + const queryFnContext: Omit< + QueryFunctionContext, + 'signal' + > = { queryKey: context.queryKey, pageParam: param, meta: context.options.meta, @@ -82,7 +86,9 @@ export function infiniteQueryBehavior< addSignalProperty(queryFnContext) - const queryFnResult = queryFn(queryFnContext as QueryFunctionContext) + const queryFnResult = queryFn( + queryFnContext as QueryFunctionContext, + ) const promise = Promise.resolve(queryFnResult).then((page) => buildNewPages(pages, param, page, previous), diff --git a/packages/query-core/src/query.ts b/packages/query-core/src/query.ts index 4e907ade4b..9e2105d03a 100644 --- a/packages/query-core/src/query.ts +++ b/packages/query-core/src/query.ts @@ -362,7 +362,6 @@ export class Query< // Create query function context const queryFnContext: Omit, 'signal'> = { queryKey: this.queryKey, - pageParam: undefined, meta: this.meta, } diff --git a/packages/query-core/src/queryClient.ts b/packages/query-core/src/queryClient.ts index e3f004e390..80789d9bb0 100644 --- a/packages/query-core/src/queryClient.ts +++ b/packages/query-core/src/queryClient.ts @@ -275,8 +275,15 @@ export class QueryClient { TError = RegisteredError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, + TPageParam = never, >( - options: FetchQueryOptions, + options: FetchQueryOptions< + TQueryFnData, + TError, + TData, + TQueryKey, + TPageParam + >, ): Promise { const defaultedOptions = this.defaultQueryOptions(options) @@ -308,8 +315,15 @@ export class QueryClient { TError = RegisteredError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, + TPageParam = unknown, >( - options: FetchInfiniteQueryOptions, + options: FetchInfiniteQueryOptions< + TQueryFnData, + TError, + TData, + TQueryKey, + TPageParam + >, ): Promise> { options.behavior = infiniteQueryBehavior() return this.fetchQuery(options) @@ -320,8 +334,15 @@ export class QueryClient { TError = RegisteredError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, + TPageParam = unknown, >( - options: FetchInfiniteQueryOptions, + options: FetchInfiniteQueryOptions< + TQueryFnData, + TError, + TData, + TQueryKey, + TPageParam + >, ): Promise { return this.fetchInfiniteQuery(options).then(noop).catch(noop) } @@ -405,9 +426,17 @@ export class QueryClient { TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, + TPageParam = never, >( options?: - | QueryObserverOptions + | QueryObserverOptions< + TQueryFnData, + TError, + TData, + TQueryData, + TQueryKey, + TPageParam + > | DefaultedQueryObserverOptions< TQueryFnData, TError, diff --git a/packages/query-core/src/tests/query.test.tsx b/packages/query-core/src/tests/query.test.tsx index 002c4f07d3..85a2d6b990 100644 --- a/packages/query-core/src/tests/query.test.tsx +++ b/packages/query-core/src/tests/query.test.tsx @@ -200,6 +200,7 @@ describe('query', () => { expect(queryFn).toHaveBeenCalledTimes(1) const args = queryFn.mock.calls[0]![0] expect(args).toBeDefined() + // @ts-expect-error page param should be undefined expect(args.pageParam).toBeUndefined() expect(args.queryKey).toEqual(key) expect(args.signal).toBeInstanceOf(AbortSignal) diff --git a/packages/query-core/src/tests/queryClient.test.tsx b/packages/query-core/src/tests/queryClient.test.tsx index c052fe7763..87a0c4aa54 100644 --- a/packages/query-core/src/tests/queryClient.test.tsx +++ b/packages/query-core/src/tests/queryClient.test.tsx @@ -565,7 +565,7 @@ describe('queryClient', () => { pageParams: [0], } as const - const fetchFn: QueryFunction = () => + const fetchFn: QueryFunction = () => Promise.resolve(data.pages[0]) await expect( @@ -573,7 +573,8 @@ describe('queryClient', () => { StrictData, any, StrictData, - StrictQueryKey + StrictQueryKey, + number >({ queryKey: key, queryFn: fetchFn, defaultPageParam: 0 }), ).resolves.toEqual(data) }) @@ -603,14 +604,15 @@ describe('queryClient', () => { type StrictQueryKey = ['strict', ...ReturnType] const key: StrictQueryKey = ['strict', ...queryKey()] - const fetchFn: QueryFunction = () => + const fetchFn: QueryFunction = () => Promise.resolve('data') await queryClient.prefetchInfiniteQuery< StrictData, any, StrictData, - StrictQueryKey + StrictQueryKey, + number >({ queryKey: key, queryFn: fetchFn, defaultPageParam: 0 }) const result = queryClient.getQueryData(key) diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts index 510a60b297..98d8d411a0 100644 --- a/packages/query-core/src/types.ts +++ b/packages/query-core/src/types.ts @@ -22,17 +22,24 @@ export type QueryKey = readonly unknown[] export type QueryFunction< T = unknown, TQueryKey extends QueryKey = QueryKey, -> = (context: QueryFunctionContext) => T | Promise + TPageParam = never, +> = (context: QueryFunctionContext) => T | Promise -export interface QueryFunctionContext< +export type QueryFunctionContext< TQueryKey extends QueryKey = QueryKey, - TPageParam = any, -> { - queryKey: TQueryKey - signal: AbortSignal - pageParam?: TPageParam - meta: QueryMeta | undefined -} + TPageParam = never, +> = [TPageParam] extends [never] + ? { + queryKey: TQueryKey + signal: AbortSignal + meta: QueryMeta | undefined + } + : { + queryKey: TQueryKey + signal: AbortSignal + pageParam: TPageParam + meta: QueryMeta | undefined + } export type InitialDataFunction = () => T | undefined @@ -50,15 +57,15 @@ export type QueryKeyHashFunction = ( queryKey: TQueryKey, ) => string -export type GetPreviousPageParamFunction = ( +export type GetPreviousPageParamFunction = ( firstPage: TQueryFnData, allPages: TQueryFnData[], -) => unknown +) => TPageParam | undefined -export type GetNextPageParamFunction = ( +export type GetNextPageParamFunction = ( lastPage: TQueryFnData, allPages: TQueryFnData[], -) => unknown +) => TPageParam | undefined export interface InfiniteData { pages: TData[] @@ -76,6 +83,7 @@ export interface QueryOptions< TError = RegisteredError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, + TPageParam = never, > { /** * If `false`, failed queries will not retry by default. @@ -87,7 +95,7 @@ export interface QueryOptions< retryDelay?: RetryDelayValue networkMode?: NetworkMode gcTime?: number - queryFn?: QueryFunction + queryFn?: QueryFunction queryHash?: string queryKey?: TQueryKey queryKeyHashFn?: QueryKeyHashFunction @@ -114,22 +122,24 @@ export interface QueryOptions< maxPages?: number } -export interface DefaultPageParam { - defaultPageParam: unknown +export interface DefaultPageParam { + defaultPageParam: TPageParam } -export interface InfiniteQueryOptions - extends DefaultPageParam { +export interface InfiniteQueryOptions< + TQueryFnData = unknown, + TPageParam = unknown, +> extends DefaultPageParam { /** * This function can be set to automatically get the previous cursor for infinite queries. * The result will also be used to determine the value of `hasPreviousPage`. */ - getPreviousPageParam?: GetPreviousPageParamFunction + getPreviousPageParam?: GetPreviousPageParamFunction /** * This function can be set to automatically get the next cursor for infinite queries. * The result will also be used to determine the value of `hasNextPage`. */ - getNextPageParam: GetNextPageParamFunction + getNextPageParam: GetNextPageParamFunction } export type ThrowErrors< @@ -150,7 +160,14 @@ export interface QueryObserverOptions< TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, -> extends QueryOptions { + TPageParam = never, +> extends QueryOptions< + TQueryFnData, + TError, + TQueryData, + TQueryKey, + TPageParam + > { /** * Set this to `false` to disable automatic refetching when the query mounts or changes query keys. * To refetch the query, use the `refetch` method returned from the `useQuery` instance. @@ -289,14 +306,16 @@ export interface InfiniteQueryObserverOptions< TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, + TPageParam = unknown, > extends QueryObserverOptions< TQueryFnData, TError, InfiniteData, InfiniteData, - TQueryKey + TQueryKey, + TPageParam >, - InfiniteQueryOptions {} + InfiniteQueryOptions {} export type DefaultedInfiniteQueryObserverOptions< TQueryFnData = unknown, @@ -320,8 +339,9 @@ export interface FetchQueryOptions< TError = RegisteredError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, + TPageParam = never, > extends WithRequired< - QueryOptions, + QueryOptions, 'queryKey' > { /** @@ -336,13 +356,15 @@ export interface FetchInfiniteQueryOptions< TError = RegisteredError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, + TPageParam = unknown, > extends FetchQueryOptions< TQueryFnData, TError, InfiniteData, - TQueryKey + TQueryKey, + TPageParam >, - DefaultPageParam {} + DefaultPageParam {} export interface ResultOptions { throwOnError?: boolean diff --git a/packages/react-query/src/types.ts b/packages/react-query/src/types.ts index bbf435976d..5e522fd641 100644 --- a/packages/react-query/src/types.ts +++ b/packages/react-query/src/types.ts @@ -41,13 +41,15 @@ export interface UseInfiniteQueryOptions< TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, + TPageParam = unknown, > extends WithRequired< InfiniteQueryObserverOptions< TQueryFnData, TError, TData, TQueryData, - TQueryKey + TQueryKey, + TPageParam >, 'queryKey' > {} diff --git a/packages/react-query/src/useInfiniteQuery.ts b/packages/react-query/src/useInfiniteQuery.ts index afa27c7801..004d6ebbf6 100644 --- a/packages/react-query/src/useInfiniteQuery.ts +++ b/packages/react-query/src/useInfiniteQuery.ts @@ -14,13 +14,15 @@ export function useInfiniteQuery< TError = RegisteredError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, + TPageParam = unknown, >( options: UseInfiniteQueryOptions< TQueryFnData, TError, TData, TQueryFnData, - TQueryKey + TQueryKey, + TPageParam >, queryClient?: QueryClient, ): UseInfiniteQueryResult { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c485a2e519..7d01bea236 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -154,8 +154,8 @@ importers: dependencies: '@algolia/client-search': 4.11.0 '@algolia/transporter': 4.11.0 - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools algoliasearch: 4.12.2 devDependencies: '@tanstack/eslint-plugin-query': link:../../../packages/eslint-plugin-query @@ -177,8 +177,8 @@ importers: react: ^18.2.0 react-dom: ^18.2.0 dependencies: - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools axios: 0.21.4 isomorphic-unfetch: 3.0.0 next: 12.2.2_biqbaboplfbrettd7655fr4n2y @@ -196,8 +196,8 @@ importers: react-dom: ^18.0.0 vite: ^3.0.0 dependencies: - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools axios: 0.21.4 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 @@ -217,8 +217,8 @@ importers: react-dom: ^18.0.0 vite: ^3.0.0 dependencies: - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools graphql: 15.8.0 graphql-request: 3.7.0_graphql@15.8.0 react: 18.2.0 @@ -245,10 +245,10 @@ importers: typescript: 4.7.4 vite: ^3.0.0 dependencies: - '@tanstack/query-sync-storage-persister': 4.24.9 - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 - '@tanstack/react-query-persist-client': 4.24.9_edqnkd4k5jgewaytq5kyy7a3ra + '@tanstack/query-sync-storage-persister': link:../../../packages/query-sync-storage-persister + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools + '@tanstack/react-query-persist-client': link:../../../packages/react-query-persist-client axios: 0.26.1 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 @@ -272,8 +272,8 @@ importers: react-dom: ^18.0.0 vite: ^3.0.0 dependencies: - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools axios: 0.26.1 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 @@ -292,8 +292,8 @@ importers: react-dom: ^18.2.0 react-intersection-observer: ^8.33.1 dependencies: - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools axios: 0.21.4 isomorphic-unfetch: 3.0.0 next: 12.2.2_biqbaboplfbrettd7655fr4n2y @@ -312,8 +312,8 @@ importers: react-dom: ^18.2.0 react-intersection-observer: ^8.33.1 dependencies: - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools axios: 0.21.4 isomorphic-unfetch: 3.0.0 next: 12.2.2_biqbaboplfbrettd7655fr4n2y @@ -333,8 +333,8 @@ importers: resolve-from: ^5.0.0 web-streams-polyfill: ^3.0.3 dependencies: - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools ky: 0.23.0 ky-universal: 0.8.2_53xdiffegfcxt6522645rot5ue next: 12.2.2_biqbaboplfbrettd7655fr4n2y @@ -358,11 +358,11 @@ importers: react-hot-toast: ^2.2.0 vite: ^3.0.0 dependencies: - '@tanstack/query-sync-storage-persister': 4.24.9 + '@tanstack/query-sync-storage-persister': link:../../../packages/query-sync-storage-persister '@tanstack/react-location': 3.7.4_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 - '@tanstack/react-query-persist-client': 4.24.9_edqnkd4k5jgewaytq5kyy7a3ra + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools + '@tanstack/react-query-persist-client': link:../../../packages/react-query-persist-client ky: 0.30.0 msw: 0.39.2 react: 18.2.0 @@ -385,8 +385,8 @@ importers: react-dom: ^18.2.0 typescript: 4.7.4 dependencies: - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools '@types/node': 14.14.14 '@types/react': 18.0.15 axios: 0.21.4 @@ -406,8 +406,8 @@ importers: react: ^18.2.0 react-dom: ^18.2.0 dependencies: - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools axios: 0.21.4 isomorphic-unfetch: 3.0.0 next: 12.2.2_biqbaboplfbrettd7655fr4n2y @@ -423,8 +423,8 @@ importers: react-dom: ^18.0.0 vite: ^3.0.0 dependencies: - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools react: 18.2.0 react-dom: 18.2.0_react@18.2.0 devDependencies: @@ -441,8 +441,8 @@ importers: react: ^18.2.0 react-dom: ^18.2.0 dependencies: - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools axios: 0.21.4 isomorphic-unfetch: 3.0.0 next: 12.2.2_biqbaboplfbrettd7655fr4n2y @@ -482,8 +482,8 @@ importers: '@react-native-community/netinfo': 6.0.2_react-native@0.64.3 '@react-navigation/native': 6.0.11_sbjh7r6wrxe2pvsvaqturwwxna '@react-navigation/stack': 6.2.2_dpltcvsy22isyfoj2zvicex7ry - '@tanstack/react-query': 4.24.9_6xi2cjj4jkvnn2q2msxp65enam - '@tanstack/react-query-devtools': 4.24.9_wbw6rstheiz66bag7jwb4yeysu + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools expo: 43.0.5_@babel+core@7.19.1 expo-constants: 12.1.3 expo-status-bar: 1.1.0 @@ -522,8 +522,8 @@ importers: sort-by: ^1.2.0 vite: ^3.0.0 dependencies: - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools localforage: 1.10.0 match-sorter: 6.3.1 react: 18.2.0 @@ -548,8 +548,8 @@ importers: vite: ^3.0.0 dependencies: '@material-ui/core': 4.12.4_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools react: 18.2.0 react-dom: 18.2.0_react@18.2.0 react-router: 5.3.3_react@18.2.0 @@ -568,8 +568,8 @@ importers: react-dom: ^18.0.0 vite: ^3.0.0 dependencies: - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools axios: 0.26.1 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 @@ -590,8 +590,8 @@ importers: vite: ^3.0.0 dependencies: '@material-ui/core': 4.12.4_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools react: 18.2.0 react-dom: 18.2.0_react@18.2.0 react-router: 5.3.3_react@18.2.0 @@ -611,8 +611,8 @@ importers: react-error-boundary: ^2.2.3 vite: ^3.0.0 dependencies: - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - '@tanstack/react-query-devtools': 4.24.9_bzphmdwvicyhtx5eo3azinrh54 + '@tanstack/react-query': link:../../../packages/react-query + '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools axios: 0.21.4 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 @@ -631,7 +631,7 @@ importers: vite: ^3.0.9 vite-plugin-solid: ^2.3.9 dependencies: - '@tanstack/solid-query': 4.24.9_solid-js@1.6.11 + '@tanstack/solid-query': link:../../../packages/solid-query graphql: 16.6.0 graphql-request: 5.0.0_graphql@16.6.0 solid-js: 1.6.11 @@ -648,7 +648,7 @@ importers: vite: ^3.0.9 vite-plugin-solid: ^2.3.9 dependencies: - '@tanstack/solid-query': 4.24.9_solid-js@1.6.11 + '@tanstack/solid-query': link:../../../packages/solid-query solid-js: 1.6.11 devDependencies: typescript: 4.7.4 @@ -663,7 +663,7 @@ importers: vite: ^3.0.9 vite-plugin-solid: ^2.3.9 dependencies: - '@tanstack/solid-query': 4.24.9_solid-js@1.6.11 + '@tanstack/solid-query': link:../../../packages/solid-query solid-js: 1.6.11 devDependencies: typescript: 4.7.4 @@ -679,7 +679,7 @@ importers: vite: ^3.0.9 vite-plugin-solid: ^2.3.9 dependencies: - '@tanstack/solid-query': 4.24.9_solid-js@1.6.11 + '@tanstack/solid-query': link:../../../packages/solid-query solid-js: 1.6.11 devDependencies: '@tanstack/eslint-plugin-query': link:../../../packages/eslint-plugin-query @@ -704,7 +704,7 @@ importers: dependencies: '@solidjs/meta': 0.28.2_solid-js@1.6.11 '@solidjs/router': 0.6.0_solid-js@1.6.11 - '@tanstack/solid-query': 4.24.9_solid-js@1.6.11 + '@tanstack/solid-query': link:../../../packages/solid-query solid-js: 1.6.11 solid-start: 0.2.21_hj77zfsbczccdokc5ewmqqrrvy undici: 5.14.0 @@ -727,7 +727,7 @@ importers: typescript: ^4.7.4 vite: ^4.0.0 dependencies: - '@tanstack/svelte-query': 4.24.9_svelte@3.55.0 + '@tanstack/svelte-query': link:../../../packages/svelte-query devDependencies: '@sveltejs/adapter-auto': 1.0.0_@sveltejs+kit@1.0.7 '@sveltejs/kit': 1.0.7_svelte@3.55.0+vite@4.0.4 @@ -748,7 +748,7 @@ importers: typescript: ^4.7.4 vite: ^4.0.0 dependencies: - '@tanstack/svelte-query': 4.24.9_svelte@3.55.0 + '@tanstack/svelte-query': link:../../../packages/svelte-query devDependencies: '@sveltejs/adapter-auto': 1.0.0_@sveltejs+kit@1.0.7 '@sveltejs/kit': 1.0.7_svelte@3.55.0+vite@4.0.4 @@ -769,7 +769,7 @@ importers: typescript: ^4.7.4 vite: ^4.0.0 dependencies: - '@tanstack/svelte-query': 4.24.9_svelte@3.55.0 + '@tanstack/svelte-query': link:../../../packages/svelte-query devDependencies: '@sveltejs/adapter-auto': 1.0.0_@sveltejs+kit@1.0.7 '@sveltejs/kit': 1.0.7_svelte@3.55.0+vite@4.0.4 @@ -790,7 +790,7 @@ importers: typescript: ^4.7.4 vite: ^4.0.0 dependencies: - '@tanstack/svelte-query': 4.24.9_svelte@3.55.0 + '@tanstack/svelte-query': link:../../../packages/svelte-query devDependencies: '@sveltejs/adapter-auto': 1.0.0_@sveltejs+kit@1.0.7 '@sveltejs/kit': 1.0.7_svelte@3.55.0+vite@4.0.4 @@ -811,7 +811,7 @@ importers: typescript: ^4.7.4 vite: ^4.0.0 dependencies: - '@tanstack/svelte-query': 4.24.9_svelte@3.55.0 + '@tanstack/svelte-query': link:../../../packages/svelte-query devDependencies: '@sveltejs/adapter-auto': 1.0.0_@sveltejs+kit@1.0.7 '@sveltejs/kit': 1.0.7_svelte@3.55.0+vite@4.0.4 @@ -832,7 +832,7 @@ importers: typescript: ^4.7.4 vite: ^4.0.0 dependencies: - '@tanstack/svelte-query': 4.24.9_svelte@3.55.0 + '@tanstack/svelte-query': link:../../../packages/svelte-query devDependencies: '@sveltejs/vite-plugin-svelte': 2.0.2_svelte@3.55.0+vite@4.0.4 '@tsconfig/svelte': 3.0.0 @@ -853,7 +853,7 @@ importers: typescript: ^4.7.4 vite: ^4.0.0 dependencies: - '@tanstack/svelte-query': 4.24.9_svelte@3.55.0 + '@tanstack/svelte-query': link:../../../packages/svelte-query devDependencies: '@sveltejs/adapter-auto': 1.0.0_@sveltejs+kit@1.0.7 '@sveltejs/kit': 1.0.7_svelte@3.55.0+vite@4.0.4 @@ -877,7 +877,7 @@ importers: typescript: ^4.7.4 vite: ^4.0.0 dependencies: - '@tanstack/svelte-query': 4.24.9_svelte@3.55.0 + '@tanstack/svelte-query': link:../../../packages/svelte-query devDependencies: '@sveltejs/adapter-auto': 1.0.0_@sveltejs+kit@1.0.7 '@sveltejs/kit': 1.0.7_svelte@3.55.0+vite@4.0.4 @@ -898,7 +898,7 @@ importers: vite: ^3.1.8 vue: ^3.2.41 dependencies: - '@tanstack/vue-query': 4.24.9_vue@3.2.41 + '@tanstack/vue-query': link:../../../packages/vue-query vue: 3.2.41 devDependencies: '@vitejs/plugin-vue': 3.1.2_vite@3.1.8+vue@3.2.41 @@ -913,7 +913,7 @@ importers: vite: 3.1.4 vue: 3.2.39 dependencies: - '@tanstack/vue-query': 4.24.9_vue@3.2.39 + '@tanstack/vue-query': link:../../../packages/vue-query vue: 3.2.39 devDependencies: '@vitejs/plugin-vue': 3.1.0_vite@3.1.4+vue@3.2.39 @@ -930,9 +930,9 @@ importers: vite: 3.2.2 vue: 3.2.41 dependencies: - '@tanstack/query-persist-client-core': 4.24.9 - '@tanstack/query-sync-storage-persister': 4.24.9 - '@tanstack/vue-query': 4.24.9_vue@3.2.41 + '@tanstack/query-persist-client-core': link:../../../packages/query-persist-client-core + '@tanstack/query-sync-storage-persister': link:../../../packages/query-sync-storage-persister + '@tanstack/vue-query': link:../../../packages/vue-query vue: 3.2.41 devDependencies: '@vitejs/plugin-vue': 3.2.0_vite@3.2.2+vue@3.2.41 @@ -7640,22 +7640,6 @@ packages: remove-accents: 0.4.2 dev: false - /@tanstack/query-core/4.24.9: - resolution: {integrity: sha512-pZQ2NpdaHzx8gPPkAPh06d6zRkjfonUzILSYBXrdHDapP2eaBbGsx5L4/dMF+fyAglFzQZdDDzZgAykbM20QVw==} - dev: false - - /@tanstack/query-persist-client-core/4.24.9: - resolution: {integrity: sha512-/pudjUvzemA5hyb0IQ6E6zMyoqci5izlKhtU5IwJyfjPikDIIcFUKbci6pSw01SJJQDX/+br8NRRmFzUNLi/pQ==} - dependencies: - '@tanstack/query-core': 4.24.9 - dev: false - - /@tanstack/query-sync-storage-persister/4.24.9: - resolution: {integrity: sha512-2Z/mestkEMl4W5J2Ip5pLdL3IjQ2G040MH4rnsXfAe76I0BTs/xjVzf32imRDvbjTsQhWbkwXr2Dug1PxfM+9A==} - dependencies: - '@tanstack/query-persist-client-core': 4.24.9 - dev: false - /@tanstack/react-location/3.7.4_biqbaboplfbrettd7655fr4n2y: resolution: {integrity: sha512-6rH2vNHGr0uyeUz5ZHvWMYjeYKGgIKFzvs5749QtnS9f+FU7t7fQE0hKZAzltBZk82LT7iYbcHBRyUg2lW13VA==} engines: {node: '>=12'} @@ -7669,132 +7653,6 @@ packages: react-dom: 18.2.0_react@18.2.0 dev: false - /@tanstack/react-query-devtools/4.24.9_bzphmdwvicyhtx5eo3azinrh54: - resolution: {integrity: sha512-NPsVf3pLMjH/XNTT5iP1q6isEBNE4kWF/IBSbxNUt0tDWK1nS1qgWr9ySTXwimsAHOWMjHkFuUF8VBRmz+axKg==} - peerDependencies: - '@tanstack/react-query': 4.24.9 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - dependencies: - '@tanstack/match-sorter-utils': 8.7.6 - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - react: 18.2.0 - react-dom: 18.2.0_react@18.2.0 - superjson: 1.10.0 - use-sync-external-store: 1.2.0_react@18.2.0 - dev: false - - /@tanstack/react-query-devtools/4.24.9_wbw6rstheiz66bag7jwb4yeysu: - resolution: {integrity: sha512-NPsVf3pLMjH/XNTT5iP1q6isEBNE4kWF/IBSbxNUt0tDWK1nS1qgWr9ySTXwimsAHOWMjHkFuUF8VBRmz+axKg==} - peerDependencies: - '@tanstack/react-query': 4.24.9 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - dependencies: - '@tanstack/match-sorter-utils': 8.7.6 - '@tanstack/react-query': 4.24.9_6xi2cjj4jkvnn2q2msxp65enam - react: 17.0.1 - react-dom: 17.0.1_react@17.0.1 - superjson: 1.10.0 - use-sync-external-store: 1.2.0_react@17.0.1 - dev: false - - /@tanstack/react-query-persist-client/4.24.9_edqnkd4k5jgewaytq5kyy7a3ra: - resolution: {integrity: sha512-6PMhvN/QJZD/lxmTwFZi8pyuwbDi9Dib4S/bMTDHzHr+3iJEZi9/6ry/IwXSHa/ho3JlujWOm5Td7VJVv8MEyw==} - peerDependencies: - '@tanstack/react-query': 4.24.9 - dependencies: - '@tanstack/query-persist-client-core': 4.24.9 - '@tanstack/react-query': 4.24.9_biqbaboplfbrettd7655fr4n2y - dev: false - - /@tanstack/react-query/4.24.9_6xi2cjj4jkvnn2q2msxp65enam: - resolution: {integrity: sha512-6WLwUT9mrngIinRtcZjrWOUENOuLbWvQpKmU6DZCo2iPQVA+qvv3Ji90Amme4AkUyWQ8ZSSRTnAFq8V2tj2ACg==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-native: '*' - peerDependenciesMeta: - react-dom: - optional: true - react-native: - optional: true - dependencies: - '@tanstack/query-core': 4.24.9 - react: 17.0.1 - react-dom: 17.0.1_react@17.0.1 - react-native: 0.64.3_gpe6tsd6gj6gjuc7hywxyjd2qm - use-sync-external-store: 1.2.0_react@17.0.1 - dev: false - - /@tanstack/react-query/4.24.9_biqbaboplfbrettd7655fr4n2y: - resolution: {integrity: sha512-6WLwUT9mrngIinRtcZjrWOUENOuLbWvQpKmU6DZCo2iPQVA+qvv3Ji90Amme4AkUyWQ8ZSSRTnAFq8V2tj2ACg==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-native: '*' - peerDependenciesMeta: - react-dom: - optional: true - react-native: - optional: true - dependencies: - '@tanstack/query-core': 4.24.9 - react: 18.2.0 - react-dom: 18.2.0_react@18.2.0 - use-sync-external-store: 1.2.0_react@18.2.0 - dev: false - - /@tanstack/solid-query/4.24.9_solid-js@1.6.11: - resolution: {integrity: sha512-pGeNCgAJZU4FNRRm74Mpihuq4KQSWMBlKwEhNCJEIg/9agprpxgfKhXDzVYRzk5pkUIxC7nUkOFqLQSZhAe7bA==} - peerDependencies: - solid-js: ^1.5.7 - dependencies: - '@tanstack/query-core': 4.24.9 - solid-js: 1.6.11 - dev: false - - /@tanstack/svelte-query/4.24.9_svelte@3.55.0: - resolution: {integrity: sha512-sKZgyrHbCVWxbGPNOwRG3py7b/si2lXCMP0jCLHIK6ncHrrxhZXhYDQgbIy75D44wKRDV7jjP2GJ7CIktWxNrA==} - peerDependencies: - svelte: ^3.54.0 - dependencies: - '@tanstack/query-core': 4.24.9 - svelte: 3.55.0 - dev: false - - /@tanstack/vue-query/4.24.9_vue@3.2.39: - resolution: {integrity: sha512-qN2SRu5DHrTYo4TgoQG59s7GEWjvP6kJ+pCe4g7ww5WYTIQz14DSXRd5Sr87SUpcp6M9RZx9R07zpf16hV+/5Q==} - peerDependencies: - '@vue/composition-api': ^1.1.2 - vue: ^2.5.0 || ^3.0.0 - peerDependenciesMeta: - '@vue/composition-api': - optional: true - dependencies: - '@tanstack/match-sorter-utils': 8.7.6 - '@tanstack/query-core': 4.24.9 - '@vue/devtools-api': 6.5.0 - vue: 3.2.39 - vue-demi: 0.13.11_vue@3.2.39 - dev: false - - /@tanstack/vue-query/4.24.9_vue@3.2.41: - resolution: {integrity: sha512-qN2SRu5DHrTYo4TgoQG59s7GEWjvP6kJ+pCe4g7ww5WYTIQz14DSXRd5Sr87SUpcp6M9RZx9R07zpf16hV+/5Q==} - peerDependencies: - '@vue/composition-api': ^1.1.2 - vue: ^2.5.0 || ^3.0.0 - peerDependenciesMeta: - '@vue/composition-api': - optional: true - dependencies: - '@tanstack/match-sorter-utils': 8.7.6 - '@tanstack/query-core': 4.24.9 - '@vue/devtools-api': 6.5.0 - vue: 3.2.41 - vue-demi: 0.13.11_vue@3.2.41 - dev: false - /@testing-library/dom/7.31.2: resolution: {integrity: sha512-3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ==} engines: {node: '>=10'} @@ -9398,7 +9256,7 @@ packages: /axios/0.21.4: resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} dependencies: - follow-redirects: 1.15.1 + follow-redirects: 1.15.1_debug@4.3.4 transitivePeerDependencies: - debug dev: false @@ -9406,7 +9264,7 @@ packages: /axios/0.24.0: resolution: {integrity: sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==} dependencies: - follow-redirects: 1.15.1 + follow-redirects: 1.15.1_debug@4.3.4 transitivePeerDependencies: - debug dev: true @@ -9414,14 +9272,14 @@ packages: /axios/0.25.0_debug@4.3.4: resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==} dependencies: - follow-redirects: 1.15.1 + follow-redirects: 1.15.1_debug@4.3.4 transitivePeerDependencies: - debug /axios/0.26.1: resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==} dependencies: - follow-redirects: 1.15.1 + follow-redirects: 1.15.1_debug@4.3.4 transitivePeerDependencies: - debug @@ -12735,7 +12593,7 @@ packages: resolution: {integrity: sha512-1gIBiWJNR0tKUNv8gZuk7l9rVX06OuLzY9AoGio7y/JT4V1IZErEMEq2TJS+PFcw/y0RshZ1J/27VfK1UQzYVg==} engines: {node: '>=0.4.0'} - /follow-redirects/1.15.1: + /follow-redirects/1.15.1_debug@4.3.4: resolution: {integrity: sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==} engines: {node: '>=4.0'} peerDependencies: @@ -12743,6 +12601,8 @@ packages: peerDependenciesMeta: debug: optional: true + dependencies: + debug: 4.3.4 /follow-redirects/1.5.10: resolution: {integrity: sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==} @@ -14424,7 +14284,7 @@ packages: '@babel/preset-env': ^7.1.6 dependencies: '@babel/core': 7.20.12 - '@babel/parser': 7.19.1 + '@babel/parser': 7.20.15 '@babel/plugin-proposal-class-properties': 7.18.6_@babel+core@7.20.12 '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6_@babel+core@7.20.12 '@babel/plugin-proposal-optional-chaining': 7.18.6_@babel+core@7.20.12 @@ -15526,7 +15386,7 @@ packages: '@babel/code-frame': 7.18.6 '@babel/core': 7.20.12 '@babel/generator': 7.20.14 - '@babel/parser': 7.19.1 + '@babel/parser': 7.20.15 '@babel/template': 7.20.7 '@babel/traverse': 7.19.1 '@babel/types': 7.19.0 @@ -18578,6 +18438,7 @@ packages: /svelte/3.55.0: resolution: {integrity: sha512-uGu2FVMlOuey4JoKHKrpZFkoYyj0VLjJdz47zX5+gVK5odxHM40RVhar9/iK2YFRVxvfg9FkhfVlR0sjeIrOiA==} engines: {node: '>= 8'} + dev: true /svelte2tsx/0.6.0_glsdxddlaertg66rhhvanbinpy: resolution: {integrity: sha512-TrxfQkO7CKi8Pu2eC/FyteDCdk3OOeQV5u6z7OjYAsOhsd0ClzAKqxJdvp6xxNQLrbFzf/XvCi9Fy8MQ1MleFA==} @@ -19302,22 +19163,6 @@ packages: react: 18.2.0 dev: false - /use-sync-external-store/1.2.0_react@17.0.1: - resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - dependencies: - react: 17.0.1 - dev: false - - /use-sync-external-store/1.2.0_react@18.2.0: - resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - dependencies: - react: 18.2.0 - dev: false - /use/3.1.1: resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==} engines: {node: '>=0.10.0'} @@ -19729,36 +19574,6 @@ packages: vue: 3.2.47 dev: false - /vue-demi/0.13.11_vue@3.2.39: - resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - peerDependencies: - '@vue/composition-api': ^1.0.0-rc.1 - vue: ^3.0.0-0 || ^2.6.0 - peerDependenciesMeta: - '@vue/composition-api': - optional: true - dependencies: - vue: 3.2.39 - dev: false - - /vue-demi/0.13.11_vue@3.2.41: - resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - peerDependencies: - '@vue/composition-api': ^1.0.0-rc.1 - vue: ^3.0.0-0 || ^2.6.0 - peerDependenciesMeta: - '@vue/composition-api': - optional: true - dependencies: - vue: 3.2.41 - dev: false - /vue/2.6.14: resolution: {integrity: sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==} dev: true