refactor(gatsby): Extract waitUntilAllJobsComplete out of buil… (gatsbyjs#22059)

MichaelDeBoey · web-flow · commit cd24d34ec6ed · 2020-03-11T16:24:04.000+05:30
diff --git a/packages/gatsby/src/commands/build.js b/packages/gatsby/src/commands/build.js
@@ -12,20 +12,18 @@ const { initTracer, stopTracer } = require(`../utils/tracer`)
 const db = require(`../db`)
 const signalExit = require(`signal-exit`)
 const telemetry = require(`gatsby-telemetry`)
-const { store, emitter, readState } = require(`../redux`)
+const { store, readState } = require(`../redux`)
 const queryUtil = require(`../query`)
 import * as appDataUtil from "../utils/app-data"
 import * as WorkerPool from "../utils/worker/pool"
 const { structureWebpackErrors } = require(`../utils/webpack-error-utils`)
-const {
-  waitUntilAllJobsComplete: waitUntilAllJobsV2Complete,
-} = require(`../utils/jobs-manager`)
 import {
   userPassesFeedbackRequestHeuristic,
   showFeedbackRequest,
 } from "../utils/feedback"
 const buildUtils = require(`../commands/build-utils`)
 const { boundActionCreators } = require(`../redux/actions`)
+import { waitUntilAllJobsComplete } from "../utils/commands/jobs-manager"
 
 let cachedPageData
 let cachedWebpackCompilationHash
@@ -45,24 +43,6 @@ type BuildArgs = {
   openTracingConfigFile: string,
 }
 
-const waitUntilAllJobsComplete = () => {
-  const jobsV1Promise = new Promise(resolve => {
-    const onEndJob = () => {
-      if (store.getState().jobs.active.length === 0) {
-        resolve()
-        emitter.off(`END_JOB`, onEndJob)
-      }
-    }
-    emitter.on(`END_JOB`, onEndJob)
-    onEndJob()
-  })
-
-  return Promise.all([
-    jobsV1Promise,
-    waitUntilAllJobsV2Complete(),
-  ]).then(() => {})
-}
-
 module.exports = async function build(program: BuildArgs) {
   if (program.profile) {
     report.warn(
diff --git a/packages/gatsby/src/commands/develop.ts b/packages/gatsby/src/commands/develop.ts
@@ -16,7 +16,7 @@ import { formatError } from "graphql"
 
 import webpackConfig from "../utils/webpack.config"
 import bootstrap from "../bootstrap"
-import { store, emitter } from "../redux"
+import { store } from "../redux"
 import { syncStaticDir } from "../utils/get-static-dir"
 import { buildHTML } from "./build-html"
 import { withBasePath } from "../utils/path"
@@ -52,35 +52,17 @@ import {
   reportWebpackWarnings,
   structureWebpackErrors,
 } from "../utils/webpack-error-utils"
+import { waitUntilAllJobsComplete } from "../utils/commands/jobs-manager"
 import {
   userPassesFeedbackRequestHeuristic,
   showFeedbackRequest,
 } from "../utils/feedback"
 
 import { BuildHTMLStage, IProgram } from "./types"
-import { waitUntilAllJobsComplete as waitUntilAllJobsV2Complete } from "../utils/jobs-manager"
 
 // checks if a string is a valid ip
 const REGEX_IP = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])$/
 
-const waitUntilAllJobsComplete = (): Promise<void> => {
-  const jobsV1Promise = new Promise(resolve => {
-    const onEndJob = (): void => {
-      if (store.getState().jobs.active.length === 0) {
-        resolve()
-        emitter.off(`END_JOB`, onEndJob)
-      }
-    }
-    emitter.on(`END_JOB`, onEndJob)
-    onEndJob()
-  })
-
-  return Promise.all([
-    jobsV1Promise,
-    waitUntilAllJobsV2Complete(),
-  ]).then(() => {})
-}
-
 // const isInteractive = process.stdout.isTTY
 
 // Watch the static directory and copy files to public as they're added or
diff --git a/packages/gatsby/src/utils/commands/jobs-manager.ts b/packages/gatsby/src/utils/commands/jobs-manager.ts
@@ -0,0 +1,22 @@
+import { emitter, store } from "../../redux"
+
+import { waitUntilAllJobsComplete as waitUntilAllJobsV2Complete } from "../jobs-manager"
+
+export const waitUntilAllJobsComplete = (): Promise<void> => {
+  const jobsV1Promise = new Promise(resolve => {
+    const onEndJob = (): void => {
+      if (store.getState().jobs.active.length === 0) {
+        resolve()
+        emitter.off(`END_JOB`, onEndJob)
+      }
+    }
+
+    emitter.on(`END_JOB`, onEndJob)
+    onEndJob()
+  })
+
+  return Promise.all([
+    jobsV1Promise,
+    waitUntilAllJobsV2Complete(),
+  ]).then(() => {})
+}
