From a1c0bf64c07e00bffd602c1311a2f2fb5d849b37 Mon Sep 17 00:00:00 2001
From: Michal Piechowiak <misiek.piechowiak@gmail.com>
Date: Mon, 21 Feb 2022 12:50:45 +0100
Subject: [PATCH] non-pqr match pqr - materialize first, queries later

---
 packages/gatsby/src/commands/build.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/gatsby/src/commands/build.ts b/packages/gatsby/src/commands/build.ts
index 7b74b7a6386f8..70797987f5d3c 100644
--- a/packages/gatsby/src/commands/build.ts
+++ b/packages/gatsby/src/commands/build.ts
@@ -302,6 +302,8 @@ module.exports = async function build(
     waitForWorkerPoolRestart = workerPool.restart()
     await mergeWorkerState(workerPool, buildSpan)
   } else {
+    waitMaterializePageMode = materializePageMode()
+
     await runStaticQueries({
       queryIds,
       parentSpan: buildSpan,
@@ -315,8 +317,6 @@ module.exports = async function build(
       parentSpan: buildSpan,
       store,
     })
-
-    waitMaterializePageMode = materializePageMode()
   }
 
   // create scope so we don't leak state object