Fix: Contentful warm builds (#34678)

Co-authored-by: gatsbybot <mathews.kyle+gatsbybot@gmail.com>
gatsbyjs · Feb 4, 2022 · d43112f · d43112f
1 parent bbe6554
commit d43112f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -462,6 +462,10 @@ jobs:
       - e2e-test:
           test_path: e2e-tests/contentful
           test_command: yarn test
+      # we build a second time to see if warm/cached builds are successful
+      - e2e-test:
+          test_path: e2e-tests/contentful
+          test_command: yarn build
       - store_artifacts:
           path: e2e-tests/contentful/__diff_output__
       - store_test_results:

diff --git a/packages/gatsby-source-contentful/src/__tests__/gatsby-node.js b/packages/gatsby-source-contentful/src/__tests__/gatsby-node.js
@@ -39,8 +39,7 @@ describe(`gatsby-node`, () => {
     setPluginStatus: jest.fn(),
     createNode: jest.fn(async node => {
       node.internal.owner = `gatsby-source-contentful`
-      // don't allow mutations (this isn't traversing so only top level is frozen)
-      currentNodeMap.set(node.id, Object.freeze(node))
+      currentNodeMap.set(node.id, node)
     }),
     deleteNode: jest.fn(node => {
       currentNodeMap.delete(node.id)

diff --git a/packages/gatsby-source-contentful/src/source-nodes.js b/packages/gatsby-source-contentful/src/source-nodes.js
@@ -56,22 +56,22 @@ export async function sourceNodes(
     actions
   const online = await isOnline()
 
+  getNodes().forEach(node => {
+    if (node.internal.owner !== `gatsby-source-contentful`) {
+      return
+    }
+    touchNode(node)
+    if (node?.fields?.localFile) {
+      // Prevent GraphQL type inference from crashing on this property
+      touchNode(getNode(node.fields.localFile))
+    }
+  })
+
   if (
     !online &&
     process.env.GATSBY_CONTENTFUL_OFFLINE === `true` &&
     process.env.NODE_ENV !== `production`
   ) {
-    getNodes().forEach(node => {
-      if (node.internal.owner !== `gatsby-source-contentful`) {
-        return
-      }
-      touchNode(node)
-      if (node.localFile___NODE) {
-        // Prevent GraphQL type inference from crashing on this property
-        touchNode(getNode(node.localFile___NODE))
-      }
-    })
-
     return
   }
 
@@ -188,7 +188,6 @@ export async function sourceNodes(
         ? n.internal.type !== `ContentfulTag`
         : true)
   )
-  existingNodes.forEach(n => touchNode(n))
 
   // Report existing, new and updated nodes
   const nodeCounts = {
@@ -254,8 +253,11 @@ export async function sourceNodes(
   existingNodes
     .filter(n => !newOrUpdatedEntries.has(`${n.id}___${n.sys.type}`))
     .forEach(n => {
-      if (foreignReferenceMap[`${n.id}___${n.sys.type}`]) {
-        foreignReferenceMap[`${n.id}___${n.sys.type}`].forEach(
+      if (
+        n.contentful_id &&
+        foreignReferenceMap[`${n.contentful_id}___${n.sys.type}`]
+      ) {
+        foreignReferenceMap[`${n.contentful_id}___${n.sys.type}`].forEach(
           foreignReference => {
             const { name, id } = foreignReference