From 44bccca3d045668bcb785ce386766ecc1a16a0bb Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Tue, 5 Feb 2019 13:37:05 -0500 Subject: [PATCH] Fix code style --- __tests__/configurePlugins.test.js | 48 +++++++++++++++++------------- src/corePlugins.js | 9 +++--- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/__tests__/configurePlugins.test.js b/__tests__/configurePlugins.test.js index 89530b2ef..a06ea79d6 100644 --- a/__tests__/configurePlugins.test.js +++ b/__tests__/configurePlugins.test.js @@ -100,15 +100,19 @@ test('plugins are configured with their default configuration if no custom confi }, } - const configuredPlugins = configurePlugins(plugins, { - fontSize: { - variants: ['responsive', 'hover'], - values: { '12': '12px', '14': '14px', '16': '16px' }, + const configuredPlugins = configurePlugins( + plugins, + { + fontSize: { + variants: ['responsive', 'hover'], + values: { '12': '12px', '14': '14px', '16': '16px' }, + }, + backgroundPosition: {}, }, - backgroundPosition: {}, - }, { - display: { variants: ['responsive'] }, - }) + { + display: { variants: ['responsive'] }, + } + ) expect(configuredPlugins).toEqual([ { @@ -145,19 +149,23 @@ test('custom plugin configuration overrides default plugin configuration', () => }, } - const configuredPlugins = configurePlugins(plugins, { - fontSize: { - variants: ['responsive', 'hover'], - values: { '12': '12px', '14': '14px', '16': '16px' }, + const configuredPlugins = configurePlugins( + plugins, + { + fontSize: { + variants: ['responsive', 'hover'], + values: { '12': '12px', '14': '14px', '16': '16px' }, + }, + display: { variants: ['responsive'] }, + backgroundPosition: {}, }, - display: { variants: ['responsive'] }, - backgroundPosition: {}, - }, { - fontSize: { - variants: ['focus', 'active'], - values: { 'sm': '.75rem', 'md': '1rem', 'lg': '1.5rem' }, - }, - }) + { + fontSize: { + variants: ['focus', 'active'], + values: { sm: '.75rem', md: '1rem', lg: '1.5rem' }, + }, + } + ) expect(configuredPlugins).toEqual([ { diff --git a/src/corePlugins.js b/src/corePlugins.js index 66782520b..a27a56998 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -53,14 +53,15 @@ import _ from 'lodash' import configurePlugins from './util/configurePlugins' function loadPlugins({ theme, variants, corePlugins }, plugins) { - const defaultCorePluginConfig = _.fromPairs(Object.keys(plugins) - .map(plugin => [ + const defaultCorePluginConfig = _.fromPairs( + Object.keys(plugins).map(plugin => [ plugin, { values: theme[plugin], variants: variants[plugin], - } - ])) + }, + ]) + ) return configurePlugins(plugins, corePlugins, defaultCorePluginConfig) }