1.0.3

fix eslint-loader path error (Provided by @HelloYie)

.eslintrc

@@ -1,4 +1,5 @@
 {
+  "parser": "babel-eslint",
   "plugins": [
     "react"
   ],

CHANGELOG.md

@@ -1,34 +1,50 @@
 # react-webpack-template - Changelog
 
+## 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.

cfg/base.js

@@ -35,14 +35,14 @@ module.exports = {
     preLoaders: [
       {
         test: /\.(js|jsx)$/,
-        include: path.join(__dirname, 'src'),
+        include: srcPath,
         loader: 'eslint-loader'
       }
     ],
     loaders: [
       {
         test: /\.css$/,
-        loader: 'style!css'
+        loader: 'style-loader!css-loader'
       },
       {
         test: /\.sass/,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-webpack-template",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "A base skeleton template for react and webpack without task runners",
   "main": "server.js",
   "scripts": {
@@ -37,18 +37,19 @@
   "homepage": "https://github.com/weblogixx/react-webpack-template#readme",
   "devDependencies": {
     "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.21.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": "^5.0.15",
+    "glob": "^6.0.0",
     "isparta-instrumenter-loader": "^1.0.0",
     "karma": "^0.13.9",
     "karma-chai": "^0.1.0",
@@ -72,6 +73,7 @@
     "webpack-dev-server": "^1.12.0"
   },
   "dependencies": {
+    "core-js": "^1.2.6",
     "lodash": "^3.10.1",
     "normalize.css": "^3.0.3",
     "react": "^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/run.js

@@ -1,3 +1,4 @@
+import 'core-js/fn/object/assign';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './Main';

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

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

src/config/dist.js

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

src/config/test.js

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

test/loadtests.js

@@ -1,5 +1,7 @@
 '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);