From 00c7a01524e33c9a96c960b68ef18fc561b24706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krist=C3=B3f=20Poduszl=C3=B3?= <kripod@protonmail.com>
Date: Fri, 19 Jan 2018 19:14:19 +0100
Subject: [PATCH 1/2] Fix images disappearing from rendered markdown files

Fixes #3608
---
 packages/gatsby-remark-images/src/index.js | 37 ++++++++++++----------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/packages/gatsby-remark-images/src/index.js b/packages/gatsby-remark-images/src/index.js
index 2384553001b01..af68e330876b6 100644
--- a/packages/gatsby-remark-images/src/index.js
+++ b/packages/gatsby-remark-images/src/index.js
@@ -85,19 +85,19 @@ module.exports = (
     class="gatsby-resp-image-wrapper"
     style="position: relative; display: block; ${
       options.wrapperStyle
-    }; max-width: ${presentationWidth}px; margin-left: auto; margin-right: auto;"
+      }; max-width: ${presentationWidth}px; margin-left: auto; margin-right: auto;"
   >
     <span
       class="gatsby-resp-image-background-image"
       style="padding-bottom: ${ratio}; position: relative; bottom: 0; left: 0; background-image: url('${
       responsiveSizesResult.base64
-    }'); background-size: cover; display: block;"
+      }'); background-size: cover; display: block;"
     >
       <img
         class="gatsby-resp-image-image"
         style="width: 100%; height: 100%; margin: 0; vertical-align: middle; position: absolute; top: 0; left: 0; box-shadow: inset 0px 0px 0px 400px ${
-          options.backgroundColor
-        };"
+      options.backgroundColor
+      };"
         alt="${node.alt ? node.alt : defaultAlt}"
         title="${node.title ? node.title : ``}"
         src="${fallbackSrc}"
@@ -141,14 +141,16 @@ module.exports = (
             fileType !== `svg`
           ) {
             const rawHTML = await generateImagesAndUpdateNode(node, resolve)
-            // Replace the image node with an inline HTML node.
-            node.type = `html`
-            node.value = rawHTML
-            return resolve(node)
-          } else {
-            // Image isn't relative so there's nothing for us to do.
-            return resolve()
+
+            if (rawHTML != null) {
+              // Replace the image node with an inline HTML node.
+              node.type = `html`
+              node.value = rawHTML
+            }
           }
+
+          // Image isn't relative so there's nothing for us to do.
+          return resolve()
         })
     )
   ).then(markdownImageNodes =>
@@ -197,11 +199,14 @@ module.exports = (
                   formattedImgTag,
                   resolve
                 )
-                // Replace the image string
-                thisImg.replaceWith(rawHTML)
-              } else {
-                return resolve()
+
+                if (rawHTML != null) {
+                  // Replace the image string
+                  thisImg.replaceWith(rawHTML)
+                }
               }
+
+              return resolve()
             }
 
             // Replace the image node with an inline HTML node.
@@ -213,6 +218,6 @@ module.exports = (
       )
     ).then(htmlImageNodes =>
       markdownImageNodes.concat(htmlImageNodes).filter(node => !!node)
+      )
     )
-  )
 }

From c332a76124ae17b71224681940af37bca24e53c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krist=C3=B3f=20Poduszl=C3=B3?= <kripod@protonmail.com>
Date: Fri, 19 Jan 2018 19:23:19 +0100
Subject: [PATCH 2/2] Revert invalid indentation changes

---
 packages/gatsby-remark-images/src/index.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/gatsby-remark-images/src/index.js b/packages/gatsby-remark-images/src/index.js
index af68e330876b6..3dfe2dceee606 100644
--- a/packages/gatsby-remark-images/src/index.js
+++ b/packages/gatsby-remark-images/src/index.js
@@ -85,19 +85,19 @@ module.exports = (
     class="gatsby-resp-image-wrapper"
     style="position: relative; display: block; ${
       options.wrapperStyle
-      }; max-width: ${presentationWidth}px; margin-left: auto; margin-right: auto;"
+    }; max-width: ${presentationWidth}px; margin-left: auto; margin-right: auto;"
   >
     <span
       class="gatsby-resp-image-background-image"
       style="padding-bottom: ${ratio}; position: relative; bottom: 0; left: 0; background-image: url('${
       responsiveSizesResult.base64
-      }'); background-size: cover; display: block;"
+    }'); background-size: cover; display: block;"
     >
       <img
         class="gatsby-resp-image-image"
         style="width: 100%; height: 100%; margin: 0; vertical-align: middle; position: absolute; top: 0; left: 0; box-shadow: inset 0px 0px 0px 400px ${
-      options.backgroundColor
-      };"
+          options.backgroundColor
+        };"
         alt="${node.alt ? node.alt : defaultAlt}"
         title="${node.title ? node.title : ``}"
         src="${fallbackSrc}"
@@ -218,6 +218,6 @@ module.exports = (
       )
     ).then(htmlImageNodes =>
       markdownImageNodes.concat(htmlImageNodes).filter(node => !!node)
-      )
     )
+  )
 }