From e01ac56b1cffcb1b1537a8989ae926073c99bd44 Mon Sep 17 00:00:00 2001
From: Logan Smyth <loganfsmyth@gmail.com>
Date: Thu, 5 Oct 2017 21:28:30 -0400
Subject: [PATCH] Simplify descriptor loading.

---
 .../babel-core/src/config/option-manager.js   | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/packages/babel-core/src/config/option-manager.js b/packages/babel-core/src/config/option-manager.js
index 90189e400f..e628ac665d 100644
--- a/packages/babel-core/src/config/option-manager.js
+++ b/packages/babel-core/src/config/option-manager.js
@@ -289,24 +289,25 @@ const loadConfig = makeWeakCache((config): {
  */
 const loadDescriptor = makeWeakCache(
   (descriptor: BasicDescriptor, cache): LoadedDescriptor => {
-    if (typeof descriptor.value !== "function") {
-      return { value: descriptor.value, descriptor };
-    }
     const { value, options } = descriptor;
 
-    const api = Object.assign(Object.create(context), {
-      cache,
-      env: () => cache.using(() => getEnv()),
-    });
+    let item = value;
+    if (typeof value === "function") {
+      const api = Object.assign(Object.create(context), {
+        cache,
+        env: () => cache.using(() => getEnv()),
+      });
 
-    let item;
-    try {
-      item = value(api, options, { dirname: descriptor.dirname });
-    } catch (e) {
-      if (descriptor.alias) {
-        e.message += ` (While processing: ${JSON.stringify(descriptor.alias)})`;
+      try {
+        item = value(api, options, { dirname: descriptor.dirname });
+      } catch (e) {
+        if (descriptor.alias) {
+          e.message += ` (While processing: ${JSON.stringify(
+            descriptor.alias,
+          )})`;
+        }
+        throw e;
       }
-      throw e;
     }
 
     if (!item || typeof item !== "object") {