fix(gatsby-source-wordpress): image fixes (#29813) (#29886)

Co-authored-by: Ward Peeters <ward@coding-tech.com> (cherry picked from commit 28124dd) Co-authored-by: Tyler Barnes <tyler@gatsbyjs.com> Co-authored-by: Vladimir Razuvaev <vladimir.razuvaev@gmail.com>
gatsbyjs · Mar 1, 2021 · c8bf571 · c8bf571
1 parent 85bb8ea
commit c8bf571
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/...urce-wordpress/src/steps/create-schema-customization/transform-fields/transform-object.js b/...urce-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/...sby-source-wordpress/src/steps/source-nodes/create-nodes/create-remote-file-node/index.js b/...sby-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/...sby-source-wordpress/src/steps/source-nodes/create-nodes/create-remote-media-item-node.js b/...sby-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
@@ -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)