fix(gatsby): fix node manifest processing in inc builds (#32538)

packages/gatsby/src/query/index.ts

@@ -11,6 +11,7 @@ import {
 } from "../utils/websocket-manager"
 import { GraphQLRunner } from "./graphql-runner"
 import { IGroupedQueryIds } from "../services"
+import { processNodeManifests } from "../utils/node-manifest"
 
 if (process.env.GATSBY_EXPERIMENTAL_QUERY_CONCURRENCY) {
   console.info(
@@ -227,7 +228,7 @@ export async function processPageQueries(
   queryIds: IGroupedQueryIds["pageQueryIds"],
   { state, activity, graphqlRunner, graphqlTracing }
 ): Promise<void> {
-  return processQueries<IGatsbyPage>({
+  const processedQueries = await processQueries<IGatsbyPage>({
     queryIds,
     createJobFn: createPageQueryJob,
     onQueryDone: undefined,
@@ -236,6 +237,15 @@ export async function processPageQueries(
     graphqlRunner,
     graphqlTracing,
   })
+
+  if (process.env.NODE_ENV !== `development`) {
+    /**
+     * only process node manifests here when not in develop. for gatsby develop we process node manifests in src/query/query-watcher.ts everytime queries are re-run. Because we process node manifests in this location for gatsby build we have all the information needed to create the manifests. In query-watcher during gatsby build we might not have all information about created pages and queries.
+     */
+    await processNodeManifests()
+  }
+
+  return processedQueries
 }
 
 function createPageQueryJob(

packages/gatsby/src/services/run-page-queries.ts

@@ -7,7 +7,6 @@ import {
   CancelExperimentNoticeCallbackOrUndefined,
 } from "../utils/show-experiment-notice"
 import { isCI } from "gatsby-core-utils"
-import { processNodeManifests } from "../utils/node-manifest"
 
 const ONE_MINUTE = 1 * 60 * 1000
 
@@ -73,13 +72,6 @@ modules.exports = {
     graphqlTracing: program?.graphqlTracing,
   })
 
-  if (process.env.NODE_ENV !== `development`) {
-    /**
-     * only process node manifests here when not in develop. for gatsby develop we process node manifests in src/query/query-watcher.ts everytime queries are re-run. Because we process node manifests in this location for gatsby build we have all the information needed to create the manifests. In query-watcher during gatsby build we might not have all information about created pages and queries.
-     */
-    await processNodeManifests()
-  }
-
   if (cancelNotice) {
     cancelNotice()
   }