Uuidv5 v1

packages/gatsby-source-lever/package.json

@@ -8,8 +8,7 @@
     "deep-map": "^1.5.0",
     "deep-map-keys": "^1.2.0",
     "json-stringify-safe": "^5.0.1",
-    "lodash": "^4.17.4",
-    "uuid": "^3.1.0"
+    "lodash": "^4.17.4"
   },
   "deprecated": false,
   "description": "Gatsby source plugin for building websites using the Lever.co Recruitment Software as a data source.",

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

@@ -15,7 +15,9 @@ describe(`Process Lever data`, () => {
     expect(entities).toMatchSnapshot()
   })
   it(`creates Gatsby IDs for each entity`, () => {
-    entities = normalize.createGatsbyIds(entities)
+    const createNodeId = jest.fn()
+    createNodeId.mockReturnValue(`uuid-from-gatsby`)
+    entities = normalize.createGatsbyIds(createNodeId, entities)
     expect(entities).toMatchSnapshot()
   })
   it(`creates nodes for each entry`, () => {

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

@@ -4,7 +4,7 @@ const normalize = require(`./normalize`)
 const typePrefix = `lever__`
 
 exports.sourceNodes = async (
-  { boundActionCreators, getNode, store, cache },
+  { boundActionCreators, getNode, store, cache, createNodeId },
   { site, verboseOutput }
 ) => {
   const { createNode } = boundActionCreators
@@ -27,7 +27,7 @@ exports.sourceNodes = async (
   entities = normalize.standardizeDates(entities)
 
   // creates Gatsby IDs for each entity
-  entities = normalize.createGatsbyIds(entities)
+  entities = normalize.createGatsbyIds(createNodeId, entities)
 
   // creates nodes for each entry
   normalize.createNodesFromEntities({ entities, createNode })

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

@@ -1,6 +1,5 @@
 const crypto = require(`crypto`)
 const deepMapKeys = require(`deep-map-keys`)
-const uuidv5 = require(`uuid/v5`)
 const stringify = require(`json-stringify-safe`)
 
 const conflictFieldPrefix = `lever_`
@@ -129,10 +128,9 @@ exports.standardizeDates = entities =>
     return e
   })
 
-const seedConstant = `c2012db8-fafc-5a03-915f-e6016ff32086`
-exports.createGatsbyIds = entities =>
+exports.createGatsbyIds = (createNodeId, entities) =>
   entities.map(e => {
-    e.id = uuidv5(e.lever_id.toString(), uuidv5(`lever`, seedConstant))
+    e.id = createNodeId(e.lever_id.toString())
     return e
   })
 

packages/gatsby-source-wordpress/package.json

@@ -13,8 +13,7 @@
     "gatsby-source-filesystem": "^1.5.14",
     "json-stringify-safe": "^5.0.1",
     "lodash": "^4.17.4",
-    "qs": "^6.4.0",
-    "uuid": "^3.1.0"
+    "qs": "^6.4.0"
   },
   "deprecated": false,
   "devDependencies": {

packages/gatsby-source-wordpress/src/__tests__/normalize.js

@@ -23,7 +23,9 @@ describe(`Process WordPress data`, () => {
     entities = normalize.excludeUnknownEntities(entities)
   })
   it(`creates Gatsby IDs for each entity`, () => {
-    entities = normalize.createGatsbyIds(entities)
+    const createNodeId = jest.fn()
+    createNodeId.mockReturnValue(`uuid-from-gatsby`)
+    entities = normalize.createGatsbyIds(createNodeId, entities)
     expect(entities).toMatchSnapshot()
   })
   it(`Creates map of types`, () => {

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

@@ -18,7 +18,7 @@ let _auth
 let _perPage
 
 exports.sourceNodes = async (
-  { boundActionCreators, getNode, store, cache },
+  { boundActionCreators, getNode, store, cache, createNodeId },
   {
     baseUrl,
     protocol,
@@ -71,7 +71,7 @@ exports.sourceNodes = async (
   entities = normalize.excludeUnknownEntities(entities)
 
   // Creates Gatsby IDs for each entity
-  entities = normalize.createGatsbyIds(entities)
+  entities = normalize.createGatsbyIds(createNodeId, entities)
 
   // Creates links between authors and user entities
   entities = normalize.mapAuthorsToUsers(entities)

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

@@ -1,7 +1,6 @@
 const crypto = require(`crypto`)
 const deepMapKeys = require(`deep-map-keys`)
 const _ = require(`lodash`)
-const uuidv5 = require(`uuid/v5`)
 const { createRemoteFileNode } = require(`gatsby-source-filesystem`)
 
 const colorized = require(`./output-color`)
@@ -141,19 +140,9 @@ exports.liftRenderedField = entities =>
 exports.excludeUnknownEntities = entities =>
   entities.filter(e => e.wordpress_id) // Excluding entities without ID
 
-const seedConstant = `b2012db8-fafc-5a03-915f-e6016ff32086`
-const typeNamespaces = {}
-exports.createGatsbyIds = entities =>
+exports.createGatsbyIds = (createNodeId, entities) =>
   entities.map(e => {
-    let namespace
-    if (typeNamespaces[e.__type]) {
-      namespace = typeNamespaces[e.__type]
-    } else {
-      typeNamespaces[e.__type] = uuidv5(e.__type, seedConstant)
-      namespace = typeNamespaces[e.__type]
-    }
-
-    e.id = uuidv5(e.wordpress_id.toString(), namespace)
+    e.id = createNodeId(`${e.__type}-${e.wordpress_id.toString()}`)
     return e
   })
 

packages/gatsby/package.json

@@ -105,6 +105,7 @@
     "style-loader": "^0.13.0",
     "type-of": "^2.0.1",
     "url-loader": "^0.5.7",
+    "uuid": "^3.1.0",
     "v8-compile-cache": "^1.1.0",
     "webpack": "^1.13.3",
     "webpack-configurator": "^0.3.0",

packages/gatsby/src/utils/api-runner-node.js

@@ -6,6 +6,7 @@ const mapSeries = require(`async/mapSeries`)
 const reporter = require(`gatsby-cli/lib/reporter`)
 const cache = require(`./cache`)
 const apiList = require(`./api-node-docs`)
+const createNodeId = require(`./create-node-id`)
 
 // Bind action creators per plugin so we can auto-add
 // metadata to actions they create.
@@ -61,6 +62,8 @@ const runAPI = (plugin, api, args) => {
     pathPrefix = store.getState().config.pathPrefix
   }
 
+  const namespacedCreateNodeId = id => createNodeId(id, plugin.name)
+
   const gatsbyNode = require(`${plugin.resolve}/gatsby-node`)
   if (gatsbyNode[api]) {
     const apiCallArgs = [
@@ -76,6 +79,7 @@ const runAPI = (plugin, api, args) => {
         reporter,
         getNodeAndSavePathDependency,
         cache,
+        createNodeId: namespacedCreateNodeId,
       },
       plugin.pluginOptions,
     ]

packages/gatsby/src/utils/create-node-id.js

@@ -0,0 +1,9 @@
+const uuidv5 = require(`uuid/v5`)
+
+const seedConstant = `638f7a53-c567-4eca-8fc1-b23efb1cfb2b`
+
+function createNodeId(id, namespace) {
+  return uuidv5(id, uuidv5(namespace, seedConstant))
+}
+
+module.exports = createNodeId