Merge pull request #3168 from CrocoDillon/babelrc-option

Use the babelrc option in babel-register
This commit is contained in:
James Kyle 2016-01-30 12:51:06 -08:00
commit 13129568ca

View File

@ -365,14 +365,14 @@ export default class OptionManager {
init(opts: Object = {}): Object {
let filename = opts.filename;
// resolve all .babelrc files
if (opts.babelrc !== false) {
this.findConfigs(filename);
}
// merge in base options
this.mergeOptions(opts, this.options, "base", null, filename && path.dirname(filename));
// resolve all .babelrc files
if (this.options.babelrc !== false) {
this.findConfigs(filename);
}
// normalise
this.normaliseOptions(opts);