fix(gatsby): reevaluate page query if context modified via createPage (…

…#15404)
gatsbyjs · Aug 8, 2019 · ddddc68 · ddddc68
1 parent 0c85897
commit ddddc68
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/packages/gatsby/src/redux/machines/__tests__/page-component.js b/packages/gatsby/src/redux/machines/__tests__/page-component.js
@@ -68,4 +68,12 @@ describe(`bootstrap`, () => {
     await sleep()
     expect(runQueuedQueries).toBeCalledWith(path)
   })
+
+  it(`will queue query when page context is changed`, async () => {
+    const service = getService({ isInBootstrap: false })
+    service.send({ type: `PAGE_CONTEXT_MODIFIED`, path: `/a/test.md` })
+    // there is setTimeout in action handler for `CONTEXT_CHANGES`
+    await sleep()
+    expect(enqueueExtractedQueryId).toBeCalledWith(`/a/test.md`)
+  })
 })
diff --git a/packages/gatsby/src/redux/machines/page-component.js b/packages/gatsby/src/redux/machines/page-component.js
@@ -22,6 +22,9 @@ module.exports = Machine(
       NEW_PAGE_CREATED: {
         actions: `setPage`,
       },
+      PAGE_CONTEXT_MODIFIED: {
+        actions: `rerunPageQuery`,
+      },
       QUERY_EXTRACTION_GRAPHQL_ERROR: `queryExtractionGraphQLError`,
       QUERY_EXTRACTION_BABEL_ERROR: `queryExtractionBabelError`,
     },
@@ -76,6 +79,14 @@ module.exports = Machine(
       isNotBootstrapping: context => !context.isInBootstrap,
     },
     actions: {
+      rerunPageQuery: (_ctx, event) => {
+        const queryUtil = require(`../../query`)
+        // Wait a bit as calling this function immediately triggers
+        // an Action call which Redux squawks about.
+        setTimeout(() => {
+          queryUtil.enqueueExtractedQueryId(event.path)
+        }, 0)
+      },
       runPageComponentQueries: (context, event) => {
         const queryUtil = require(`../../query`)
         // Wait a bit as calling this function immediately triggers

diff --git a/packages/gatsby/src/redux/reducers/components.js b/packages/gatsby/src/redux/reducers/components.js
@@ -40,6 +40,11 @@ module.exports = (state = new Map(), action) => {
         service = services.get(action.payload.componentPath)
         if (!service.state.context.pages.has(action.payload.path)) {
           service.send({ type: `NEW_PAGE_CREATED`, path: action.payload.path })
+        } else if (action.contextModified) {
+          service.send({
+            type: `PAGE_CONTEXT_MODIFIED`,
+            path: action.payload.path,
+          })
         }
       }