From d95d28eec8cd0906ec04d011edaa93ff45095acc Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Wed, 13 Feb 2019 14:25:37 -0500 Subject: [PATCH] Fix code style --- __tests__/resolveConfig.test.js | 8 ++++---- src/util/resolveConfig.js | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/__tests__/resolveConfig.test.js b/__tests__/resolveConfig.test.js index ecdce1ac5..45b8498c4 100644 --- a/__tests__/resolveConfig.test.js +++ b/__tests__/resolveConfig.test.js @@ -442,7 +442,7 @@ test('theme values in the extend section extend the existing theme', () => { backgroundColors: { customBackground: '#bada55', }, - } + }, }, } @@ -520,7 +520,7 @@ test('theme values in the extend section extend the user theme', () => { height: { customHeight: '500vh', }, - } + }, }, } @@ -536,7 +536,7 @@ test('theme values in the extend section extend the user theme', () => { }, height: { '0': 0, - 'full': '100%', + full: '100%', }, width: { '0': 0, @@ -604,7 +604,7 @@ test('theme values in the extend section can extend values that are depended on backgroundColors: { customBackground: '#bada55', }, - } + }, }, } diff --git a/src/util/resolveConfig.js b/src/util/resolveConfig.js index 7e82aef13..523ccf0a9 100644 --- a/src/util/resolveConfig.js +++ b/src/util/resolveConfig.js @@ -13,7 +13,8 @@ function resolveFunctionKeys(object) { } function without(object, key) { - return (({[key]: _, ...rest }) => rest)(object) + /* eslint-disable no-unused-vars */ + return (({ [key]: _, ...rest }) => rest)(object) } function mergeExtensions(theme) { @@ -21,7 +22,7 @@ function mergeExtensions(theme) { return isFunction(theme[key]) ? mergedTheme => ({ ...theme[key](mergedTheme), - ...extensions + ...extensions, }) : { ...theme[key],