V2 - Switch Sources and Transformers to use createNodeId for ids (gat…

…sbyjs#3807)

* Switch Sources and Transformers to use createNodeId for ids

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

* Remove unused imports

src/__tests__/create-file-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, {})
+  })
 })

src/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,

src/gatsby-node.js

@@ -4,7 +4,7 @@ const fs = require(`fs`)
 const { createId, createFileNode } = require(`./create-file-node`)
 
 exports.sourceNodes = (
-  { actions, getNode, hasNodeChanged, reporter },
+  { actions, getNode, createNodeId, hasNodeChanged, reporter },
   pluginOptions
 ) => {
   const { createNode, deleteNode } = actions
@@ -36,7 +36,7 @@ Please pick a path to an existing directory.
   })
 
   const createAndProcessNode = path =>
-    createFileNode(path, pluginOptions).then(createNode)
+    createFileNode(path, createNodeId, pluginOptions).then(createNode)
 
   // For every path that is reported before the 'ready' event, we throw them
   // into a queue and then flush the queue when 'ready' event arrives.