diff --git a/src/util/resolveConfig.js b/src/util/resolveConfig.js index 523ccf0a9..6189d6cdc 100644 --- a/src/util/resolveConfig.js +++ b/src/util/resolveConfig.js @@ -12,13 +12,8 @@ function resolveFunctionKeys(object) { }, {}) } -function without(object, key) { - /* eslint-disable no-unused-vars */ - return (({ [key]: _, ...rest }) => rest)(object) -} - -function mergeExtensions(theme) { - return mergeWith({}, without(theme, 'extend'), theme.extend, (_, extensions, key) => { +function mergeExtensions({ extend, ...theme }) { + return mergeWith({}, theme, extend, (_, extensions, key) => { return isFunction(theme[key]) ? mergedTheme => ({ ...theme[key](mergedTheme),