update universal-redux-server to babel6 and es6

.eslintrc

@@ -28,7 +28,7 @@
   "settings": {
     "import/parser": "babel-eslint",
     "import/resolve": {
-      moduleDirectory: ["node_modules", "node_modules/universal-redux/node-modules", "src"]
+      moduleDirectory: ["node_modules", "node_modules/universal-redux/node_modules", "src"]
     }
   },
   "globals": {

bin/build.js

@@ -1,6 +1,4 @@
 #!/usr/bin/env node
-// require('../server.babel'); // babel registration (runtime transpilation for node)
-
 var webpack = require('webpack');
 var webpackConfig = require('./merge-configs');
 var fs = require('fs');

bin/local-dev.sh

@@ -29,7 +29,6 @@ compile() {
   cp $ROOT_DIR/config/* $PROJECT_PATH/node_modules/universal-redux/config/ > /dev/null
   cp $ROOT_DIR/.babelrc $PROJECT_PATH/node_modules/universal-redux
   cp $ROOT_DIR/.eslintrc $PROJECT_PATH/node_modules/universal-redux
-  cp $ROOT_DIR/server.babel.js $PROJECT_PATH/node_modules/universal-redux
   babel $ROOT_DIR/src/ --presets es2015,stage-0,react --plugins transform-runtime --out-dir $PROJECT_PATH/node_modules/universal-redux/lib > /dev/null
   echo Update complete, continuing to watch...
 }

bin/server.js

@@ -1,25 +1,3 @@
 #!/usr/bin/env node
-// require('../server.babel'); // babel registration (runtime transpilation for node)
-
-var path = require('path');
-var renderer = require('../lib/server');
-var config = require(path.resolve('config/universal-redux.config.js'));
-
-// TODO: why does this script execute twice, once before requires are resolved??
-if(renderer.app) {
-
-  // method 1
-  renderer.setup(config);
-  renderer.start();
-
-  // method 2
-  // renderer.setup(config);
-  // renderer.start();
-
-  // method 3
-  // renderer.configure(config);
-  // renderer.setup();
-  // renderer.start();
-} else {
-  console.log('Renderer not found.');
-}
+require('./transpile'); // babel registration (runtime transpilation for node)
+require('./server_es6.js');

bin/server_es6.js

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+const path = require('path');
+const renderer = require('../lib/server').default;
+const config = require(path.resolve('config/universal-redux.config.js'));
+
+// method 1
+renderer.setup(config);
+renderer.start();
+
+// method 2
+// renderer.setup(config);
+// renderer.start();
+
+// method 3
+// renderer.configure(config);
+// renderer.setup();
+// renderer.start();

server.babel.js → bin/transpile.js

@@ -3,13 +3,13 @@
 var fs = require('fs');
 var path = require('path');
 
-var babelrc = fs.readFileSync(path.resolve(__dirname, './.babelrc'));
+var babelrc = fs.readFileSync(path.resolve(__dirname, '../.babelrc'));
 var config;
 
 try {
   config = JSON.parse(babelrc);
 } catch (err) {
-  console.error('==>     ERROR: Error parsing your .babelrc.');
+  console.error('==>     ERROR: Error parsing your babelrc');
   console.error(err);
 }
 

bin/webpack-dev-server.js

@@ -1,6 +1,4 @@
 #!/usr/bin/env node
-// require('../server.babel'); // babel registration (runtime transpilation for node)
-
 var path = require('path');
 var Express = require('express');
 var webpack = require('webpack');