From 8b708e2efad6ec5088d824172e337c2a7750351d Mon Sep 17 00:00:00 2001
From: kingcody <me@codymize.com>
Date: Sat, 5 Sep 2015 03:58:40 -0400
Subject: [PATCH] feat(app): compile server with babel-runtime

---
 app/templates/Gruntfile.js    | 18 +++++++++++++++---
 app/templates/_package.json   |  3 ++-
 app/templates/server/app.js   |  3 ---
 app/templates/server/index.js |  9 +++++++--
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
index cac1f2618..15e544a5a 100644
--- a/app/templates/Gruntfile.js
+++ b/app/templates/Gruntfile.js
@@ -581,13 +581,13 @@ module.exports = function (grunt) {
           ext: '.js'
         }]
       }
-    },<% } if(filters.babel) { %>
+    },<% } %>
 
     // Compiles ES6 to JavaScript using Babel
     babel: {
       options: {
         sourceMap: true
-      },
+      },<% if(filters.babel) { %>
       client: {
         files: [{
           expand: true,
@@ -595,8 +595,19 @@ module.exports = function (grunt) {
           src: ['{app,components}/**/!(*.spec).js'],
           dest: '.tmp'
         }]
+      },<% } %>
+      server: {
+        options: {
+          optional: ['runtime']
+        },
+        files: [{
+          expand: true,
+          cwd: '<%%= yeoman.server %>',
+          src: ['**/*.{js,json}'],
+          dest: '<%%= yeoman.dist %>/<%%= yeoman.server %>'
+        }]
       }
-    },<% } if(filters.stylus) { %>
+    },<% if(filters.stylus) { %>
 
     // Compiles Stylus to CSS
     stylus: {
@@ -902,6 +913,7 @@ module.exports = function (grunt) {
     'concat',
     'ngAnnotate',
     'copy:dist',
+    'babel:server',
     'cdnify',
     'cssmin',
     'uglify',
diff --git a/app/templates/_package.json b/app/templates/_package.json
index 523dd7c53..cfecfbbd6 100644
--- a/app/templates/_package.json
+++ b/app/templates/_package.json
@@ -14,7 +14,7 @@
     "composable-middleware": "^0.3.0",
     "lodash": "^3.10.1",
     "lusca": "^1.3.0",
-    "babel-core": "^5.6.4",<% if (filters.jade) { %>
+    "babel-runtime": "^5.8.20",<% if (filters.jade) { %>
     "jade": "^1.11.0",<% } %><% if (filters.html) { %>
     "ejs": "^2.3.3",<% } %><% if (filters.mongoose) { %>
     "mongoose": "^4.1.2",
@@ -37,6 +37,7 @@
   },
   "devDependencies": {
     "autoprefixer": "^6.0.0",
+    "babel-core": "^5.6.4",
     "grunt": "~0.4.5",
     "grunt-wiredep": "^2.0.0",
     "grunt-concurrent": "^2.0.1",
diff --git a/app/templates/server/app.js b/app/templates/server/app.js
index 1b28cdb11..d6280f1e7 100644
--- a/app/templates/server/app.js
+++ b/app/templates/server/app.js
@@ -4,9 +4,6 @@
 
 'use strict';
 
-// Set default node environment to development
-process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-
 import express from 'express';<% if (filters.mongoose) { %>
 import mongoose from 'mongoose';<% } %><% if (filters.sequelize) { %>
 import sqldb from './sqldb';<% } %>
diff --git a/app/templates/server/index.js b/app/templates/server/index.js
index fc65cd5f4..7a1b65b99 100644
--- a/app/templates/server/index.js
+++ b/app/templates/server/index.js
@@ -1,7 +1,12 @@
 'use strict';
 
-// Register the Babel require hook
-require('babel-core/register');
+// Set default node environment to development
+var env = process.env.NODE_ENV = process.env.NODE_ENV || 'development';
+
+if (env === 'production' || env === 'test') {
+  // Register the Babel require hook
+  require('babel-core/register');
+}
 
 // Export the application
 exports = module.exports = require('./app');