1.0.0

Fix override order for base.js and dev.js / dist.js

.babelrc

@@ -0,0 +1,6 @@
+{
+  "presets": [
+    "es2015",
+    "react"
+  ]
+}

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)

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'
       }
     ]
   },

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' }
+      ]
     }
   });
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-webpack-template",
-  "version": "0.3.2",
+  "version": "1.0.0",
   "description": "A base skeleton template for react and webpack without task runners",
   "main": "server.js",
   "scripts": {
@@ -36,8 +36,10 @@
   },
   "homepage": "https://github.com/weblogixx/react-webpack-template#readme",
   "devDependencies": {
-    "babel-core": "^5.8.22",
+    "babel-core": "^6.0.0",
-    "babel-loader": "^5.3.2",
+    "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",