Store when the GC was initiated and compare against updatedAt

src/queryCache.js

@@ -238,9 +238,12 @@ export function makeQueryCache() {
     }
 
     query.scheduleGarbageCollection = () => {
+      const scheduledAt = Date.now()
       query.cacheTimeout = setTimeout(
         () => {
-          cache.removeQueries(d => d.queryHash === query.queryHash)
+          cache.removeQueries(
+            d => d.state.updatedAt < scheduledAt && d.queryHash === query.queryHash
+          )
         },
         typeof query.state.data === 'undefined' &&
           query.state.status !== 'error'

src/tests/cleanup.js

@@ -34,7 +34,7 @@ const PostsByUser = () => {
   return null
 }
 
-export const Page = ({ onAfterHide }) => {
+export const Page = () => {
   const [showContent, setShowContent] = React.useState(false)
 
   return (
@@ -59,7 +59,6 @@ export const Page = ({ onAfterHide }) => {
                 data-testid="hideContent"
                 onClick={() => {
                   setShowContent(false)
-                  if (onAfterHide) onAfterHide()
                 }}
               >
                 Close Modal

src/tests/cleanup.test.js

@@ -1,23 +1,15 @@
 import React from 'react'
 import { render, fireEvent } from '@testing-library/react'
-import { cleanup } from '@testing-library/react/pure'
 import { queryCache } from '..'
 import { Page } from './cleanup'
 
 describe('query cleanup', () => {
   afterEach(() => {
     queryCache.clear()
-    // This will make things pass as it force-flushes the microtask queue twice
-    // but it's a bandaid over an underlying issue
-    // await cleanup()
   })
 
-  test('should prefetchQuery by force for first query', async () => {
-    await queryCache.prefetchQuery(
-      ['user', 1],
-      () => Promise.resolve({ userId: 1, username: 'Mock User' }),
-      { force: true }
-    )
+  test('should set query data on first test', async () => {
+    queryCache.setQueryData(['user', 1], { userId: 1, username: 'Mock User' })
 
     const { findByTestId, findByText } = render(<Page />)
 
@@ -30,17 +22,9 @@ describe('query cleanup', () => {
     expect(userProfile).toBeDefined()
   })
 
-  test('should prefetch by force for both queries', async () => {
-    await queryCache.prefetchQuery(
-      ['user', 1],
-      () => Promise.resolve({ userId: 1, username: 'Mock User' }),
-      { force: true }
-    )
-    await queryCache.prefetchQuery(
-      ['posts', 1],
-      () => Promise.resolve([{ postId: 1, body: 'World' }]),
-      { force: true }
-    )
+  test('should not garbage collect new initial data', async () => {
+    queryCache.setQueryData(['user', 1], { userId: 1, username: 'Mock 2 User' })
+    queryCache.setQueryData(['posts', 1], [{ postId: 1, body: 'World' }])
 
     const { findByTestId, findByText } = render(<Page />)