From f4093a552f28cc21d815bbdb36dbe7b4fca99c33 Mon Sep 17 00:00:00 2001 From: CrocoDillon Date: Mon, 14 Dec 2015 17:47:06 -0500 Subject: [PATCH 1/2] Use the babelrc option in babel-register Which can be used to ignore `.babelrc` files by setting this to false, currently ignored in babel-register. --- packages/babel-register/src/node.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/babel-register/src/node.js b/packages/babel-register/src/node.js index a1a389c868..6bcf4f5ffb 100644 --- a/packages/babel-register/src/node.js +++ b/packages/babel-register/src/node.js @@ -54,7 +54,7 @@ function compile(filename) { // merge in base options and resolve all the plugins and presets relative to this file optsManager.mergeOptions(deepClone(transformOpts), "base", null, path.dirname(filename)); - let opts = optsManager.init({ filename }); + let opts = optsManager.init({ filename, babelrc: transformOpts.babelrc }); let cacheKey = `${JSON.stringify(opts)}:${babel.version}`; From 1ba81153a76dc8771430334cb189df9c66a4579d Mon Sep 17 00:00:00 2001 From: CrocoDillon Date: Wed, 23 Dec 2015 05:29:06 -0500 Subject: [PATCH 2/2] Use `this.options.babelrc` instead of `opts.babelrc` --- .../src/transformation/file/options/option-manager.js | 10 +++++----- packages/babel-register/src/node.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/babel-core/src/transformation/file/options/option-manager.js b/packages/babel-core/src/transformation/file/options/option-manager.js index c65108039c..9683b3519c 100644 --- a/packages/babel-core/src/transformation/file/options/option-manager.js +++ b/packages/babel-core/src/transformation/file/options/option-manager.js @@ -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); diff --git a/packages/babel-register/src/node.js b/packages/babel-register/src/node.js index 6bcf4f5ffb..a1a389c868 100644 --- a/packages/babel-register/src/node.js +++ b/packages/babel-register/src/node.js @@ -54,7 +54,7 @@ function compile(filename) { // merge in base options and resolve all the plugins and presets relative to this file optsManager.mergeOptions(deepClone(transformOpts), "base", null, path.dirname(filename)); - let opts = optsManager.init({ filename, babelrc: transformOpts.babelrc }); + let opts = optsManager.init({ filename }); let cacheKey = `${JSON.stringify(opts)}:${babel.version}`;