Fixed singleton loading problems from webpack config.

CHANGELOG.md

@@ -1,12 +1,17 @@
 # react-webpack-template - Changelog
 
+## 1.5.3:
+
+1. Asset paths are now relative (makes it easier to use bundles in subdirectories)
+2. Removed loading problems for webpack configurations overriding (see https://github.com/newtriks/generator-react-webpack/issues/194)
+
 ## 1.5.2:
 
 1. Updated dependencies to latests (babel-eslint, eslint, karma-mocha-reporter, normalize.css)
 
 ## 1.5.1:
 
-1. Emergency fix for corruct eslint version (2.3 is currently buggy). Fixes https://github.com/newtriks/generator-react-webpack/issues/196
+1. Emergency fix for correct eslint version (2.3 is currently buggy). Fixes https://github.com/newtriks/generator-react-webpack/issues/196
 2. Added mocha to eslint global config as requested in https://github.com/newtriks/generator-react-webpack/issues/195
 
 ## 1.5.0:

cfg/base.js

@@ -17,7 +17,7 @@ module.exports = {
   output: {
     path: path.join(__dirname, '/../dist/assets'),
     filename: 'app.js',
-    publicPath: defaultSettings.publicPath
+    publicPath: `.${defaultSettings.publicPath}`
   },
   devServer: {
     contentBase: './src/',

src/index.html

@@ -11,6 +11,6 @@
   <div id="app">APPLICATION CONTENT</div>
 
   <script>__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__</script>
-  <script type="text/javascript" src="assets/app.js"></script>
+  <script type="text/javascript" src="./assets/app.js"></script>
 </body>
 </html>

webpack.config.js

@@ -8,7 +8,7 @@ const allowedEnvs = ['dev', 'dist', 'test'];
 
 // Set the correct environment
 var env;
-if(args._.length > 0 && args._.indexOf('start') !== -1) {
+if (args._.length > 0 && args._.indexOf('start') !== -1) {
   env = 'test';
 } else if (args.env) {
   env = args.env;
@@ -17,14 +17,6 @@ if(args._.length > 0 && args._.indexOf('start') !== -1) {
 }
 process.env.REACT_WEBPACK_ENV = env;
 
-// Get available configurations
-const 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'))
-};
-
 /**
  * Build the webpack configuration
  * @param  {String} wantedEnv The wanted environment
@@ -33,7 +25,8 @@ const configs = {
 function buildConfig(wantedEnv) {
   let isValid = wantedEnv && wantedEnv.length > 0 && allowedEnvs.indexOf(wantedEnv) !== -1;
   let validEnv = isValid ? wantedEnv : 'dev';
-  return configs[validEnv];
+  let config = require(path.join(__dirname, 'cfg/' + validEnv));
+  return config;
 }
 
 module.exports = buildConfig(env);