wassname/react-webpack-template
1
0
Fork 0
mirror of https://github.com/wassname/react-webpack-template.git synced 2026-08-04 13:13:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed singleton loading problems from webpack config.

Browse Source
This commit is contained in:
Chris
2016-03-29 14:11:12 +02:00
parent ce025c4116
commit 45b31f0227
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webpack.config.js
+3 -10
View File
@@ -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);