From bbd0f7666e454a6c98a9d3123a8128ca5be52d3b Mon Sep 17 00:00:00 2001
From: Chris <cs@weblogixx.de>
Date: Tue, 17 Nov 2015 07:39:34 +0100
Subject: [PATCH] Updated babel to 6.0

---
 .babelrc      |  6 ++++++
 CHANGELOG.md  | 10 ++++++++++
 cfg/test.js   | 17 +++++++++--------
 karma.conf.js |  7 +++++--
 package.json  |  8 +++++---
 5 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 .babelrc

diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..bd20dc1
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    "es2015",
+    "react"
+  ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3bc4b4..7355d24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # react-webpack-template - Changelog
 
+## 1.0.0:
+___Upgrades___:
+1. Updated to babel core version (6.0.x)
+2. Replaced isparta-loader with the more current (and better maintained) isparta-instrumenter-loader.
+
+## 0.3.2:
+___Features___:
+1. Added support for bower components in webpack
+2. Added coverage reporting via karma-coverage
+
 ## 0.3.1:
 ___Upgrades___:
 1. Added bugfix for tests in watch mode (could be overridden by config)
diff --git a/cfg/test.js b/cfg/test.js
index 9090627..b8540ce 100644
--- a/cfg/test.js
+++ b/cfg/test.js
@@ -7,6 +7,15 @@ var BowerWebpackPlugin = require('bower-webpack-plugin');
 module.exports = {
   devtool: 'eval',
   module: {
+    preLoaders: [
+      {
+        test: /\.(js|jsx)$/,
+        loader: 'isparta-instrumenter-loader',
+        include: [
+          path.join(__dirname, '/../src')
+        ]
+      }
+    ],
     loaders: [
       {
         test: /\.(png|jpg|gif|woff|woff2|css|sass|scss|less|styl)$/,
@@ -19,14 +28,6 @@ module.exports = {
           path.join(__dirname, '/../src'),
           path.join(__dirname, '/../test')
         ]
-      },
-      {
-        test: /\.(js|jsx)$/,
-        loader: 'babel-loader',
-        include: [
-          path.join(__dirname, '/../src')
-        ],
-        loader: 'isparta'
       }
     ]
   },
diff --git a/karma.conf.js b/karma.conf.js
index f9ba063..38365c6 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -23,8 +23,11 @@ module.exports = function(config) {
       noInfo: true
     },
     coverageReporter: {
-      type: 'html',
-      dir: 'coverage/'
+      dir: 'coverage/',
+      reporters: [
+        { type: 'html' },
+        { type: 'text' }
+      ]
     }
   });
 };
diff --git a/package.json b/package.json
index 5e931bf..3f1f086 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,10 @@
   },
   "homepage": "https://github.com/weblogixx/react-webpack-template#readme",
   "devDependencies": {
-    "babel-core": "^5.8.22",
-    "babel-loader": "^5.3.2",
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-preset-es2015": "^6.0.15",
+    "babel-preset-react": "^6.0.15",
     "bower-webpack-plugin": "^0.1.9",
     "chai": "^3.2.0",
     "copyfiles": "^0.2.1",
@@ -47,7 +49,7 @@
     "eslint-plugin-react": "^3.3.0",
     "file-loader": "^0.8.4",
     "glob": "^5.0.15",
-    "isparta-loader": "^1.0.0",
+    "isparta-instrumenter-loader": "^0.2.2",
     "karma": "^0.13.9",
     "karma-chai": "^0.1.0",
     "karma-coverage": "^0.5.3",