[FEATURE] Added hydrate support for advanced Rendertron Setup

related pull request: GoogleChrome/rendertron#654
magento · Apr 9, 2021 · e388b5d · e388b5d
1 parent 9d5e9e9
commit e388b5d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/upward-js/lib/createUpwardServer.js b/packages/upward-js/lib/createUpwardServer.js
@@ -56,7 +56,8 @@ async function createUpwardServer({
                 excludeUrlPattern: new RegExp(
                     env.RENDERTRON_EXCLUDE_URL_PATTERN,
                     'i'
-                )
+                ),
+                timeout: 500
             })
         );
     }

diff --git a/packages/venia-concept/src/index.js b/packages/venia-concept/src/index.js
@@ -112,13 +112,15 @@ const apolloLink = ApolloLink.from([
     Adapter.apolloLink(apiBase)
 ]);
 
-ReactDOM.render(
+const rootElement = document.getElementById('root');
+const renderMethod = rootElement.hasChildNodes() ? 'hydrate' : 'render';
+ReactDOM[renderMethod](
     <Adapter apiBase={apiBase} apollo={{ link: apolloLink }} store={store}>
         <AppContextProvider>
             <App />
         </AppContextProvider>
     </Adapter>,
-    document.getElementById('root')
+    rootElement
 );
 
 registerSW();