From aee1e444318912e246764c4a024c0f6542e33a82 Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Mon, 18 Mar 2019 11:42:56 -0400
Subject: [PATCH] Fix code style

---
 src/util/resolveConfig.js | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/util/resolveConfig.js b/src/util/resolveConfig.js
index 913af7ca4..0db03c222 100644
--- a/src/util/resolveConfig.js
+++ b/src/util/resolveConfig.js
@@ -4,19 +4,13 @@ import defaults from 'lodash/defaults'
 import map from 'lodash/map'
 import get from 'lodash/get'
 
-function resolveConfig(configs) {
-  return defaults(
-    {
-      theme: resolveFunctionKeys(mergeExtensions(defaults(...map(configs, 'theme')))),
-      variants: defaults(...map(configs, 'variants')),
-    },
-    ...configs
-  )
+function value(valueToResolve, ...args) {
+  return isFunction(valueToResolve) ? valueToResolve(...args) : valueToResolve
 }
 
 function mergeExtensions({ extend, ...theme }) {
-  return mergeWith(theme, extend, (themeValue, extensions, key) => {
-    if (!isFunction(themeValue) && !(isFunction(extensions))) {
+  return mergeWith(theme, extend, (themeValue, extensions) => {
+    if (!isFunction(themeValue) && !isFunction(extensions)) {
       return {
         ...themeValue,
         ...extensions,
@@ -41,8 +35,12 @@ function resolveFunctionKeys(object) {
   }, {})
 }
 
-function value(valueToResolve, ...args) {
-  return isFunction(valueToResolve) ? valueToResolve(...args) : valueToResolve
+export default function resolveConfig(configs) {
+  return defaults(
+    {
+      theme: resolveFunctionKeys(mergeExtensions(defaults(...map(configs, 'theme')))),
+      variants: defaults(...map(configs, 'variants')),
+    },
+    ...configs
+  )
 }
-
-export default resolveConfig