From 2342d72c5e331bc052d507d6acb55d92d24ab663 Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Wed, 13 Feb 2019 14:22:45 -0500
Subject: [PATCH] Use existing parameter

---
 src/util/resolveConfig.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/util/resolveConfig.js b/src/util/resolveConfig.js
index 165ba4811..7e82aef13 100644
--- a/src/util/resolveConfig.js
+++ b/src/util/resolveConfig.js
@@ -2,7 +2,6 @@ import mergeWith from 'lodash/mergeWith'
 import isFunction from 'lodash/isFunction'
 import defaults from 'lodash/defaults'
 import map from 'lodash/map'
-import get from 'lodash/get'
 
 function resolveFunctionKeys(object) {
   return Object.keys(object).reduce((resolved, key) => {
@@ -18,15 +17,15 @@ function without(object, key) {
 }
 
 function mergeExtensions(theme) {
-  return mergeWith({}, without(theme, 'extend'), theme.extend, (_, value, key) => {
+  return mergeWith({}, without(theme, 'extend'), theme.extend, (_, extensions, key) => {
     return isFunction(theme[key])
       ? mergedTheme => ({
           ...theme[key](mergedTheme),
-          ...get(theme.extend, key, {})
+          ...extensions
         })
       : {
           ...theme[key],
-          ...get(theme.extend, key, {}),
+          ...extensions,
         }
   })
 }