Skip to content

Commit ff6fcba

Browse files
committed
add branch config
1 parent 22386e6 commit ff6fcba

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
node_modules/
2+
*.swp

lib/build.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,26 @@ function getBabelTarget(envConfig) {
1313
return unknown ? "6.10" : current.replace(/^nodejs/, "");
1414
}
1515

16-
function webpackConfig(dir, additionalConfig) {
17-
var config = conf.load();
16+
function loadEnvironment(config) {
1817
var envConfig = config.build.environment || config.build.Environment || {};
19-
var context = (
18+
var contextConfig = (
2019
process.env.CONTEXT &&
2120
config.context &&
2221
config.context[process.env.CONTEXT] &&
2322
(config.context[process.env.CONTEXT].environment || config.context[process.env.CONTEXT].Environment)
2423
) || {};
25-
Object.keys(context).forEach(key => {
26-
envConfig[key] = context[key];
27-
});
24+
var branchConfig = (
25+
process.env.BRANCH &&
26+
config.context &&
27+
config.context[process.env.BRANCH] &&
28+
(config.context[process.env.BRANCH].environment || config.context[process.env.BRANCH].Environment)
29+
) || {};
30+
return merge(envConfig, contextConfig, branchConfig);
31+
}
32+
33+
function webpackConfig(dir, additionalConfig) {
34+
var config = conf.load();
35+
var envConfig = loadEnvironment(config);
2836
var babelOpts = { cacheDirectory: true };
2937
if (!fs.existsSync(path.join(process.cwd(), ".babelrc"))) {
3038
babelOpts.presets = [

0 commit comments

Comments
 (0)