From dd82a43599370c5f220515573eb1f178fe176629 Mon Sep 17 00:00:00 2001
From: Buck DeFore <bdefore@gmail.com>
Date: Tue, 22 Dec 2015 06:59:53 -0800
Subject: [PATCH] update universal-redux-server to babel6 and es6

---
 .eslintrc                           |  2 +-
 bin/build.js                        |  2 --
 bin/local-dev.sh                    |  1 -
 bin/server.js                       | 26 ++------------------------
 bin/server_es6.js                   | 17 +++++++++++++++++
 server.babel.js => bin/transpile.js |  4 ++--
 bin/webpack-dev-server.js           |  2 --
 7 files changed, 22 insertions(+), 32 deletions(-)
 create mode 100644 bin/server_es6.js
 rename server.babel.js => bin/transpile.js (64%)
 mode change 100755 => 100644

diff --git a/.eslintrc b/.eslintrc
index d71b1cc..9f20716 100644
--- a/.eslintrc
+++ b/.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": {
diff --git a/bin/build.js b/bin/build.js
index 3697e8b..b2774da 100755
--- a/bin/build.js
+++ b/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');
diff --git a/bin/local-dev.sh b/bin/local-dev.sh
index bf5e970..164f7b2 100755
--- a/bin/local-dev.sh
+++ b/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...
 }
diff --git a/bin/server.js b/bin/server.js
index b2dcf23..49ff059 100755
--- a/bin/server.js
+++ b/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');
diff --git a/bin/server_es6.js b/bin/server_es6.js
new file mode 100644
index 0000000..ea537bf
--- /dev/null
+++ b/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();
diff --git a/server.babel.js b/bin/transpile.js
old mode 100755
new mode 100644
similarity index 64%
rename from server.babel.js
rename to bin/transpile.js
index eea98e5..1f409f4
--- a/server.babel.js
+++ b/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);
 }
 
diff --git a/bin/webpack-dev-server.js b/bin/webpack-dev-server.js
index 48d5f9e..2ec1037 100755
--- a/bin/webpack-dev-server.js
+++ b/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');