Use pendingQueryRuns available on the event

packages/gatsby/src/services/calculate-dirty-queries.ts

@@ -3,11 +3,14 @@ import { IGroupedQueryIds } from "./"
 import { IQueryRunningContext } from "../state-machines/query-running/types"
 import { assertStore } from "../utils/assert-store"
 
-export async function calculateDirtyQueries({
-  store,
-  websocketManager,
-  currentlyHandledPendingQueryRuns,
-}: Partial<IQueryRunningContext>): Promise<{
+export async function calculateDirtyQueries(
+  { store, websocketManager }: Partial<IQueryRunningContext>,
+  {
+    pendingQueryRuns: currentlyHandledPendingQueryRuns,
+  }: {
+    pendingQueryRuns?: Set<string>
+  } = {}
+): Promise<{
   queryIds: IGroupedQueryIds
 }> {
   assertStore(store)

packages/gatsby/src/state-machines/query-running/actions.ts

@@ -42,16 +42,10 @@ export const trackRequestedQueryRun = assign<
   },
 })
 
-export const clearCurrentlyHandledPendingQueryRuns =
-  assign<IQueryRunningContext>({
-    currentlyHandledPendingQueryRuns: undefined,
-  })
-
 export const queryActions: ActionFunctionMap<IQueryRunningContext, any> = {
   assignDirtyQueries,
   flushPageData,
   markSourceFilesDirty,
   markSourceFilesClean,
   trackRequestedQueryRun,
-  clearCurrentlyHandledPendingQueryRuns,
 }

packages/gatsby/src/state-machines/query-running/index.ts

@@ -62,21 +62,15 @@ export const queryStates: MachineConfig<IQueryRunningContext, any, any> = {
       },
     },
     calculatingDirtyQueries: {
-      entry: assign<IQueryRunningContext>(({ pendingQueryRuns }) => {
-        return {
-          pendingQueryRuns: new Set(),
-          currentlyHandledPendingQueryRuns: pendingQueryRuns,
-        }
+      entry: assign({
+        pendingQueryRuns: new Set(),
       }),
       invoke: {
         id: `calculating-dirty-queries`,
         src: `calculateDirtyQueries`,
         onDone: {
           target: `runningStaticQueries`,
-          actions: [
-            `assignDirtyQueries`,
-            `clearCurrentlyHandledPendingQueryRuns`,
-          ],
+          actions: [`assignDirtyQueries`],
         },
       },
     },

packages/gatsby/src/state-machines/query-running/types.ts

@@ -23,5 +23,4 @@ export interface IQueryRunningContext {
   websocketManager?: WebsocketManager
   filesDirty?: boolean
   pendingQueryRuns?: Set<string>
-  currentlyHandledPendingQueryRuns?: Set<string>
 }