processPageQueries and processStaticQueries

packages/gatsby/src/commands/build.js

@@ -28,18 +28,6 @@ type BuildArgs = {
   openTracingConfigFile: string,
 }
 
-async function runStaticQueries({ parentSpan }, staticQueryIds) {
-  let activity = report.activityTimer(`run static queries`, { parentSpan })
-  activity.start()
-  await queryRunner.processQueries(
-    staticQueryIds.map(id =>
-      queryRunner.makeStaticQueryJob(store.getState(), id)
-    ),
-    { activity }
-  )
-  activity.end()
-}
-
 module.exports = async function build(program: BuildArgs) {
   let activity
   initTracer(program.openTracingConfigFile)
@@ -60,7 +48,12 @@ module.exports = async function build(program: BuildArgs) {
   const queryIds = queryRunner.calcBootstrapDirtyQueryIds(store.getState())
   const { staticQueryIds, pageQueryIds } = queryRunner.groupQueryIds(queryIds)
 
-  await runStaticQueries({ parentSpan: buildSpan }, staticQueryIds)
+  activity = report.activityTimer(`run static queries`, {
+    parentSpan: buildSpan,
+  })
+  activity.start()
+  await queryRunner.processStaticQueries(staticQueryIds, { activity })
+  activity.end()
 
   await apiRunnerNode(`onPreBuild`, {
     graphql: graphqlRunner,
@@ -87,13 +80,9 @@ module.exports = async function build(program: BuildArgs) {
     payload: webpackCompilationHash,
   })
 
-  const state = store.getState()
   activity = report.activityTimer(`run page queries`)
   activity.start()
-  await queryRunner.processQueries(
-    pageQueryIds.map(id => queryRunner.makePageQueryJob(state, id)),
-    { activity }
-  )
+  await queryRunner.processPageQueries(pageQueryIds, { activity })
   activity.end()
 
   const waitJobsFinished = () =>

packages/gatsby/src/commands/develop.js

@@ -102,23 +102,10 @@ function startQueryDaemon() {
   queryRunner.startDaemon(queue)
 }
 
-async function runStaticQueries(queryIds) {
-  let activity = report.activityTimer(`run static queries`)
-  activity.start()
-  await queryRunner.processQueries(
-    queryIds.map(id => queryRunner.makeStaticQueryJob(store.getState(), id)),
-    { activity }
-  )
-  activity.end()
-}
-
 const runPageQueries = async queryIds => {
   let activity = report.activityTimer(`run page queries`)
   activity.start()
-  await queryRunner.processQueries(
-    queryIds.map(id => queryRunner.makePageQueryJob(store.getState(), id)),
-    { activity }
-  )
+  await queryRunner.processPageQueries(queryIds, { activity })
   activity.end()
 
   require(`../redux/actions`).boundActionCreators.setProgramStatus(
@@ -556,7 +543,10 @@ module.exports = async (program: any) => {
 
   const queryIds = queryRunner.calcBootstrapDirtyQueryIds(store.getState())
   const { staticQueryIds, pageQueryIds } = queryRunner.groupQueryIds(queryIds)
-  await runStaticQueries(staticQueryIds)
+  let activity = report.activityTimer(`run static queries`)
+  activity.start()
+  await queryRunner.processStaticQueries(staticQueryIds, { activity })
+  activity.end()
 
   const [compiler] = await startServer(program)
 

packages/gatsby/src/query/index.js

@@ -187,11 +187,13 @@ const processQueries = async (queryJobs, { activity }) => {
   const queue = queryQueue.create()
   queue.on(`task_finish`, () => {
     const stats = queue.getStats()
-    activity.setStatus(
-      `${stats.total}/${stats.peak} ${(
-        stats.total / convertHrtime(process.hrtime(startQueries)).seconds
-      ).toFixed(2)} queries/second`
-    )
+    if (activity) {
+      activity.setStatus(
+        `${stats.total}/${stats.peak} ${(
+          stats.total / convertHrtime(process.hrtime(startQueries)).seconds
+        ).toFixed(2)} queries/second`
+      )
+    }
   })
   const drainedPromise = new Promise(resolve => {
     queue.once(`drain`, resolve)
@@ -203,6 +205,20 @@ const processQueries = async (queryJobs, { activity }) => {
   await drainedPromise
 }
 
+const processPageQueries = async (queryIds, { state, activity }) => {
+  state = state || store.getState()
+  await processQueries(queryIds.map(id => makePageQueryJob(state, id)), {
+    activity,
+  })
+}
+
+const processStaticQueries = async (queryIds, { state, activity }) => {
+  state = state || store.getState()
+  await processQueries(queryIds.map(id => makeStaticQueryJob(state, id)), {
+    activity,
+  })
+}
+
 /////////////////////////////////////////////////////////////////////
 // Background query daemon (for gatsby develop)
 
@@ -254,9 +270,9 @@ module.exports = {
   enqueueExtractedQueryId,
   calcBootstrapDirtyQueryIds,
   groupQueryIds,
-  makeStaticQueryJob,
-  makePageQueryJob,
   processQueries,
+  processPageQueries,
+  processStaticQueries,
   runQueries,
   startDaemon,
   createQueue: queryQueue.create,