Merge branch 'fix-components-missing-props' into next

tgallacher · Sep 2, 2019 · 6c0937e · 6c0937e
2 parents 78deb56 + 36289f0
commit 6c0937e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/__tests__/gatsby-ssr.test.js b/__tests__/gatsby-ssr.test.js
@@ -44,6 +44,7 @@ it('removes the generator <meta> tag', () => {
   let result;
   // mock component objects
   const initialHeadComponents = [
+    { type: 'meta' }, // no props
     { type: 'link', props: { href: '/#' } },
     {
       type: 'meta',
@@ -73,6 +74,7 @@ it('removes the version string from the generator <meta> tag', () => {
   };
   // mock component objects
   const initialHeadComponents = [
+    { type: 'meta' }, // no props
     { type: 'link', props: { href: '/#' } },
     {
       type: 'meta',

diff --git a/src/gatsby-ssr.js b/src/gatsby-ssr.js
@@ -14,13 +14,13 @@ exports.onPreRenderHTML = (
   const keepTag = removeVersionOnly || content != undefined;
   const headComponents = getHeadComponents()
     .map(c =>
-      isGeneratorTag(c.type, c.props.name)
+      isGeneratorTag(c.type, c.props ? c.props.name : '')
         ? Object.assign({}, c, {
             props: Object.assign({}, c.props, { content: content || 'Gatsby' }),
           })
         : c,
     )
-    .filter(({ type, props: { name, content } }) =>
+    .filter(({ type, props: { name, content } = {} }) =>
       keepTag ? true : !isGeneratorTag(type, name),
     );