gatsby-watcher.js: explicitly start watching delete page in develop

gatsbyjs · Apr 3, 2019 · 9abfd41 · 9abfd41
1 parent 8c50073
commit 9abfd41
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 24 deletions.
diff --git a/packages/gatsby/src/commands/develop.js b/packages/gatsby/src/commands/develop.js
@@ -34,6 +34,7 @@ const apiRunnerNode = require(`../utils/api-runner-node`)
 const telemetry = require(`gatsby-telemetry`)
 const detectPortInUseAndPrompt = require(`../utils/detect-port-in-use-and-prompt`)
 const onExit = require(`signal-exit`)
+const queryWatcher = require(`../query/query-watcher`)
 
 // const isInteractive = process.stdout.isTTY
 
@@ -87,6 +88,8 @@ async function startServer(program) {
   // Start bootstrap process.
   await bootstrap(program)
 
+  queryWatcher.startWatchDeletePage()
+
   await createIndexHtml()
 
   const devConfig = await webpackConfig(

diff --git a/packages/gatsby/src/query/query-watcher.js b/packages/gatsby/src/query/query-watcher.js
@@ -267,32 +267,24 @@ const watch = rootDir => {
   filesToWatch.forEach(filePath => watcher.add(filePath))
 }
 
-if (process.env.gatsby_executing_command === `develop`) {
-  let bootstrapFinished = false
-
-  emitter.on(`BOOTSTRAP_FINISHED`, () => {
-    bootstrapFinished = true
-  })
-
+exports.startWatchDeletePage = () => {
   emitter.on(`DELETE_PAGE`, action => {
-    if (bootstrapFinished) {
-      const componentPath = slash(action.payload.component)
-      const { pages } = store.getState()
-      let otherPageWithTemplateExists = false
-      for (let page of pages.values()) {
-        if (slash(page.component) === componentPath) {
-          otherPageWithTemplateExists = true
-          break
-        }
-      }
-      if (!otherPageWithTemplateExists) {
-        store.dispatch({
-          type: `REMOVE_TEMPLATE_COMPONENT`,
-          payload: {
-            componentPath,
-          },
-        })
+    const componentPath = slash(action.payload.component)
+    const { pages } = store.getState()
+    let otherPageWithTemplateExists = false
+    for (let page of pages.values()) {
+      if (slash(page.component) === componentPath) {
+        otherPageWithTemplateExists = true
+        break
       }
     }
+    if (!otherPageWithTemplateExists) {
+      store.dispatch({
+        type: `REMOVE_TEMPLATE_COMPONENT`,
+        payload: {
+          componentPath,
+        },
+      })
+    }
   })
 }