1.3.1

Moved run script to root of src folder

.babelrc

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

.eslintrc

@@ -1,4 +1,5 @@
 {
+  "parser": "babel-eslint",
   "plugins": [
     "react"
   ],
@@ -23,6 +24,7 @@
     "no-unused-vars": 1,
     "no-trailing-spaces": [1, { "skipBlankLines": true }],
     "no-unreachable": 1,
-    "no-alert": 0
+    "no-alert": 0,
+    "react/jsx-uses-react": 1
   }
 }

.gitignore

@@ -25,3 +25,6 @@ build/Release
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
+
+# Bower
+bower_components/

.travis.yml

@@ -0,0 +1,6 @@
+language: node_js
+node_js:
+  - '4.1.0'
+before_install:
+  - currentfolder=${PWD##*/}
+  - if [ "$currentfolder" != 'react-webpack-template' ]; then cd .. && eval "mv $currentfolder react-webpack-template" && cd react-webpack-template; fi

CHANGELOG.md

@@ -0,0 +1,79 @@
+# react-webpack-template - Changelog
+
+## 1.3.1:
+
+1. Removed karma-phantomjs-shim (with PhantomJS 2 there is no need for shims anymore)
+
+## 1.3.0:
+
+1. Updated phantomjs to 2.0
+
+## 1.2.1:
+
+1. Updated lodash to latest stable version
+2. Cleaned up formatting of unittests
+
+## 1.2.0:
+
+1. Updated core-js to new 2.0 stable
+2. Moved lodash and react-addons-testutils to devDependencies (provided by [harunhasdal](https://github.com/harunhasdal))
+3. Moved run component from ```src/components/run.js``` to ```src/index.js``` (provided by [stylesuxx](https://github.com/stylesuxx))
+
+## 1.1.0:
+
+1. Added support for easier webpack include management (can now be set via cfg/base.js, see README.md)
+
+## 1.0.3:
+
+1. Support for config independent settings in ```src/config/base.js``` (provided by [sthzg](https://github.com/sthzg))
+2. Fixed eslint loader path (provided by [HelloYie](https://github.com/HelloYie))
+3. Added support for babel-eslint (as suggested in https://github.com/newtriks/generator-react-webpack/issues/173)
+
+## 1.0.2:
+
+1. Added babel-eslint (as suggested in https://github.com/newtriks/generator-react-webpack/issues/173)
+
+## 1.0.2:
+
+1. Updated css-loader to current stable (0.23)
+2. Updated glob to new major (5.x to 6.x)
+
+## 1.0.1:
+___Upgrades___:
+
+1. Updated isparta-instrumenter-loader to new version 1.0
+
+## 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)
+2. Added new badges to README
+3. Updated devDependencies to current ones
+
+## 0.3.0:
+___Upgrades___:
+
+1. Added webpacks define plugin for dist version
+2. Added new task ```test:watch``` to watch for changes
+
+## 0.2.0:
+___Upgrades:___
+
+1. Updated React from 0.13 to 0.14 (using ```^0.14```) as version string. This included minor code changes for components (now use the splitted "React"-Package) and the runner (Using React-DOM).
+2. Updated the shallow renderer for unit tests.
+
+___Backwards incompatible changes:___
+
+1. Default unit tests do not need to traverse down to `Component._store.props`, but directly to `Component.props`. Please keep this in mind when using properties in your tests.

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Chris
+Copyright (c) 2015 Christian Schilling <cs@weblogixx.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

README.md

@@ -1,27 +1,31 @@
 # Welcome to react-webpack-template
-This repository holds a base template for the new version of generator-react-webpack.
-It can be understood as the prototype for newly generated projects.
+> This repository holds the base template for the current version of [generator-react-webpack](https://github.com/newtriks/generator-react-webpack).
+It can also be used as the prototype for newly generated projects.
+
+[![Build Status](https://travis-ci.org/weblogixx/react-webpack-template.svg)](https://travis-ci.org/weblogixx/react-webpack-template) ![Amount of Downloads per month](https://img.shields.io/npm/dm/react-webpack-template.svg "Amount of Downloads") ![Dependency Tracker](https://img.shields.io/david/weblogixx/react-webpack-template.svg "Dependency Tracker") ![Dependency Tracker](https://img.shields.io/david/dev/weblogixx/react-webpack-template.svg "Dependency Tracker")
 
 ## Features
-The following features are planned to be included in the final version:
+The following features are currently included:
 
 - [x] Webpack and Webpack-Dev-Server, including hot-loader
 - [x] Babel and JSX
 - [x] Mocha Unit tests (*optional*)
-- [ ] React.Router
-- [x] EsLint Support
+- [x] esLint Support
 - [x] No dependency on grunt, gulp or the next hot taskrunner!
+- [x] Support for environment-specific configuration files
+- [x] Support for code coverage via [isparta-loader](https://github.com/deepsweet/isparta-loader)
 
 ## Todo
-- [ ] The dynamic webpack configuration is clunky, there must be a better way to do that!
-- [ ] Karmas webpack configuration is not included in the global webpack.config.js file, but it really should
+- [ ] Better performance for webpack builds
 
 ## What is it for?
-This template can be used directly for the creation of new projects.
-Also it will be the "template" for the next version of generator-react-webpack.
+This template can be used directly for the creation of new projects. When using it like this, make sure to ___not___ install it via npm but download it directly. The template is (nearly) useless for itself when downloaded via npm!
+
+Basically, it is currently only used as the base template of [generator-react-webpack](https://github.com/newtriks/generator-react-webpack).
 
 ## Using it
-The template is available via webpack. The following commands are available:
+The template uses webpack as build tool to serve files and run tests. The following commands are available:
+
 ```bash
 # Start for development
 npm start # or
@@ -36,6 +40,9 @@ npm run dist
 # Run unit tests
 npm test
 
+# Run the unit tests continuously (repeat the test when code changes are saved)
+npm run test:watch
+
 # Lint all files in src (also automatically done AFTER tests are run)
 npm run lint
 
@@ -47,6 +54,7 @@ npm run copy
 ```
 
 You can also use your globally installed version of webpack like this:
+
 ```bash
 # Build or run the dev version:
 webpack
@@ -60,8 +68,46 @@ webpack --env=dist
 webpack-dev-server --env=dist
 ```
 
+## Including third party modules (e.g. from npm)
+The default setting for the webpack configuration is to only include the ```src``` and ```test``` directories. If you want to add any modules from npm, you have to add them in ```cfg/base.js```. One example is:
+
+```javascript
+// Somewhere on top of the file:
+let npmBase = path.join(__dirname, '../node_modules');
+let additionalPaths = [ path.join(npmBase, 'react-bootstrap') ];
+```
+
+All entries added to the additionalPaths array will be appended to the include path for babel.
+
+## A note on unit testing
+When running tests, coverage information (provided via Istanbul) will also be written into the ```coverage/``` directory. If you do not need this, just comment out or remove the section in ```karma.conf``` like this:
+
+```javascript
+/* do not use coverage reporting!
+coverageReporter: {
+  type: 'html',
+  dir: 'coverage/'
+}*/
+```
+
+Also, you should adjust your webpack test configuration (located in ```cfg/test.js```) to reflect this:
+
+```javascript
+/* Uncomment this to prevent loading via isparta
+{
+  test: /\.(js|jsx)$/,
+  loader: 'babel-loader',
+  include: [
+    path.join(__dirname, '/../src')
+  ],
+  loader: 'isparta'
+}*/
+```
+
 ## License
 react-webpack-template is available under MIT-License and can therefore be used in any project free of charge.
 
 ## Contributors
-- Weblogixx (cs@weblogixx.de)
+- Christian Schilling (cs@weblogixx.de)
+- Martin Jul (martin@mjul.com)
+- Stephan Herzog (sthzgvie@gmail.com)

cfg/base.js

@@ -0,0 +1,78 @@
+'use strict';
+let path = require('path');
+
+let port = 8000;
+let srcPath = path.join(__dirname, '/../src');
+let publicPath = '/assets/';
+
+// Additional npm or bower modules to include in builds
+// Add all foreign plugins you may need into this array
+// @example:
+// let npmBase = path.join(__dirname, '../node_modules');
+// let additionalPaths = [ path.join(npmBase, 'react-bootstrap') ];
+let additionalPaths = [];
+
+module.exports = {
+  additionalPaths: additionalPaths,
+  port: port,
+  debug: true,
+  output: {
+    path: path.join(__dirname, '/../dist/assets'),
+    filename: 'app.js',
+    publicPath: publicPath
+  },
+  devServer: {
+    contentBase: './src/',
+    historyApiFallback: true,
+    hot: true,
+    port: port,
+    publicPath: publicPath,
+    noInfo: false
+  },
+  resolve: {
+    extensions: ['', '.js', '.jsx'],
+    alias: {
+      actions: srcPath + '/actions/',
+      components: srcPath + '/components/',
+      sources: srcPath + '/sources/',
+      stores: srcPath + '/stores/',
+      styles: srcPath + '/styles/',
+      config: srcPath + '/config/' + process.env.REACT_WEBPACK_ENV
+    }
+  },
+  module: {
+    preLoaders: [
+      {
+        test: /\.(js|jsx)$/,
+        include: srcPath,
+        loader: 'eslint-loader'
+      }
+    ],
+    loaders: [
+      {
+        test: /\.css$/,
+        loader: 'style-loader!css-loader'
+      },
+      {
+        test: /\.sass/,
+        loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded&indentedSyntax'
+      },
+      {
+        test: /\.scss/,
+        loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded'
+      },
+      {
+        test: /\.less/,
+        loader: 'style-loader!css-loader!less-loader'
+      },
+      {
+        test: /\.styl/,
+        loader: 'style-loader!css-loader!stylus-loader'
+      },
+      {
+        test: /\.(png|jpg|gif|woff|woff2)$/,
+        loader: 'url-loader?limit=8192'
+      }
+    ]
+  }
+};

cfg/dev.js

@@ -0,0 +1,39 @@
+'use strict';
+
+let path = require('path');
+let webpack = require('webpack');
+let _ = require('lodash');
+
+let baseConfig = require('./base');
+
+// Add needed plugins here
+let BowerWebpackPlugin = require('bower-webpack-plugin');
+
+let config = _.merge({
+  entry: [
+    'webpack-dev-server/client?http://127.0.0.1:8000',
+    'webpack/hot/only-dev-server',
+    './src/index'
+  ],
+  cache: true,
+  devtool: 'eval',
+  plugins: [
+    new webpack.HotModuleReplacementPlugin(),
+    new webpack.NoErrorsPlugin(),
+    new BowerWebpackPlugin({
+      searchResolveModulesDirectories: false
+    })
+  ]
+}, baseConfig);
+
+// Add needed loaders
+config.module.loaders.push({
+  test: /\.(js|jsx)$/,
+  loader: 'react-hot!babel-loader',
+  include: [].concat(
+    config.additionalPaths,
+    [ path.join(__dirname, '/../src') ]
+  )
+});
+
+module.exports = config;

cfg/dist.js

@@ -0,0 +1,40 @@
+'use strict';
+
+let path = require('path');
+let webpack = require('webpack');
+let _ = require('lodash');
+
+let baseConfig = require('./base');
+
+// Add needed plugins here
+let BowerWebpackPlugin = require('bower-webpack-plugin');
+
+let config = _.merge({
+  entry: path.join(__dirname, '../src/index'),
+  cache: false,
+  devtool: 'sourcemap',
+  plugins: [
+    new webpack.optimize.DedupePlugin(),
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': '"production"'
+    }),
+    new BowerWebpackPlugin({
+      searchResolveModulesDirectories: false
+    }),
+    new webpack.optimize.UglifyJsPlugin(),
+    new webpack.optimize.OccurenceOrderPlugin(),
+    new webpack.optimize.AggressiveMergingPlugin(),
+    new webpack.NoErrorsPlugin()
+  ]
+}, baseConfig);
+
+config.module.loaders.push({
+  test: /\.(js|jsx)$/,
+  loader: 'babel',
+  include: [].concat(
+    config.additionalPaths,
+    [ path.join(__dirname, '/../src') ]
+  )
+});
+
+module.exports = config;

cfg/test.js

@@ -0,0 +1,58 @@
+'use strict';
+
+let path = require('path');
+let srcPath = path.join(__dirname, '/../src/');
+
+let baseConfig = require('./base');
+
+// Add needed plugins here
+let 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)$/,
+        loader: 'null-loader'
+      },
+      {
+        test: /\.(js|jsx)$/,
+        loader: 'babel-loader',
+        include: [].concat(
+          baseConfig.additionalPaths,
+          [
+            path.join(__dirname, '/../src'),
+            path.join(__dirname, '/../test')
+          ]
+        )
+      }
+    ]
+  },
+  resolve: {
+    extensions: [ '', '.js', '.jsx' ],
+    alias: {
+      actions: srcPath + 'actions/',
+      helpers: path.join(__dirname, '/../test/helpers'),
+      components: srcPath + 'components/',
+      sources: srcPath + 'sources/',
+      stores: srcPath + 'stores/',
+      styles: srcPath + 'styles/',
+      config: srcPath + 'config/' + process.env.REACT_WEBPACK_ENV
+    }
+  },
+  plugins: [
+    new BowerWebpackPlugin({
+      searchResolveModulesDirectories: false
+    })
+  ]
+};

karma.conf.js

@@ -1,56 +1,33 @@
-var path = require('path');
-var srcPath = __dirname + '/src/';
+var webpackCfg = require('./webpack.config');
 
 module.exports = function(config) {
   config.set({
     basePath: '',
-    browsers: ['PhantomJS'],
+    browsers: [ 'PhantomJS' ],
     files: [
       'test/loadtests.js'
     ],
     port: 8080,
     captureTimeout: 60000,
-    frameworks: ['phantomjs-shim', 'mocha', 'chai'],
+    frameworks: [ 'mocha', 'chai' ],
     client: {
-      mocha: {
-
-      }
+      mocha: {}
     },
     singleRun: true,
-    reporters: ['mocha'],
+    reporters: [ 'mocha', 'coverage' ],
     preprocessors: {
-      'test/loadtests.js': ['webpack', 'sourcemap']
-    },
-    webpack: {
-      cache: true,
-      devtool: 'inline-source-map',
-      module: {
-        loaders: [
-          {
-            test: /\.(css|png|jpg|gif|woff|woff2)$/,
-            loader: 'null-loader'
-          },
-          {
-            test: /\.(js|jsx)$/,
-            loader: 'babel-loader',
-            exclude: /node_modules/
-          }
-        ]
-      },
-      resolve: {
-        extensions: ['', '.js', '.jsx'],
-        alias: {
-          actions: srcPath + '/actions/',
-          helpers: path.join(__dirname, 'test', 'helpers'),
-          components: srcPath + '/components/',
-          sources: srcPath + '/sources/',
-          stores: srcPath + '/stores/',
-          styles: srcPath + '/styles/'
-        }
-      }
+      'test/loadtests.js': [ 'webpack', 'sourcemap' ]
     },
+    webpack: webpackCfg,
     webpackServer: {
       noInfo: true
+    },
+    coverageReporter: {
+      dir: 'coverage/',
+      reporters: [
+        { type: 'html' },
+        { type: 'text' }
+      ]
     }
   });
 };

package.json

@@ -1,18 +1,22 @@
 {
   "name": "react-webpack-template",
-  "version": "0.0.5",
+  "version": "1.3.1",
   "description": "A base skeleton template for react and webpack without task runners",
-  "main": "index.js",
+  "main": "server.js",
   "scripts": {
     "start": "node server.js --env=dev",
     "test": "karma start",
+    "test:watch": "karma start --autoWatch=true --singleRun=false",
     "posttest": "npm run lint",
     "serve": "node server.js --env=dev",
     "serve:dist": "node server.js --env=dist",
     "dist": "npm run copy & webpack --env=dist",
     "lint": "eslint ./src",
-    "copy": "copyfiles -f ./src/index.html ./dist",
-    "clean": "rimraf dist/*"
+    "copy": "copyfiles -f ./src/index.html ./src/favicon.ico ./dist",
+    "clean": "rimraf dist/*",
+    "release:major": "npm version major && npm publish && git push --follow-tags",
+    "release:minor": "npm version minor && npm publish && git push --follow-tags",
+    "release:patch": "npm version patch && npm publish && git push --follow-tags"
   },
   "repository": {
     "type": "git",
@@ -32,37 +36,47 @@
   },
   "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-eslint": "^5.0.0-beta4",
+    "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",
-    "css-loader": "^0.16.0",
+    "css-loader": "^0.23.0",
     "eslint": "^1.2.1",
     "eslint-loader": "^1.0.0",
     "eslint-plugin-react": "^3.3.0",
     "file-loader": "^0.8.4",
+    "glob": "^6.0.0",
+    "isparta-instrumenter-loader": "^1.0.0",
     "karma": "^0.13.9",
     "karma-chai": "^0.1.0",
+    "karma-coverage": "^0.5.3",
     "karma-mocha": "^0.2.0",
     "karma-mocha-reporter": "^1.1.1",
-    "karma-phantomjs-launcher": "^0.2.1",
-    "karma-phantomjs-shim": "^1.1.1",
+    "karma-phantomjs-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.5",
     "karma-webpack": "^1.7.0",
+    "lodash": "^4.0.0",
     "minimist": "^1.2.0",
     "mocha": "^2.2.5",
     "null-loader": "^0.1.1",
     "open": "0.0.5",
-    "phantomjs": "^1.9.18",
+    "phantomjs-prebuilt": "^2.0.0",
+    "react-addons-test-utils": "^0.14.0",
     "react-hot-loader": "^1.2.9",
     "rimraf": "^2.4.3",
-    "style-loader": "^0.12.3",
+    "style-loader": "^0.13.0",
     "url-loader": "^0.5.6",
     "webpack": "^1.12.0",
-    "webpack-dev-server": "^1.10.1"
+    "webpack-dev-server": "^1.12.0"
   },
   "dependencies": {
+    "core-js": "^2.0.0",
     "normalize.css": "^3.0.3",
-    "react": "^0.13.3"
+    "react": "^0.14.0",
+    "react-dom": "^0.14.0"
   }
 }

server.js

@@ -1,4 +1,5 @@
 /*eslint no-console:0 */
+require('core-js/fn/object/assign');
 var webpack = require('webpack');
 var WebpackDevServer = require('webpack-dev-server');
 var config = require('./webpack.config');

src/components/Main.js

@@ -1,13 +1,16 @@
 require('normalize.css');
 require('styles/App.css');
 
-import React from 'react/addons';
+import React from 'react';
+
+let yeomanImage = require('../images/yeoman.png');
 
 class AppComponent extends React.Component {
   render() {
     return (
       <div className="index">
-        Content
+        <img src={yeomanImage} alt="Yeoman Generator" />
+        <div className="notice">Please edit <code>src/components/Main.js</code> to get started!</div>
       </div>
     );
   }

src/components/run.js

@@ -1,5 +0,0 @@
-import React from 'react';
-import App from './Main';
-
-// Render the main component into the dom
-React.render(<App />, document.getElementById('app'));

src/config/README.md

@@ -0,0 +1,17 @@
+# About this folder
+This folder holds configuration files for different environments.
+You can use it to provide your app with different settings based on the 
+current environment, e.g. to configure different API base urls depending on 
+whether your setup runs in dev mode or is built for distribution.
+You can include the configuration into your code like this:
+
+```javascript
+let react = require('react/addons');
+let config = require('config');
+class MyComponent extends React.Component {
+  constructor(props) {
+    super(props);
+    let currentAppEnv = config.appEnv;
+  }
+}
+```

src/config/base.js

@@ -0,0 +1,6 @@
+'use strict';
+
+
+// Settings configured here will be merged into the final config object.
+export default {
+}

src/config/dev.js

@@ -0,0 +1,10 @@
+'use strict';
+
+import baseConfig from './base';
+
+
+let config = {
+  appEnv: 'dev'  // feel free to remove the appEnv property here
+};
+
+export default Object.freeze(Object.assign({}, baseConfig, config));

src/config/dist.js

@@ -0,0 +1,11 @@
+'use strict';
+
+import baseConfig from './base';
+
+
+let config = {
+  appEnv: 'dist'  // feel free to remove the appEnv property here
+};
+
+export default Object.freeze(Object.assign({}, baseConfig, config));
+

src/config/test.js

@@ -0,0 +1,11 @@
+'use strict';
+
+import baseConfig from './base';
+
+
+let config = {
+  appEnv: 'test'  // don't remove the appEnv property here
+};
+
+export default Object.freeze(Object.assign(baseConfig, config));
+

src/index.js

@@ -0,0 +1,7 @@
+import 'core-js/fn/object/assign';
+import React from 'react';
+import ReactDOM from 'react-dom';
+import App from './components/Main';
+
+// Render the main component into the dom
+ReactDOM.render(<App />, document.getElementById('app'));

src/styles/App.css

@@ -1 +1,21 @@
 /* Base Application Styles */
+body {
+  color: #fff;
+  background: #222;
+}
+
+.index img {
+  margin: 40px auto;
+  border-radius: 4px;
+  background: #fff;
+  display: block;
+}
+
+.index .notice {
+  margin: 20px auto;
+  padding: 15px 0;
+  text-align: center;
+  border: 1px solid #000;
+  border-width: 1px 0;
+  background: #666;
+}

test/components/MainTest.js

@@ -11,17 +11,13 @@ import createComponent from 'helpers/shallowRenderHelper';
 import Main from 'components/Main';
 
 describe('MainComponent', () => {
-    let MainComponent;
+  let MainComponent;
 
-    beforeEach(() => {
-      MainComponent = createComponent(Main);
-    });
+  beforeEach(() => {
+    MainComponent = createComponent(Main);
+  });
 
-    it('should have its component name as default className', () => {
-      expect(MainComponent._store.props.className).to.equal('index');
-    });
-
-    it('should do something!', () => {
-      expect(true).to.be.true;
-    });
+  it('should have its component name as default className', () => {
+    expect(MainComponent.props.className).to.equal('index');
+  });
 });

test/config/ConfigTest.js

@@ -0,0 +1,12 @@
+/*eslint-env node, mocha */
+/*global expect */
+/*eslint no-console: 0*/
+'use strict';
+
+import config from 'config';
+
+describe('appEnvConfigTests', () => {
+  it('should load app config file depending on current --env', () => {
+    expect(config.appEnv).to.equal('test');
+  });
+});

test/helpers/shallowRenderHelper.js

@@ -5,8 +5,8 @@
  * @see http://simonsmith.io/unit-testing-react-components-without-a-dom/
  * @author somonsmith
  */
-import React from 'react/addons';
-const TestUtils = React.addons.TestUtils;
+import React from 'react';
+import TestUtils from 'react-addons-test-utils';
 
 /**
  * Get the shallow rendered component

test/loadtests.js

@@ -1,2 +1,7 @@
-var testsContext = require.context('.', true, /(Test\.js$)|(Helper\.js$)/);
+'use strict';
+
+require('core-js/fn/object/assign');
+
+// Add support for all files in the test directory
+const testsContext = require.context('.', true, /(Test\.js$)|(Helper\.js$)/);
 testsContext.keys().forEach(testsContext);

webpack.config.js

@@ -1,100 +1,48 @@
-var webpack = require('webpack');
-var args = require('minimist')(process.argv.slice(2));
+'use strict';
+
 var path = require('path');
-var env = args.env || 'dev';
+var args = require('minimist')(process.argv.slice(2));
 
-var port = 8000;
-var srcPath = __dirname + '/src/';
-var publicPath = '/assets/';
+// List of allowed environments
+var allowedEnvs = ['dev', 'dist', 'test'];
 
-var config = {
-  port: port,
-  debug: true,
-  output: {
-    path: path.join(__dirname, 'dist/assets'),
-    filename: 'app.js',
-    publicPath: publicPath
-  },
-  devServer: {
-    contentBase: './src/',
-    historyApiFallback: true,
-    hot: true,
-    port: port,
-    publicPath: publicPath,
-    noInfo: false
-  },
-  resolve: {
-    extensions: ['', '.js', '.jsx'],
-    alias: {
-      actions: srcPath + '/actions/',
-      components: srcPath + '/components/',
-      sources: srcPath + '/sources/',
-      stores: srcPath + '/stores/',
-      styles: srcPath + '/styles/'
-    }
-  },
-  module: {
-    preLoaders: [
-      {
-        test: /\.(js|jsx)$/,
-        exclude: /node_modules/,
-        loader: 'eslint-loader'
-      }
-    ],
-    loaders: [
-      {
-        test: /\.css$/,
-        loader: 'style!css'
-      },
-      {
-        test: /\.(png|jpg|gif|woff|woff2)$/,
-        loader: 'url-loader?limit=8192'
-      }
-    ]
-  }
+// Set the correct environment
+var env;
+if(args._.length > 0 && args._.indexOf('start') !== -1) {
+  env = 'test';
+} else if (args.env) {
+  env = args.env;
+} else {
+  env = 'dev';
+}
+process.env.REACT_WEBPACK_ENV = env;
+
+// Get available configurations
+var configs = {
+  base: require(path.join(__dirname, 'cfg/base')),
+  dev: require(path.join(__dirname, 'cfg/dev')),
+  dist: require(path.join(__dirname, 'cfg/dist')),
+  test: require(path.join(__dirname, 'cfg/test'))
 };
 
-// Use config depending on environment
-switch(env) {
-  case 'dist':
-    config.entry = './src/components/run';
-    config.cache = false;
-    config.devtool = false;
-    config.plugins = [
-      new webpack.optimize.DedupePlugin(),
-      new webpack.optimize.UglifyJsPlugin(),
-      new webpack.optimize.OccurenceOrderPlugin(),
-      new webpack.optimize.AggressiveMergingPlugin(),
-      new webpack.NoErrorsPlugin()
-    ];
-
-    // Add needed loaders
-    config.module.loaders.push({
-      test: /\.(js|jsx)$/,
-      loader: 'babel',
-      include: path.join(__dirname, 'src')
-    });
-    break;
-
-  default:
-    config.entry = [
-      'webpack-dev-server/client?http://127.0.0.1:' + port,
-      'webpack/hot/only-dev-server',
-      './src/components/run'
-    ];
-    config.cache = true;
-    config.devtool = 'sourcemap';
-    config.plugins = [
-      new webpack.HotModuleReplacementPlugin(),
-      new webpack.NoErrorsPlugin()
-    ];
-
-    // Add needed loaders
-    config.module.loaders.push({
-      test: /\.(js|jsx)$/,
-      loader: 'react-hot!babel-loader',
-      include: path.join(__dirname, 'src')
-    });
+/**
+ * Get an allowed environment
+ * @param  {String}  env
+ * @return {String}
+ */
+function getValidEnv(env) {
+  var isValid = env && env.length > 0 && allowedEnvs.indexOf(env) !== -1;
+  return isValid ? env : 'dev';
 }
 
-module.exports = config;
+/**
+ * Build the webpack configuration
+ * @param  {String} env Environment to use
+ * @return {Object} Webpack config
+ */
+function buildConfig(env) {
+  var usedEnv = getValidEnv(env);
+  return configs[usedEnv];
+}
+
+module.exports = buildConfig(env);