react/client.js

@@ -22,7 +22,12 @@ const middleware = applyMiddleware(sagaMiddleware);
 const reduxMiddleware = window.__REDUX_DEVTOOLS_EXTENSION__ ? compose(middleware, window.__REDUX_DEVTOOLS_EXTENSION__()) : middleware;
 
 // create teh store
-let store = createStore(Reducer, preloadedState, reduxMiddleware);
+let store;
+if (preloadedState) {
+  store = createStore(Reducer, preloadedState, reduxMiddleware);
+} else {
+  store = createStore(Reducer, reduxMiddleware);
+}
 
 // run the saga middlweare
 sagaMiddleware.run(rootSaga);

webpack.config.js

@@ -36,24 +36,31 @@ module.exports = [
     },
   },
   {
-    target   : 'node',
+    target: 'node',
+    node  : {
+      __dirname: true,
+    },
     externals: nodeExternals(),
     entry    : ['./index.js'],
     output   : {
-      path      : __dirname,
-      publicPath: '',
-      filename  : 'server.js',
+      path    : Path.join(__dirname, 'build/'),
+      filename: 'server.js',
     },
     watch : true,
     module: {
-      loaders: [
+      rules: [
         {
-          loader : 'babel-loader',
+          test   : /.jsx?$/,
           exclude: /node_modules/,
-          query  : {
+          loader : 'babel-loader',
+          options: {
             presets: ['es2015'],
           },
         },
+        {
+          test  : /.css$/,
+          loader: 'css-loader',
+        },
       ],
     },
     resolve: {
@@ -61,7 +68,7 @@ module.exports = [
         'node_modules',
         __dirname,
       ],
-      extensions: ['.js'],
+      extensions: ['.js', '.json', '.jsx', '.css'],
     },
   },
 ];