make sure to flush styles and head (#459)

vercel · Dec 21, 2016 · fe962b1 · fe962b1
1 parent 4faa281
commit fe962b1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/server/document.js b/server/document.js
@@ -6,12 +6,18 @@ import flush from 'styled-jsx/server'
 export default class Document extends Component {
   static getInitialProps ({ renderPage }) {
     let head
-    const { html, css, ids } = renderStatic(() => {
-      const page = renderPage()
-      head = page.head
-      return page.html
-    })
-    const styles = flush()
+    let rendered
+    let styles
+    try {
+      rendered = renderStatic(() => {
+        const page = renderPage()
+        head = page.head
+        return page.html
+      })
+    } finally {
+      styles = flush()
+    }
+    const { html, css, ids } = rendered
     const nextCSS = { css, ids, styles }
     return { html, head, nextCSS }
   }

diff --git a/server/render.js b/server/render.js
@@ -62,8 +62,15 @@ async function doRender (req, res, pathname, query, {
       router: new Router(pathname, query)
     })
 
-    const html = (staticMarkup ? renderToStaticMarkup : renderToString)(app)
-    const head = Head.rewind() || defaultHead()
+    const render = staticMarkup ? renderToStaticMarkup : renderToString
+
+    let html
+    let head
+    try {
+      html = render(app)
+    } finally {
+      head = Head.rewind() || defaultHead()
+    }
     return { html, head }
   }