Revert "Use pendingQueryRuns available on the event (#36393)"

This reverts commit 9460dd3.

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

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

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

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

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

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