cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add package.json dirname to mergeOptions - closes #3093

Browse Source
This commit is contained in:
Sebastian McKenzie 2015-11-17 22:58:24 -08:00
parent d2e07cffb9
commit ba68bd255e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/babel-core/src/transformation/file/options/option-manager.js
View File

@ -157,7 +157,7 @@ export default class OptionManager {
throw err; throw err;
} }
this.mergeOptions(opts, loc); this.mergeOptions(opts, loc, null, path.dirname(loc));
this.resolvedConfigs.push(loc); this.resolvedConfigs.push(loc);
return !!opts; return !!opts;
@ -237,7 +237,7 @@ export default class OptionManager {
merge(this.options, opts); merge(this.options, opts);
// merge in env options // merge in env options
this.mergeOptions(envOpts, `${alias}.env.${envKey}`); this.mergeOptions(envOpts, `${alias}.env.${envKey}`, null, dirname);
} }
mergePresets(presets: Array<string | Object>, dirname: string) { mergePresets(presets: Array<string | Object>, dirname: string) {