fix(gatsby-plugin-contentful): wait for contentTypes to be created) (#22307)

* fix(gatsby-plugin-contentful): wait for contentTypes to be created)

* add comments

Author: wardpeet

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

@@ -216,35 +216,45 @@ exports.sourceNodes = async (
       }
     })
 
-  contentTypeItems.forEach((contentTypeItem, i) => {
-    normalize.createNodesForContentType({
-      contentTypeItem,
-      contentTypeItems,
-      restrictedNodeFields,
-      conflictFieldPrefix,
-      entries: entryList[i],
-      createNode,
-      createNodeId,
-      resolvable,
-      foreignReferenceMap,
-      defaultLocale,
-      locales,
-      space,
-      useNameForId: pluginConfig.get(`useNameForId`),
-      richTextOptions: pluginConfig.get(`richText`),
-    })
-  })
+  for (let i = 0; i < contentTypeItems.length; i++) {
+    const contentTypeItem = contentTypeItems[i]
+
+    // A contentType can hold lots of entries which create nodes
+    // We wait until all nodes are created and processed until we handle the next one
+    // TODO add batching in gatsby-core
+    await Promise.all(
+      normalize.createNodesForContentType({
+        contentTypeItem,
+        contentTypeItems,
+        restrictedNodeFields,
+        conflictFieldPrefix,
+        entries: entryList[i],
+        createNode,
+        createNodeId,
+        resolvable,
+        foreignReferenceMap,
+        defaultLocale,
+        locales,
+        space,
+        useNameForId: pluginConfig.get(`useNameForId`),
+        richTextOptions: pluginConfig.get(`richText`),
+      })
+    )
+  }
 
-  assets.forEach(assetItem => {
-    normalize.createAssetNodes({
-      assetItem,
-      createNode,
-      createNodeId,
-      defaultLocale,
-      locales,
-      space,
-    })
-  })
+  for (let i = 0; i < assets.length; i++) {
+    // We wait for each asset to be process until handling the next one.
+    await Promise.all(
+      normalize.createAssetNodes({
+        assetItem: assets[i],
+        createNode,
+        createNodeId,
+        defaultLocale,
+        locales,
+        space,
+      })
+    )
+  }
 
   if (pluginConfig.get(`downloadLocal`)) {
     await downloadContentfulAssets({

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

@@ -307,6 +307,7 @@ exports.createNodesForContentType = ({
     contentTypeItemId = contentTypeItem.sys.id
   }
 
+  const createNodePromises = []
   locales.forEach(locale => {
     const localesFallback = buildFallbackChain(locales)
     const mId = makeMakeId({
@@ -584,14 +585,16 @@ exports.createNodesForContentType = ({
 
     contentTypeNode.internal.contentDigest = contentDigest
 
-    createNode(contentTypeNode)
+    createNodePromises.push(createNode(contentTypeNode))
     entryNodes.forEach(entryNode => {
-      createNode(entryNode)
+      createNodePromises.push(createNode(entryNode))
     })
     childrenNodes.forEach(entryNode => {
-      createNode(entryNode)
+      createNodePromises.push(createNode(entryNode))
     })
   })
+
+  return createNodePromises
 }
 
 exports.createAssetNodes = ({
@@ -602,6 +605,7 @@ exports.createAssetNodes = ({
   locales,
   space,
 }) => {
+  const createNodePromises = []
   locales.forEach(locale => {
     const localesFallback = buildFallbackChain(locales)
     const mId = makeMakeId({
@@ -614,27 +618,16 @@ exports.createAssetNodes = ({
       localesFallback,
     })
 
-    const localizedAsset = { ...assetItem }
-    // Create a node for each asset. They may be referenced by Entries
-    //
-    // Get localized fields.
-    localizedAsset.fields = {
-      file: localizedAsset.fields.file
-        ? getField(localizedAsset.fields.file)
-        : null,
-      title: localizedAsset.fields.title
-        ? getField(localizedAsset.fields.title)
-        : ``,
-      description: localizedAsset.fields.description
-        ? getField(localizedAsset.fields.description)
-        : ``,
-    }
     const assetNode = {
-      contentful_id: localizedAsset.sys.contentful_id,
-      id: mId(space.sys.id, localizedAsset.sys.id),
+      contentful_id: assetItem.sys.contentful_id,
+      id: mId(space.sys.id, assetItem.sys.id),
       parent: null,
       children: [],
-      ...localizedAsset.fields,
+      file: assetItem.fields.file ? getField(assetItem.fields.file) : null,
+      title: assetItem.fields.title ? getField(assetItem.fields.title) : ``,
+      description: assetItem.fields.description
+        ? getField(assetItem.fields.description)
+        : ``,
       node_locale: locale.code,
       internal: {
         type: `${makeTypeName(`Asset`)}`,
@@ -646,6 +639,8 @@ exports.createAssetNodes = ({
 
     assetNode.internal.contentDigest = contentDigest
 
-    createNode(assetNode)
+    createNodePromises.push(createNode(assetNode))
   })
+
+  return createNodePromises
 }