Merge pull request #500 from kairyou/master

client-side: don't fetch data for initial route

Author: bertho-zero

src/client.js

@@ -86,7 +86,14 @@ initSocket();
       location: history.location
     };
 
-    await trigger('fetch', components, triggerLocals);
+    // Don't fetch data for initial route, server has already done the work:
+    if (window.__PRELOADED__) {
+      // Delete initial data so that subsequent data fetches can occur:
+      delete window.__PRELOADED__;
+    } else {
+      // Fetch mandatory data dependencies for 2nd route change onwards:
+      await trigger('fetch', components, triggerLocals);
+    }
     await trigger('defer', components, triggerLocals);
 
     ReactDOM.hydrate(

src/helpers/Html.js

@@ -59,7 +59,9 @@ const Html = ({
         <div id="content" dangerouslySetInnerHTML={{ __html: content }} />
         {store && (
           <script
-            dangerouslySetInnerHTML={{ __html: `window.__data=${serialize(store.getState())};` }}
+            dangerouslySetInnerHTML={{
+              __html: `window.__PRELOADED__=true;window.__data=${serialize(store.getState())};`
+            }}
             charSet="UTF-8"
           />
         )}