[pull] main from TanStack:main

packages/query-core/src/__tests__/queryObserver.test.tsx

@@ -1481,12 +1481,12 @@ describe('queryObserver', () => {
   it('should not refetchOnWindowFocus when staleTime is static and query has background error', async () => {
     const key = queryKey()
     let callCount = 0
-    const queryFn = vi.fn(async () => {
+    const queryFn = vi.fn(() => {
       callCount++
       if (callCount === 1) {
-        return 'data'
+        return Promise.resolve('data')
       }
-      throw new Error('background error')
+      return Promise.reject(new Error('background error'))
     })
 
     const observer = new QueryObserver(queryClient, {
@@ -1520,15 +1520,15 @@ describe('queryObserver', () => {
   it('should refetchOnWindowFocus when query has background error and staleTime is not static', async () => {
     const key = queryKey()
     let callCount = 0
-    const queryFn = vi.fn(async () => {
+    const queryFn = vi.fn(() => {
       callCount++
       if (callCount === 1) {
-        return 'data'
+        return Promise.resolve('data')
       }
       if (callCount === 2) {
-        throw new Error('background error')
+        return Promise.reject(new Error('background error'))
       }
-      return 'new data'
+      return Promise.resolve('new data')
     })
 
     const observer = new QueryObserver(queryClient, {

packages/query-core/src/__tests__/streamedQuery.test.tsx

@@ -550,6 +550,7 @@ describe('streamedQuery', () => {
       retry: false,
       queryFn: streamedQuery({
         refetchMode: 'reset',
+        // eslint-disable-next-line @typescript-eslint/require-await
         streamFn: async function* () {
           if (shouldError) {
             throw error
@@ -711,6 +712,7 @@ describe('streamedQuery', () => {
     const observer = new QueryObserver(queryClient, {
       queryKey: key,
       queryFn: streamedQuery({
+        // eslint-disable-next-line @typescript-eslint/require-await
         streamFn: async function* () {
           const v = [1, 2, 3]
           yield* v

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

@@ -5675,9 +5675,9 @@ describe('useQuery', () => {
       function Component() {
         const state = useQuery({
           queryKey: key,
-          queryFn: async () => {
+          queryFn: () => {
             count++
-            return `data${count}`
+            return Promise.resolve(`data${count}`)
           },
         })
 

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

@@ -3950,7 +3950,7 @@ describe('useQuery', () => {
   })
 
   // See https://github.com/tannerlinsley/react-query/issues/360
-  it('should init to status:pending, fetchStatus:idle when enabled is false', async () => {
+  it('should init to status:pending, fetchStatus:idle when enabled is false', () => {
     const key = queryKey()
 
     function Page() {
@@ -5017,7 +5017,7 @@ describe('useQuery', () => {
     })
   })
 
-  it('should only call the query hash function once', async () => {
+  it('should only call the query hash function once', () => {
     const key = queryKey()
 
     let hashes = 0
@@ -5943,9 +5943,9 @@ describe('useQuery', () => {
       function Component() {
         const state = useQuery(() => ({
           queryKey: key,
-          queryFn: async () => {
+          queryFn: () => {
             count++
-            return `data${count}`
+            return Promise.resolve(`data${count}`)
           },
         }))