public/bundle/bundle.js

@@ -15717,8 +15717,10 @@ var reduxMiddleware = window.__REDUX_DEVTOOLS_EXTENSION__ ? (0, _redux.compose)(
 // create teh store
 var store = void 0;
 if (preloadedState) {
+  console.log('initial load: preloaded state found');
   store = (0, _redux.createStore)(_reducers2.default, preloadedState, reduxMiddleware);
 } else {
+  console.log('initial load: no preloaded state found');
   store = (0, _redux.createStore)(_reducers2.default, reduxMiddleware);
 }
 

react/client.js

@@ -24,8 +24,10 @@ const reduxMiddleware = window.__REDUX_DEVTOOLS_EXTENSION__ ? compose(middleware
 // create teh store
 let store;
 if (preloadedState) {
+  console.log('initial load: preloaded state found');
   store = createStore(Reducer, preloadedState, reduxMiddleware);
 } else {
+  console.log('initial load: no preloaded state found');
   store = createStore(Reducer, reduxMiddleware);
 }
 

webpack.config.js

@@ -5,46 +5,44 @@ const REACT_ROOT = Path.resolve(__dirname, 'react/');
 console.log('REACT_ROOT:', REACT_ROOT);
 
 module.exports = [
+  // {
+  //   target: 'web',
+  //   entry : ['babel-polyfill', 'whatwg-fetch', './react/client.js'],
+  //   output: {
+  //     path      : Path.join(__dirname, 'public/bundle/'),
+  //     publicPath: 'public/bundle/',
+  //     filename  : 'bundle.js',
+  //   },
+  //   watch : true,
+  //   module: {
+  //     loaders: [
+  //       {
+  //         test   : /.jsx?$/,
+  //         loader : 'babel-loader',
+  //         exclude: /node_modules/,
+  //         query  : {
+  //           presets: ['es2015', 'react', 'stage-2'],
+  //         },
+  //       },
+  //     ],
+  //   },
+  //   resolve: {
+  //     modules: [
+  //       REACT_ROOT,
+  //       'node_modules',
+  //       __dirname,
+  //     ],
+  //     extensions: ['.js', '.jsx', '.scss'],
+  //   },
+  // },
   {
-    target: 'web',
+    target   : 'node',
-    entry : ['babel-polyfill', 'whatwg-fetch', './react/client.js'],
+    externals: [nodeExternals()],
-    output: {
+    entry    : ['./server.js'],
-      path      : Path.join(__dirname, 'public/bundle/'),
-      publicPath: 'public/bundle/',
-      filename  : 'bundle.js',
-    },
-    watch : true,
-    module: {
-      loaders: [
-        {
-          test   : /.jsx?$/,
-          loader : 'babel-loader',
-          exclude: /node_modules/,
-          query  : {
-            presets: ['es2015', 'react', 'stage-2'],
-          },
-        },
-      ],
-    },
-    resolve: {
-      modules: [
-        REACT_ROOT,
-        'node_modules',
-        __dirname,
-      ],
-      extensions: ['.js', '.jsx', '.scss'],
-    },
-  },
-  {
-    target: 'node',
-    node  : {
-      __dirname: true,
-    },
-    externals: nodeExternals(),
-    entry    : ['./index.js'],
     output   : {
-      path    : Path.join(__dirname, 'build/'),
+      path      : Path.resolve(__dirname),
-      filename: 'server.js',
+      publicPath: '/',
+      filename  : 'serverBundle.js',
     },
     watch : true,
     module: {
@@ -54,7 +52,7 @@ module.exports = [
           exclude: /node_modules/,
           loader : 'babel-loader',
           options: {
-            presets: ['es2015'],
+            presets: ['es2015',  'react', 'stage-2'],
           },
         },
         {
@@ -65,6 +63,7 @@ module.exports = [
     },
     resolve: {
       modules: [
+        REACT_ROOT,
         'node_modules',
         __dirname,
       ],