From 4a5d5513708f36e8ed235e03338417b8ea814b80 Mon Sep 17 00:00:00 2001
From: Logan Smyth <loganfsmyth@gmail.com>
Date: Thu, 9 Nov 2017 12:06:08 -0800
Subject: [PATCH] Set babelrc:false on config load for more consistent loading.

---
 packages/babel-core/src/config/option-manager.js |  1 +
 packages/babel-register/src/node.js              | 15 +++++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/babel-core/src/config/option-manager.js b/packages/babel-core/src/config/option-manager.js
index 9f65f4762d..4d8cac0395 100644
--- a/packages/babel-core/src/config/option-manager.js
+++ b/packages/babel-core/src/config/option-manager.js
@@ -120,6 +120,7 @@ class OptionManager {
 
     // Tack the passes onto the object itself so that, if this object is passed back to Babel a second time,
     // it will be in the right structure to not change behavior.
+    opts.babelrc = false;
     opts.plugins = this.passes[0];
     opts.presets = this.passes
       .slice(1)
diff --git a/packages/babel-register/src/node.js b/packages/babel-register/src/node.js
index f4715ff35d..21729f4fdb 100644
--- a/packages/babel-register/src/node.js
+++ b/packages/babel-register/src/node.js
@@ -63,16 +63,11 @@ function compile(code, filename) {
     }
   }
 
-  const result = babel.transform(
-    code,
-    Object.assign(opts, {
-      // Do not process config files since has already been done with the OptionManager
-      // calls above and would introduce duplicates.
-      babelrc: false,
-      sourceMaps: opts.sourceMaps === undefined ? "both" : opts.sourceMaps,
-      ast: false,
-    }),
-  );
+  const result = babel.transform(code, {
+    ...opts,
+    sourceMaps: opts.sourceMaps === undefined ? "both" : opts.sourceMaps,
+    ast: false,
+  });
 
   if (cache) {
     cache[cacheKey] = result;