Merge branch 'main' into test/query-core-exact-assertions

Author: sukvvon

.github/renovate.json

@@ -3,10 +3,11 @@
   "configMigration": true,
   "extends": [
     "config:recommended",
+    "helpers:pinGitHubActionDigests",
     "group:allNonMajor",
     "schedule:weekly",
+    "security:minimumReleaseAgeNpm",
     ":approveMajorUpdates",
-    ":automergeMinor",
     ":disablePeerDependencies",
     ":maintainLockFilesMonthly",
     ":semanticCommits",

CONTRIBUTING.md

@@ -31,7 +31,7 @@ If you have been assigned to fix an issue or develop a new feature, please follo
     corepack enable && corepack prepare
     ```
 
-  - We use [nvm](https://github.com/nvm-sh/nvm) to manage node versions - please make sure to use the version mentioned in `.nvmrc`
+  - We use [nvm](https://github.com/nvm-sh/nvm) to manage node versions - please make sure to use the version mentioned in [.nvmrc](./.nvmrc)
 
     ```bash
     nvm use

packages/preact-query/src/__tests__/usePrefetchQuery.test.tsx

@@ -109,11 +109,11 @@ describe('usePrefetchQuery', () => {
       queryFn,
     }
 
-    queryFn.mockImplementationOnce(async () => {
-      await sleep(10)
-
-      throw new Error('Oops! Server error!')
-    })
+    queryFn.mockImplementationOnce(() =>
+      sleep(10).then(() => {
+        throw new Error('Oops! Server error!')
+      }),
+    )
 
     function Page() {
       const state = useSuspenseQuery(queryOpts)
@@ -190,11 +190,11 @@ describe('usePrefetchQuery', () => {
       queryFn,
     }
 
-    queryFn.mockImplementationOnce(async () => {
-      await sleep(10)
-
-      throw new Error('Oops! Server error!')
-    })
+    queryFn.mockImplementationOnce(() =>
+      sleep(10).then(() => {
+        throw new Error('Oops! Server error!')
+      }),
+    )
 
     function Page() {
       const state = useSuspenseQuery(queryOpts)

packages/react-query/src/__tests__/usePrefetchQuery.test.tsx

@@ -107,11 +107,11 @@ describe('usePrefetchQuery', () => {
       queryFn,
     }
 
-    queryFn.mockImplementationOnce(async () => {
-      await sleep(10)
-
-      throw new Error('Oops! Server error!')
-    })
+    queryFn.mockImplementationOnce(() =>
+      sleep(10).then(() => {
+        throw new Error('Oops! Server error!')
+      }),
+    )
 
     function Page() {
       const state = useSuspenseQuery(queryOpts)
@@ -188,11 +188,11 @@ describe('usePrefetchQuery', () => {
       queryFn,
     }
 
-    queryFn.mockImplementationOnce(async () => {
-      await sleep(10)
-
-      throw new Error('Oops! Server error!')
-    })
+    queryFn.mockImplementationOnce(() =>
+      sleep(10).then(() => {
+        throw new Error('Oops! Server error!')
+      }),
+    )
 
     function Page() {
       const state = useSuspenseQuery(queryOpts)

packages/solid-query/src/__tests__/QueryClientProvider.test.tsx

@@ -41,7 +41,7 @@ describe('QueryClientProvider', () => {
     await vi.advanceTimersByTimeAsync(10)
     expect(rendered.getByText('test')).toBeInTheDocument()
 
-    expect(queryCache.find({ queryKey: key })).toBeDefined()
+    expect(queryCache.find({ queryKey: key })?.state.data).toBe('test')
   })
 
   it('allows multiple caches to be partitioned', async () => {
@@ -94,10 +94,10 @@ describe('QueryClientProvider', () => {
     expect(rendered.getByText('test1')).toBeInTheDocument()
     expect(rendered.getByText('test2')).toBeInTheDocument()
 
-    expect(queryCache1.find({ queryKey: key1 })).toBeDefined()
-    expect(queryCache1.find({ queryKey: key2 })).not.toBeDefined()
-    expect(queryCache2.find({ queryKey: key1 })).not.toBeDefined()
-    expect(queryCache2.find({ queryKey: key2 })).toBeDefined()
+    expect(queryCache1.find({ queryKey: key1 })?.state.data).toBe('test1')
+    expect(queryCache1.find({ queryKey: key2 })).toBeUndefined()
+    expect(queryCache2.find({ queryKey: key1 })).toBeUndefined()
+    expect(queryCache2.find({ queryKey: key2 })?.state.data).toBe('test2')
   })
 
   it("uses defaultOptions for queries when they don't provide their own config", async () => {
@@ -135,7 +135,6 @@ describe('QueryClientProvider', () => {
     await vi.advanceTimersByTimeAsync(10)
     expect(rendered.getByText('test')).toBeInTheDocument()
 
-    expect(queryCache.find({ queryKey: key })).toBeDefined()
     expect(queryCache.find({ queryKey: key })?.options.gcTime).toBe(Infinity)
   })
 

packages/solid-query/src/__tests__/mutationOptions.test.tsx

@@ -507,6 +507,5 @@ describe('mutationOptions', () => {
     const lastSnapshot = mutationStateArray[mutationStateArray.length - 1]!
     expect(lastSnapshot.length).toEqual(1)
     expect(lastSnapshot[0]?.data).toEqual('data1')
-    expect(lastSnapshot[1]).toBeFalsy()
   })
 })

packages/solid-query/src/__tests__/suspense.test.tsx

@@ -196,7 +196,7 @@ describe("useQuery's in Suspense mode", () => {
     const rendered = renderWithClient(queryClient, () => <App />)
 
     expect(rendered.queryByText('rendered')).not.toBeInTheDocument()
-    expect(queryCache.find({ queryKey: key })).toBeFalsy()
+    expect(queryCache.find({ queryKey: key })).toBeUndefined()
 
     fireEvent.click(rendered.getByLabelText('toggle'))
     await vi.advanceTimersByTimeAsync(10)

packages/solid-query/src/__tests__/useQuery.test.tsx

@@ -5746,7 +5746,9 @@ describe('useQuery', () => {
     await vi.advanceTimersByTimeAsync(10)
 
     expect(rendered.getByText('status: success')).toBeInTheDocument()
-    expect(queryClient1.getQueryCache().find({ queryKey: key })).toBeDefined()
+    expect(
+      queryClient1.getQueryCache().find({ queryKey: key })?.state.data,
+    ).toBe('data')
     expect(queryFn).toHaveBeenCalledTimes(1)
 
     setClient(queryClient2)