V2 - Switch Sources and Transformers to use createNodeId for ids (#3807)

* Switch Sources and Transformers to use createNodeId for ids

* Only use createNodeId if an id isn't passed in

* Remove unused imports

Author: danielfarrell

Breaking Changes.md

@@ -1,3 +1,4 @@
 
 - Remove postcss plugins (cssnext, cssimport) from default css loader config
 - change webpack api
+- Source & transformer plugins now use UUIDs for ids. If you used glob or regex to query nodes by id then you'll need to query something else.

packages/gatsby-source-contentful/src/__tests__/__snapshots__/normalize.js.snap

@@ -52,13 +52,16 @@ describe(`Process contentful data`, () => {
 
   it(`creates nodes for each entry`, () => {
     const createNode = jest.fn()
+    const createNodeId = jest.fn()
+    createNodeId.mockReturnValue(`uuid-from-gatsby`)
     contentTypeItems.forEach((contentTypeItem, i) => {
       normalize.createContentTypeNodes({
         contentTypeItem,
         restrictedNodeFields,
         conflictFieldPrefix,
         entries: entryList[i].map(normalize.fixIds),
         createNode,
+        createNodeId,
         resolvable,
         foreignReferenceMap,
         defaultLocale,
@@ -70,11 +73,14 @@ describe(`Process contentful data`, () => {
 
   it(`creates nodes for each asset`, () => {
     const createNode = jest.fn()
+    const createNodeId = jest.fn()
+    createNodeId.mockReturnValue(`uuid-from-gatsby`)
     const assets = currentSyncData.assets
     assets.forEach(assetItem => {
       normalize.createAssetNodes({
         assetItem,
         createNode,
+        createNodeId,
         defaultLocale,
         locales,
       })

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

@@ -30,7 +30,7 @@ exports.setFieldsOnGraphQLNodeType = require(`./extend-node-type`).extendNodeTyp
  */
 
 exports.sourceNodes = async (
-  { actions, getNodes, hasNodeChanged, store },
+  { actions, getNodes, createNodeId, hasNodeChanged, store },
   { spaceId, accessToken, host }
 ) => {
   const { createNode, deleteNodes, touchNode, setPluginStatus } = actions
@@ -151,6 +151,7 @@ exports.sourceNodes = async (
       conflictFieldPrefix,
       entries: entryList[i],
       createNode,
+      createNodeId,
       resolvable,
       foreignReferenceMap,
       defaultLocale,
@@ -162,6 +163,7 @@ exports.sourceNodes = async (
     normalize.createAssetNodes({
       assetItem,
       createNode,
+      createNodeId,
       defaultLocale,
       locales,
     })

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

@@ -149,10 +149,10 @@ exports.buildForeignReferenceMap = ({
   return foreignReferenceMap
 }
 
-function createTextNode(node, key, text, createNode) {
+function createTextNode(node, key, text, createNode, createNodeId) {
   const str = _.isString(text) ? text : ` `
   const textNode = {
-    id: `${node.id}${key}TextNode`,
+    id: createNodeId(`${node.id}${key}TextNode`),
     parent: node.id,
     children: [],
     [key]: str,
@@ -171,11 +171,11 @@ function createTextNode(node, key, text, createNode) {
 }
 exports.createTextNode = createTextNode
 
-function createJSONNode(node, key, content, createNode) {
+function createJSONNode(node, key, content, createNode, createNodeId) {
   const str = JSON.stringify(content)
   const JSONNode = {
     ...content,
-    id: `${node.id}${key}JSONNode`,
+    id: createNodeId(`${node.id}${key}JSONNode`),
     parent: node.id,
     children: [],
     internal: {
@@ -199,6 +199,7 @@ exports.createContentTypeNodes = ({
   conflictFieldPrefix,
   entries,
   createNode,
+  createNodeId,
   resolvable,
   foreignReferenceMap,
   defaultLocale,
@@ -286,7 +287,7 @@ exports.createContentTypeNodes = ({
       }
 
       let entryNode = {
-        id: mId(entryItem.sys.id),
+        id: createNodeId(mId(entryItem.sys.id)),
         contentful_id: entryItem.sys.contentful_id,
         createdAt: entryItem.sys.createdAt,
         updatedAt: entryItem.sys.updatedAt,
@@ -328,7 +329,8 @@ exports.createContentTypeNodes = ({
             entryNode,
             entryItemFieldKey,
             entryItemFields[entryItemFieldKey],
-            createNode
+            createNode,
+            createNodeId,
           )
 
           delete entryItemFields[entryItemFieldKey]
@@ -337,7 +339,8 @@ exports.createContentTypeNodes = ({
             entryNode,
             entryItemFieldKey,
             entryItemFields[entryItemFieldKey],
-            createNode
+            createNode,
+            createNodeId,
           )
 
           delete entryItemFields[entryItemFieldKey]
@@ -356,7 +359,7 @@ exports.createContentTypeNodes = ({
 
     // Create a node for each content type
     const contentTypeNode = {
-      id: contentTypeItemId,
+      id: createNodeId(contentTypeItemId),
       parent: null,
       children: [],
       name: contentTypeItem.name,
@@ -382,6 +385,7 @@ exports.createContentTypeNodes = ({
 exports.createAssetNodes = ({
   assetItem,
   createNode,
+  createNodeId,
   defaultLocale,
   locales,
 }) => {
@@ -405,7 +409,7 @@ exports.createAssetNodes = ({
         : ``,
     }
     const assetNode = {
-      id: mId(localizedAsset.sys.id),
+      id: createNodeId(mId(localizedAsset.sys.id)),
       parent: null,
       children: [],
       ...localizedAsset.fields,

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

@@ -13,7 +13,7 @@ const createContentDigest = obj =>
 
 exports.sourceNodes = async (
   { actions, getNode, hasNodeChanged, store, cache },
-  { baseUrl, apiBase }
+  { baseUrl, apiBase, createNodeId }
 ) => {
   const { createNode } = actions
 
@@ -103,7 +103,7 @@ exports.sourceNodes = async (
 
     _.each(contentType.data, datum => {
       const node = {
-        id: datum.id,
+        id: createNodeId(datum.id),
         parent: null,
         children: [],
         ...datum.attributes,

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

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-source-faker",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "A gatsby plugin to get fake data for testing",
   "main": "index.js",
   "scripts": {

packages/gatsby-source-faker/package.json

@@ -1,7 +1,7 @@
 const faker = require(`faker`)
 const crypto = require(`crypto`)
 
-exports.sourceNodes = ({ actions }, pluginOptions) => {
+exports.sourceNodes = ({ actions, createNodeId }, pluginOptions) => {
   const { createNode } = actions
   const { schema, count, type } = pluginOptions
   for (let i = 0; i < count; i++) {
@@ -20,7 +20,7 @@ exports.sourceNodes = ({ actions }, pluginOptions) => {
       .digest(`hex`)
 
     const nodeBase = {
-      id: JSON.stringify(faker.random.number()),
+      id: createNodeId(JSON.stringify(faker.random.number())),
       parent: null,
       children: [],
       internal: {

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

@@ -5,6 +5,9 @@ const { createFileNode } = require(`../create-file-node`)
 // FIXME: This test needs to not use snapshots because of file differences
 // and locations across users and CI systems
 describe(`create-file-node`, () => {
-  it(`creates a file node`, () =>
-    createFileNode(path.resolve(`${__dirname}/fixtures/file.json`), {}))
+  it(`creates a file node`, () => {
+    const createNodeId = jest.fn()
+    createNodeId.mockReturnValue(`uuid-from-gatsby`)
+    return createFileNode(path.resolve(`${__dirname}/fixtures/file.json`), createNodeId, {})
+  })
 })

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

@@ -14,7 +14,7 @@ const createId = path => {
 
 exports.createId = createId
 
-exports.createFileNode = async (pathToFile, pluginOptions = {}) => {
+exports.createFileNode = async (pathToFile, createNodeId, pluginOptions = {}) => {
   const slashed = slash(pathToFile)
   const parsedSlashed = path.parse(slashed)
   const slashedFile = {
@@ -56,7 +56,7 @@ exports.createFileNode = async (pathToFile, pluginOptions = {}) => {
       // Don't actually make the File id the absolute path as otherwise
       // people will use the id for that and ids shouldn't be treated as
       // useful information.
-      id: createId(pathToFile),
+      id: createNodeId(pathToFile),
       children: [],
       parent: `___SOURCE___`,
       internal,