packages/gatsby-admin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-admin",
-  "version": "0.23.0",
+  "version": "0.23.1",
   "main": "index.js",
   "author": "Max Stoiber",
   "license": "MIT",
@@ -29,7 +29,7 @@
     "@typescript-eslint/parser": "^4.29.3",
     "csstype": "^2.6.14",
     "formik": "^2.2.6",
-    "gatsby": "^3.13.0",
+    "gatsby": "^3.13.1",
     "gatsby-interface": "^0.0.244",
     "gatsby-plugin-typescript": "^3.13.0",
     "gatsby-plugin-webfonts": "^1.1.4",

packages/gatsby-source-contentful/src/__tests__/extend-node-type.js

@@ -99,7 +99,7 @@ describe(`contentful extend node type`, () => {
     test(`keeps image format`, async () => {
       const result = await getBase64Image(imageProps)
       expect(result).toMatch(
-        `data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAECAMAAAC5ge+kAAAAllBMVEUAAABHl745rOE7tOc7tOcqMDkqMDkqMDkqMDnfzG9Pm7o7tOc7tOcqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDn4wF/eXWDtXGjtXGgqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDnbVmDpWGbtXGjtXGh1tTylAAAAMnRSTlMATd3gVSUjTCDgHRIscF+MeqB8qpqbk4ienYAxr+AeEipyZI9/aW+No4WJeWuuTdzgVnu3oiUAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQflCAUMNjFcK/NJAAAAMklEQVQI12NkBII/DCDA+htIsDEy/mBj4WDEBCwiyLwnIpyMjL/ZWASB7PMMMPAZTAIALlUHKTqI1/MAAAAASUVORK5CYII=`
+        `data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAECAMAAAC5ge+kAAAAllBMVEUAAABHl745rOE7tOc7tOcqMDkqMDkqMDkqMDnfzG9Pm7o7tOc7tOcqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDn4wF/eXWDtXGjtXGgqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDkqMDnbVmDpWGbtXGjtXGh1tTylAAAAMnRSTlMATd3gVSUjTCDgHRIscF+MeqB8qpqbk4ienYAxr+AeEipyZI9/aW+No4WJeWuuTdzgVnu3oiUAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQflCBQANxNx70pyAAAAMklEQVQI12NkBII/DCDA+htIsDEy/mBj4WDEBCwiyLwnIpyMjL/ZWASB7PMMMPAZTAIALlUHKTqI1/MAAAAASUVORK5CYII=`
       )
     })
     test(`uses given image format`, async () => {

packages/gatsby-source-drupal/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gatsby-source-drupal",
   "description": "Gatsby source plugin for building websites using the Drupal CMS as a data source",
-  "version": "4.13.0",
+  "version": "4.13.1",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"

packages/gatsby-source-drupal/src/__tests__/fixtures/1593545806.json

@@ -1,6 +1,11 @@
 {
   "timestamp": 1593545807,
   "entities": [
+    {
+      "action": "delete",
+      "id": "file-4",
+      "type": "file--file"
+    },
     {
       "jsonapi": {
         "version": "1.0",

packages/gatsby-source-drupal/src/__tests__/fixtures/article.json

@@ -43,6 +43,32 @@
             "id": "file-1"
           }
         },
+        "field_secondary_image": {
+          "data": [
+            {
+              "type": "file--file",
+              "id": "file-4"
+            }
+          ]
+        },
+        "field_secondary_multiple_image": {
+          "data": [
+            {
+              "type": "file--file",
+              "id": "file-3"
+            },
+            {
+              "type": "file--file",
+              "id": "file-4"
+            }
+          ]
+        },
+        "field_tertiary_image": {
+          "data": {
+            "type": "file--file",
+            "id": "file-4"
+          }
+        },
         "field_tags": {
           "data": null
         }

packages/gatsby-source-drupal/src/__tests__/index.js

@@ -32,6 +32,7 @@ describe(`gatsby-source-drupal`, () => {
   const { objectContaining } = expect
   const actions = {
     createNode: jest.fn(node => (nodes[node.id] = node)),
+    deleteNode: jest.fn(node => delete nodes[node.id]),
     setPluginStatus: jest.fn(),
     touchNode: jest.fn(),
   }
@@ -433,15 +434,22 @@ describe(`gatsby-source-drupal`, () => {
         const fastBuilds = true
         await sourceNodes(args, { baseUrl, fastBuilds })
       })
+
       it(`Attributes`, () => {
         expect(nodes[createNodeId(`und.article-3`)].title).toBe(`Article #3`)
       })
+
       it(`Relationships`, () => {
         expect(nodes[createNodeId(`und.article-3`)].relationships).toEqual({
           field_main_image___NODE: createNodeId(`und.file-1`),
           field_tags___NODE: [createNodeId(`und.tag-1`)],
         })
+        expect(
+          nodes[createNodeId(`und.article-2`)].relationships
+            .field_secondary_image___NODE
+        ).toEqual([createNodeId(`und.file-4`)])
       })
+
       it(`Back references`, () => {
         expect(
           nodes[createNodeId(`und.file-1`)].relationships[
@@ -473,17 +481,32 @@ describe(`gatsby-source-drupal`, () => {
         })
         await sourceNodes(args, { baseUrl, fastBuilds })
       })
+
       it(`Attributes`, () => {
         expect(nodes[createNodeId(`und.article-3`)].title).toBe(
           `Article #3 - Synced`
         )
       })
+
       it(`Relationships`, () => {
         // removed `field_main_image`, changed `field_tags`
         expect(nodes[createNodeId(`und.article-3`)].relationships).toEqual({
           field_tags___NODE: [createNodeId(`und.tag-2`)],
         })
+        expect(
+          nodes[createNodeId(`und.article-2`)].relationships
+            .field_secondary_image___NODE
+        ).toBe(undefined)
+        expect(
+          nodes[createNodeId(`und.article-2`)].relationships
+            .field_secondary_multiple_image___NODE.length
+        ).toBe(1)
+        expect(
+          nodes[createNodeId(`und.article-2`)].relationships
+            .field_tertiary_image___NODE_image___NODE
+        ).toBe(undefined)
       })
+
       it(`Back references`, () => {
         // removed `field_main_image`, `file-1` no longer has back reference to `article-3`
         expect(

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

@@ -14,7 +14,11 @@ const {
   isFileNode,
   createNodeIdWithVersion,
 } = require(`./normalize`)
-const { handleReferences, handleWebhookUpdate } = require(`./utils`)
+const {
+  handleReferences,
+  handleWebhookUpdate,
+  handleDeletedNode,
+} = require(`./utils`)
 
 const agent = {
   http: new HttpAgent(),
@@ -149,19 +153,15 @@ exports.sourceNodes = async (
         }
 
         for (const nodeToDelete of nodesToDelete) {
-          const nodeIdToDelete = createNodeId(
-            createNodeIdWithVersion(
-              nodeToDelete.id,
-              nodeToDelete.type,
-              getOptions().languageConfig
-                ? nodeToDelete.attributes?.langcode
-                : `und`,
-              nodeToDelete.attributes?.drupal_internal__revision_id,
-              entityReferenceRevisions
-            )
-          )
-          actions.deleteNode(getNode(nodeIdToDelete))
-          reporter.log(`Deleted node: ${nodeIdToDelete}`)
+          const deletedNode = await handleDeletedNode({
+            actions,
+            getNode,
+            node: nodeToDelete,
+            createNodeId,
+            createContentDigest,
+            entityReferenceRevisions,
+          })
+          reporter.log(`Deleted node: ${deletedNode.id}`)
         }
 
         changesActivity.end()
@@ -248,21 +248,14 @@ exports.sourceNodes = async (
         const nodesToSync = res.body.entities
         for (const nodeSyncData of nodesToSync) {
           if (nodeSyncData.action === `delete`) {
-            actions.deleteNode(
-              getNode(
-                createNodeId(
-                  createNodeIdWithVersion(
-                    nodeSyncData.id,
-                    nodeSyncData.type,
-                    getOptions().languageConfig
-                      ? nodeSyncData.attributes.langcode
-                      : `und`,
-                    nodeSyncData.attributes?.drupal_internal__revision_id,
-                    entityReferenceRevisions
-                  )
-                )
-              )
-            )
+            handleDeletedNode({
+              actions,
+              getNode,
+              node: nodeSyncData,
+              createNodeId,
+              createContentDigest,
+              entityReferenceRevisions,
+            })
           } else {
             // The data could be a single Drupal entity or an array of Drupal
             // entities to update.

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

@@ -110,6 +110,78 @@ const handleReferences = (
 
 exports.handleReferences = handleReferences
 
+const handleDeletedNode = async ({
+  actions,
+  node,
+  getNode,
+  createNodeId,
+  createContentDigest,
+  entityReferenceRevisions,
+}) => {
+  const deletedNode = getNode(
+    createNodeId(
+      createNodeIdWithVersion(
+        node.id,
+        node.type,
+        getOptions().languageConfig ? node.attributes.langcode : `und`,
+        node.attributes?.drupal_internal__revision_id,
+        entityReferenceRevisions
+      )
+    )
+  )
+
+  // Remove the deleted node from backRefsNamesLookup
+  backRefsNamesLookup.delete(deletedNode)
+
+  // Remove relationships from other nodes and re-create them.
+  Object.keys(deletedNode.relationships).forEach(key => {
+    let ids = deletedNode.relationships[key]
+    ids = [].concat(ids)
+    ids.forEach(id => {
+      const node = getNode(id)
+      let referencedNodes = referencedNodesLookup.get(node)
+      if (referencedNodes?.includes(deletedNode.id)) {
+        // Loop over relationships and cleanup references.
+        Object.entries(node.relationships).forEach(([key, value]) => {
+          // If a string ref matches, delete it.
+          if (_.isString(value) && value === deletedNode.id) {
+            delete node.relationships[key]
+          }
+
+          // If it's an array, filter, then check if the array is empty and then delete
+          // if so
+          if (_.isArray(value)) {
+            value = value.filter(v => v !== deletedNode.id)
+
+            if (value.length === 0) {
+              delete node.relationships[key]
+            } else {
+              node.relationships[key] = value
+            }
+          }
+        })
+
+        // Remove deleted node from array of referencedNodes
+        referencedNodes = referencedNodes.filter(nId => nId !== deletedNode.id)
+        referencedNodesLookup.set(node, referencedNodes)
+      }
+      // Recreate the referenced node with its now cleaned-up relationships.
+      if (node.internal.owner) {
+        delete node.internal.owner
+      }
+      if (node.fields) {
+        delete node.fields
+      }
+      node.internal.contentDigest = createContentDigest(node)
+      actions.createNode(node)
+    })
+  })
+
+  actions.deleteNode(deletedNode)
+
+  return deletedNode
+}
+
 const handleWebhookUpdate = async (
   {
     nodeToUpdate,
@@ -216,3 +288,4 @@ const handleWebhookUpdate = async (
 }
 
 exports.handleWebhookUpdate = handleWebhookUpdate
+exports.handleDeletedNode = handleDeletedNode

packages/gatsby/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gatsby",
   "description": "Blazing fast modern site generator for React",
-  "version": "3.13.0",
+  "version": "3.13.1",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bin": {
     "gatsby": "./cli.js"

packages/gatsby/src/utils/webpack-utils.ts

@@ -765,7 +765,7 @@ export const createWebpackUtils = (
     })
 
   plugins.moment = (): WebpackPluginInstance =>
-    plugins.ignore(/^\.\/locale$/, /moment$/)
+    plugins.ignore({ resourceRegExp: /^\.\/locale$/, contextRegExp: /moment$/ })
 
   plugins.extractStats = (): GatsbyWebpackStatsExtractor =>
     new GatsbyWebpackStatsExtractor()