@tanstack/solid-query 5.0.0-alpha.4 → 5.0.0-alpha.5

package/build/source/__tests__/QueryClientProvider.test.jsx

@@ -3,6 +3,7 @@ import { queryKey } from './utils';
 import { QueryCache } from '@tanstack/query-core';
 import { createQuery, QueryClientProvider, useQueryClient } from '..';
 import { createQueryClient, sleep } from './utils';
+import { vi } from 'vitest';
 describe('QueryClientProvider', () => {
     it('sets a specific cache for all queries to use', async () => {
         const key = queryKey();
@@ -106,7 +107,7 @@ describe('QueryClientProvider', () => {
     });
     describe('useQueryClient', () => {
         it('should throw an error if no query client has been set', () => {
-            const consoleMock = jest
+            const consoleMock = vi
                 .spyOn(console, 'error')
                 .mockImplementation(() => undefined);
             function Page() {

package/build/source/__tests__/createInfiniteQuery.test.jsx

@@ -3,6 +3,7 @@ import { createQueryClient, sleep } from './utils';
 import { createEffect, createRenderEffect, createSignal, For, Index, Match, Switch, } from 'solid-js';
 import { createInfiniteQuery, QueryCache, QueryClientProvider, keepPreviousData, } from '..';
 import { Blink, queryKey, setActTimeout } from './utils';
+import { vi } from 'vitest';
 const pageSize = 10;
 const fetchItems = async (page, ts, noNext, noPrev) => {
     await sleep(10);
@@ -582,9 +583,9 @@ describe('useInfiniteQuery', () => {
         const start = 10;
         const onAborts = [];
         const abortListeners = [];
-        const fetchPage = jest.fn(async ({ pageParam, signal }) => {
-            const onAbort = jest.fn();
-            const abortListener = jest.fn();
+        const fetchPage = vi.fn(async ({ pageParam, signal }) => {
+            const onAbort = vi.fn();
+            const abortListener = vi.fn();
             onAborts.push(onAbort);
             abortListeners.push(abortListener);
             signal.onabort = onAbort;
@@ -648,9 +649,9 @@ describe('useInfiniteQuery', () => {
         const start = 10;
         const onAborts = [];
         const abortListeners = [];
-        const fetchPage = jest.fn(async ({ pageParam, signal }) => {
-            const onAbort = jest.fn();
-            const abortListener = jest.fn();
+        const fetchPage = vi.fn(async ({ pageParam, signal }) => {
+            const onAbort = vi.fn();
+            const abortListener = vi.fn();
             onAborts.push(onAbort);
             abortListeners.push(abortListener);
             signal.onabort = onAbort;
@@ -1131,7 +1132,7 @@ describe('useInfiniteQuery', () => {
               </>}>
             <Match when={state.status === 'pending'}>Loading...</Match>
             <Match when={state.status === 'error'}>
-              <span>Error: {state.error.message}</span>
+              <span>Error: {state.error?.message}</span>
             </Match>
           </Switch>
         </div>);
@@ -1221,7 +1222,7 @@ describe('useInfiniteQuery', () => {
               </>}>
             <Match when={state.status === 'pending'}>Loading...</Match>
             <Match when={state.status === 'error'}>
-              <span>Error: {state.error.message}</span>
+              <span>Error: {state.error?.message}</span>
             </Match>
           </Switch>
         </div>);
@@ -1264,10 +1265,10 @@ describe('useInfiniteQuery', () => {
     });
     it('should cancel the query function when there are no more subscriptions', async () => {
         const key = queryKey();
-        let cancelFn = jest.fn();
+        let cancelFn = vi.fn();
         const queryFn = ({ signal }) => {
             const promise = new Promise((resolve, reject) => {
-                cancelFn = jest.fn(() => reject('Cancelled'));
+                cancelFn = vi.fn(() => reject('Cancelled'));
                 signal?.addEventListener('abort', cancelFn);
                 sleep(20).then(() => resolve('OK'));
             });

package/build/source/__tests__/createMutation.test.jsx

@@ -3,6 +3,7 @@ import { createEffect, createRenderEffect, createSignal, ErrorBoundary, } from '
 import { fireEvent, render, screen, waitFor } from 'solid-testing-library';
 import { createMutation, MutationCache, QueryCache, QueryClientProvider, } from '..';
 import { createQueryClient, mockNavigatorOnLine, queryKey, setActTimeout, sleep, } from './utils';
+import { vi } from 'vitest';
 describe('createMutation', () => {
     const queryCache = new QueryCache();
     const mutationCache = new MutationCache();
@@ -63,8 +64,8 @@ describe('createMutation', () => {
     });
     it('should be able to call `onSuccess` and `onSettled` after each successful mutate', async () => {
         const [count, setCount] = createSignal(0);
-        const onSuccessMock = jest.fn();
-        const onSettledMock = jest.fn();
+        const onSuccessMock = vi.fn();
+        const onSettledMock = vi.fn();
         function Page() {
             const mutation = createMutation(() => ({
                 mutationFn: (vars) => Promise.resolve(vars.count),
@@ -110,7 +111,7 @@ describe('createMutation', () => {
     });
     it('should set correct values for `failureReason` and `failureCount` on multiple mutate calls', async () => {
         const [count, setCount] = createSignal(0);
-        const mutateFn = jest.fn();
+        const mutateFn = vi.fn();
         mutateFn.mockImplementationOnce(() => {
             return Promise.reject(new Error('Error test Jonas'));
         });
@@ -152,8 +153,8 @@ describe('createMutation', () => {
         await waitFor(() => screen.getByText('Failed because null'));
     });
     it('should be able to call `onError` and `onSettled` after each failed mutate', async () => {
-        const onErrorMock = jest.fn();
-        const onSettledMock = jest.fn();
+        const onErrorMock = vi.fn();
+        const onSettledMock = vi.fn();
         const [count, setCount] = createSignal(0);
         function Page() {
             const mutation = createMutation(() => ({
@@ -388,7 +389,7 @@ describe('createMutation', () => {
     });
     it('should call onMutate even if paused', async () => {
         const onlineMock = mockNavigatorOnLine(false);
-        const onMutate = jest.fn();
+        const onMutate = vi.fn();
         let count = 0;
         function Page() {
             const mutation = createMutation(() => ({
@@ -617,8 +618,8 @@ describe('createMutation', () => {
         });
     });
     it('should pass meta to mutation', async () => {
-        const errorMock = jest.fn();
-        const successMock = jest.fn();
+        const errorMock = vi.fn();
+        const successMock = vi.fn();
         const queryClientMutationMeta = createQueryClient({
             mutationCache: new MutationCache({
                 onSuccess: (_, __, ___, mutation) => {
@@ -664,10 +665,10 @@ describe('createMutation', () => {
         expect(errorMock).toHaveBeenCalledWith(metaErrorMessage);
     });
     it('should call cache callbacks when unmounted', async () => {
-        const onSuccess = jest.fn();
-        const onSuccessMutate = jest.fn();
-        const onSettled = jest.fn();
-        const onSettledMutate = jest.fn();
+        const onSuccess = vi.fn();
+        const onSuccessMutate = vi.fn();
+        const onSettled = vi.fn();
+        const onSettledMutate = vi.fn();
         const mutationKey = queryKey();
         let count = 0;
         function Page() {
@@ -718,10 +719,10 @@ describe('createMutation', () => {
         expect(onSettledMutate).toHaveBeenCalledTimes(0);
     });
     it('should call mutate callbacks only for the last observer', async () => {
-        const onSuccess = jest.fn();
-        const onSuccessMutate = jest.fn();
-        const onSettled = jest.fn();
-        const onSettledMutate = jest.fn();
+        const onSuccess = vi.fn();
+        const onSuccessMutate = vi.fn();
+        const onSettled = vi.fn();
+        const onSettledMutate = vi.fn();
         let count = 0;
         function Page() {
             const mutation = createMutation(() => ({
@@ -762,7 +763,7 @@ describe('createMutation', () => {
     });
     it('should go to error state if onSuccess callback errors', async () => {
         const error = new Error('error from onSuccess');
-        const onError = jest.fn();
+        const onError = vi.fn();
         function Page() {
             const mutation = createMutation(() => ({
                 mutationFn: async (_text) => {
@@ -815,7 +816,7 @@ describe('createMutation', () => {
     it('should go to error state if onSettled callback errors', async () => {
         const error = new Error('error from onSettled');
         const mutateFnError = new Error('mutateFnError');
-        const onError = jest.fn();
+        const onError = vi.fn();
         function Page() {
             const mutation = createMutation(() => ({
                 mutationFn: async (_text) => {

package/build/source/__tests__/createQueries.test.jsx

@@ -3,6 +3,7 @@ import * as QueriesObserverModule from '../../../query-core/src/queriesObserver'
 import { createRenderEffect, createSignal } from 'solid-js';
 import { createQueries, QueriesObserver, QueryCache, QueryClientProvider, } from '..';
 import { createQueryClient, expectType, expectTypeNotAny, queryKey, sleep, } from './utils';
+import { vi } from 'vitest';
 describe('useQueries', () => {
     const queryCache = new QueryCache();
     const queryClient = createQueryClient({ queryCache });
@@ -620,7 +621,7 @@ describe('useQueries', () => {
                 return () => void 0;
             }
         }
-        const QueriesObserverSpy = jest
+        const QueriesObserverSpy = vi
             .spyOn(QueriesObserverModule, 'QueriesObserver')
             .mockImplementation((fn) => {
             return new QueriesObserverMock(fn);
@@ -657,20 +658,4 @@ describe('useQueries', () => {
         await sleep(20);
         QueriesObserverSpy.mockRestore();
     });
-    it('should use provided custom queryClient', async () => {
-        const key = queryKey();
-        const queryFn = () => {
-            return Promise.resolve('custom client');
-        };
-        function Page() {
-            const state = createQueries(() => ({
-                queries: [{ queryKey: key, queryFn }],
-            }), () => queryClient);
-            return (<div>
-          <h1>Status: {state[0].data}</h1>
-        </div>);
-        }
-        render(() => <Page />);
-        await waitFor(() => screen.getByText('Status: custom client'));
-    });
 });

package/build/source/__tests__/createQuery.test.jsx

@@ -3,6 +3,7 @@ import { createEffect, createMemo, createRenderEffect, createSignal, ErrorBounda
 import { fireEvent, render, screen, waitFor } from 'solid-testing-library';
 import { createQuery, QueryCache, QueryClientProvider, keepPreviousData, } from '..';
 import { Blink, createQueryClient, expectType, mockNavigatorOnLine, mockVisibilityState, queryKey, setActTimeout, sleep, } from './utils';
+import { vi } from 'vitest';
 describe('createQuery', () => {
     const queryCache = new QueryCache();
     const queryClient = createQueryClient({ queryCache });
@@ -361,7 +362,7 @@ describe('createQuery', () => {
     it('should call onSuccess after a query has been fetched', async () => {
         const key = queryKey();
         const states = [];
-        const onSuccess = jest.fn();
+        const onSuccess = vi.fn();
         function Page() {
             const state = createQuery(() => ({
                 queryKey: key,
@@ -387,7 +388,7 @@ describe('createQuery', () => {
     it('should call onSuccess after a disabled query has been fetched', async () => {
         const key = queryKey();
         const states = [];
-        const onSuccess = jest.fn();
+        const onSuccess = vi.fn();
         function Page() {
             const state = createQuery(() => ({
                 queryKey: key,
@@ -416,7 +417,7 @@ describe('createQuery', () => {
     it('should not call onSuccess if a component has unmounted', async () => {
         const key = queryKey();
         const states = [];
-        const onSuccess = jest.fn();
+        const onSuccess = vi.fn();
         function Page() {
             const [show, setShow] = createSignal(true);
             createEffect(() => {
@@ -448,7 +449,7 @@ describe('createQuery', () => {
     it('should call onError after a query has been fetched with an error', async () => {
         const key = queryKey();
         const states = [];
-        const onError = jest.fn();
+        const onError = vi.fn();
         function Page() {
             const state = createQuery(() => ({
                 queryKey: key,
@@ -471,7 +472,7 @@ describe('createQuery', () => {
     });
     it('should not call onError when receiving a CancelledError', async () => {
         const key = queryKey();
-        const onError = jest.fn();
+        const onError = vi.fn();
         function Page() {
             const state = createQuery(() => ({
                 queryKey: key,
@@ -497,7 +498,7 @@ describe('createQuery', () => {
     it('should call onSettled after a query has been fetched', async () => {
         const key = queryKey();
         const states = [];
-        const onSettled = jest.fn();
+        const onSettled = vi.fn();
         function Page() {
             const state = createQuery(() => ({
                 queryKey: key,
@@ -520,7 +521,7 @@ describe('createQuery', () => {
     it('should call onSettled after a query has been fetched with an error', async () => {
         const key = queryKey();
         const states = [];
-        const onSettled = jest.fn();
+        const onSettled = vi.fn();
         function Page() {
             const state = createQuery(() => ({
                 queryKey: key,
@@ -1887,7 +1888,7 @@ describe('createQuery', () => {
     });
     it('should not refetch query on focus when `enabled` is set to `false`', async () => {
         const key = queryKey();
-        const queryFn = jest.fn().mockReturnValue('data');
+        const queryFn = vi.fn().mockReturnValue('data');
         function Page() {
             const { data = 'default' } = createQuery(() => ({
                 queryKey: key,
@@ -2523,7 +2524,7 @@ describe('createQuery', () => {
     });
     it('should retry specified number of times', async () => {
         const key = queryKey();
-        const queryFn = jest.fn();
+        const queryFn = vi.fn();
         queryFn.mockImplementation(() => {
             return Promise.reject(new Error('Error test Barrett'));
         });
@@ -2552,7 +2553,7 @@ describe('createQuery', () => {
     });
     it('should not retry if retry function `false`', async () => {
         const key = queryKey();
-        const queryFn = jest.fn();
+        const queryFn = vi.fn();
         queryFn.mockImplementationOnce(() => {
             return Promise.reject(new Error('Error test Tanner'));
         });
@@ -2585,7 +2586,7 @@ describe('createQuery', () => {
     });
     it('should extract retryDelay from error', async () => {
         const key = queryKey();
-        const queryFn = jest.fn();
+        const queryFn = vi.fn();
         queryFn.mockImplementation(() => {
             return Promise.reject({ delay: 50 });
         });
@@ -2747,9 +2748,9 @@ describe('createQuery', () => {
     it('should refetch if stale after a prefetch', async () => {
         const key = queryKey();
         const states = [];
-        const queryFn = jest.fn();
+        const queryFn = vi.fn();
         queryFn.mockImplementation(() => 'data');
-        const prefetchQueryFn = jest.fn();
+        const prefetchQueryFn = vi.fn();
         prefetchQueryFn.mockImplementation(() => 'not yet...');
         await queryClient.prefetchQuery({
             queryKey: key,
@@ -2773,9 +2774,9 @@ describe('createQuery', () => {
     });
     it('should not refetch if not stale after a prefetch', async () => {
         const key = queryKey();
-        const queryFn = jest.fn();
+        const queryFn = vi.fn();
         queryFn.mockImplementation(() => 'data');
-        const prefetchQueryFn = jest.fn();
+        const prefetchQueryFn = vi.fn();
         prefetchQueryFn.mockImplementation(async () => {
             await sleep(10);
             return 'not yet...';
@@ -2977,7 +2978,7 @@ describe('createQuery', () => {
     });
     it('it should support enabled:false in query object syntax', async () => {
         const key = queryKey();
-        const queryFn = jest.fn();
+        const queryFn = vi.fn();
         queryFn.mockImplementation(() => 'data');
         function Page() {
             const { fetchStatus } = createQuery(() => ({
@@ -3028,7 +3029,7 @@ describe('createQuery', () => {
         <Page />
       </QueryClientProvider>));
         await waitFor(() => screen.getByText('fetched data'));
-        const setTimeoutSpy = jest.spyOn(window, 'setTimeout');
+        const setTimeoutSpy = vi.spyOn(window, 'setTimeout');
         result.unmount();
         expect(setTimeoutSpy).not.toHaveBeenCalled();
     });
@@ -3046,14 +3047,14 @@ describe('createQuery', () => {
         <Page />
       </QueryClientProvider>));
         await waitFor(() => screen.getByText('fetched data'));
-        const setTimeoutSpy = jest.spyOn(window, 'setTimeout');
+        const setTimeoutSpy = vi.spyOn(window, 'setTimeout');
         result.unmount();
         expect(setTimeoutSpy).toHaveBeenLastCalledWith(expect.any(Function), 1000 * 60 * 10);
     });
     it('should not cause memo churn when data does not change', async () => {
         const key = queryKey();
-        const queryFn = jest.fn().mockReturnValue('data');
-        const memoFn = jest.fn();
+        const queryFn = vi.fn().mockReturnValue('data');
+        const memoFn = vi.fn();
         function Page() {
             const result = createQuery(() => ({
                 queryKey: key,
@@ -3234,7 +3235,7 @@ describe('createQuery', () => {
     });
     it('should refetch if any query instance becomes enabled', async () => {
         const key = queryKey();
-        const queryFn = jest.fn().mockReturnValue('data');
+        const queryFn = vi.fn().mockReturnValue('data');
         function Disabled() {
             createQuery(() => ({ queryKey: key, queryFn, enabled: false }));
             return null;
@@ -3504,10 +3505,10 @@ describe('createQuery', () => {
     });
     it('should cancel the query function when there are no more subscriptions', async () => {
         const key = queryKey();
-        let cancelFn = jest.fn();
+        let cancelFn = vi.fn();
         const queryFn = ({ signal }) => {
             const promise = new Promise((resolve, reject) => {
-                cancelFn = jest.fn(() => reject('Cancelled'));
+                cancelFn = vi.fn(() => reject('Cancelled'));
                 signal?.addEventListener('abort', cancelFn);
                 sleep(20).then(() => resolve('OK'));
             });
@@ -3767,7 +3768,7 @@ describe('createQuery', () => {
         expect(renders).toBe(hashes);
     });
     it('should refetch when changed enabled to true in error state', async () => {
-        const queryFn = jest.fn();
+        const queryFn = vi.fn();
         queryFn.mockImplementation(async () => {
             await sleep(10);
             return Promise.reject(new Error('Suspense Error Bingo'));
@@ -4514,7 +4515,7 @@ describe('createQuery', () => {
     });
     it('setQueryData - should not call onSuccess callback of active observers', async () => {
         const key = queryKey();
-        const onSuccess = jest.fn();
+        const onSuccess = vi.fn();
         function Page() {
             const state = createQuery(() => ({
                 queryKey: key,

package/build/source/__tests__/suspense.test.jsx

@@ -2,6 +2,7 @@ import { fireEvent, render, screen, waitFor } from 'solid-testing-library';
 import { createRenderEffect, createSignal, ErrorBoundary, on, Show, Suspense, } from 'solid-js';
 import { createInfiniteQuery, createQuery, QueryCache, QueryClientProvider, } from '..';
 import { createQueryClient, queryKey, sleep } from './utils';
+import { vi } from 'vitest';
 describe("useQuery's in Suspense mode", () => {
     const queryCache = new QueryCache();
     const queryClient = createQueryClient({ queryCache });
@@ -91,7 +92,7 @@ describe("useQuery's in Suspense mode", () => {
     });
     it('should not call the queryFn twice when used in Suspense mode', async () => {
         const key = queryKey();
-        const queryFn = jest.fn();
+        const queryFn = vi.fn();
         queryFn.mockImplementation(() => {
             sleep(10);
             return 'data';
@@ -141,7 +142,7 @@ describe("useQuery's in Suspense mode", () => {
     });
     it('should call onSuccess on the first successful call', async () => {
         const key = queryKey();
-        const successFn = jest.fn();
+        const successFn = vi.fn();
         function Page() {
             createQuery(() => ({
                 queryKey: [key],
@@ -166,8 +167,8 @@ describe("useQuery's in Suspense mode", () => {
     });
     it('should call every onSuccess handler within a suspense boundary', async () => {
         const key = queryKey();
-        const successFn1 = jest.fn();
-        const successFn2 = jest.fn();
+        const successFn1 = vi.fn();
+        const successFn2 = vi.fn();
         function FirstComponent() {
             createQuery(() => ({
                 queryKey: key,
@@ -514,7 +515,7 @@ describe("useQuery's in Suspense mode", () => {
     });
     it('should not call the queryFn when not enabled', async () => {
         const key = queryKey();
-        const queryFn = jest.fn();
+        const queryFn = vi.fn();
         queryFn.mockImplementation(async () => {
             await sleep(10);
             return '23';

package/build/source/__tests__/useIsMutating.test.jsx

@@ -5,6 +5,7 @@ import { createEffect, createRenderEffect, createSignal, Show } from 'solid-js';
 import { render } from 'solid-testing-library';
 import * as MutationCacheModule from '../../../query-core/src/mutationCache';
 import { setActTimeout } from './utils';
+import { vi } from 'vitest';
 describe('useIsMutating', () => {
     it('should return the number of fetching mutations', async () => {
         const isMutatings = [];
@@ -126,6 +127,27 @@ describe('useIsMutating', () => {
         // Again, No unnecessary re-renders like React
         await waitFor(() => expect(isMutatings).toEqual([0, 1, 0]));
     });
+    it('should use provided custom queryClient', async () => {
+        const queryClient = createQueryClient();
+        function Page() {
+            const isMutating = useIsMutating(undefined, () => queryClient);
+            const { mutate } = createMutation(() => ({
+                mutationKey: ['mutation1'],
+                mutationFn: async () => {
+                    await sleep(10);
+                    return 'data';
+                },
+            }), () => queryClient);
+            createEffect(() => {
+                mutate();
+            });
+            return (<div>
+          <div>mutating: {isMutating}</div>
+        </div>);
+        }
+        render(() => <Page></Page>);
+        await waitFor(() => screen.findByText('mutating: 1'));
+    });
     it('should not change state if unmounted', async () => {
         // We have to mock the MutationCache to not unsubscribe
         // the listener when the component is unmounted
@@ -135,7 +157,7 @@ describe('useIsMutating', () => {
                 return () => void 0;
             }
         }
-        const MutationCacheSpy = jest
+        const MutationCacheSpy = vi
             .spyOn(MutationCacheModule, 'MutationCache')
             .mockImplementation((fn) => {
             return new MutationCacheMock(fn);
@@ -173,25 +195,4 @@ describe('useIsMutating', () => {
         await sleep(20);
         MutationCacheSpy.mockRestore();
     });
-    it('should use provided custom queryClient', async () => {
-        const queryClient = createQueryClient();
-        function Page() {
-            const isMutating = useIsMutating(undefined, () => queryClient);
-            const { mutate } = createMutation(() => ({
-                mutationKey: ['mutation1'],
-                mutationFn: async () => {
-                    await sleep(10);
-                    return 'data';
-                },
-            }), () => queryClient);
-            createEffect(() => {
-                mutate();
-            });
-            return (<div>
-          <div>mutating: {isMutating}</div>
-        </div>);
-        }
-        render(() => <Page></Page>);
-        await waitFor(() => screen.findByText('mutating: 1'));
-    });
 });

package/build/source/__tests__/utils.jsx

@@ -1,5 +1,6 @@
 import { QueryClient } from '@tanstack/query-core';
 import { createEffect, createSignal, onCleanup, Show } from 'solid-js';
+import { vi } from 'vitest';
 let queryKeyCount = 0;
 export function queryKey() {
     queryKeyCount++;
@@ -20,10 +21,10 @@ export function createQueryClient(config) {
     return new QueryClient(config);
 }
 export function mockVisibilityState(value) {
-    return jest.spyOn(document, 'visibilityState', 'get').mockReturnValue(value);
+    return vi.spyOn(document, 'visibilityState', 'get').mockReturnValue(value);
 }
 export function mockNavigatorOnLine(value) {
-    return jest.spyOn(navigator, 'onLine', 'get').mockReturnValue(value);
+    return vi.spyOn(navigator, 'onLine', 'get').mockReturnValue(value);
 }
 export function sleep(timeout) {
     return new Promise((resolve, _reject) => {

package/build/types/__tests__/utils.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="jest" />
 /// <reference types="node" />
 import type { QueryClientConfig } from '@tanstack/query-core';
 import { QueryClient } from '@tanstack/query-core';
@@ -8,8 +7,8 @@ export declare const Blink: (props: {
     duration: number;
 } & ParentProps) => import("solid-js").JSX.Element;
 export declare function createQueryClient(config?: QueryClientConfig): QueryClient;
-export declare function mockVisibilityState(value: DocumentVisibilityState): jest.SpyInstance<DocumentVisibilityState, [], any>;
-export declare function mockNavigatorOnLine(value: boolean): jest.SpyInstance<boolean, [], any>;
+export declare function mockVisibilityState(value: DocumentVisibilityState): import("vitest/dist/index-1cfc7f58").S<[], DocumentVisibilityState>;
+export declare function mockNavigatorOnLine(value: boolean): import("vitest/dist/index-1cfc7f58").S<[], boolean>;
 export declare function sleep(timeout: number): Promise<void>;
 export declare function setActTimeout(fn: () => void, ms?: number): NodeJS.Timeout;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.0.0-alpha.4",
+  "version": "5.0.0-alpha.5",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -40,10 +40,10 @@
     "src"
   ],
   "devDependencies": {
-    "solid-jest": "^0.2.0"
+    "vite-plugin-solid": "^2.3.9"
   },
   "dependencies": {
-    "@tanstack/query-core": "5.0.0-alpha.3"
+    "@tanstack/query-core": "5.0.0-alpha.5"
   },
   "peerDependencies": {
     "solid-js": "^1.6.2"
@@ -53,7 +53,7 @@
     "clean": "rimraf ./build",
     "test:eslint": "eslint --ext .ts,.tsx ./src",
     "test:types": "tsc",
-    "test:lib": "jest --config ./jest.config.ts",
+    "test:lib": "vitest run --coverage",
     "test:lib:dev": "pnpm run test:lib --watch",
     "build:types": "tsc --build"
   }

package/src/__tests__/QueryClientProvider.test.tsx

@@ -4,6 +4,7 @@ import { queryKey } from './utils'
 import { QueryCache } from '@tanstack/query-core'
 import { createQuery, QueryClientProvider, useQueryClient } from '..'
 import { createQueryClient, sleep } from './utils'
+import { vi } from 'vitest'
 
 describe('QueryClientProvider', () => {
   it('sets a specific cache for all queries to use', async () => {
@@ -145,7 +146,7 @@ describe('QueryClientProvider', () => {
 
   describe('useQueryClient', () => {
     it('should throw an error if no query client has been set', () => {
-      const consoleMock = jest
+      const consoleMock = vi
         .spyOn(console, 'error')
         .mockImplementation(() => undefined)
 

package/src/__tests__/createInfiniteQuery.test.tsx

@@ -23,6 +23,8 @@ import {
   keepPreviousData,
 } from '..'
 import { Blink, queryKey, setActTimeout } from './utils'
+import { vi } from 'vitest'
+import type { Mock } from 'vitest'
 
 interface Result {
   items: number[]
@@ -712,14 +714,14 @@ describe('useInfiniteQuery', () => {
   it('should silently cancel an ongoing fetchNextPage request when another fetchNextPage is invoked', async () => {
     const key = queryKey()
     const start = 10
-    const onAborts: jest.Mock<any, any>[] = []
-    const abortListeners: jest.Mock<any, any>[] = []
-    const fetchPage = jest.fn<
-      Promise<number>,
-      [QueryFunctionContext<typeof key, number>]
+    const onAborts: Mock<any, any>[] = []
+    const abortListeners: Mock<any, any>[] = []
+    const fetchPage = vi.fn<
+      [QueryFunctionContext<typeof key, number>],
+      Promise<number>
     >(async ({ pageParam, signal }) => {
-      const onAbort = jest.fn()
-      const abortListener = jest.fn()
+      const onAbort = vi.fn()
+      const abortListener = vi.fn()
       onAborts.push(onAbort)
       abortListeners.push(abortListener)
       signal.onabort = onAbort
@@ -794,14 +796,14 @@ describe('useInfiniteQuery', () => {
   it('should not cancel an ongoing fetchNextPage request when another fetchNextPage is invoked if `cancelRefetch: false` is used ', async () => {
     const key = queryKey()
     const start = 10
-    const onAborts: jest.Mock<any, any>[] = []
-    const abortListeners: jest.Mock<any, any>[] = []
-    const fetchPage = jest.fn<
-      Promise<number>,
-      [QueryFunctionContext<typeof key, number>]
+    const onAborts: Mock<any, any>[] = []
+    const abortListeners: Mock<any, any>[] = []
+    const fetchPage = vi.fn<
+      [QueryFunctionContext<typeof key, number>],
+      Promise<number>
     >(async ({ pageParam, signal }) => {
-      const onAbort = jest.fn()
-      const abortListener = jest.fn()
+      const onAbort = vi.fn()
+      const abortListener = vi.fn()
       onAborts.push(onAbort)
       abortListeners.push(abortListener)
       signal.onabort = onAbort
@@ -1396,7 +1398,7 @@ describe('useInfiniteQuery', () => {
           >
             <Match when={state.status === 'pending'}>Loading...</Match>
             <Match when={state.status === 'error'}>
-              <span>Error: {state.error!.message}</span>
+              <span>Error: {state.error?.message}</span>
             </Match>
           </Switch>
         </div>
@@ -1523,7 +1525,7 @@ describe('useInfiniteQuery', () => {
           >
             <Match when={state.status === 'pending'}>Loading...</Match>
             <Match when={state.status === 'error'}>
-              <span>Error: {state.error!.message}</span>
+              <span>Error: {state.error?.message}</span>
             </Match>
           </Switch>
         </div>
@@ -1587,11 +1589,11 @@ describe('useInfiniteQuery', () => {
 
   it('should cancel the query function when there are no more subscriptions', async () => {
     const key = queryKey()
-    let cancelFn: jest.Mock = jest.fn()
+    let cancelFn: Mock = vi.fn()
 
     const queryFn = ({ signal }: { signal?: AbortSignal }) => {
       const promise = new Promise<string>((resolve, reject) => {
-        cancelFn = jest.fn(() => reject('Cancelled'))
+        cancelFn = vi.fn(() => reject('Cancelled'))
         signal?.addEventListener('abort', cancelFn)
         sleep(20).then(() => resolve('OK'))
       })

package/src/__tests__/createMutation.test.tsx

@@ -20,6 +20,7 @@ import {
   setActTimeout,
   sleep,
 } from './utils'
+import { vi } from 'vitest'
 
 describe('createMutation', () => {
   const queryCache = new QueryCache()
@@ -108,8 +109,8 @@ describe('createMutation', () => {
 
   it('should be able to call `onSuccess` and `onSettled` after each successful mutate', async () => {
     const [count, setCount] = createSignal(0)
-    const onSuccessMock = jest.fn()
-    const onSettledMock = jest.fn()
+    const onSuccessMock = vi.fn()
+    const onSettledMock = vi.fn()
 
     function Page() {
       const mutation = createMutation(() => ({
@@ -174,7 +175,7 @@ describe('createMutation', () => {
     const [count, setCount] = createSignal(0)
     type Value = { count: number }
 
-    const mutateFn = jest.fn<Promise<Value>, [value: Value]>()
+    const mutateFn = vi.fn<[value: Value], Promise<Value>>()
 
     mutateFn.mockImplementationOnce(() => {
       return Promise.reject(new Error('Error test Jonas'))
@@ -231,8 +232,8 @@ describe('createMutation', () => {
   })
 
   it('should be able to call `onError` and `onSettled` after each failed mutate', async () => {
-    const onErrorMock = jest.fn()
-    const onSettledMock = jest.fn()
+    const onErrorMock = vi.fn()
+    const onSettledMock = vi.fn()
     const [count, setCount] = createSignal(0)
 
     function Page() {
@@ -562,7 +563,7 @@ describe('createMutation', () => {
 
   it('should call onMutate even if paused', async () => {
     const onlineMock = mockNavigatorOnLine(false)
-    const onMutate = jest.fn()
+    const onMutate = vi.fn()
     let count = 0
 
     function Page() {
@@ -870,8 +871,8 @@ describe('createMutation', () => {
   })
 
   it('should pass meta to mutation', async () => {
-    const errorMock = jest.fn()
-    const successMock = jest.fn()
+    const errorMock = vi.fn()
+    const successMock = vi.fn()
 
     const queryClientMutationMeta = createQueryClient({
       mutationCache: new MutationCache({
@@ -930,10 +931,10 @@ describe('createMutation', () => {
   })
 
   it('should call cache callbacks when unmounted', async () => {
-    const onSuccess = jest.fn()
-    const onSuccessMutate = jest.fn()
-    const onSettled = jest.fn()
-    const onSettledMutate = jest.fn()
+    const onSuccess = vi.fn()
+    const onSuccessMutate = vi.fn()
+    const onSettled = vi.fn()
+    const onSettledMutate = vi.fn()
     const mutationKey = queryKey()
     let count = 0
 
@@ -1006,10 +1007,10 @@ describe('createMutation', () => {
   })
 
   it('should call mutate callbacks only for the last observer', async () => {
-    const onSuccess = jest.fn()
-    const onSuccessMutate = jest.fn()
-    const onSettled = jest.fn()
-    const onSettledMutate = jest.fn()
+    const onSuccess = vi.fn()
+    const onSuccessMutate = vi.fn()
+    const onSettled = vi.fn()
+    const onSettledMutate = vi.fn()
     let count = 0
 
     function Page() {
@@ -1072,7 +1073,7 @@ describe('createMutation', () => {
 
   it('should go to error state if onSuccess callback errors', async () => {
     const error = new Error('error from onSuccess')
-    const onError = jest.fn()
+    const onError = vi.fn()
 
     function Page() {
       const mutation = createMutation(() => ({
@@ -1148,7 +1149,7 @@ describe('createMutation', () => {
   it('should go to error state if onSettled callback errors', async () => {
     const error = new Error('error from onSettled')
     const mutateFnError = new Error('mutateFnError')
-    const onError = jest.fn()
+    const onError = vi.fn()
 
     function Page() {
       const mutation = createMutation(() => ({

package/src/__tests__/createQueries.test.tsx

@@ -23,6 +23,7 @@ import {
   queryKey,
   sleep,
 } from './utils'
+import { vi } from 'vitest'
 
 describe('useQueries', () => {
   const queryCache = new QueryCache()
@@ -739,7 +740,7 @@ describe('useQueries', () => {
       }
     }
 
-    const QueriesObserverSpy = jest
+    const QueriesObserverSpy = vi
       .spyOn(QueriesObserverModule, 'QueriesObserver')
       .mockImplementation((fn) => {
         return new QueriesObserverMock(fn)
@@ -789,29 +790,4 @@ describe('useQueries', () => {
     await sleep(20)
     QueriesObserverSpy.mockRestore()
   })
-
-  it('should use provided custom queryClient', async () => {
-    const key = queryKey()
-    const queryFn = () => {
-      return Promise.resolve('custom client')
-    }
-
-    function Page() {
-      const state = createQueries(
-        () => ({
-          queries: [{ queryKey: key, queryFn }],
-        }),
-        () => queryClient,
-      )
-      return (
-        <div>
-          <h1>Status: {state[0].data}</h1>
-        </div>
-      )
-    }
-
-    render(() => <Page />)
-
-    await waitFor(() => screen.getByText('Status: custom client'))
-  })
 })

package/src/__tests__/createQuery.test.tsx

@@ -33,6 +33,8 @@ import {
   setActTimeout,
   sleep,
 } from './utils'
+import { vi } from 'vitest'
+import type { Mock } from 'vitest'
 
 describe('createQuery', () => {
   const queryCache = new QueryCache()
@@ -491,7 +493,7 @@ describe('createQuery', () => {
   it('should call onSuccess after a query has been fetched', async () => {
     const key = queryKey()
     const states: CreateQueryResult<string>[] = []
-    const onSuccess = jest.fn()
+    const onSuccess = vi.fn()
 
     function Page() {
       const state = createQuery(() => ({
@@ -523,7 +525,7 @@ describe('createQuery', () => {
   it('should call onSuccess after a disabled query has been fetched', async () => {
     const key = queryKey()
     const states: CreateQueryResult<string>[] = []
-    const onSuccess = jest.fn()
+    const onSuccess = vi.fn()
 
     function Page() {
       const state = createQuery(() => ({
@@ -561,7 +563,7 @@ describe('createQuery', () => {
   it('should not call onSuccess if a component has unmounted', async () => {
     const key = queryKey()
     const states: CreateQueryResult<string>[] = []
-    const onSuccess = jest.fn()
+    const onSuccess = vi.fn()
 
     function Page() {
       const [show, setShow] = createSignal(true)
@@ -601,7 +603,7 @@ describe('createQuery', () => {
   it('should call onError after a query has been fetched with an error', async () => {
     const key = queryKey()
     const states: CreateQueryResult<unknown>[] = []
-    const onError = jest.fn()
+    const onError = vi.fn()
 
     function Page() {
       const state = createQuery(() => ({
@@ -632,7 +634,7 @@ describe('createQuery', () => {
 
   it('should not call onError when receiving a CancelledError', async () => {
     const key = queryKey()
-    const onError = jest.fn()
+    const onError = vi.fn()
 
     function Page() {
       const state = createQuery(() => ({
@@ -666,7 +668,7 @@ describe('createQuery', () => {
   it('should call onSettled after a query has been fetched', async () => {
     const key = queryKey()
     const states: CreateQueryResult<string>[] = []
-    const onSettled = jest.fn()
+    const onSettled = vi.fn()
 
     function Page() {
       const state = createQuery(() => ({
@@ -696,7 +698,7 @@ describe('createQuery', () => {
   it('should call onSettled after a query has been fetched with an error', async () => {
     const key = queryKey()
     const states: CreateQueryResult<string>[] = []
-    const onSettled = jest.fn()
+    const onSettled = vi.fn()
 
     function Page() {
       const state = createQuery(() => ({
@@ -2452,7 +2454,7 @@ describe('createQuery', () => {
 
   it('should not refetch query on focus when `enabled` is set to `false`', async () => {
     const key = queryKey()
-    const queryFn = jest.fn<string, unknown[]>().mockReturnValue('data')
+    const queryFn = vi.fn<unknown[], string>().mockReturnValue('data')
 
     function Page() {
       const { data = 'default' } = createQuery(() => ({
@@ -3296,7 +3298,7 @@ describe('createQuery', () => {
   it('should retry specified number of times', async () => {
     const key = queryKey()
 
-    const queryFn = jest.fn<unknown, unknown[]>()
+    const queryFn = vi.fn<unknown[], unknown>()
     queryFn.mockImplementation(() => {
       return Promise.reject(new Error('Error test Barrett'))
     })
@@ -3337,7 +3339,7 @@ describe('createQuery', () => {
   it('should not retry if retry function `false`', async () => {
     const key = queryKey()
 
-    const queryFn = jest.fn<unknown, unknown[]>()
+    const queryFn = vi.fn<unknown[], unknown>()
 
     queryFn.mockImplementationOnce(() => {
       return Promise.reject(new Error('Error test Tanner'))
@@ -3385,7 +3387,7 @@ describe('createQuery', () => {
 
     type DelayError = { delay: number }
 
-    const queryFn = jest.fn<unknown, unknown[]>()
+    const queryFn = vi.fn<unknown[], unknown>()
     queryFn.mockImplementation(() => {
       return Promise.reject({ delay: 50 })
     })
@@ -3596,10 +3598,10 @@ describe('createQuery', () => {
     const key = queryKey()
     const states: CreateQueryResult<string>[] = []
 
-    const queryFn = jest.fn<string, unknown[]>()
+    const queryFn = vi.fn<unknown[], string>()
     queryFn.mockImplementation(() => 'data')
 
-    const prefetchQueryFn = jest.fn<string, unknown[]>()
+    const prefetchQueryFn = vi.fn<unknown[], string>()
     prefetchQueryFn.mockImplementation(() => 'not yet...')
 
     await queryClient.prefetchQuery({
@@ -3633,10 +3635,10 @@ describe('createQuery', () => {
   it('should not refetch if not stale after a prefetch', async () => {
     const key = queryKey()
 
-    const queryFn = jest.fn<string, unknown[]>()
+    const queryFn = vi.fn<unknown[], string>()
     queryFn.mockImplementation(() => 'data')
 
-    const prefetchQueryFn = jest.fn<Promise<string>, unknown[]>()
+    const prefetchQueryFn = vi.fn<unknown[], Promise<string>>()
     prefetchQueryFn.mockImplementation(async () => {
       await sleep(10)
       return 'not yet...'
@@ -3909,7 +3911,7 @@ describe('createQuery', () => {
 
   it('it should support enabled:false in query object syntax', async () => {
     const key = queryKey()
-    const queryFn = jest.fn<string, unknown[]>()
+    const queryFn = vi.fn<unknown[], string>()
     queryFn.mockImplementation(() => 'data')
 
     function Page() {
@@ -3981,7 +3983,7 @@ describe('createQuery', () => {
     ))
 
     await waitFor(() => screen.getByText('fetched data'))
-    const setTimeoutSpy = jest.spyOn(window, 'setTimeout')
+    const setTimeoutSpy = vi.spyOn(window, 'setTimeout')
 
     result.unmount()
 
@@ -4007,7 +4009,7 @@ describe('createQuery', () => {
     ))
 
     await waitFor(() => screen.getByText('fetched data'))
-    const setTimeoutSpy = jest.spyOn(window, 'setTimeout')
+    const setTimeoutSpy = vi.spyOn(window, 'setTimeout')
 
     result.unmount()
 
@@ -4019,8 +4021,8 @@ describe('createQuery', () => {
 
   it('should not cause memo churn when data does not change', async () => {
     const key = queryKey()
-    const queryFn = jest.fn<string, unknown[]>().mockReturnValue('data')
-    const memoFn = jest.fn()
+    const queryFn = vi.fn<unknown[], string>().mockReturnValue('data')
+    const memoFn = vi.fn()
 
     function Page() {
       const result = createQuery(() => ({
@@ -4255,7 +4257,7 @@ describe('createQuery', () => {
   it('should refetch if any query instance becomes enabled', async () => {
     const key = queryKey()
 
-    const queryFn = jest.fn<string, unknown[]>().mockReturnValue('data')
+    const queryFn = vi.fn<unknown[], string>().mockReturnValue('data')
 
     function Disabled() {
       createQuery(() => ({ queryKey: key, queryFn, enabled: false }))
@@ -4610,11 +4612,11 @@ describe('createQuery', () => {
 
   it('should cancel the query function when there are no more subscriptions', async () => {
     const key = queryKey()
-    let cancelFn: jest.Mock = jest.fn()
+    let cancelFn: Mock = vi.fn()
 
     const queryFn = ({ signal }: { signal?: AbortSignal }) => {
       const promise = new Promise<string>((resolve, reject) => {
-        cancelFn = jest.fn(() => reject('Cancelled'))
+        cancelFn = vi.fn(() => reject('Cancelled'))
         signal?.addEventListener('abort', cancelFn)
         sleep(20).then(() => resolve('OK'))
       })
@@ -4958,7 +4960,7 @@ describe('createQuery', () => {
   })
 
   it('should refetch when changed enabled to true in error state', async () => {
-    const queryFn = jest.fn<unknown, unknown[]>()
+    const queryFn = vi.fn<unknown[], unknown>()
     queryFn.mockImplementation(async () => {
       await sleep(10)
       return Promise.reject(new Error('Suspense Error Bingo'))
@@ -6052,7 +6054,7 @@ describe('createQuery', () => {
 
   it('setQueryData - should not call onSuccess callback of active observers', async () => {
     const key = queryKey()
-    const onSuccess = jest.fn()
+    const onSuccess = vi.fn()
 
     function Page() {
       const state = createQuery(() => ({

package/src/__tests__/suspense.test.tsx

@@ -20,6 +20,7 @@ import {
   QueryClientProvider,
 } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
+import { vi } from 'vitest'
 
 describe("useQuery's in Suspense mode", () => {
   const queryCache = new QueryCache()
@@ -142,7 +143,7 @@ describe("useQuery's in Suspense mode", () => {
   it('should not call the queryFn twice when used in Suspense mode', async () => {
     const key = queryKey()
 
-    const queryFn = jest.fn<string, unknown[]>()
+    const queryFn = vi.fn<unknown[], string>()
     queryFn.mockImplementation(() => {
       sleep(10)
       return 'data'
@@ -219,7 +220,7 @@ describe("useQuery's in Suspense mode", () => {
   it('should call onSuccess on the first successful call', async () => {
     const key = queryKey()
 
-    const successFn = jest.fn()
+    const successFn = vi.fn()
 
     function Page() {
       createQuery(() => ({
@@ -254,8 +255,8 @@ describe("useQuery's in Suspense mode", () => {
   it('should call every onSuccess handler within a suspense boundary', async () => {
     const key = queryKey()
 
-    const successFn1 = jest.fn()
-    const successFn2 = jest.fn()
+    const successFn1 = vi.fn()
+    const successFn2 = vi.fn()
 
     function FirstComponent() {
       createQuery(() => ({
@@ -733,7 +734,7 @@ describe("useQuery's in Suspense mode", () => {
   it('should not call the queryFn when not enabled', async () => {
     const key = queryKey()
 
-    const queryFn = jest.fn<Promise<string>, unknown[]>()
+    const queryFn = vi.fn<unknown[], Promise<string>>()
     queryFn.mockImplementation(async () => {
       await sleep(10)
       return '23'

package/src/__tests__/useIsMutating.test.tsx

@@ -6,6 +6,7 @@ import { createEffect, createRenderEffect, createSignal, Show } from 'solid-js'
 import { render } from 'solid-testing-library'
 import * as MutationCacheModule from '../../../query-core/src/mutationCache'
 import { setActTimeout } from './utils'
+import { vi } from 'vitest'
 
 describe('useIsMutating', () => {
   it('should return the number of fetching mutations', async () => {
@@ -157,6 +158,33 @@ describe('useIsMutating', () => {
     await waitFor(() => expect(isMutatings).toEqual([0, 1, 0]))
   })
 
+  it('should use provided custom queryClient', async () => {
+    const queryClient = createQueryClient()
+    function Page() {
+      const isMutating = useIsMutating(undefined, () => queryClient)
+      const { mutate } = createMutation(
+        () => ({
+          mutationKey: ['mutation1'],
+          mutationFn: async () => {
+            await sleep(10)
+            return 'data'
+          },
+        }),
+        () => queryClient,
+      )
+      createEffect(() => {
+        mutate()
+      })
+      return (
+        <div>
+          <div>mutating: {isMutating}</div>
+        </div>
+      )
+    }
+    render(() => <Page></Page>)
+    await waitFor(() => screen.findByText('mutating: 1'))
+  })
+
   it('should not change state if unmounted', async () => {
     // We have to mock the MutationCache to not unsubscribe
     // the listener when the component is unmounted
@@ -167,7 +195,7 @@ describe('useIsMutating', () => {
       }
     }
 
-    const MutationCacheSpy = jest
+    const MutationCacheSpy = vi
       .spyOn(MutationCacheModule, 'MutationCache')
       .mockImplementation((fn) => {
         return new MutationCacheMock(fn)
@@ -217,36 +245,4 @@ describe('useIsMutating', () => {
     await sleep(20)
     MutationCacheSpy.mockRestore()
   })
-
-  it('should use provided custom queryClient', async () => {
-    const queryClient = createQueryClient()
-
-    function Page() {
-      const isMutating = useIsMutating(undefined, () => queryClient)
-      const { mutate } = createMutation(
-        () => ({
-          mutationKey: ['mutation1'],
-          mutationFn: async () => {
-            await sleep(10)
-            return 'data'
-          },
-        }),
-        () => queryClient,
-      )
-
-      createEffect(() => {
-        mutate()
-      })
-
-      return (
-        <div>
-          <div>mutating: {isMutating}</div>
-        </div>
-      )
-    }
-
-    render(() => <Page></Page>)
-
-    await waitFor(() => screen.findByText('mutating: 1'))
-  })
 })

package/src/__tests__/utils.tsx

@@ -2,6 +2,7 @@ import type { QueryClientConfig } from '@tanstack/query-core'
 import { QueryClient } 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<string> {
@@ -34,11 +35,11 @@ export function createQueryClient(config?: QueryClientConfig): QueryClient {
 }
 
 export function mockVisibilityState(value: DocumentVisibilityState) {
-  return jest.spyOn(document, 'visibilityState', 'get').mockReturnValue(value)
+  return vi.spyOn(document, 'visibilityState', 'get').mockReturnValue(value)
 }
 
 export function mockNavigatorOnLine(value: boolean) {
-  return jest.spyOn(navigator, 'onLine', 'get').mockReturnValue(value)
+  return vi.spyOn(navigator, 'onLine', 'get').mockReturnValue(value)
 }
 
 export function sleep(timeout: number): Promise<void> {