From ba68bd255eca166e80be22e6768c3dac9649d5d1 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Tue, 17 Nov 2015 22:58:24 -0800
Subject: [PATCH] add package.json dirname to mergeOptions - closes #3093

---
 .../src/transformation/file/options/option-manager.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 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 80f9f6e574..069dad9d9a 100644
--- a/packages/babel-core/src/transformation/file/options/option-manager.js
+++ b/packages/babel-core/src/transformation/file/options/option-manager.js
@@ -157,7 +157,7 @@ export default class OptionManager {
       throw err;
     }
 
-    this.mergeOptions(opts, loc);
+    this.mergeOptions(opts, loc, null, path.dirname(loc));
     this.resolvedConfigs.push(loc);
 
     return !!opts;
@@ -237,7 +237,7 @@ export default class OptionManager {
     merge(this.options, opts);
 
     // 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) {