fix(gatsby-transformer-remark): Don't produce invalid AST in TOC(#17080)

gatsbyjs · Sep 2, 2019 · 6ba39ad · 6ba39ad
1 parent 9aba647
commit 6ba39ad
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/packages/gatsby-transformer-remark/src/__tests__/__snapshots__/extend-node.js.snap b/packages/gatsby-transformer-remark/src/__tests__/__snapshots__/extend-node.js.snap
@@ -593,7 +593,14 @@ Object {
   "frontmatter": Object {
     "title": "my little pony",
   },
-  "tableOfContents": null,
+  "tableOfContents": "<ul>
+<li>
+<p></p>
+<ul>
+<li></li>
+</ul>
+</li>
+</ul>",
 }
 `;
 

diff --git a/packages/gatsby-transformer-remark/src/__tests__/extend-node.js b/packages/gatsby-transformer-remark/src/__tests__/extend-node.js
@@ -105,6 +105,10 @@ const bootstrapTest = (
         additionalParameters,
         pluginOptions,
       }).then(result => {
+        if (result.errors) {
+          done.fail(result.errors)
+        }
+
         try {
           test(result.data.listNode[0])
           done()
@@ -882,7 +886,6 @@ some other text
     node => {
       expect(node).toMatchSnapshot()
       expect(console.warn).toBeCalled()
-      expect(node.tableOfContents).toBe(null)
     }
   )
 

diff --git a/packages/gatsby-transformer-remark/src/extend-node-type.js b/packages/gatsby-transformer-remark/src/extend-node-type.js
@@ -294,7 +294,9 @@ module.exports = (
                 .replace(/\/\//g, `/`)
             }
             if (node.children) {
-              node.children = node.children.map(node => addSlugToUrl(node))
+              node.children = node.children
+                .map(node => addSlugToUrl(node))
+                .filter(Boolean)
             }
 
             return node