From ce44f3796fd276a0cbca12a016996931cf8dc026 Mon Sep 17 00:00:00 2001 From: Tyler Barnes Date: Mon, 1 Mar 2021 07:46:51 -0800 Subject: [PATCH] fix(gatsby-source-wordpress): image fixes (#29813) Co-authored-by: Ward Peeters (cherry picked from commit 28124dd74b87902f9fa8cf3895ff8b4d54bc0fd6) --- .../transform-fields/transform-object.js | 2 +- .../create-nodes/create-remote-file-node/index.js | 3 +-- .../create-nodes/create-remote-media-item-node.js | 3 +++ .../src/steps/source-nodes/create-nodes/process-node.js | 6 +++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/gatsby-source-wordpress/src/steps/create-schema-customization/transform-fields/transform-object.js b/packages/gatsby-source-wordpress/src/steps/create-schema-customization/transform-fields/transform-object.js index cc33a60d30d3e..d3940964e6d26 100644 --- a/packages/gatsby-source-wordpress/src/steps/create-schema-customization/transform-fields/transform-object.js +++ b/packages/gatsby-source-wordpress/src/steps/create-schema-customization/transform-fields/transform-object.js @@ -54,7 +54,7 @@ export const buildGatsbyNodeObjectResolver = ({ field, fieldName }) => async ( schema: { typePrefix: prefix }, } = getPluginOptions() - if (!existingNode.__typename.startsWith(prefix)) { + if (existingNode?.__typename && !existingNode.__typename.startsWith(prefix)) { existingNode.__typename = buildTypeName(existingNode.__typename) } diff --git a/packages/gatsby-source-wordpress/src/steps/source-nodes/create-nodes/create-remote-file-node/index.js b/packages/gatsby-source-wordpress/src/steps/source-nodes/create-nodes/create-remote-file-node/index.js index 9272667adaba5..ee0b995c14b02 100644 --- a/packages/gatsby-source-wordpress/src/steps/source-nodes/create-nodes/create-remote-file-node/index.js +++ b/packages/gatsby-source-wordpress/src/steps/source-nodes/create-nodes/create-remote-file-node/index.js @@ -8,7 +8,6 @@ const { isWebUri } = require(`valid-url`) const Queue = require(`better-queue`) const readChunk = require(`read-chunk`) const fileType = require(`file-type`) -const { createProgress } = require(`gatsby-source-filesystem/utils`) const { createFileNode } = require(`gatsby-source-filesystem/create-file-node`) const { @@ -431,7 +430,7 @@ module.exports = ({ } if (totalJobs === 0) { - bar = createProgress(`Downloading remote files`, reporter) + bar = reporter.createProgress(`Downloading remote files`) bar.start() } diff --git a/packages/gatsby-source-wordpress/src/steps/source-nodes/create-nodes/create-remote-media-item-node.js b/packages/gatsby-source-wordpress/src/steps/source-nodes/create-nodes/create-remote-media-item-node.js index 2679398744024..f35af40b69efc 100644 --- a/packages/gatsby-source-wordpress/src/steps/source-nodes/create-nodes/create-remote-media-item-node.js +++ b/packages/gatsby-source-wordpress/src/steps/source-nodes/create-nodes/create-remote-media-item-node.js @@ -138,6 +138,9 @@ export const errorPanicker = ({ ) ) reporter.panic(error) + } else { + console.error(error) + reporter.panic() } } diff --git a/packages/gatsby-source-wordpress/src/steps/source-nodes/create-nodes/process-node.js b/packages/gatsby-source-wordpress/src/steps/source-nodes/create-nodes/process-node.js index f2cb23da72615..8ac48aa5fc9a1 100644 --- a/packages/gatsby-source-wordpress/src/steps/source-nodes/create-nodes/process-node.js +++ b/packages/gatsby-source-wordpress/src/steps/source-nodes/create-nodes/process-node.js @@ -827,7 +827,11 @@ const replaceNodeHtmlLinks = ({ wpUrl, nodeString, node }) => { const normalizedPath = path.replace(/\\/g, ``) // replace normalized match with relative path - const thisMatchRegex = new RegExp(normalizedMatch, `g`) + const thisMatchRegex = new RegExp( + normalizedMatch + `(?!/?wp-content|/?wp-admin|/?wp-includes)`, + `g` + ) + nodeString = nodeString.replace(thisMatchRegex, normalizedPath) } catch (e) { console.error(e)