From 8271ffc64473cb887666e57695f22af2b515ab5f Mon Sep 17 00:00:00 2001
From: Nick Balestra <nbalestra@opentable.com>
Date: Tue, 18 Oct 2016 23:08:53 +0100
Subject: [PATCH] fix(cycle-scripts-es-webpack): Test can now be written ine
 ES6 as well

ISSUES CLOSED: #14, #13
---
 cycle-scripts-es-webpack/scripts/configs/.babelrc  |  3 +++
 cycle-scripts-es-webpack/scripts/init.js           |  3 +++
 .../scripts/take-off-training-wheels.js            | 14 +++++++++++---
 cycle-scripts-es-webpack/template/src/app.test.js  |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 cycle-scripts-es-webpack/scripts/configs/.babelrc

diff --git a/cycle-scripts-es-webpack/scripts/configs/.babelrc b/cycle-scripts-es-webpack/scripts/configs/.babelrc
new file mode 100644
index 0000000..c13c5f6
--- /dev/null
+++ b/cycle-scripts-es-webpack/scripts/configs/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}
diff --git a/cycle-scripts-es-webpack/scripts/init.js b/cycle-scripts-es-webpack/scripts/init.js
index c15e0c9..21bda60 100644
--- a/cycle-scripts-es-webpack/scripts/init.js
+++ b/cycle-scripts-es-webpack/scripts/init.js
@@ -142,6 +142,9 @@ module.exports = function (appPath, appName, streamLib, verbose, originalDirecto
     'build': 'cycle-scripts build',
     'take-off-training-wheels': 'cycle-scripts take-off-training-wheels'
   }
+  appPackage.babel = {
+    'presets': ['es2015']
+  }
   fs.writeFileSync(
     appPackageJson,
     JSON.stringify(appPackage, null, 2)
diff --git a/cycle-scripts-es-webpack/scripts/take-off-training-wheels.js b/cycle-scripts-es-webpack/scripts/take-off-training-wheels.js
index 85b6cc8..1854b11 100644
--- a/cycle-scripts-es-webpack/scripts/take-off-training-wheels.js
+++ b/cycle-scripts-es-webpack/scripts/take-off-training-wheels.js
@@ -26,6 +26,9 @@ Object.keys(appPackageJson.devDependencies)
   })
 devDependencies = Object.assign({}, devDependencies, ownPackageJson.dependencies)
 
+// Delete babel config in package.json
+delete appPackageJson.babel
+
 // Write the new package.json
 var newPackageJson = Object.assign({}, appPackageJson, {scripts: scripts, devDependencies: devDependencies})
 fs.writeFileSync(
@@ -33,13 +36,18 @@ fs.writeFileSync(
   JSON.stringify(newPackageJson, null, 2)
 )
 
-// Copy scripts
 mkdirp(scriptsPath, function () {
-  function copy (script) {
-    fs.copySync(path.join(__dirname, script), path.join(scriptsPath, script))
+  function copy (script, subDir, inRoot) {
+    subDir = subDir || ''
+    fs.copySync(path.join(__dirname, subDir, script), path.join(inRoot ? '' : scriptsPath, script))
   }
 
+  // Copy scripts
   copy('start.js')
   copy('test.js')
   copy('build.js')
+
+  // Copy configs
+  copy('.babelrc', 'configs', true)
 })
+
diff --git a/cycle-scripts-es-webpack/template/src/app.test.js b/cycle-scripts-es-webpack/template/src/app.test.js
index 24916c1..6cc55ae 100644
--- a/cycle-scripts-es-webpack/template/src/app.test.js
+++ b/cycle-scripts-es-webpack/template/src/app.test.js
@@ -1,4 +1,4 @@
-var assert = require('assert')
+import assert from 'assert'
 
 describe('App', function () {
   it('should test something', function () {