Switch createContentDigest to api-runner-node

gatsbyjs · Oct 26, 2021 · c25860f · c25860f
1 parent a69586f
commit c25860f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/packages/gatsby-core-utils/src/create-content-digest.ts b/packages/gatsby-core-utils/src/create-content-digest.ts
@@ -27,7 +27,7 @@ export const createContentDigest = (
   input: BinaryLike | string | any
 ): string => {
   if (typeof input === `object` && !Buffer.isBuffer(input)) {
-    return hasher.hash({ ...input, internal: null })
+    return hasher.hash(input)
   }
 
   return hashPrimitive(input)

diff --git a/packages/gatsby-source-drupal/src/gatsby-node.js b/packages/gatsby-source-drupal/src/gatsby-node.js
@@ -272,6 +272,9 @@ ${JSON.stringify(webhookBody, null, 4)}`
 
       drupalFetchIncrementalActivity.start()
 
+      console.log(
+        urlJoin(baseUrl, `gatsby-fastbuilds/sync/`, lastFetched.toString())
+      )
       try {
         // Hit fastbuilds endpoint with the lastFetched date.
         const res = await requestQueue.push([

diff --git a/packages/gatsby-source-drupal/src/utils.js b/packages/gatsby-source-drupal/src/utils.js
@@ -367,6 +367,7 @@ ${JSON.stringify(nodeToUpdate, null, 4)}
       internal: null,
     })
 
+    console.log({ oldDigest, newDigest: node.internal.contentDigest })
     if (oldDigest !== node.internal.contentDigest) {
       if (node.internal.owner) {
         delete node.internal.owner

diff --git a/packages/gatsby/src/utils/api-runner-node.js b/packages/gatsby/src/utils/api-runner-node.js
@@ -13,7 +13,9 @@ const { codeFrameColumns } = require(`@babel/code-frame`)
 const fs = require(`fs-extra`)
 const { getCache } = require(`./get-cache`)
 import { createNodeId } from "./create-node-id"
-const { createContentDigest } = require(`gatsby-core-utils`)
+const {
+  createContentDigest: _createContentDigest,
+} = require(`gatsby-core-utils`)
 import {
   buildObjectType,
   buildUnionType,
@@ -31,6 +33,25 @@ const { getNonGatsbyCodeFrameFormatted } = require(`./stack-trace-utils`)
 const { trackBuildError, decorateEvent } = require(`gatsby-telemetry`)
 import errorParser from "./api-runner-error-parser"
 
+// Override createContentDigest to remove autogenerated data from nodes to
+// ensure consistent digests.
+function createContentDigest(node) {
+  return _createContentDigest({
+    ...node,
+    internal: {
+      ...node.internal,
+      // Remove auto-generated fields that'd prevent
+      // creating a consistent contentDigest.
+      contentDigest: undefined,
+      owner: undefined,
+      fieldOwners: undefined,
+      ignoreType: undefined,
+      counter: undefined,
+    },
+    fields: undefined,
+  })
+}
+
 if (!process.env.BLUEBIRD_DEBUG && !process.env.BLUEBIRD_LONG_STACK_TRACES) {
   // Unless specified - disable longStackTraces
   // as this have severe perf penalty ( http://bluebirdjs.com/docs/api/promise.longstacktraces.html )