Merge remote-tracking branch 'upstream/master'

Author: arfianadam

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/components/ReduxAsyncConnect/ReduxAsyncConnect.js

@@ -10,7 +10,10 @@ class ReduxAsyncConnect extends Component {
   static propTypes = {
     children: PropTypes.node.isRequired,
     history: PropTypes.objectOf(PropTypes.any).isRequired,
-    location: PropTypes.objectOf(PropTypes.any).isRequired
+    location: PropTypes.objectOf(PropTypes.any).isRequired,
+    routes: PropTypes.arrayOf(PropTypes.object).isRequired,
+    store: PropTypes.objectOf(PropTypes.any).isRequired,
+    helpers: PropTypes.objectOf(PropTypes.any).isRequired
   };
 
   state = {
@@ -25,7 +28,10 @@ class ReduxAsyncConnect extends Component {
     const {
       history, location, routes, store, helpers
     } = this.props;
-    const navigated = nextProps.location !== location;
+    const {
+      location: { pathname, search }
+    } = nextProps;
+    const navigated = `${pathname}${search}` !== `${location.pathname}${location.search}`;
 
     if (navigated) {
       // save the location so we can render the old screen

src/containers/About/About.js

@@ -4,6 +4,7 @@ import { provideHooks } from 'redial';
 import MiniInfoBar from 'components/MiniInfoBar/MiniInfoBar';
 import { isLoaded as isInfoLoaded, load as loadInfo } from 'redux/modules/info';
 
+/* eslint-disable max-len */
 @provideHooks({
   fetch: ({ store: { dispatch, getState } }) => !isInfoLoaded(getState()) ? dispatch(loadInfo()).catch(() => null) : Promise.resolve()
 })

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"
           />
         )}

src/redux/create.js

@@ -46,7 +46,8 @@ export default function createStore({
 
   if (__CLIENT__ && __DEVTOOLS__) {
     const { persistState } = require('redux-devtools');
-    const DevTools = require('../containers/DevTools/DevTools');
+    let DevTools = require('../containers/DevTools/DevTools');
+    DevTools = DevTools.__esModule ? DevTools.default : DevTools;
 
     Array.prototype.push.apply(enhancers, [
       window.devToolsExtension ? window.devToolsExtension() : DevTools.instrument(),

webpack/dev.config.js

@@ -128,6 +128,9 @@ const webpackConfig = {
     // new webpack.LoaderOptionsPlugin({
     // }),
 
+    /* wepack build status - show webpack build progress in terminal */
+    new webpack.ProgressPlugin(),
+
     // hot reload
     new webpack.HotModuleReplacementPlugin(),
 

webpack/prod.config.js

@@ -169,6 +169,9 @@ module.exports = {
     extensions: ['.json', '.js', '.jsx']
   },
   plugins: [
+    /* wepack build status - show webpack build progress in terminal */
+    new webpack.ProgressPlugin(),
+
     new CleanPlugin([assetsPath], { root: projectRootPath }),
 
     // css files from the extract-text-plugin loader