From e5288ff8fe56df29c61b4ec046304996eb829ab4 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Mon, 27 Apr 2020 09:03:50 -0400 Subject: [PATCH] Remove target helper --- src/plugins/objectFit.js | 27 ++++++++++++--------------- src/plugins/objectPosition.js | 33 +++++++++++++++------------------ src/util/processPlugins.js | 4 ---- 3 files changed, 27 insertions(+), 37 deletions(-) diff --git a/src/plugins/objectFit.js b/src/plugins/objectFit.js index 5c2b31c1c..9fd0a0b8e 100644 --- a/src/plugins/objectFit.js +++ b/src/plugins/objectFit.js @@ -1,21 +1,18 @@ export default function() { - return function({ addUtilities, variants, target }) { - target( + return function({ addUtilities, variants, config }) { + if (config('target') === 'ie11') { + return + } + + addUtilities( { - ie11: () => {}, + '.object-contain': { 'object-fit': 'contain' }, + '.object-cover': { 'object-fit': 'cover' }, + '.object-fill': { 'object-fit': 'fill' }, + '.object-none': { 'object-fit': 'none' }, + '.object-scale-down': { 'object-fit': 'scale-down' }, }, - () => { - addUtilities( - { - '.object-contain': { 'object-fit': 'contain' }, - '.object-cover': { 'object-fit': 'cover' }, - '.object-fill': { 'object-fit': 'fill' }, - '.object-none': { 'object-fit': 'none' }, - '.object-scale-down': { 'object-fit': 'scale-down' }, - }, - variants('objectFit') - ) - } + variants('objectFit') ) } } diff --git a/src/plugins/objectPosition.js b/src/plugins/objectPosition.js index d55a9cc05..9921aec19 100644 --- a/src/plugins/objectPosition.js +++ b/src/plugins/objectPosition.js @@ -1,25 +1,22 @@ import _ from 'lodash' export default function() { - return function({ addUtilities, e, theme, variants, target }) { - target( - { - ie11: () => {}, - }, - () => { - const utilities = _.fromPairs( - _.map(theme('objectPosition'), (value, modifier) => { - return [ - `.${e(`object-${modifier}`)}`, - { - 'object-position': value, - }, - ] - }) - ) + return function({ addUtilities, e, theme, variants, config }) { + if (config('target') === 'ie11') { + return + } - addUtilities(utilities, variants('objectPosition')) - } + const utilities = _.fromPairs( + _.map(theme('objectPosition'), (value, modifier) => { + return [ + `.${e(`object-${modifier}`)}`, + { + 'object-position': value, + }, + ] + }) ) + + addUtilities(utilities, variants('objectPosition')) } } diff --git a/src/util/processPlugins.js b/src/util/processPlugins.js index 62ec32370..c0404a2d9 100644 --- a/src/util/processPlugins.js +++ b/src/util/processPlugins.js @@ -27,9 +27,6 @@ export default function(plugins, config) { return prefixSelector(config.prefix, selector) } const getConfigValue = (path, defaultValue) => _.get(config, path, defaultValue) - const target = (targets, defaultTarget) => { - return _.get(targets, getConfigValue('target'), defaultTarget)() - } plugins.forEach(plugin => { if (plugin.__isOptionsFunction) { @@ -41,7 +38,6 @@ export default function(plugins, config) { handler({ postcss, config: getConfigValue, - target, theme: (path, defaultValue) => getConfigValue(`theme.${path}`, defaultValue), variants: (path, defaultValue) => { if (Array.isArray(config.variants)) {