Merge branch 'main' into fix/issue-10129-suspense-queries-combine

Author: veeceey

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

@@ -855,4 +855,47 @@ describe('useSuspenseQueries 2', () => {
     consoleErrorSpy.mockRestore()
     process.env.NODE_ENV = envCopy
   })
+
+  it('should only suspend queries that are pending when some queries already have data', async () => {
+    const key1 = queryKey()
+    const key2 = queryKey()
+
+    queryClient.setQueryData(key1, 'cached')
+
+    function Page() {
+      const [result1, result2] = useSuspenseQueries({
+        queries: [
+          {
+            queryKey: key1,
+            queryFn: () => sleep(QUERY_DURATION).then(() => 'data1'),
+          },
+          {
+            queryKey: key2,
+            queryFn: () => sleep(QUERY_DURATION).then(() => 'data2'),
+          },
+        ],
+      })
+
+      return (
+        <div>
+          <div>data1: {result1.data}</div>
+          <div>data2: {result2.data}</div>
+        </div>
+      )
+    }
+
+    const rendered = renderWithClient(
+      queryClient,
+      <Suspense fallback={<div>loading</div>}>
+        <Page />
+      </Suspense>,
+    )
+
+    expect(rendered.getByText('loading')).toBeInTheDocument()
+
+    await vi.advanceTimersByTimeAsync(QUERY_DURATION)
+
+    expect(rendered.getByText('data1: cached')).toBeInTheDocument()
+    expect(rendered.getByText('data2: data2')).toBeInTheDocument()
+  })
 })

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

@@ -18,6 +18,54 @@ describe('useMutationState', () => {
     vi.useRealTimers()
   })
 
+  it('should return all mutation states when called without options', async () => {
+    const queryClient = new QueryClient()
+    const mutationKey = ['mutation']
+
+    function States() {
+      const mutationStates = useMutationState()
+
+      return <div>count: {mutationStates().length}</div>
+    }
+
+    function Mutate() {
+      const mutation = useMutation(() => ({
+        mutationKey,
+        mutationFn: (input: number) => sleep(150).then(() => 'data' + input),
+      }))
+
+      return (
+        <div>
+          <button onClick={() => mutation.mutate(1)}>mutate</button>
+        </div>
+      )
+    }
+
+    function Page() {
+      return (
+        <div>
+          <States />
+          <Mutate />
+        </div>
+      )
+    }
+
+    const rendered = render(() => (
+      <QueryClientProvider client={queryClient}>
+        <Page />
+      </QueryClientProvider>
+    ))
+
+    expect(rendered.getByText('count: 0')).toBeInTheDocument()
+
+    fireEvent.click(rendered.getByRole('button', { name: /mutate/i }))
+    await vi.advanceTimersByTimeAsync(0)
+    expect(rendered.getByText('count: 1')).toBeInTheDocument()
+
+    await vi.advanceTimersByTimeAsync(150)
+    expect(rendered.getByText('count: 1')).toBeInTheDocument()
+  })
+
   it('should return variables after calling mutate', async () => {
     const queryClient = new QueryClient()
     const variables: Array<Array<unknown>> = []