[pull] main from TanStack:main

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

@@ -1202,4 +1202,104 @@ describe('dehydration and rehydration', () => {
     clientQueryClient.clear()
     serverQueryClient.clear()
   })
+
+  test('should not redact errors when shouldRedactErrors returns false', async () => {
+    const queryCache = new QueryCache()
+    const queryClient = createQueryClient({
+      queryCache,
+      defaultOptions: {
+        dehydrate: {
+          shouldDehydrateQuery: () => true,
+          shouldRedactErrors: () => false,
+        },
+      },
+    })
+
+    const testError = new Error('original error')
+
+    const promise = queryClient
+      .prefetchQuery({
+        queryKey: ['error'],
+        queryFn: () => Promise.reject(testError),
+        retry: false,
+      })
+      .catch(() => undefined)
+
+    const dehydrated = dehydrate(queryClient)
+
+    expect(dehydrated.queries[0]?.promise).toBeInstanceOf(Promise)
+    await expect(dehydrated.queries[0]?.promise).rejects.toBe(testError)
+    await promise
+  })
+
+  test('should handle errors in promises for pending queries', async () => {
+    const consoleMock = vi.spyOn(console, 'error')
+    consoleMock.mockImplementation(() => undefined)
+
+    const queryCache = new QueryCache()
+    const queryClient = createQueryClient({
+      queryCache,
+      defaultOptions: {
+        dehydrate: {
+          shouldDehydrateQuery: () => true,
+        },
+      },
+    })
+
+    const promise = queryClient
+      .prefetchQuery({
+        queryKey: ['error'],
+        queryFn: () => Promise.reject(new Error('test error')),
+        retry: false,
+      })
+      .catch(() => undefined)
+
+    const dehydrated = dehydrate(queryClient)
+
+    expect(dehydrated.queries[0]?.promise).toBeInstanceOf(Promise)
+
+    await expect(dehydrated.queries[0]?.promise).rejects.toThrow('redacted')
+    await promise
+    consoleMock.mockRestore()
+  })
+
+  test('should log error in development environment when redacting errors', async () => {
+    const originalNodeEnv = process.env.NODE_ENV
+    process.env.NODE_ENV = 'development'
+
+    const consoleMock = vi.spyOn(console, 'error')
+    consoleMock.mockImplementation(() => undefined)
+
+    const queryCache = new QueryCache()
+    const queryClient = createQueryClient({
+      queryCache,
+      defaultOptions: {
+        dehydrate: {
+          shouldDehydrateQuery: () => true,
+          shouldRedactErrors: () => true,
+        },
+      },
+    })
+
+    const testError = new Error('test error')
+
+    const promise = queryClient
+      .prefetchQuery({
+        queryKey: ['error'],
+        queryFn: () => Promise.reject(testError),
+        retry: false,
+      })
+      .catch(() => undefined)
+
+    const dehydrated = dehydrate(queryClient)
+
+    await expect(dehydrated.queries[0]?.promise).rejects.toThrow('redacted')
+    expect(consoleMock).toHaveBeenCalledWith(
+      expect.stringContaining('test error'),
+    )
+    await promise
+
+    process.env.NODE_ENV = originalNodeEnv
+    consoleMock.mockRestore()
+  })
 })