fix(gatsby-source-filesystem): Let plugins set parent when creating F…

…ile nodes with createRemoteFileNode (#11795) * WIP update * Fixes to drupal/wordpress * Add docs for parentNodeId
gatsbyjs · Feb 20, 2019 · 5a3c1fc · 5a3c1fc
1 parent ad5132a
commit 5a3c1fc
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 2 deletions.
diff --git a/packages/gatsby-source-drupal/src/gatsby-node.js b/packages/gatsby-source-drupal/src/gatsby-node.js
@@ -208,6 +208,7 @@ exports.sourceNodes = async (
             cache,
             createNode,
             createNodeId,
+            parentNodeId: node.id,
             auth,
           })
         } catch (e) {

diff --git a/packages/gatsby-source-filesystem/README.md b/packages/gatsby-source-filesystem/README.md
@@ -163,6 +163,9 @@ createRemoteFileNode({
   // The source url of the remote file
   url: `https://example.com/a-file.jpg`,
 
+  // The id of the parent node (i.e. the node to which the new remote File node will be linked to.
+  parentNodeId,
+
   // The redux store which is passed to all Node APIs.
   store,
 
@@ -208,6 +211,7 @@ exports.downloadMediaFiles = ({
       try {
         fileNode = await createRemoteFileNode({
           url: node.source_url,
+          parentNodeId: node.id,
           store,
           cache,
           createNode,
@@ -238,6 +242,7 @@ The helper tries first to retrieve the file name and extension by parsing the ur
 createRemoteFileNode({
   // The source url of the remote file
   url: `https://example.com/a-file-without-an-extension`,
+  parentNodeId: node.id,
   store,
   cache,
   createNode,

diff --git a/packages/gatsby-source-filesystem/src/create-remote-file-node.js b/packages/gatsby-source-filesystem/src/create-remote-file-node.js
@@ -183,6 +183,7 @@ async function processRemoteNode({
   store,
   cache,
   createNode,
+  parentNodeId,
   auth = {},
   createNodeId,
   ext,
@@ -248,6 +249,7 @@ async function processRemoteNode({
   // Create the file node.
   const fileNode = await createFileNode(filename, createNodeId, {})
   fileNode.internal.description = `File "${url}"`
+  fileNode.parent = parentNodeId
   // Override the default plugin as gatsby-source-filesystem needs to
   // be the owner of File nodes or there'll be conflicts if any other
   // File nodes are created through normal usages of
@@ -305,6 +307,7 @@ module.exports = ({
   store,
   cache,
   createNode,
+  parentNodeId = null,
   auth = {},
   createNodeId,
   ext = null,
@@ -348,6 +351,7 @@ module.exports = ({
     store,
     cache,
     createNode,
+    parentNodeId,
     createNodeId,
     auth,
     ext,

diff --git a/packages/gatsby-source-shopify/src/nodes.js b/packages/gatsby-source-shopify/src/nodes.js
@@ -21,7 +21,7 @@ const { createNodeFactory, generateNodeId } = createNodeHelpers({
 })
 
 const downloadImageAndCreateFileNode = async (
-  { url },
+  { url, nodeId },
   { createNode, createNodeId, touchNode, store, cache }
 ) => {
   let fileNodeID
@@ -41,6 +41,7 @@ const downloadImageAndCreateFileNode = async (
     cache,
     createNode,
     createNodeId,
+    parentNodeId: nodeId,
   })
 
   if (fileNode) {
@@ -63,7 +64,7 @@ export const ArticleNode = imageArgs =>
 
     if (node.image)
       node.image.localFile___NODE = await downloadImageAndCreateFileNode(
-        { id: node.image.id, url: node.image.src },
+        { id: node.image.id, url: node.image.src, nodeId: node.id },
         imageArgs
       )
 
@@ -84,6 +85,7 @@ export const CollectionNode = imageArgs =>
         {
           id: node.image.id,
           url: node.image.src && node.image.src.split(`?`)[0],
+          nodeId: node.id,
         },
         imageArgs
       )

diff --git a/packages/gatsby-source-wordpress/src/normalize.js b/packages/gatsby-source-wordpress/src/normalize.js
@@ -500,6 +500,7 @@ exports.downloadMediaFiles = async ({
               cache,
               createNode,
               createNodeId,
+              parentNodeId: e.id,
               auth: _auth,
             })
 

diff --git a/packages/gatsby-transformer-screenshot/src/gatsby-node.js b/packages/gatsby-transformer-screenshot/src/gatsby-node.js
@@ -44,6 +44,7 @@ exports.onPreBootstrap = (
         cache,
         createNode,
         createNodeId,
+        parentNodeId: n.id,
         createContentDigest,
       })
     } else {
@@ -90,6 +91,7 @@ exports.onCreateNode = async (
           createNode,
           createNodeId,
           createContentDigest,
+          parentNodeId: node.id,
         })
         .on(`finish`, r => {
           resolve(r)
@@ -115,6 +117,7 @@ const createScreenshotNode = async ({
   cache,
   createNode,
   createNodeId,
+  parentNodeId,
   createContentDigest,
 }) => {
   try {
@@ -135,6 +138,7 @@ const createScreenshotNode = async ({
         cache,
         createNode,
         createNodeId,
+        parentNodeId,
       })
       expires = screenshotResponse.data.expires