chore(*): Use new createContentDigest helper

packages/gatsby-source-contentful/package.json

@@ -33,7 +33,7 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "gatsby": ">2.0.0-alpha"
+    "gatsby": ">2.0.15"
   },
   "repository": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-contentful",
   "scripts": {

packages/gatsby-source-contentful/src/cache-image.js

@@ -1,9 +1,10 @@
-const crypto = require(`crypto`)
 const { resolve, parse } = require(`path`)
 
 const axios = require(`axios`)
 const { pathExists, createWriteStream } = require(`fs-extra`)
 
+const createContentDigest = require(`../../gatsby/src/utils/create-content-digest`)
+
 module.exports = async function cacheImage(store, image, options) {
   const program = store.getState().program
   const CACHE_DIR = resolve(`${program.directory}/.cache/contentful/assets/`)
@@ -37,10 +38,7 @@ module.exports = async function cacheImage(store, image, options) {
     params.push(`bg=${background}`)
   }
 
-  const optionsHash = crypto
-    .createHash(`md5`)
-    .update(JSON.stringify([url, ...params]))
-    .digest(`hex`)
+  const optionsHash = createContentDigest([url, ...params])
 
   const { name, ext } = parse(fileName)
   const absolutePath = resolve(CACHE_DIR, `${name}-${optionsHash}${ext}`)

packages/gatsby-source-contentful/src/normalize.js

@@ -1,13 +1,10 @@
 const _ = require(`lodash`)
-const crypto = require(`crypto`)
 const stringify = require(`json-stringify-safe`)
 const deepMap = require(`deep-map`)
 
-const digest = str =>
-  crypto
-    .createHash(`md5`)
-    .update(str)
-    .digest(`hex`)
+const createContentDigest = require(`../../gatsby/src/utils/create-content-digest`)
+
+const digest = str => createContentDigest(str)
 const typePrefix = `Contentful`
 const makeTypeName = type => _.upperFirst(_.camelCase(`${typePrefix} ${type}`))
 

packages/gatsby-source-filesystem/package.json

@@ -32,7 +32,7 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "gatsby": ">2.0.0-alpha"
+    "gatsby": ">2.0.15"
   },
   "repository": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-filesystem",
   "scripts": {

packages/gatsby-source-filesystem/src/__tests__/create-file-node.js

@@ -1,6 +1,7 @@
 const path = require(`path`)
 
 const { createFileNode } = require(`../create-file-node`)
+const createContentDigest = require(`../../../gatsby/src/utils/create-content-digest`)
 
 // FIXME: This test needs to not use snapshots because of file differences
 // and locations across users and CI systems
@@ -11,6 +12,7 @@ describe(`create-file-node`, () => {
     return createFileNode(
       path.resolve(`${__dirname}/fixtures/file.json`),
       createNodeId,
+      createContentDigest,
       {}
     )
   })

packages/gatsby-source-filesystem/src/create-file-node.js

@@ -5,11 +5,11 @@ const mime = require(`mime`)
 const prettyBytes = require(`pretty-bytes`)
 
 const md5File = require(`bluebird`).promisify(require(`md5-file`))
-const crypto = require(`crypto`)
 
 exports.createFileNode = async (
   pathToFile,
   createNodeId,
+  createContentDigest,
   pluginOptions = {}
 ) => {
   const slashed = slash(pathToFile)
@@ -27,12 +27,10 @@ exports.createFileNode = async (
   const stats = await fs.stat(slashedFile.absolutePath)
   let internal
   if (stats.isDirectory()) {
-    const contentDigest = crypto
-      .createHash(`md5`)
-      .update(
-        JSON.stringify({ stats: stats, absolutePath: slashedFile.absolutePath })
-      )
-      .digest(`hex`)
+    const contentDigest = createContentDigest({
+      stats: stats,
+      absolutePath: slashedFile.absolutePath,
+    })
     internal = {
       contentDigest,
       type: `Directory`,

packages/gatsby-source-filesystem/src/create-remote-file-node.js

@@ -1,6 +1,5 @@
 const fs = require(`fs-extra`)
 const got = require(`got`)
-const crypto = require(`crypto`)
 const path = require(`path`)
 const { isWebUri } = require(`valid-url`)
 const Queue = require(`better-queue`)
@@ -46,20 +45,6 @@ const cacheId = url => `create-remote-file-node-${url}`
  * utils *
  *********/
 
-/**
- * createHash
- * --
- *
- * Create an md5 hash of the given str
- * @param  {Stringq} str
- * @return {String}
- */
-const createHash = str =>
-  crypto
-    .createHash(`md5`)
-    .update(str)
-    .digest(`hex`)
-
 const CACHE_DIR = `.cache`
 const FS_PLUGIN_DIR = `gatsby-source-filesystem`
 
@@ -172,6 +157,7 @@ async function processRemoteNode({
   store,
   cache,
   createNode,
+  createContentDigest,
   auth = {},
   createNodeId,
 }) {
@@ -195,7 +181,7 @@ async function processRemoteNode({
   }
 
   // Create the temp and permanent file names for the url.
-  const digest = createHash(url)
+  const digest = createContentDigest(url)
   const ext = getRemoteFileExtension(url)
 
   const tmpFilename = createFilePath(programDir, `tmp-${digest}`, ext)
@@ -221,7 +207,12 @@ async function processRemoteNode({
     }
 
     // Create the file node.
-    const fileNode = await createFileNode(filename, createNodeId, {})
+    const fileNode = await createFileNode(
+      filename,
+      createNodeId,
+      createContentDigest,
+      {}
+    )
     fileNode.internal.description = `File "${url}"`
     // Override the default plugin as gatsby-source-filesystem needs to
     // be the owner of File nodes or there'll be conflicts if any other

packages/gatsby-source-filesystem/src/gatsby-node.js

@@ -48,7 +48,15 @@ const createFSMachine = () =>
   })
 
 exports.sourceNodes = (
-  { actions, getNode, createNodeId, hasNodeChanged, reporter, emitter },
+  {
+    actions,
+    getNode,
+    createNodeId,
+    createContentDigest,
+    hasNodeChanged,
+    reporter,
+    emitter,
+  },
   pluginOptions
 ) => {
   const { createNode, deleteNode } = actions
@@ -103,6 +111,7 @@ See docs here - https://www.gatsbyjs.org/packages/gatsby-source-filesystem/
     const fileNodePromise = createFileNode(
       path,
       createNodeId,
+      createContentDigest,
       pluginOptions
     ).then(fileNode => {
       createNode(fileNode)

packages/gatsby-source-hacker-news/package.json

@@ -24,7 +24,7 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "gatsby": ">2.0.0-alpha"
+    "gatsby": ">2.0.15"
   },
   "repository": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-hacker-news",
   "scripts": {

packages/gatsby-source-hacker-news/src/gatsby-node.js

@@ -1,5 +1,4 @@
 const axios = require(`axios`)
-const crypto = require(`crypto`)
 const url = require(`url`)
 const _ = require(`lodash`)
 
@@ -12,6 +11,7 @@ exports.sourceNodes = async ({
   actions,
   getNode,
   createNodeId,
+  createContentDigest,
   hasNodeChanged,
 }) => {
   const { createNode } = actions
@@ -117,10 +117,7 @@ fragment commentsFragment on HackerNewsItem {
     storyNode.by = storyNode.by.id
 
     // Get content digest of node.
-    const contentDigest = crypto
-      .createHash(`md5`)
-      .update(JSON.stringify(storyNode))
-      .digest(`hex`)
+    const contentDigest = createContentDigest(storyNode)
 
     storyNode.internal.contentDigest = contentDigest
     createNode(storyNode)
@@ -147,10 +144,7 @@ fragment commentsFragment on HackerNewsItem {
         const nodeStr = JSON.stringify(commentNode)
 
         // Get content digest of comment node.
-        const contentDigest = crypto
-          .createHash(`md5`)
-          .update(nodeStr)
-          .digest(`hex`)
+        const contentDigest = createContentDigest(nodeStr)
 
         commentNode.internal.contentDigest = contentDigest
         commentNode.internal.content = nodeStr

packages/gatsby-source-lever/package.json

@@ -30,7 +30,7 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "gatsby": ">2.0.0-alpha"
+    "gatsby": ">2.0.15"
   },
   "repository": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-lever",
   "scripts": {

packages/gatsby-source-lever/src/normalize.js

@@ -1,21 +1,18 @@
-const crypto = require(`crypto`)
 const deepMapKeys = require(`deep-map-keys`)
 const stringify = require(`json-stringify-safe`)
 
 const conflictFieldPrefix = `lever_`
 // restrictedNodeFields from here https://www.gatsbyjs.org/docs/node-interface/
 const restrictedNodeFields = [`id`, `children`, `parent`, `fields`, `internal`]
 
+const createContentDigest = require(`../../gatsby/src/utils/create-content-digest`)
+
 /**
  * Encrypts a String using md5 hash of hexadecimal digest.
  *
  * @param {any} str
  */
-const digest = str =>
-  crypto
-    .createHash(`md5`)
-    .update(str)
-    .digest(`hex`)
+const digest = str => createContentDigest(str)
 
 /**
  * Create the Graph QL Node

packages/gatsby-source-mongodb/package.json

@@ -25,7 +25,7 @@
   "license": "MIT",
   "main": "index.js",
   "peerDependencies": {
-    "gatsby": ">2.0.0-alpha"
+    "gatsby": ">2.0.15"
   },
   "repository": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-mongodb",
   "scripts": {

packages/gatsby-source-mongodb/src/gatsby-node.js

@@ -1,9 +1,10 @@
 const MongoClient = require(`mongodb`).MongoClient
-const crypto = require(`crypto`)
 const prepareMappingChildNode = require(`./mapping`)
 const _ = require(`lodash`)
 const queryString = require(`query-string`)
 
+const createContentDigest = require(`../../gatsby/src/utils/create-content-digest`)
+
 exports.sourceNodes = (
   { actions, getNode, createNodeId, hasNodeChanged },
   pluginOptions
@@ -85,10 +86,7 @@ function createNodes(
           internal: {
             type: `mongodb${caps(dbName)}${caps(collectionName)}`,
             content: JSON.stringify(item),
-            contentDigest: crypto
-              .createHash(`md5`)
-              .update(JSON.stringify(item))
-              .digest(`hex`),
+            contentDigest: createContentDigest(item),
           },
         }
         const childrenNodes = []
@@ -109,7 +107,8 @@ function createNodes(
                 mediaItemFieldKey,
                 node[mediaItemFieldKey],
                 mapObj[mediaItemFieldKey],
-                createNode
+                createNode,
+                createContentDigest
               )
 
               node[`${mediaItemFieldKey}___NODE`] = mappingChildNode.id

packages/gatsby-source-mongodb/src/mapping.js

@@ -1,7 +1,13 @@
-const _ = require(`lodash`),
-  crypto = require(`crypto`)
+const _ = require(`lodash`)
 
-module.exports = function(node, key, text, mediaType, createNode) {
+module.exports = function(
+  node,
+  key,
+  text,
+  mediaType,
+  createNode,
+  createContentDigest
+) {
   const str = _.isString(text) ? text : ` `
   const id = `${node.id}${key}MappingNode`
   const mappingNode = {
@@ -13,10 +19,7 @@ module.exports = function(node, key, text, mediaType, createNode) {
       type: _.camelCase(`${node.internal.type} ${key} MappingNode`),
       mediaType: mediaType,
       content: str,
-      contentDigest: crypto
-        .createHash(`md5`)
-        .update(JSON.stringify(str))
-        .digest(`hex`),
+      contentDigest: createContentDigest(str),
     },
   }
 

packages/gatsby-source-npm-package-search/package.json

@@ -19,7 +19,7 @@
   "license": "MIT",
   "main": "index.js",
   "peerDependencies": {
-    "gatsby": ">2.0.0-alpha"
+    "gatsby": ">2.0.15"
   },
   "scripts": {
     "build": "babel src --out-dir . --ignore **/__tests__",

packages/gatsby-source-npm-package-search/src/gatsby-node.js

@@ -1,15 +1,10 @@
 const algoliasearch = require(`algoliasearch`)
-const crypto = require(`crypto`)
+
+const createContentDigest = require(`../../gatsby/src/utils/create-content-digest`)
 
 const client = algoliasearch(`OFCNCOG2CU`, `6fbcaeafced8913bf0e4d39f0b541957`)
 var index = client.initIndex(`npm-search`)
 
-const createContentDigest = obj =>
-  crypto
-    .createHash(`md5`)
-    .update(JSON.stringify(obj))
-    .digest(`hex`)
-
 function browse({ index, ...params }) {
   let hits = []
   const browser = index.browseAll(params)