fix(query-core): ignore stale query removals (#11524)

Author: gwagjiug

.changeset/stale-query-removal.md

@@ -0,0 +1,5 @@
+---
+'@tanstack/query-core': patch
+---
+
+Ignore removal requests for query instances that are no longer stored in the cache.

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

@@ -419,18 +419,22 @@ describe('queryCache', () => {
   })
 
   describe('QueryCache.remove', () => {
-    it('should only delete the instance currently stored under its queryHash', () => {
+    it('should be a no-op if the query is no longer the cached instance', () => {
       const key = queryKey()
 
       const staleQuery = queryCache.build(queryClient, { queryKey: key })
       queryCache.remove(staleQuery)
 
       const currentQuery = queryCache.build(queryClient, { queryKey: key })
       expect(currentQuery).not.toBe(staleQuery)
+      const subscriber = vi.fn()
+      const unsubscribe = queryCache.subscribe(subscriber)
 
       queryCache.remove(staleQuery)
 
       expect(queryCache.get(hashKey(key))).toBe(currentQuery)
+      expect(subscriber).not.toHaveBeenCalled()
+      unsubscribe()
     })
   })
 

packages/query-core/src/queryCache.ts

@@ -208,13 +208,9 @@ export class QueryCache extends Subscribable<QueryCacheListener> {
   remove(query: Query<any, any, any, any>): void {
     const queryInMap = this.#queries.get(query.queryHash)
 
-    if (queryInMap) {
+    if (queryInMap === query) {
       query.destroy()
-
-      if (queryInMap === query) {
-        this.#queries.delete(query.queryHash)
-      }
-
+      this.#queries.delete(query.queryHash)
       this.notify({ type: 'removed', query })
     }
   }