From 545562bf0de7fc2f8d08780c39d3dc3fc2c2a465 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Wed, 8 Jul 2020 18:47:06 +0300
Subject: [PATCH] Fix styled SSR for pages not requiring secondPassRenderResult

---
 src/server/index.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/server/index.ts b/src/server/index.ts
index 30a22ea..652f45c 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -40,11 +40,16 @@ server.get("*", async (req, res) => {
     resolutions: {}, promises: {},
   };
 
-  const firstPassRenderResult = renderToString(React.createElement(App, { url: req.url, context }));
-
   // Styled-components Step 1: Create an instance of ServerStyleSheet
   const sheet = new ServerStyleSheet();
 
+  // Styled-components Step 2: Retrieve styles from components in the page
+  const firstPassRenderResult = renderToString(
+    sheet.collectStyles(
+      React.createElement(App, { url: req.url, context })
+    )
+  );
+
   const promiseKeys = Object.keys(context.promises);
   let result: string;
   if (promiseKeys.length === 0) {